Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2026-03-02 04:09:24 +00:00
Code Issues Projects Releases Wiki Activity

(core) Move guessing logic for column types to run in node once for all columns.

Browse Source 
Summary:
Previously, columns of type Any were created and modified one by one by reusing
the "empty column" logic from the data engine. This copies that logic to Node,
and sets the type of all columns together, to create them with the correct type
in the AddTable call.

This makes imports about twice faster (when slowness is due to many columns),
but doesn't address all cases where individual handling of columns causes slowness.

Test Plan: Added a test case for the new helper function.

Reviewers: alexmojaki

Reviewed By: alexmojaki

Subscribers: alexmojaki

Differential Revision: https://phab.getgrist.com/D3427
This commit is contained in:
Dmitry S
2022-05-19 12:49:13 -04:00
parent a6063f570a
commit 309ddb0fe7
2 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/server/lib/ActiveDocImport.ts
View File

@@ -12,6 +12,7 @@ import {ApiError} from 'app/common/ApiError';
import {BulkColValues, CellValue, fromTableDataAction, TableRecordValue, UserAction} from 'app/common/DocActions';
import * as gutil from 'app/common/gutil';
import {DocStateComparison} from 'app/common/UserAPI';
import {guessColInfoForImports} from 'app/common/ValueGuesser';
import {ParseFileResult, ParseOptions} from 'app/plugin/FileParserAPI';
import {GristColumn, GristTable} from 'app/plugin/GristTable';
import {ActiveDoc} from 'app/server/lib/ActiveDoc';
@@ -303,7 +304,7 @@ export class ActiveDocImport {
const origTableName = table.table_name ? table.table_name : '';
const transformRule = transformRuleMap && transformRuleMap.hasOwnProperty(origTableName) ?
transformRuleMap[origTableName] : null;
const columnMetadata = cleanColumnMetadata(table.column_metadata);
const columnMetadata = cleanColumnMetadata(table.column_metadata, table.table_data, this._activeDoc);
const result: ApplyUAResult = await this._activeDoc.applyUserActions(docSession,
[["AddTable", hiddenTableName, columnMetadata]]);
const retValue: AddTableRetValue = result.retValues[0];
@@ -758,17 +759,24 @@ function getMergeFunction({type}: MergeStrategy): MergeFunction {
* Tweak the column metadata used in the AddTable action.
* If `columns` is populated with non-blank column ids, adds labels to all
* columns using the values set for the column ids.
* Ensure that columns of type Any start out as formula columns, i.e. empty columns,
* so that type guessing is triggered when new data is added.
* For columns of type Any, guess the type and parse data according to it, or mark as empty
* formula columns when they should be empty.
*/
function cleanColumnMetadata(columns: GristColumn[]) {
return columns.map(c => {
function cleanColumnMetadata(columns: GristColumn[], tableData: unknown[][], activeDoc: ActiveDoc) {
return columns.map((c, index) => {
const newCol: any = {...c};
if (c.id) {
newCol.label = c.id;
}
if (c.type === "Any") {
newCol.isFormula = true;
// If import logic left it to us to decide on column type, then use our guessing logic to
// pick a suitable type and widgetOptions, and to convert values to it.
const origValues = tableData[index] as CellValue[];
const {values, colMetadata} = guessColInfoForImports(origValues, activeDoc.docData!);
tableData[index] = values;
if (colMetadata) {
Object.assign(newCol, colMetadata);
}
}
return newCol;
});