(core) Nice summary table IDs

Summary:
Changes auto-generated summary table IDs from e.g. `GristSummary_6_Table1` to `Table1_summary_A_B` (meaning `Table1` grouped by `A` and `B`). This makes it easier to write formulas involving summary tables, make API requests, understand logs, etc.

Because these don't encode the source table ID as reliably as before, `decode_summary_table_name` now uses the summary table schema info, not just the summary table ID. Specifically, it looks at the type of the `group` column, which is `RefList:<source table id>`.

Renaming a source table renames the summary table as before, and now renaming a groupby column renames the summary table as well.

Conflicting table names are resolved in the usual way by adding a number at the end, e.g. `Table1_summary_A_B2`. These summary tables are not automatically renamed when the disambiguation is no longer needed.

A new migration renames all summary tables to the new scheme, and updates formulas using summary tables with a simple regex.

Test Plan:
Updated many tests to use the new style of name.

Added new Python tests to for resolving conflicts when renaming source tables and groupby columns.

Added a test for the migration, including renames in formulas.

Reviewers: georgegevoian

Reviewed By: georgegevoian

Differential Revision: https://phab.getgrist.com/D3508
This commit is contained in:
Alex Hall
2022-07-11 20:00:25 +02:00
parent f1df6c0a46
commit b8486dcdba
18 changed files with 507 additions and 311 deletions

View File

@@ -1,5 +1,6 @@
import json
import re
from collections import defaultdict
import six
from six.moves import xrange
@@ -378,7 +379,8 @@ def migration7(tdset):
groupby_colrefs = [int(x) for x in m.group(2).strip("_").split("_")]
# Prepare a new-style name for the summary table. Be sure not to conflict with existing tables
# or with each other (i.e. don't rename multiple tables to the same name).
new_name = summary.encode_summary_table_name(source_table_name)
groupby_col_ids = [columns_map_by_ref[c].colId for c in groupby_colrefs]
new_name = summary.encode_summary_table_name(source_table_name, groupby_col_ids)
new_name = identifiers.pick_table_ident(new_name, avoid=table_name_set)
table_name_set.add(new_name)
log.warn("Upgrading summary table %s for %s(%s) to %s" % (
@@ -1014,3 +1016,60 @@ def migration30(tdset):
new_view_section_id += 1
return tdset.apply_doc_actions(doc_actions)
@migration(schema_version=31)
def migration31(tdset):
columns = list(actions.transpose_bulk_action(tdset.all_tables['_grist_Tables_column']))
tables = list(actions.transpose_bulk_action(tdset.all_tables['_grist_Tables']))
tables_by_ref = {t.id: t for t in tables}
columns_by_table_ref = defaultdict(list)
for col in columns:
columns_by_table_ref[col.parentId].append(col)
table_name_set = {t.tableId for t in tables}
table_renames = [] # List of (table, new_name) pairs
for t in six.itervalues(tables_by_ref):
if not t.summarySourceTable:
continue
source_table = tables_by_ref[t.summarySourceTable]
# Prepare a new-style name for the summary table. Be sure not to conflict with existing tables
# or with each other (i.e. don't rename multiple tables to the same name).
groupby_col_ids = [c.colId for c in columns_by_table_ref[t.id] if c.summarySourceCol]
new_name = summary.encode_summary_table_name(source_table.tableId, groupby_col_ids)
if new_name == t.tableId:
continue
new_name = identifiers.pick_table_ident(new_name, avoid=table_name_set)
table_name_set.add(new_name)
log.warn("Upgrading summary table %s for %s(%s) to %s" % (
t.tableId, source_table.tableId, groupby_col_ids, new_name))
# Schedule a rename of the summary table.
table_renames.append((t, new_name))
doc_actions = [
actions.RenameTable(t.tableId, new)
for (t, new) in table_renames
]
if table_renames:
doc_actions.append(
actions.BulkUpdateRecord(
'_grist_Tables', [t.id for t, new in table_renames],
{'tableId': [new for t, new in table_renames]}
)
)
# Update formulas in all columns containing old-style names like 'GristSummary_'
for col in columns:
if 'GristSummary_' not in col.formula:
continue
formula = col.formula
for table, new_name in table_renames:
# Use regex to only match whole words
formula = re.sub(r'\b%s\b' % table.tableId, new_name, formula)
doc_actions.append(actions.UpdateRecord('_grist_Tables_column', col.id, {'formula': formula}))
return tdset.apply_doc_actions(doc_actions)