cypher: retire post-#1260 reentry delegator shims

Author: lmeyerov

CHANGELOG.md

@@ -11,6 +11,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Documentation
 - **GFQL component-labeling examples + README clarity (#1324)**: Added concise WCC/SCC labeling examples for `compute_cugraph`, `compute_igraph('clusters')`, and local Cypher `CALL graphistry.cugraph.*` write/row modes in GFQL docs, clarified that component IDs are partition labels (not stable semantic IDs), and tightened the main README GFQL intro sentence for readability.
 
+### Internal
+- **GFQL / Cypher row-carrier follow-through cleanup (#989, post-#1260 split)**: Retired transitional lowering-level bounded-reentry delegator shims (`_map_terminal_reentry_query`, `_drop_bare_alias_items_from_stage`, `_rewrite_multi_whole_row_prefix`, `_compile_bounded_reentry_query`) that only forwarded into `graphistry/compute/gfql/cypher/reentry/runtime.py`. Lowering now calls runtime-owned reentry helpers directly at use sites, and the split-guard tests were trimmed to keep only projection-planning delegator assertions.
+
 ## [0.55.1 - 2026-05-05]
 
 ### Tests

graphistry/compute/gfql/cypher/lowering.py

@@ -7243,8 +7243,10 @@ def rewrite_text(expr: ExpressionText, field: str) -> ExpressionText:
     # `_collect_secondary_property_refs` would fail-fast on what is in fact a
     # forwarding pattern, blocking IC3 even after #1248 admits the prefix WITH.
     secondary_forwarding_re = re.compile(r"[A-Za-z_][A-Za-z0-9_]*")
+    from graphistry.compute.gfql.cypher.reentry import runtime as _reentry_runtime
+
     cleaned_with_stages_tail = tuple(
-        _drop_bare_alias_items_from_stage(
+        _reentry_runtime._drop_bare_alias_items_from_stage(
             stage, secondary_aliases, identifier_re=secondary_forwarding_re
         )
         for stage in query.with_stages[1:]
@@ -7373,52 +7375,6 @@ def rewrite_text(expr: ExpressionText, field: str) -> ExpressionText:
     return rewritten_query, rewritten_prefix_stage, tuple(sorted(secondary_aliases))
 
 
-def _map_terminal_reentry_query(
-    compiled_query: CompiledCypherQuery,
-    *,
-    transform: Callable[[CompiledCypherQuery], CompiledCypherQuery],
-) -> CompiledCypherQuery:
-    from graphistry.compute.gfql.cypher.reentry import runtime as _reentry_runtime
-
-    return _reentry_runtime._map_terminal_reentry_query(compiled_query, transform=transform)
-
-
-def _drop_bare_alias_items_from_stage(
-    stage: ProjectionStage,
-    aliases: AbstractSet[str],
-    *,
-    identifier_re: "re.Pattern[str]",
-) -> ProjectionStage:
-    from graphistry.compute.gfql.cypher.reentry import runtime as _reentry_runtime
-
-    return _reentry_runtime._drop_bare_alias_items_from_stage(stage, aliases, identifier_re=identifier_re)
-
-
-def _rewrite_multi_whole_row_prefix(
-    prefix_stage: ProjectionStage,
-    *,
-    query: CypherQuery,
-    reentry_first_alias: Optional[str],
-) -> Tuple[ProjectionStage, Tuple[ProjectionStage, ...], Dict[str, Tuple[str, ...]]]:
-    from graphistry.compute.gfql.cypher.reentry import runtime as _reentry_runtime
-
-    return _reentry_runtime._rewrite_multi_whole_row_prefix(
-        prefix_stage,
-        query=query,
-        reentry_first_alias=reentry_first_alias,
-    )
-
-
-def _compile_bounded_reentry_query(
-    query: CypherQuery,
-    *,
-    params: Optional[Mapping[str, Any]] = None,
-) -> CompiledCypherQuery:
-    from graphistry.compute.gfql.cypher.reentry import runtime as _reentry_runtime
-
-    return _reentry_runtime._compile_bounded_reentry_query(query, params=params)
-
-
 def _compile_call_query(
     query: CypherQuery,
     *,
@@ -8349,7 +8305,9 @@ def _attach_graph_context(result: CompiledCypherQuery) -> CompiledCypherQuery:
         params=params,
     )
     if query.reentry_matches:
-        return _attach_graph_context(_compile_bounded_reentry_query(query, params=params))
+        from graphistry.compute.gfql.cypher.reentry import runtime as _reentry_runtime
+
+        return _attach_graph_context(_reentry_runtime._compile_bounded_reentry_query(query, params=params))
     if query.call is not None:
         return _attach_graph_context(_compile_call_query(query, params=params))
     if query.row_sequence:

graphistry/tests/compute/gfql/cypher/test_lowering_s3_split_guard.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 
-from graphistry.compute.chain import Chain
 from graphistry.compute.gfql.cypher import lowering, projection_planning
-from graphistry.compute.gfql.cypher.reentry import runtime as reentry_runtime
 
 
 def test_issue_1301_projection_split_delegator_round_trip() -> None:
@@ -11,17 +9,6 @@ def test_issue_1301_projection_split_delegator_round_trip() -> None:
     extracted = projection_planning._split_qualified_name(expr, line=1, column=1)
     assert lowered == extracted == ("person", "name")
 
-
-def test_issue_1301_reentry_runtime_delegator_identity_path() -> None:
-    compiled = lowering.CompiledCypherQuery(chain=Chain([], validate=False))
-
-    lowered = lowering._map_terminal_reentry_query(compiled, transform=lambda q: q)
-    extracted = reentry_runtime._map_terminal_reentry_query(compiled, transform=lambda q: q)
-
-    assert lowered is compiled
-    assert extracted is compiled
-
-
 def test_issue_1301_projection_delegator_forwards_args(monkeypatch) -> None:
     captured = {}
     alias_obj = object()
@@ -43,21 +30,3 @@ def _stub(expr, *, alias_targets, params, field, line, column):
 
     assert out == ("x", "y")
     assert captured["args"] == ("a.b", alias_targets, {"p": 1}, "return.item", 7, 11)
-
-
-def test_issue_1301_reentry_compile_delegator_forwards_params(monkeypatch) -> None:
-    captured = {}
-
-    def _stub(query, *, params):
-        captured["query"] = query
-        captured["params"] = params
-        return "compiled"
-
-    monkeypatch.setattr(reentry_runtime, "_compile_bounded_reentry_query", _stub)
-    query = object()
-    params = {"limit": 5}
-    out = lowering._compile_bounded_reentry_query(query, params=params)
-
-    assert out == "compiled"
-    assert captured["query"] is query
-    assert captured["params"] == params