Skip to content

Fix planner to honor enableComprehensions flag #1303

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 2, 2026
Merged

Fix planner to honor enableComprehensions flag #1303

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
9 changes: 6 additions & 3 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1982,10 +1982,13 @@ public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception

@Test
public void program_comprehensionDisabled_throws() throws Exception {
// TODO: Planner ExecutionFrame ignores CelOptions.enableComprehension(false).
Cel cel =
legacyCelBuilderWithMacros()
.setOptions(CelOptions.current().enableComprehension(false).build())
plannerCelBuilderWithMacros()
.setOptions(
CelOptions.current()
.enableHeterogeneousNumericComparisons(true)
.enableComprehension(false)
.build())
.build();
CelAbstractSyntaxTree ast = cel.compile("['foo', 'bar'].map(x, x)").getAst();

Expand Down
8 changes: 6 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/ExecutionFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ static ExecutionFrame create(
@Nullable CelEvaluationListener listener) {
return new ExecutionFrame(
functionResolver,
celOptions.comprehensionMaxIterations(),
getComprehensionMaxIterations(celOptions),
partialVars,
listener,
/* asyncTracker= */ null);
Expand All @@ -61,12 +61,16 @@ static ExecutionFrame createForAsync(
checkNotNull(asyncTracker, "asyncTracker");
return new ExecutionFrame(
functionResolver,
celOptions.comprehensionMaxIterations(),
getComprehensionMaxIterations(celOptions),
partialVars,
listener,
asyncTracker);
}

private static int getComprehensionMaxIterations(CelOptions celOptions) {
return celOptions.enableComprehension() ? celOptions.comprehensionMaxIterations() : 0;
}

Optional<CelResolvedOverload> findOverload(
String functionName, Collection<String> overloadIds, Object[] args)
throws CelEvaluationException {
Expand Down
Loading