Merge pull request #1148 from merico-dev/1145-low-performance-on-a-qu…

…ery-with-360k-rows-of-data 1145 low performance on a query with 360k rows of data
merico-dev · Aug 30, 2023 · 75d91a8 · 75d91a8
2 parents 7b76466 + 730f9b4
commit 75d91a8
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/api/package.json b/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/api",
-  "version": "10.23.1",
+  "version": "10.24.0",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/dashboard/package.json b/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/dashboard",
-  "version": "10.23.1",
+  "version": "10.24.0",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

diff --git a/dashboard/src/dashboard-editor/model/content/index.ts b/dashboard/src/dashboard-editor/model/content/index.ts
@@ -157,7 +157,7 @@ const _ContentModel = types
         };
       }
       return {
-        data: q.data.toJSON(),
+        data: q.data,
         len: q.data.length,
         state: q.state,
         error: q.error,

diff --git a/dashboard/src/dashboard-render/model/content.ts b/dashboard/src/dashboard-render/model/content.ts
@@ -111,7 +111,7 @@ export const ContentRenderModel = types
         };
       }
       return {
-        data: q.data.toJSON(),
+        data: q.data,
         len: q.data.length,
         state: q.state,
         error: q.error,

diff --git a/dashboard/src/model/render-model/dashboard/content/panels/panel.ts b/dashboard/src/model/render-model/dashboard/content/panels/panel.ts
@@ -16,7 +16,7 @@ export const PanelRenderModel = PanelMeta.views((self) => ({
     },
     get data() {
       return this.queries.reduce((ret: TPanelData, q) => {
-        ret[q.id] = q.data.toJSON();
+        ret[q.id] = q.data;
         return ret;
       }, {});
     },

diff --git a/dashboard/src/model/render-model/dashboard/content/queries/queries.ts b/dashboard/src/model/render-model/dashboard/content/queries/queries.ts
@@ -29,7 +29,7 @@ export const QueriesRenderModel = types
       downloadAllData() {
         const idDataList = self.current.map(({ name, data }) => ({
           id: name,
-          data: data.toJSON(),
+          data,
         }));
         downloadDataListAsZip(idDataList);
       },
@@ -39,7 +39,7 @@ export const QueriesRenderModel = types
           .filter((q) => idset.has(q.id))
           .map(({ name, data }) => ({
             id: name,
-            data: data.toJSON(),
+            data,
           }));
         downloadDataListAsZip(idDataList);
       },

diff --git a/dashboard/src/model/render-model/dashboard/content/queries/query.ts b/dashboard/src/model/render-model/dashboard/content/queries/query.ts
@@ -19,7 +19,7 @@ export const QueryRenderModel = types
     MuteQueryModel,
     types.model({
       state: types.optional(types.enumeration(['idle', 'loading', 'error']), 'idle'),
-      data: types.optional(types.array(types.frozen<string[] | number[]>()), []),
+      data: types.optional(types.frozen<string[][] | number[][]>([]), []),
       error: types.frozen(),
     }),
   )

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/root",
-  "version": "10.23.1",
+  "version": "10.24.0",
   "private": true,
   "workspaces": [
     "api",

diff --git a/settings-form/package.json b/settings-form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/settings-form",
-  "version": "10.23.1",
+  "version": "10.24.0",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

diff --git a/website/package.json b/website/package.json
@@ -2,7 +2,7 @@
   "name": "@devtable/website",
   "private": true,
   "license": "Apache-2.0",
-  "version": "10.23.1",
+  "version": "10.24.0",
   "scripts": {
     "dev": "vite",
     "preview": "vite preview"