Skip to content

Fix constant folding to work with list provided as an identifier #199

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
Dec 21, 2023
Merged

Fix constant folding to work with list provided as an identifier #199

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
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
bazel-bin
bazel-examples
bazel-genfiles
bazel-grpc-java
bazel-cel-java
bazel-out
bazel-testlogs

Expand All @@ -27,4 +27,4 @@ bin
target

# Temporary output dir for artifacts
mvn-artifacts
mvn-artifacts
7 changes: 6 additions & 1 deletion optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,12 @@ private Optional<CelAbstractSyntaxTree> maybePruneBranches(

return Optional.of(replaceSubtree(ast, result, expr.id()));
} else if (function.equals(Operator.IN.getFunction())) {
CelCreateList haystack = call.args().get(1).createList();
CelExpr callArg = call.args().get(1);
if (!callArg.exprKind().getKind().equals(Kind.CREATE_LIST)) {
return Optional.empty();
}

CelCreateList haystack = callArg.createList();
if (haystack.elements().isEmpty()) {
return Optional.of(
replaceSubtree(
Expand Down
6 changes: 6 additions & 0 deletions optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelOptions;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.SimpleType;
import dev.cel.extensions.CelOptionalLibrary;
import dev.cel.optimizer.CelOptimizationException;
Expand All @@ -41,6 +43,8 @@ public class ConstantFoldingOptimizerTest {
CelFactory.standardCelBuilder()
.addVar("x", SimpleType.DYN)
.addVar("y", SimpleType.DYN)
.addVar("list_var", ListType.create(SimpleType.STRING))
.addVar("map_var", MapType.create(SimpleType.STRING, SimpleType.STRING))
.addMessageTypes(TestAllTypes.getDescriptor())
.setContainer("dev.cel.testing.testdata.proto3")
.addCompilerLibraries(CelOptionalLibrary.INSTANCE)
Expand Down Expand Up @@ -152,6 +156,8 @@ public class ConstantFoldingOptimizerTest {
@TestParameters("{source: 'x + dyn([1, 2] + [3, 4])', expected: 'x + [1, 2, 3, 4]'}")
@TestParameters(
"{source: '{\"a\": dyn([1, 2]), \"b\": x}', expected: '{\"a\": [1, 2], \"b\": x}'}")
@TestParameters("{source: 'map_var[?\"key\"]', expected: 'map_var[?\"key\"]'}")
@TestParameters("{source: '\"abc\" in list_var', expected: '\"abc\" in list_var'}")
// TODO: Support folding lists with mixed types. This requires mutable lists.
// @TestParameters("{source: 'dyn([1]) + [1.0]'}")
public void constantFold_success(String source, String expected) throws Exception {
Expand Down