Expressions are rewritten into the following forms: * *
- * // Selection chains (user message is 3-tuple, leaf scalar is 4-tuple)
+ * // Selection chains (user message is 3-tuple, leaf scalar is 4-tuple, leaf type is 3rd argument)
* request.user.age -> cel.@attribute(request,
- * [[user_num, "user", type_code], [age_num, "age", type_code, default_val]])
+ * [[user_num, "user", type_code], [age_num, "age", type_code, default_val]], int)
*
* // Presence tests (2-tuples)
* has(request.user.age) -> cel.@hasField(request,
@@ -127,15 +129,18 @@ public final class SelectOptimizer implements CelAstOptimizer {
private static final String CEL_ATTRIBUTE_FUNCTION_NAME = "cel.@attribute";
private static final String CEL_HAS_FIELD_FUNCTION_NAME = "cel.@hasField";
+ private static final TypeParamType TYPE_PARAM_T = TypeParamType.create("T");
+
@VisibleForTesting
static final CelFunctionDecl CEL_ATTRIBUTE_FUNCTION_DECL =
CelFunctionDecl.newFunctionDeclaration(
CEL_ATTRIBUTE_FUNCTION_NAME,
CelOverloadDecl.newGlobalOverload(
"cel_attribute_list",
+ TYPE_PARAM_T,
SimpleType.DYN,
- SimpleType.DYN,
- ListType.create(SimpleType.DYN)));
+ ListType.create(SimpleType.DYN),
+ TypeType.create(TYPE_PARAM_T)));
@VisibleForTesting
static final CelFunctionDecl CEL_HAS_FIELD_FUNCTION_DECL =
@@ -295,8 +300,19 @@ private void rewriteSelectChain(
CelMutableExpr qualifiersExpr =
CelMutableExpr.ofList(idGenerator.nextExprId(), CelMutableList.create(qualifierLists));
- String functionName = isHasField ? CEL_HAS_FIELD_FUNCTION_NAME : CEL_ATTRIBUTE_FUNCTION_NAME;
- topNode.expr().setCall(CelMutableCall.create(functionName, currentExpr, qualifiersExpr));
+ if (isHasField) {
+ topNode
+ .expr()
+ .setCall(CelMutableCall.create(CEL_HAS_FIELD_FUNCTION_NAME, currentExpr, qualifiersExpr));
+ } else {
+ CelMutableExpr typeExpr =
+ CelMutableExpr.ofIdent(idGenerator.nextExprId(), resolveTypeIdent(topField));
+ topNode
+ .expr()
+ .setCall(
+ CelMutableCall.create(
+ CEL_ATTRIBUTE_FUNCTION_NAME, currentExpr, qualifiersExpr, typeExpr));
+ }
}
private static long resolveTypeCode(FieldDescriptor field) {
@@ -306,6 +322,43 @@ private static long resolveTypeCode(FieldDescriptor field) {
return field.getType().toProto().getNumber();
}
+ private static String resolveTypeIdent(FieldDescriptor field) {
+ if (field.isMapField()) {
+ return "map";
+ }
+ if (field.isRepeated()) {
+ return "list";
+ }
+ switch (field.getType()) {
+ case DOUBLE:
+ case FLOAT:
+ return "double";
+ case INT64:
+ case SINT64:
+ case SFIXED64:
+ case INT32:
+ case SINT32:
+ case SFIXED32:
+ case ENUM:
+ return "int";
+ case UINT64:
+ case FIXED64:
+ case UINT32:
+ case FIXED32:
+ return "uint";
+ case BOOL:
+ return "bool";
+ case STRING:
+ return "string";
+ case BYTES:
+ return "bytes";
+ case MESSAGE:
+ return field.getMessageType().getFullName();
+ default:
+ throw new IllegalArgumentException("Unsupported protobuf field type: " + field.getType());
+ }
+ }
+
private boolean isTopOfSelectChain(CelNavigableMutableAst navAst, CelNavigableMutableExpr node) {
return getOptimizableField(navAst, node).isPresent()
&& !node.parent().flatMap(parent -> getOptimizableField(navAst, parent)).isPresent();
@@ -414,13 +467,6 @@ private static CelAbstractSyntaxTree tagAstExtension(CelAbstractSyntaxTree ast)
return CelAbstractSyntaxTree.newParsedAst(ast.getExpr(), celSourceBuilder.build());
}
- private SelectOptimizer(
- SelectOptimizerOptions options, Iterable fileDescriptors) {
- this.options = checkNotNull(options);
- this.astMutator = AstMutator.newInstance(options.iterationLimit());
- this.descriptorPool = newDescriptorPool(options, checkNotNull(fileDescriptors));
- }
-
private static CelDescriptorPool newDescriptorPool(
SelectOptimizerOptions options, Iterable fileDescriptors) {
CelDescriptors celDescriptors =
@@ -432,6 +478,13 @@ private static CelDescriptorPool newDescriptorPool(
return CombinedDescriptorPool.create(descriptorPools.build());
}
+ private SelectOptimizer(
+ SelectOptimizerOptions options, Iterable fileDescriptors) {
+ this.options = checkNotNull(options);
+ this.astMutator = AstMutator.newInstance(options.iterationLimit());
+ this.descriptorPool = newDescriptorPool(options, checkNotNull(fileDescriptors));
+ }
+
/** Options configuring the behavior of {@link SelectOptimizer}. */
@AutoValue
public abstract static class SelectOptimizerOptions {
diff --git a/optimizer/src/test/java/dev/cel/optimizer/optimizers/BUILD.bazel b/optimizer/src/test/java/dev/cel/optimizer/optimizers/BUILD.bazel
index 787012466..1fd34709a 100644
--- a/optimizer/src/test/java/dev/cel/optimizer/optimizers/BUILD.bazel
+++ b/optimizer/src/test/java/dev/cel/optimizer/optimizers/BUILD.bazel
@@ -26,6 +26,7 @@ java_library(
"//extensions:optional_library",
# "//java/com/google/testing/testsize:annotations",
"//optimizer",
+ "//optimizer:ast_optimizer",
"//optimizer:optimization_exception",
"//optimizer:optimizer_builder",
"//optimizer/optimizers:common_subexpression_elimination",
diff --git a/optimizer/src/test/java/dev/cel/optimizer/optimizers/SelectOptimizerTest.java b/optimizer/src/test/java/dev/cel/optimizer/optimizers/SelectOptimizerTest.java
index 7740319fe..f08d01990 100644
--- a/optimizer/src/test/java/dev/cel/optimizer/optimizers/SelectOptimizerTest.java
+++ b/optimizer/src/test/java/dev/cel/optimizer/optimizers/SelectOptimizerTest.java
@@ -34,8 +34,10 @@
import dev.cel.common.CelFunctionDecl;
import dev.cel.common.CelMutableAst;
import dev.cel.common.CelOptions;
+import dev.cel.common.CelOverloadDecl;
import dev.cel.common.CelProtoAbstractSyntaxTree;
import dev.cel.common.CelValidationException;
+import dev.cel.common.ast.CelReference;
import dev.cel.common.navigation.CelNavigableMutableAst;
import dev.cel.common.types.MapType;
import dev.cel.common.types.SimpleType;
@@ -43,6 +45,7 @@
import dev.cel.expr.conformance.proto2.NestedTestAllTypes;
import dev.cel.expr.conformance.proto2.TestAllTypesProto;
import dev.cel.expr.conformance.proto3.TestAllTypes;
+import dev.cel.optimizer.CelAstOptimizer;
import dev.cel.optimizer.CelOptimizer;
import dev.cel.optimizer.CelOptimizerFactory;
import dev.cel.optimizer.optimizers.SelectOptimizer.SelectOptimizerOptions;
@@ -119,27 +122,32 @@ private static Cel setupEnv(CelBuilder celBuilder) {
private enum RewriteTestCase {
// === Selection & Traversal ===
PROTO3_SINGLE_FIELD_SELECT(
- "msg.single_int64", "cel.@attribute(msg, [[2, \"single_int64\", 3, 0]])"),
+ "msg.single_int64", "cel.@attribute(msg, [[2, \"single_int64\", 3, 0]], int)"),
PROTO3_SINGLE_MESSAGE_FIELD_SELECT(
- "msg.single_nested_message", "cel.@attribute(msg, [[21, \"single_nested_message\", 11]])"),
+ "msg.single_nested_message",
+ "cel.@attribute(msg, [[21, \"single_nested_message\", 11]],"
+ + " cel.expr.conformance.proto3.TestAllTypes.NestedMessage)"),
PROTO3_CHAINED_FIELD_SELECT(
"msg.single_nested_message.bb",
- "cel.@attribute(msg, [[21, \"single_nested_message\", 11], [1, \"bb\", 5, 0]])"),
+ "cel.@attribute(msg, [[21, \"single_nested_message\", 11], [1, \"bb\", 5, 0]], int)"),
PROTO2_SINGLE_MESSAGE_FIELD_SELECT(
"proto2_msg.single_nested_message",
- "cel.@attribute(proto2_msg, [[21, \"single_nested_message\", 11]])"),
+ "cel.@attribute(proto2_msg, [[21, \"single_nested_message\", 11]],"
+ + " cel.expr.conformance.proto2.TestAllTypes.NestedMessage)"),
PROTO2_CHAINED_FIELD_SELECT(
"proto2_msg.single_nested_message.bb",
- "cel.@attribute(proto2_msg, [[21, \"single_nested_message\", 11], [1, \"bb\", 5, 0]])"),
+ "cel.@attribute(proto2_msg, [[21, \"single_nested_message\", 11], [1, \"bb\", 5, 0]],"
+ + " int)"),
PROTO2_TRIPLE_CHAINED_FIELD_SELECT(
"nested_msg.child.payload.single_int64",
"cel.@attribute(nested_msg, "
+ "[[1, \"child\", 11], "
+ "[2, \"payload\", 11], "
- + "[2, \"single_int64\", 3, -64]])"),
+ + "[2, \"single_int64\", 3, -64]], int)"),
PROTO2_CHAINED_MESSAGE_FIELD_SELECT(
"nested_msg.child.payload",
- "cel.@attribute(nested_msg, [[1, \"child\", 11], [2, \"payload\", 11]])"),
+ "cel.@attribute(nested_msg, [[1, \"child\", 11], [2, \"payload\", 11]],"
+ + " cel.expr.conformance.proto2.TestAllTypes)"),
// === Presence Tests: Proto2 (Explicit Presence) vs Proto3 (Implicit/Explicit Presence) ===
// In proto2, scalar fields have explicit presence (has-bit).
@@ -178,102 +186,122 @@ private enum RewriteTestCase {
// === Default Value Divergence: Proto2 Custom Defaults vs Proto3 Zero Defaults ===
// Int32: proto2 has custom default -32, proto3 has 0
PROTO2_CUSTOM_INT32(
- "proto2_msg.single_int32", "cel.@attribute(proto2_msg, [[1, \"single_int32\", 5, -32]])"),
- PROTO3_ZERO_INT32("msg.single_int32", "cel.@attribute(msg, [[1, \"single_int32\", 5, 0]])"),
+ "proto2_msg.single_int32",
+ "cel.@attribute(proto2_msg, [[1, \"single_int32\", 5, -32]], int)"),
+ PROTO3_ZERO_INT32(
+ "msg.single_int32", "cel.@attribute(msg, [[1, \"single_int32\", 5, 0]], int)"),
// Int64: proto2 has custom default -64, proto3 has 0
PROTO2_CUSTOM_INT64(
- "proto2_msg.single_int64", "cel.@attribute(proto2_msg, [[2, \"single_int64\", 3, -64]])"),
- PROTO3_ZERO_INT64("msg.single_int64", "cel.@attribute(msg, [[2, \"single_int64\", 3, 0]])"),
+ "proto2_msg.single_int64",
+ "cel.@attribute(proto2_msg, [[2, \"single_int64\", 3, -64]], int)"),
+ PROTO3_ZERO_INT64(
+ "msg.single_int64", "cel.@attribute(msg, [[2, \"single_int64\", 3, 0]], int)"),
// Uint32: proto2 has custom default 32, proto3 has 0
PROTO2_CUSTOM_UINT32(
"proto2_msg.single_uint32",
- "cel.@attribute(proto2_msg, [[3, \"single_uint32\", 13, 32u]])"),
+ "cel.@attribute(proto2_msg, [[3, \"single_uint32\", 13, 32u]], uint)"),
PROTO3_ZERO_UINT32(
- "msg.single_uint32", "cel.@attribute(msg, [[3, \"single_uint32\", 13, 0u]])"),
+ "msg.single_uint32", "cel.@attribute(msg, [[3, \"single_uint32\", 13, 0u]], uint)"),
// Uint64: proto2 has custom default 64, proto3 has 0
PROTO2_CUSTOM_UINT64(
- "proto2_msg.single_uint64", "cel.@attribute(proto2_msg, [[4, \"single_uint64\", 4, 64u]])"),
- PROTO3_ZERO_UINT64("msg.single_uint64", "cel.@attribute(msg, [[4, \"single_uint64\", 4, 0u]])"),
+ "proto2_msg.single_uint64",
+ "cel.@attribute(proto2_msg, [[4, \"single_uint64\", 4, 64u]], uint)"),
+ PROTO3_ZERO_UINT64(
+ "msg.single_uint64", "cel.@attribute(msg, [[4, \"single_uint64\", 4, 0u]], uint)"),
// String: proto2 has custom default "empty", proto3 has ""
PROTO2_CUSTOM_STRING(
"proto2_msg.single_string",
- "cel.@attribute(proto2_msg, [[14, \"single_string\", 9, \"empty\"]])"),
+ "cel.@attribute(proto2_msg, [[14, \"single_string\", 9, \"empty\"]], string)"),
PROTO3_ZERO_STRING(
- "msg.single_string", "cel.@attribute(msg, [[14, \"single_string\", 9, \"\"]])"),
+ "msg.single_string", "cel.@attribute(msg, [[14, \"single_string\", 9, \"\"]], string)"),
// Bool: proto2 has custom default true, proto3 has false
PROTO2_CUSTOM_BOOL(
- "proto2_msg.single_bool", "cel.@attribute(proto2_msg, [[13, \"single_bool\", 8, true]])"),
- PROTO3_ZERO_BOOL("msg.single_bool", "cel.@attribute(msg, [[13, \"single_bool\", 8, false]])"),
+ "proto2_msg.single_bool",
+ "cel.@attribute(proto2_msg, [[13, \"single_bool\", 8, true]], bool)"),
+ PROTO3_ZERO_BOOL(
+ "msg.single_bool", "cel.@attribute(msg, [[13, \"single_bool\", 8, false]], bool)"),
// Float: proto2 has custom default 3.0, proto3 has 0.0
PROTO2_CUSTOM_FLOAT(
- "proto2_msg.single_float", "cel.@attribute(proto2_msg, [[11, \"single_float\", 2, 3.0]])"),
- PROTO3_ZERO_FLOAT("msg.single_float", "cel.@attribute(msg, [[11, \"single_float\", 2, 0.0]])"),
+ "proto2_msg.single_float",
+ "cel.@attribute(proto2_msg, [[11, \"single_float\", 2, 3.0]], double)"),
+ PROTO3_ZERO_FLOAT(
+ "msg.single_float", "cel.@attribute(msg, [[11, \"single_float\", 2, 0.0]], double)"),
// Double: proto2 has custom default 6.4, proto3 has 0.0
PROTO2_CUSTOM_DOUBLE(
"proto2_msg.single_double",
- "cel.@attribute(proto2_msg, [[12, \"single_double\", 1, 6.4]])"),
+ "cel.@attribute(proto2_msg, [[12, \"single_double\", 1, 6.4]], double)"),
PROTO3_ZERO_DOUBLE(
- "msg.single_double", "cel.@attribute(msg, [[12, \"single_double\", 1, 0.0]])"),
+ "msg.single_double", "cel.@attribute(msg, [[12, \"single_double\", 1, 0.0]], double)"),
// Bytes: proto2 has custom default "none", proto3 has ""
PROTO2_CUSTOM_BYTES(
"proto2_msg.single_bytes",
- "cel.@attribute(proto2_msg, [[15, \"single_bytes\", 12, b\"\\156\\157\\156\\145\"]])"),
+ "cel.@attribute(proto2_msg, [[15, \"single_bytes\", 12, b\"\\156\\157\\156\\145\"]],"
+ + " bytes)"),
PROTO3_ZERO_BYTES(
- "msg.single_bytes", "cel.@attribute(msg, [[15, \"single_bytes\", 12, b\"\"]])"),
+ "msg.single_bytes", "cel.@attribute(msg, [[15, \"single_bytes\", 12, b\"\"]], bytes)"),
// Enum: proto2 has custom default 1 (BAR), proto3 has 0 (FOO)
PROTO2_CUSTOM_ENUM(
"proto2_msg.single_nested_enum",
- "cel.@attribute(proto2_msg, [[22, \"single_nested_enum\", 14, 1]])"),
+ "cel.@attribute(proto2_msg, [[22, \"single_nested_enum\", 14, 1]], int)"),
PROTO3_ZERO_ENUM(
- "msg.single_nested_enum", "cel.@attribute(msg, [[22, \"single_nested_enum\", 14, 0]])"),
-
- // Fixed / sfixed fields
+ "msg.single_nested_enum",
+ "cel.@attribute(msg, [[22, \"single_nested_enum\", 14, 0]], int)"),
+
+ // Fixed / sfixed / sint fields
+ PROTO3_FIXED32(
+ "msg.single_fixed32", "cel.@attribute(msg, [[7, \"single_fixed32\", 7, 0u]], uint)"),
+ PROTO3_FIXED64(
+ "msg.single_fixed64", "cel.@attribute(msg, [[8, \"single_fixed64\", 6, 0u]], uint)"),
PROTO3_SFIXED32(
- "msg.single_sfixed32", "cel.@attribute(msg, [[9, \"single_sfixed32\", 15, 0]])"),
+ "msg.single_sfixed32", "cel.@attribute(msg, [[9, \"single_sfixed32\", 15, 0]], int)"),
PROTO3_SFIXED64(
- "msg.single_sfixed64", "cel.@attribute(msg, [[10, \"single_sfixed64\", 16, 0]])"),
+ "msg.single_sfixed64", "cel.@attribute(msg, [[10, \"single_sfixed64\", 16, 0]], int)"),
+ PROTO3_SINT32("msg.single_sint32", "cel.@attribute(msg, [[5, \"single_sint32\", 17, 0]], int)"),
+ PROTO3_SINT64("msg.single_sint64", "cel.@attribute(msg, [[6, \"single_sint64\", 18, 0]], int)"),
// Repeated fields: empty list default
PROTO2_REPEATED_PRIMITIVE(
"proto2_msg.repeated_int64",
- "cel.@attribute(proto2_msg, [[32, \"repeated_int64\", 3, []]])"),
+ "cel.@attribute(proto2_msg, [[32, \"repeated_int64\", 3, []]], list)"),
PROTO3_REPEATED_PRIMITIVE(
- "msg.repeated_int64", "cel.@attribute(msg, [[32, \"repeated_int64\", 3, []]])"),
+ "msg.repeated_int64", "cel.@attribute(msg, [[32, \"repeated_int64\", 3, []]], list)"),
PROTO3_REPEATED_MESSAGE(
"msg.repeated_nested_message",
- "cel.@attribute(msg, [[51, \"repeated_nested_message\", 11, []]])"),
+ "cel.@attribute(msg, [[51, \"repeated_nested_message\", 11, []]], list)"),
// Well-known types
PROTO3_TIMESTAMP(
"msg.single_timestamp",
- "cel.@attribute(msg, [[102, \"single_timestamp\", 11, timestamp(0)]])"),
+ "cel.@attribute(msg, [[102, \"single_timestamp\", 11, timestamp(0)]],"
+ + " google.protobuf.Timestamp)"),
PROTO3_DURATION(
"msg.single_duration",
- "cel.@attribute(msg, [[101, \"single_duration\", 11, duration(\"0s\")]])"),
+ "cel.@attribute(msg, [[101, \"single_duration\", 11, duration(\"0s\")]],"
+ + " google.protobuf.Duration)"),
// Map selects
MAP_FIELD_INDEXING(
"msg.map_int64_message[1].bb",
"cel.@attribute("
- + "cel.@attribute(msg, [[95, \"map_int64_message\", 20, {}]])[1], "
- + "[[1, \"bb\", 5, 0]])"),
+ + "cel.@attribute(msg, [[95, \"map_int64_message\", 20, {}]], map)[1], "
+ + "[[1, \"bb\", 5, 0]], int)"),
MAP_FIELD_SELECT_CHAIN_STOPS_AT_MAP_BOUNDARY(
"map_var_msg.key.single_nested_message.bb",
"cel.@attribute(map_var_msg.key, "
+ "[[21, \"single_nested_message\", 11], "
- + "[1, \"bb\", 5, 0]])"),
+ + "[1, \"bb\", 5, 0]], int)"),
MAP_FIELD_SELECT_STOPS_AT_MAP_BOUNDARY(
"map_var_msg.key.single_int64",
- "cel.@attribute(map_var_msg.key, [[2, \"single_int64\", 3, 0]])"),
+ "cel.@attribute(map_var_msg.key, [[2, \"single_int64\", 3, 0]], int)"),
MAP_FIELD_HAS_STOPS_AT_MAP_BOUNDARY(
"has(map_var_msg.key.single_nested_message)",
"cel.@hasField(map_var_msg.key, [[21, \"single_nested_message\"]])"),
@@ -283,17 +311,17 @@ private enum RewriteTestCase {
PROTO_MAP_FIELD_SELECT_STOPS_AT_MAP_BOUNDARY(
"msg.map_string_message.key.bb",
"cel.@attribute("
- + "cel.@attribute(msg, [[227, \"map_string_message\", 20, {}]]).key, "
- + "[[1, \"bb\", 5, 0]])"),
+ + "cel.@attribute(msg, [[227, \"map_string_message\", 20, {}]], map).key, "
+ + "[[1, \"bb\", 5, 0]], int)"),
PROTO_MAP_FIELD_HAS_STOPS_AT_MAP_BOUNDARY(
"has(msg.map_string_message.key.bb)",
"cel.@hasField("
- + "cel.@attribute(msg, [[227, \"map_string_message\", 20, {}]]).key, "
+ + "cel.@attribute(msg, [[227, \"map_string_message\", 20, {}]], map).key, "
+ "[[1, \"bb\"]])"),
MIXED_BOOLEAN_EXPRESSION(
"msg.single_int64 > 0 && has(msg.single_nested_message)",
- "cel.@attribute(msg, [[2, \"single_int64\", 3, 0]]) > 0 "
+ "cel.@attribute(msg, [[2, \"single_int64\", 3, 0]], int) > 0 "
+ "&& cel.@hasField(msg, [[21, \"single_nested_message\"]])");
private final String expression;
@@ -376,7 +404,7 @@ public void optimize_withFileDescriptors_success() throws Exception {
CelAbstractSyntaxTree optimizedAst = optimizer.optimize(ast);
assertThat(CEL_UNPARSER.unparse(optimizedAst))
- .isEqualTo("cel.@attribute(msg, [[2, \"single_int64\", 3, 0]])");
+ .isEqualTo("cel.@attribute(msg, [[2, \"single_int64\", 3, 0]], int)");
}
@Test
@@ -394,7 +422,7 @@ public void optimize_withFileDescriptorsIterable_success() throws Exception {
CelAbstractSyntaxTree optimizedAst = optimizer.optimize(ast);
assertThat(CEL_UNPARSER.unparse(optimizedAst))
- .isEqualTo("cel.@attribute(msg, [[2, \"single_int64\", 3, 0]])");
+ .isEqualTo("cel.@attribute(msg, [[2, \"single_int64\", 3, 0]], int)");
}
@Test
@@ -409,7 +437,7 @@ public void newInstance_withOptionsAndFileDescriptors_preservesAddedDescriptors(
CelAbstractSyntaxTree optimizedAst = optimizer.optimize(ast, cel).optimizedAst();
assertThat(CEL_UNPARSER.unparse(optimizedAst))
- .isEqualTo("cel.@attribute(proto2_msg, [[2, \"single_int64\", 3, -64]])");
+ .isEqualTo("cel.@attribute(proto2_msg, [[2, \"single_int64\", 3, -64]], int)");
}
@Test
@@ -459,7 +487,9 @@ public void optimizeAndEvaluate_withAttributeFunctionBinding_evaluatesSuccessful
.addFunctionDeclarations(SelectOptimizer.CEL_ATTRIBUTE_FUNCTION_DECL)
.addFunctionBindings(
CelFunctionBinding.from(
- "cel_attribute_list", Object.class, List.class, (target, path) -> 42L))
+ "cel_attribute_list",
+ ImmutableList.of(Object.class, List.class, Object.class),
+ args -> 42L))
.build();
CelOptimizer optimizer =
CelOptimizerFactory.standardCelOptimizerBuilder(celWithBinding)
@@ -487,7 +517,9 @@ public void optimizeAndEvaluate_withChainedMessageSelect_unpacksTuplesSuccessful
.addFunctionDeclarations(SelectOptimizer.CEL_ATTRIBUTE_FUNCTION_DECL)
.addFunctionBindings(
CelFunctionBinding.from(
- "cel_attribute_list", Object.class, List.class, (target, path) -> path))
+ "cel_attribute_list",
+ ImmutableList.of(Object.class, List.class, Object.class),
+ args -> args[1]))
.build();
CelOptimizer optimizer =
CelOptimizerFactory.standardCelOptimizerBuilder(celWithBinding)
@@ -545,7 +577,9 @@ public void optimizeAndEvaluate_withSelectOnMapValue_evaluatesSuccessfully() thr
.addFunctionDeclarations(SelectOptimizer.CEL_ATTRIBUTE_FUNCTION_DECL)
.addFunctionBindings(
CelFunctionBinding.from(
- "cel_attribute_list", Object.class, List.class, (target, path) -> 42L))
+ "cel_attribute_list",
+ ImmutableList.of(Object.class, List.class, Object.class),
+ args -> 42L))
.build();
CelOptimizer optimizer =
CelOptimizerFactory.standardCelOptimizerBuilder(celWithBinding)
@@ -608,7 +642,9 @@ public void optimizeAndEvaluate_withMissingMapKey_throwsEvaluationException() th
.addFunctionDeclarations(SelectOptimizer.CEL_ATTRIBUTE_FUNCTION_DECL)
.addFunctionBindings(
CelFunctionBinding.from(
- "cel_attribute_list", Object.class, List.class, (target, path) -> 42L))
+ "cel_attribute_list",
+ ImmutableList.of(Object.class, List.class, Object.class),
+ args -> 42L))
.build();
CelOptimizer optimizer =
CelOptimizerFactory.standardCelOptimizerBuilder(celWithBinding)
@@ -744,7 +780,7 @@ public void newInstance_fileDescriptorsVarargs_defaultOptions_success() throws E
CelAbstractSyntaxTree optimizedAst = optimizer.optimize(ast, cel).optimizedAst();
assertThat(CEL_UNPARSER.unparse(optimizedAst))
- .isEqualTo("cel.@attribute(proto2_msg, [[2, \"single_int64\", 3, -64]])");
+ .isEqualTo("cel.@attribute(proto2_msg, [[2, \"single_int64\", 3, -64]], int)");
}
@Test
@@ -756,7 +792,7 @@ public void newInstance_fileDescriptorsIterable_defaultOptions_success() throws
CelAbstractSyntaxTree optimizedAst = optimizer.optimize(ast, cel).optimizedAst();
assertThat(CEL_UNPARSER.unparse(optimizedAst))
- .isEqualTo("cel.@attribute(proto2_msg, [[2, \"single_int64\", 3, -64]])");
+ .isEqualTo("cel.@attribute(proto2_msg, [[2, \"single_int64\", 3, -64]], int)");
}
@Test
@@ -774,7 +810,7 @@ public void newInstance_fileDescriptorsIterable_defaultOptions_success() throws
CelAbstractSyntaxTree proto3Optimized = optimizer.optimize(proto3Ast, cel).optimizedAst();
assertThat(CEL_UNPARSER.unparse(proto2Optimized))
- .isEqualTo("cel.@attribute(proto2_msg, [[2, \"single_int64\", 3, -64]])");
+ .isEqualTo("cel.@attribute(proto2_msg, [[2, \"single_int64\", 3, -64]], int)");
assertThat(CEL_UNPARSER.unparse(proto3Optimized)).isEqualTo("msg.single_int64");
}
@@ -794,18 +830,18 @@ public void newInstance_fileDescriptorsIterable_defaultOptions_success() throws
CelAbstractSyntaxTree proto3Optimized = optimizer.optimize(proto3Ast, cel).optimizedAst();
assertThat(CEL_UNPARSER.unparse(proto2Optimized))
- .isEqualTo("cel.@attribute(proto2_msg, [[2, \"single_int64\", 3, -64]])");
+ .isEqualTo("cel.@attribute(proto2_msg, [[2, \"single_int64\", 3, -64]], int)");
assertThat(CEL_UNPARSER.unparse(proto3Optimized)).isEqualTo("msg.single_int64");
}
private enum CompilerRejectionTestCase {
ATTRIBUTE_AT_SIGN(
SelectOptimizer.CEL_ATTRIBUTE_FUNCTION_DECL,
- "cel.@attribute(msg, [])",
+ "cel.@attribute(msg, [], int)",
"token recognition error at: '@'"),
ATTRIBUTE_OVERLOAD(
SelectOptimizer.CEL_ATTRIBUTE_FUNCTION_DECL,
- "cel_attribute_list(msg, [])",
+ "cel_attribute_list(msg, [], int)",
"undeclared reference to 'cel_attribute_list'"),
HAS_FIELD_AT_SIGN(
SelectOptimizer.CEL_HAS_FIELD_FUNCTION_DECL,
@@ -912,6 +948,12 @@ public void optimize_toParsedExpr_matchesExpectedSerializedProto() throws Except
+ " }\n"
+ " }\n"
+ " }\n"
+ + " args {\n"
+ + " id: 13\n"
+ + " ident_expr {\n"
+ + " name: \"int\"\n"
+ + " }\n"
+ + " }\n"
+ " }\n"
+ "}\n"
+ "source_info {\n"
@@ -931,4 +973,70 @@ public void optimize_toParsedExpr_matchesExpectedSerializedProto() throws Except
assertThat(parsedExpr).isEqualTo(expectedParsedExpr);
}
+
+ @Test
+ public void
+ optimize_binaryOperationOnOptimizedSelect_resolvesOverloadAndPreservesConcreteResultType()
+ throws Exception {
+ CelAbstractSyntaxTree ast = cel.compile("msg.single_int64 + 1").getAst();
+
+ CelAbstractSyntaxTree optimizedAst = celOptimizer.optimize(ast);
+
+ assertThat(optimizedAst.getResultType()).isEqualTo(SimpleType.INT);
+ assertThat(CEL_UNPARSER.unparse(optimizedAst))
+ .isEqualTo("cel.@attribute(msg, [[2, \"single_int64\", 3, 0]], int) + 1");
+ }
+
+ @Test
+ public void
+ optimize_stringOperationOnOptimizedSelect_resolvesOverloadAndPreservesConcreteResultType()
+ throws Exception {
+ CelAbstractSyntaxTree ast = cel.compile("msg.single_string + 'suffix'").getAst();
+
+ CelAbstractSyntaxTree optimizedAst = celOptimizer.optimize(ast);
+
+ assertThat(optimizedAst.getResultType()).isEqualTo(SimpleType.STRING);
+ assertThat(CEL_UNPARSER.unparse(optimizedAst))
+ .isEqualTo("cel.@attribute(msg, [[14, \"single_string\", 9, \"\"]], string) + \"suffix\"");
+ }
+
+ @Test
+ public void optimize_resultFunctionDeclarations_containsOnlySingularAttributeAndHasField()
+ throws Exception {
+ SelectOptimizer optimizer = SelectOptimizer.newInstance(TestAllTypes.getDescriptor().getFile());
+ CelAbstractSyntaxTree ast = cel.compile("msg.single_int64").getAst();
+
+ CelAstOptimizer.OptimizationResult result = optimizer.optimize(ast, cel);
+
+ assertThat(result.newFunctionDecls())
+ .containsExactly(
+ SelectOptimizer.CEL_ATTRIBUTE_FUNCTION_DECL,
+ SelectOptimizer.CEL_HAS_FIELD_FUNCTION_DECL);
+ assertThat(
+ SelectOptimizer.CEL_ATTRIBUTE_FUNCTION_DECL.overloads().stream()
+ .map(CelOverloadDecl::overloadId))
+ .containsExactly("cel_attribute_list");
+ }
+
+ @Test
+ public void optimize_referenceMap_containsSingleOverloadIdForAttributeCall() throws Exception {
+ CelAbstractSyntaxTree ast = cel.compile("msg.single_int64").getAst();
+
+ CelAbstractSyntaxTree optimizedAst = celOptimizer.optimize(ast);
+
+ CelReference reference = optimizedAst.getReferenceOrThrow(optimizedAst.getExpr().id());
+ assertThat(reference.overloadIds()).containsExactly("cel_attribute_list");
+ }
+
+ @Test
+ public void optimize_binaryOperationBetweenOptimizedSelects_resolvesSingleOverloadInReferenceMap()
+ throws Exception {
+ CelAbstractSyntaxTree ast = cel.compile("msg.single_int64 + msg.single_sint64").getAst();
+
+ CelAbstractSyntaxTree optimizedAst = celOptimizer.optimize(ast);
+
+ assertThat(optimizedAst.getResultType()).isEqualTo(SimpleType.INT);
+ CelReference addReference = optimizedAst.getReferenceOrThrow(optimizedAst.getExpr().id());
+ assertThat(addReference.overloadIds()).containsExactly("add_int64");
+ }
}
diff --git a/protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptor.java b/protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptor.java
index c066bb18e..33cef48f9 100644
--- a/protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptor.java
+++ b/protobuf/src/main/java/dev/cel/protobuf/CelLiteDescriptor.java
@@ -18,6 +18,7 @@
import com.google.errorprone.annotations.Immutable;
import com.google.protobuf.MessageLite;
+import com.google.protobuf.WireFormat;
import dev.cel.common.annotations.Internal;
import java.util.Collections;
import java.util.HashMap;
@@ -84,6 +85,10 @@ public Optional findByFieldNumber(int fieldNumber) {
return Optional.ofNullable(fieldNumberToFieldDescriptors.get(fieldNumber));
}
+ public Optional findByFieldName(String fieldName) {
+ return Optional.ofNullable(fieldNameToFieldDescriptors.get(fieldName));
+ }
+
public FieldLiteDescriptor getByFieldNameOrThrow(String fieldName) {
return Objects.requireNonNull(fieldNameToFieldDescriptors.get(fieldName));
}
@@ -184,24 +189,65 @@ public enum JavaType {
* This is exactly the same as com.google.protobuf.Descriptors#Type
*/
public enum Type {
- DOUBLE,
- FLOAT,
- INT64,
- UINT64,
- INT32,
- FIXED64,
- FIXED32,
- BOOL,
- STRING,
- GROUP,
- MESSAGE,
- BYTES,
- UINT32,
- ENUM,
- SFIXED32,
- SFIXED64,
- SINT32,
- SINT64
+ DOUBLE(1, WireFormat.FieldType.DOUBLE),
+ FLOAT(2, WireFormat.FieldType.FLOAT),
+ INT64(3, WireFormat.FieldType.INT64),
+ UINT64(4, WireFormat.FieldType.UINT64),
+ INT32(5, WireFormat.FieldType.INT32),
+ FIXED64(6, WireFormat.FieldType.FIXED64),
+ FIXED32(7, WireFormat.FieldType.FIXED32),
+ BOOL(8, WireFormat.FieldType.BOOL),
+ STRING(9, WireFormat.FieldType.STRING),
+ GROUP(10, WireFormat.FieldType.GROUP),
+ MESSAGE(11, WireFormat.FieldType.MESSAGE),
+ BYTES(12, WireFormat.FieldType.BYTES),
+ UINT32(13, WireFormat.FieldType.UINT32),
+ ENUM(14, WireFormat.FieldType.ENUM),
+ SFIXED32(15, WireFormat.FieldType.SFIXED32),
+ SFIXED64(16, WireFormat.FieldType.SFIXED64),
+ SINT32(17, WireFormat.FieldType.SINT32),
+ SINT64(18, WireFormat.FieldType.SINT64);
+
+ private final int number;
+ private final WireFormat.FieldType wireFormatFieldType;
+
+ Type(int number, WireFormat.FieldType wireFormatFieldType) {
+ this.number = number;
+ this.wireFormatFieldType = wireFormatFieldType;
+ }
+
+ public int getNumber() {
+ return number;
+ }
+
+ public WireFormat.FieldType toWireFormatFieldType() {
+ return wireFormatFieldType;
+ }
+
+ public boolean isPackable() {
+ return wireFormatFieldType.isPackable();
+ }
+
+ private static final Type[] TYPES_BY_NUMBER;
+
+ static {
+ Type[] values = values();
+ TYPES_BY_NUMBER = new Type[values.length + 1];
+ for (Type type : values) {
+ TYPES_BY_NUMBER[type.number] = type;
+ }
+ }
+
+ public static Type forNumber(int number) {
+ if (number < 1 || number >= TYPES_BY_NUMBER.length) {
+ throw new IllegalArgumentException("Unsupported proto type code: " + number);
+ }
+ return TYPES_BY_NUMBER[number];
+ }
+ }
+
+ public int getFieldNumber() {
+ return fieldNumber;
}
public String getFieldName() {
diff --git a/protobuf/src/test/java/dev/cel/protobuf/BUILD.bazel b/protobuf/src/test/java/dev/cel/protobuf/BUILD.bazel
index 58e298b29..635379aab 100644
--- a/protobuf/src/test/java/dev/cel/protobuf/BUILD.bazel
+++ b/protobuf/src/test/java/dev/cel/protobuf/BUILD.bazel
@@ -16,6 +16,7 @@ java_test(
"@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto_lite",
"@maven//:com_google_testparameterinjector_test_parameter_injector",
"@maven//:junit_junit",
+ "@maven_android//:com_google_protobuf_protobuf_javalite",
],
)
diff --git a/protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java b/protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java
index 1ceed29bb..a0878a62f 100644
--- a/protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java
+++ b/protobuf/src/test/java/dev/cel/protobuf/CelLiteDescriptorTest.java
@@ -15,7 +15,10 @@
package dev.cel.protobuf;
import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
+import com.google.protobuf.WireFormat;
+import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.expr.conformance.proto3.TestAllTypesCelLiteDescriptor;
import dev.cel.protobuf.CelLiteDescriptor.FieldLiteDescriptor;
@@ -146,4 +149,99 @@ public void fieldDescriptor_nestedMessage_fullyQualifiedNames() {
assertThat(fieldLiteDescriptor.getFieldProtoTypeName())
.isEqualTo("cel.expr.conformance.proto3.TestAllTypes.NestedMessage");
}
+
+ @Test
+ public void protoFieldType_numbersAndWireTypes() {
+ assertThat(FieldLiteDescriptor.Type.DOUBLE.getNumber()).isEqualTo(1);
+ assertThat(FieldLiteDescriptor.Type.DOUBLE.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.DOUBLE);
+
+ assertThat(FieldLiteDescriptor.Type.FLOAT.getNumber()).isEqualTo(2);
+ assertThat(FieldLiteDescriptor.Type.FLOAT.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.FLOAT);
+
+ assertThat(FieldLiteDescriptor.Type.INT64.getNumber()).isEqualTo(3);
+ assertThat(FieldLiteDescriptor.Type.INT64.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.INT64);
+
+ assertThat(FieldLiteDescriptor.Type.UINT64.getNumber()).isEqualTo(4);
+ assertThat(FieldLiteDescriptor.Type.UINT64.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.UINT64);
+
+ assertThat(FieldLiteDescriptor.Type.INT32.getNumber()).isEqualTo(5);
+ assertThat(FieldLiteDescriptor.Type.INT32.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.INT32);
+
+ assertThat(FieldLiteDescriptor.Type.FIXED64.getNumber()).isEqualTo(6);
+ assertThat(FieldLiteDescriptor.Type.FIXED64.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.FIXED64);
+
+ assertThat(FieldLiteDescriptor.Type.FIXED32.getNumber()).isEqualTo(7);
+ assertThat(FieldLiteDescriptor.Type.FIXED32.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.FIXED32);
+
+ assertThat(FieldLiteDescriptor.Type.BOOL.getNumber()).isEqualTo(8);
+ assertThat(FieldLiteDescriptor.Type.BOOL.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.BOOL);
+
+ assertThat(FieldLiteDescriptor.Type.STRING.getNumber()).isEqualTo(9);
+ assertThat(FieldLiteDescriptor.Type.STRING.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.STRING);
+
+ assertThat(FieldLiteDescriptor.Type.GROUP.getNumber()).isEqualTo(10);
+ assertThat(FieldLiteDescriptor.Type.GROUP.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.GROUP);
+
+ assertThat(FieldLiteDescriptor.Type.MESSAGE.getNumber()).isEqualTo(11);
+ assertThat(FieldLiteDescriptor.Type.MESSAGE.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.MESSAGE);
+
+ assertThat(FieldLiteDescriptor.Type.BYTES.getNumber()).isEqualTo(12);
+ assertThat(FieldLiteDescriptor.Type.BYTES.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.BYTES);
+
+ assertThat(FieldLiteDescriptor.Type.UINT32.getNumber()).isEqualTo(13);
+ assertThat(FieldLiteDescriptor.Type.UINT32.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.UINT32);
+
+ assertThat(FieldLiteDescriptor.Type.ENUM.getNumber()).isEqualTo(14);
+ assertThat(FieldLiteDescriptor.Type.ENUM.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.ENUM);
+
+ assertThat(FieldLiteDescriptor.Type.SFIXED32.getNumber()).isEqualTo(15);
+ assertThat(FieldLiteDescriptor.Type.SFIXED32.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.SFIXED32);
+
+ assertThat(FieldLiteDescriptor.Type.SFIXED64.getNumber()).isEqualTo(16);
+ assertThat(FieldLiteDescriptor.Type.SFIXED64.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.SFIXED64);
+
+ assertThat(FieldLiteDescriptor.Type.SINT32.getNumber()).isEqualTo(17);
+ assertThat(FieldLiteDescriptor.Type.SINT32.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.SINT32);
+
+ assertThat(FieldLiteDescriptor.Type.SINT64.getNumber()).isEqualTo(18);
+ assertThat(FieldLiteDescriptor.Type.SINT64.toWireFormatFieldType())
+ .isEqualTo(WireFormat.FieldType.SINT64);
+ }
+
+ @Test
+ public void protoFieldType_forNumber_roundTripAllTypes(
+ @TestParameter FieldLiteDescriptor.Type type) {
+ assertThat(FieldLiteDescriptor.Type.forNumber(type.getNumber())).isEqualTo(type);
+ }
+
+ @Test
+ public void protoFieldType_forNumber_outOfRange_throws() {
+ assertThrows(IllegalArgumentException.class, () -> FieldLiteDescriptor.Type.forNumber(0));
+ assertThrows(IllegalArgumentException.class, () -> FieldLiteDescriptor.Type.forNumber(19));
+ }
+
+ @Test
+ public void protoFieldType_isPackable() {
+ assertThat(FieldLiteDescriptor.Type.INT32.isPackable()).isTrue();
+ assertThat(FieldLiteDescriptor.Type.STRING.isPackable()).isFalse();
+ assertThat(FieldLiteDescriptor.Type.MESSAGE.isPackable()).isFalse();
+ assertThat(FieldLiteDescriptor.Type.BYTES.isPackable()).isFalse();
+ }
}