Skip to content

Keep SelectOptimizer from reusing macro call node IDs #1430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Oct 29, 2026
Merged

Keep SelectOptimizer from reusing macro call node IDs #1430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions optimizer/src/main/java/dev/cel/optimizer/optimizers/SelectOptimizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import static com.google.common.collect.ImmutableList.toImmutableList;
import static dev.cel.optimizer.optimizers.DefaultOptimizerConstants.CEL_ATTRIBUTE_FUNCTION_NAME;
import static dev.cel.optimizer.optimizers.DefaultOptimizerConstants.CEL_HAS_FIELD_FUNCTION_NAME;
import static java.lang.Math.max;

import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
Expand Down Expand Up @@ -244,8 +245,13 @@ public OptimizationResult optimize(CelAbstractSyntaxTree ast, Cel cel) {
return OptimizationResult.create(ast);
}

MonotonicIdGenerator idGenerator =
CelExprIdGeneratorFactory.newMonotonicIdGenerator(navAst.getRoot().maxId());
// Macro calls may hold nodes absent from the expression (e.g. comprehension variables) whose
// IDs exceed its own, so new IDs must start past them too.
long maxId = navAst.getRoot().maxId();
for (CelMutableExpr macroCall : astToModify.source().getMacroCalls().values()) {
maxId = max(maxId, CelNavigableMutableExpr.fromExpr(macroCall).maxId());
}
MonotonicIdGenerator idGenerator = CelExprIdGeneratorFactory.newMonotonicIdGenerator(maxId);

int iterationCount = 0;
for (CelNavigableMutableExpr topNode : topOfChainSelects) {
Expand Down
21 changes: 21 additions & 0 deletions optimizer/src/test/java/dev/cel/optimizer/optimizers/SelectOptimizerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1727,6 +1727,27 @@ public void optimize_optionalMapKeySelection_rewritesMapField() throws Exception
"cel.@attribute(msg, [[61, \"map_string_string\", -1, [9, 9]]], {\"\": \"\"}).?key");
}

@Test
public void optimize_afterConstantFolding_preservesMacroCalls() throws Exception {
CelOptimizer optimizer =
CelOptimizerFactory.standardCelOptimizerBuilder(cel)
.addAstOptimizers(
ConstantFoldingOptimizer.getInstance(),
SelectOptimizer.newInstance(
PROTO2_TEST_ALL_TYPES_DESCRIPTOR.getFile(),
NestedTestAllTypes.getDescriptor().getFile()))
.build();
CelAbstractSyntaxTree ast =
cel.compile("[nested_msg].map(n, n.child.payload.single_int64 + (1 + 1))").getAst();

CelAbstractSyntaxTree optimizedAst = optimizer.optimize(ast);

assertThat(CEL_UNPARSER.unparse(optimizedAst))
.isEqualTo(
"[nested_msg].map(n, cel.@attribute(n, [[1, \"child\", 11], [2, \"payload\", 11],"
+ " [2, \"single_int64\", 3]], -64) + 2)");
}

private static CelOptimizer newSelectOptimizer(Cel cel) {
return CelOptimizerFactory.standardCelOptimizerBuilder(cel)
.addAstOptimizers(
Expand Down
Loading