Skip to content

Avoid re-checking the AST in CelOptimizer if it was not modified. #1205

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

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Avoid re-checking the AST in CelOptimizer if it was not modified. #1205

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
21 changes: 12 additions & 9 deletions optimizer/src/main/java/dev/cel/optimizer/CelOptimizerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ final class CelOptimizerImpl implements CelOptimizer {
}

@Override
@SuppressWarnings("ReferenceEquality")
public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptimizationException {
if (!ast.isChecked()) {
throw new IllegalArgumentException("AST must be type-checked.");
Expand All @@ -49,16 +50,18 @@ public CelAbstractSyntaxTree optimize(CelAbstractSyntaxTree ast) throws CelOptim
try {
for (CelAstOptimizer optimizer : astOptimizers) {
OptimizationResult result = optimizer.optimize(optimizedAst, celOptimizerEnv);
if (!result.newFunctionDecls().isEmpty() || !result.newVarDecls().isEmpty()) {
celOptimizerEnv =
celOptimizerEnv
.toCelBuilder()
.addVarDeclarations(result.newVarDecls())
.addFunctionDeclarations(result.newFunctionDecls())
.build();
if (result.optimizedAst() != optimizedAst) {
if (!result.newFunctionDecls().isEmpty() || !result.newVarDecls().isEmpty()) {
celOptimizerEnv =
celOptimizerEnv
.toCelBuilder()
.addVarDeclarations(result.newVarDecls())
.addFunctionDeclarations(result.newFunctionDecls())
.build();
}
optimizedAst = celOptimizerEnv.check(result.optimizedAst()).getAst();
assertAstIdCorrectness(optimizedAst);
}
optimizedAst = celOptimizerEnv.check(result.optimizedAst()).getAst();
assertAstIdCorrectness(optimizedAst);
}
} catch (CelValidationException e) {
throw new CelOptimizationException(
Expand Down
25 changes: 25 additions & 0 deletions optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,31 @@ public void block_lazyEvaluationContainsError_cleansUpCycleState() throws Except
assertThat(e).hasMessageThat().doesNotContain("Cycle detected");
}

@Test
public void cse_nestedMacro_noOp_assertAstIdCorrectness() throws Exception {
Cel cel =
runtimeFlavor
.builder()
.addVar("x", SimpleType.DYN)
.setStandardMacros(CelStandardMacro.STANDARD_MACROS)
.setOptions(CelOptions.current().populateMacroCalls(true).build())
.addCompilerLibraries(CelExtensions.comprehensions())
.addRuntimeLibraries(CelExtensions.comprehensions())
.build();
CelOptimizer celOptimizer =
CelOptimizerFactory.standardCelOptimizerBuilder(cel)
.addAstOptimizers(SubexpressionOptimizer.getInstance())
.build();
CelAbstractSyntaxTree ast =
cel.compile("[{}, {\"a\": 1}, {\"b\": 2}].filter(m, has(x.a))").getAst();

CelAbstractSyntaxTree optimizedAst = celOptimizer.optimize(ast);

assertThat(CEL_UNPARSER.unparse(optimizedAst))
.isEqualTo("[{}, {\"a\": 1}, {\"b\": 2}].filter(m, has(x.a))");
assertThat(optimizedAst).isSameInstanceAs(ast);
}

/**
* Converts AST containing cel.block related test functions to internal functions (e.g: cel.block
* -> cel.@block)
Expand Down
Loading