Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ java_library(
"//common/internal:map_keys",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
"//runtime:type_resolver",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
Expand Down Expand Up @@ -866,6 +867,7 @@ cel_android_library(
"//common/exceptions:invalid_argument",
"//common/internal:map_keys_android",
"//runtime:interpretable_android",
"//runtime:type_resolver_android",
"//runtime/src/main/java/dev/cel/runtime:accumulated_unknowns_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand Down
20 changes: 8 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/planner/EvalCreateMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@

package dev.cel.runtime.planner;

import static com.google.common.base.Preconditions.checkArgument;

import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Sets;
import com.google.errorprone.annotations.Immutable;
Expand All @@ -25,6 +23,7 @@
import dev.cel.common.internal.MapKeys;
import dev.cel.runtime.AccumulatedUnknowns;
import dev.cel.runtime.GlobalResolver;
import dev.cel.runtime.TypeResolver;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
Expand Down Expand Up @@ -98,7 +97,8 @@ private static void validateAndTrackKey(
Set<Object> keysSeen, PlannedInterpretable keyInterpretable, Object key) {
if (!MapKeys.isValidKeyType(key)) {
throw new LocalizedEvaluationException(
new CelInvalidArgumentException("Unsupported key type: " + key),
new CelInvalidArgumentException(
"Unsupported key type: " + TypeResolver.resolveTypeName(key)),
keyInterpretable.expr().id());
}

Expand All @@ -123,14 +123,12 @@ static PlannedInterpretable create(
ImmutableMap.Builder<Object, Object> builder =
ImmutableMap.builderWithExpectedSize(keys.length);
HashSet<Object> keysSeen = Sets.newHashSetWithExpectedSize(keys.length);
try {
for (int i = 0; i < keys.length; i++) {
Object key = ((EvalConstant) keys[i]).constantValue();
validateAndTrackKey(keysSeen, keys[i], key);
builder.put(key, ((EvalConstant) values[i]).constantValue());
for (int i = 0; i < keys.length; i++) {
Object key = ((EvalConstant) keys[i]).constantValue();
if (!MapKeys.isValidKeyType(key) || !keysSeen.add(MapKeys.normalize(key))) {
return new EvalCreateMap(expr, keys, values, isOptional);
}
} catch (LocalizedEvaluationException e) {
return new EvalCreateMap(expr, keys, values, isOptional);
builder.put(key, ((EvalConstant) values[i]).constantValue());
}
return EvalConstant.create(expr, builder.buildOrThrow());
}
Expand All @@ -141,8 +139,6 @@ private EvalCreateMap(
PlannedInterpretable[] values,
boolean[] isOptional) {
super(expr);
checkArgument(keys.length == values.length);
checkArgument(keys.length == isOptional.length);
this.keys = keys;
this.values = values;
this.isOptional = isOptional;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -656,14 +656,32 @@ public void plan_createMap_absentOptionalEntry_keyNotTaken() throws Exception {
}

@Test
public void plan_createMap_unsupportedKeyType_throws() throws Exception {
CelAbstractSyntaxTree ast = compile("{1.0: 'foo'}");
@TestParameters({
"{expression: \"{1.0: 'foo'}\", column: 1, expectedType: 'double'}",
"{expression: \"{null: 'foo'}\", column: 1, expectedType: 'null_type'}",
"{expression: \"{b'foo': 'foo'}\", column: 1, expectedType: 'bytes'}",
"{expression: \"{[1]: 'foo'}\", column: 1, expectedType: 'list'}",
"{expression: \"{{}: 'foo'}\", column: 1, expectedType: 'map'}",
"{expression: \"{int: 'foo'}\", column: 1, expectedType: 'type'}",
"{expression: \"{TestAllTypes{}: 'foo'}\", column: 13,"
+ " expectedType: 'dev.cel.expr.conformance.proto3.TestAllTypes'}",
"{expression: \"{dyn_var: 'foo'}\", column: 1,"
+ " expectedType: 'dev.cel.expr.conformance.proto3.TestAllTypes'}",
})
public void plan_createMap_unsupportedKeyType_throws(
String expression, int column, String expectedType) throws Exception {
CelAbstractSyntaxTree ast = compile(expression);
Program program = PLANNER.plan(ast);

CelEvaluationException e = assertThrows(CelEvaluationException.class, program::eval);
CelEvaluationException e =
assertThrows(
CelEvaluationException.class,
() -> program.eval(ImmutableMap.of("dyn_var", TestAllTypes.getDefaultInstance())));
assertThat(e)
.hasMessageThat()
.contains("evaluation error at <input>:1: Unsupported key type: 1.0");
.contains(
String.format(
"evaluation error at <input>:%d: Unsupported key type: %s", column, expectedType));
}

@Test
Expand Down
Loading