Adapt the function dispatch result to allow for automatic Any unpacking

PiperOrigin-RevId: 647784646
google · Jun 28, 2024 · db83a47 · db83a47
1 parent 0e2fd64
commit db83a47
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 4 deletions.
diff --git a/runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java b/runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java
@@ -411,10 +411,11 @@ private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall
 
       Object[] argArray = Arrays.stream(argResults).map(IntermediateResult::value).toArray();
 
-      return IntermediateResult.create(
-          attr,
+      Object dispatchResult =
           dispatcher.dispatch(
-              metadata, expr.id(), callExpr.function(), reference.overloadIds(), argArray));
+              metadata, expr.id(), callExpr.function(), reference.overloadIds(), argArray);
+      dispatchResult = typeProvider.adapt(dispatchResult);
+      return IntermediateResult.create(attr, dispatchResult);
     }
 
     private Optional<CelAttribute> maybeContainerIndexAttribute(
@@ -717,7 +718,7 @@ private IntermediateResult evalList(ExecutionFrame frame, CelExpr unusedExpr, Ce
         Object value = evaluatedElement.value();
         if (!optionalIndicesSet
                 .isEmpty() // Performance optimization to prevent autoboxing when there's no
-                           // optionals.
+            // optionals.
             && optionalIndicesSet.contains(i)
             && !isUnknownValue(value)) {
           Optional<?> optionalVal = (Optional<?>) value;

diff --git a/runtime/src/test/resources/packUnpackAny.baseline b/runtime/src/test/resources/packUnpackAny.baseline
@@ -8,6 +8,9 @@ declare d {
 declare message {
   value dev.cel.testing.testdata.proto3.TestAllTypes
 }
+declare list {
+  value list(dyn)
+}
 =====>
 bindings: {d=seconds: 100
 } +> {any=type_url: "type.googleapis.com/google.protobuf.Duration"
@@ -25,6 +28,9 @@ declare d {
 declare message {
   value dev.cel.testing.testdata.proto3.TestAllTypes
 }
+declare list {
+  value list(dyn)
+}
 =====>
 bindings: {message=single_any {
   type_url: "type.googleapis.com/google.protobuf.Duration"
@@ -45,6 +51,9 @@ declare d {
 declare message {
   value dev.cel.testing.testdata.proto3.TestAllTypes
 }
+declare list {
+  value list(dyn)
+}
 =====>
 bindings: {message=single_any {
   type_url: "type.googleapis.com/google.protobuf.Duration"
@@ -64,6 +73,9 @@ declare d {
 declare message {
   value dev.cel.testing.testdata.proto3.TestAllTypes
 }
+declare list {
+  value list(dyn)
+}
 =====>
 bindings: {any=single_int64: 1
 }
@@ -79,12 +91,38 @@ declare d {
 declare message {
   value dev.cel.testing.testdata.proto3.TestAllTypes
 }
+declare list {
+  value list(dyn)
+}
 =====>
 bindings: {any=type_url: "type.googleapis.com/google.protobuf.Int64Value"
 value: "\b\001"
 }
 result:   true
 
+Source: list[0] == message
+declare any {
+  value any
+}
+declare d {
+  value google.protobuf.Duration
+}
+declare message {
+  value dev.cel.testing.testdata.proto3.TestAllTypes
+}
+declare list {
+  value list(dyn)
+}
+=====>
+bindings: {list=[type_url: "type.googleapis.com/dev.cel.testing.testdata.proto3.TestAllTypes"
+value: "\242\0062\n,type.googleapis.com/google.protobuf.Duration\022\002\bd"
+], message=single_any {
+  type_url: "type.googleapis.com/google.protobuf.Duration"
+  value: "\bd"
+}
+}
+result:   true
+
 Source: TestAllTypes{single_any: d}
 declare any {
   value any
@@ -95,6 +133,9 @@ declare d {
 declare message {
   value dev.cel.testing.testdata.proto3.TestAllTypes
 }
+declare list {
+  value list(dyn)
+}
 =====>
 bindings: {d=seconds: 100
 }
@@ -114,6 +155,9 @@ declare d {
 declare message {
   value dev.cel.testing.testdata.proto3.TestAllTypes
 }
+declare list {
+  value list(dyn)
+}
 =====>
 bindings: {message=single_int64: -1
 }
@@ -133,6 +177,9 @@ declare d {
 declare message {
   value dev.cel.testing.testdata.proto3.TestAllTypes
 }
+declare list {
+  value list(dyn)
+}
 =====>
 bindings: {message=single_uint64: 1
 }
@@ -152,6 +199,9 @@ declare d {
 declare message {
   value dev.cel.testing.testdata.proto3.TestAllTypes
 }
+declare list {
+  value list(dyn)
+}
 =====>
 bindings: {}
 result:   single_any {
@@ -170,6 +220,9 @@ declare d {
 declare message {
   value dev.cel.testing.testdata.proto3.TestAllTypes
 }
+declare list {
+  value list(dyn)
+}
 =====>
 bindings: {}
 result:   single_any {
@@ -188,6 +241,9 @@ declare d {
 declare message {
   value dev.cel.testing.testdata.proto3.TestAllTypes
 }
+declare list {
+  value list(dyn)
+}
 =====>
 bindings: {}
 result:   single_any {
@@ -206,6 +262,9 @@ declare d {
 declare message {
   value dev.cel.testing.testdata.proto3.TestAllTypes
 }
+declare list {
+  value list(dyn)
+}
 =====>
 bindings: {message=single_bytes: "happy"
 }

diff --git a/testing/src/main/java/dev/cel/testing/BaseInterpreterTest.java b/testing/src/main/java/dev/cel/testing/BaseInterpreterTest.java
@@ -569,6 +569,7 @@ public void packUnpackAny() throws Exception {
     declareVariable("any", CelTypes.ANY);
     declareVariable("d", CelTypes.DURATION);
     declareVariable("message", CelTypes.createMessage(TestAllTypes.getDescriptor().getFullName()));
+    declareVariable("list", CelTypes.createList(CelTypes.DYN));
     Duration duration = Durations.fromSeconds(100);
     Any any = Any.pack(duration);
     TestAllTypes message = TestAllTypes.newBuilder().setSingleAny(any).build();
@@ -584,6 +585,10 @@ public void packUnpackAny() throws Exception {
     runTest(Activation.of("any", TestAllTypes.newBuilder().setSingleInt64(1).build()));
     source = "any == 1";
     runTest(Activation.of("any", Any.pack(Int64Value.of(1))));
+    source = "list[0] == message";
+    runTest(
+        Activation.copyOf(
+            ImmutableMap.of("list", ImmutableList.of(Any.pack(message)), "message", message)));
 
     // pack any
     source = "TestAllTypes{single_any: d}";