(core) Fix self-updating trigger formulas used in lookups

Summary:
The problem: For a data-cleaning column (one that depends on itself) `doBulkUpdateRecord` calls `prevent_recalc(should_prevent=False)``
which is supposed to cause it to get calculated eventually.
But before that it calls `_do_doc_action` -> `apply_doc_action` -> `_bring_lookups_up_to_date` which recalculates
a lookup column which eventually calls `_recompute_step(allow_evaluation=False)` on the data-cleaning column
which shouldn't really do anything significant but it both modifies the set `self.recompute_map[node]`
and then removes it from the map after it's empty.

The solution: when `allow_evaluation=False` and `self._prevent_recompute_map[node]` is nonempty,
ensure `self.recompute_map[node]` is not modified,
and check the map directly (instead of `dirty_rows` which can now be separate) to see if the set is empty before cleanup.

Test Plan: Added a lookup column to test_self_trigger, ensured that this caused the test to fail without the other two changes in engine.py.

Reviewers: paulfitz

Reviewed By: paulfitz

Subscribers: dsagal

Differential Revision: https://phab.getgrist.com/D3006
This commit is contained in:
Alex Hall
2021-08-30 21:55:14 +02:00
parent 29dd33a45c
commit 5258fa649d
2 changed files with 34 additions and 10 deletions

View File

@@ -707,7 +707,13 @@ class Engine(object):
exempt = self._prevent_recompute_map.get(node, None)
if exempt:
dirty_rows.difference_update(exempt)
# If allow_evaluation=False we're not supposed to actually compute dirty_rows.
# But we may need to compute them later,
# so ensure self.recompute_map[node] isn't mutated by separating it from dirty_rows.
# Therefore dirty_rows is assigned a new value. Note that -= would be a mutation.
dirty_rows = dirty_rows - exempt
if allow_evaluation:
self.recompute_map[node] = dirty_rows
require_rows = sorted(require_rows or [])
@@ -797,9 +803,12 @@ class Engine(object):
finally:
for row_id in cleaned:
# this modifies self.recompute_map[node], to which dirty_rows is a reference
# Usually dirty_rows refers to self.recompute_map[node], so this modifies both
dirty_rows.discard(row_id)
if not dirty_rows:
# However it's possible for them to be different
# (see above where `exempt` is nonempty and allow_evaluation=True)
# so here we check self.recompute_map[node] directly
if not self.recompute_map[node]:
self.recompute_map.pop(node)
def _recompute_one_cell(self, frame, table, col, row_id, cycle=False, node=None):