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
108 changes: 106 additions & 2 deletions extensions/src/test/java/dev/cel/extensions/CelExtensionsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,32 @@
package dev.cel.extensions;

import static com.google.common.truth.Truth.assertThat;
import static dev.cel.common.CelFunctionDecl.newFunctionDeclaration;
import static dev.cel.common.CelOverloadDecl.newGlobalOverload;
import static org.junit.Assert.assertThrows;

import com.google.testing.junit.testparameterinjector.TestParameter;
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
import dev.cel.bundle.Cel;
import dev.cel.bundle.CelFactory;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelOptions;
import dev.cel.common.CelValidationException;
import dev.cel.common.types.SimpleType;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.extensions.CelStringExtensions.Function;
import dev.cel.runtime.CelEvaluationException;
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelLiteRuntime;
import dev.cel.runtime.CelLiteRuntimeFactory;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelStandardFunctions;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
@RunWith(TestParameterInjector.class)
public class CelExtensionsTest {

@Test
Expand Down Expand Up @@ -197,4 +209,96 @@ public void getAllFunctionNames() {
"optional.ofNonZeroValue",
"cel.@mapInsert");
}

@Test
public void crossExtensionSharedFunctionName_reverse_dispatchesAcrossListsAndStrings(
@TestParameter boolean isParseOnly) throws Exception {
Cel cel =
CelFactory.plannerCelBuilder()
.addCompilerLibraries(CelExtensions.lists(), CelExtensions.strings())
.addRuntimeLibraries(CelExtensions.lists(), CelExtensions.strings())
.build();
String expression = "dyn('hello').reverse() == 'olleh' && dyn([1, 2]).reverse() == [2, 1]";
CelAbstractSyntaxTree ast =
isParseOnly ? cel.parse(expression).getAst() : cel.compile(expression).getAst();

Object result = cel.createProgram(ast).eval();

assertThat(result).isEqualTo(true);
}

@Test
public void crossExtensionSharedFunctionName_liteRuntime_reverseDispatchesAcrossListsAndStrings(
@TestParameter boolean isParseOnly) throws Exception {
CelCompiler compiler =
CelCompilerFactory.standardCelCompilerBuilder()
.addLibraries(CelExtensions.lists(), CelExtensions.strings())
.build();
CelLiteRuntime runtime =
CelLiteRuntimeFactory.newLiteRuntimeBuilder()
.setStandardFunctions(CelStandardFunctions.ALL_STANDARD_FUNCTIONS)
.addLibraries(CelListsRuntimeLibrary.lists(), CelStringRuntimeLibrary.strings())
.build();
String expression = "dyn('hello').reverse() == 'olleh' && dyn([1, 2]).reverse() == [2, 1]";
CelAbstractSyntaxTree ast =
isParseOnly ? compiler.parse(expression).getAst() : compiler.compile(expression).getAst();

Object result = runtime.createProgram(ast).eval();

assertThat(result).isEqualTo(true);
}

@Test
public void toCelBuilder_mergesDerivedLibrariesAndFunctionBindings() throws Exception {
Cel baseCel =
CelFactory.plannerCelBuilder()
.addCompilerLibraries(CelExtensions.lists())
.addRuntimeLibraries(CelExtensions.lists())
.addFunctionDeclarations(
newFunctionDeclaration(
"fn",
newGlobalOverload("fn_int", SimpleType.INT, SimpleType.INT),
newGlobalOverload("fn_str", SimpleType.STRING, SimpleType.STRING)))
.addFunctionBindings(
CelFunctionBinding.fromOverloads(
"fn", CelFunctionBinding.from("fn_int", Long.class, x -> x + 1L)))
.build();
Cel derivedCel =
baseCel
.toCelBuilder()
.addCompilerLibraries(CelExtensions.strings())
.addRuntimeLibraries(CelExtensions.strings())
.addFunctionBindings(
CelFunctionBinding.fromOverloads(
"fn",
CelFunctionBinding.from("fn_int", Long.class, x -> x + 100L),
CelFunctionBinding.from("fn_str", String.class, s -> s + "!")))
.build();
String expression =
"dyn('hello').reverse() == 'olleh' && dyn([1, 2]).reverse() == [2, 1]"
+ " && fn(dyn(1)) == 2 && fn(dyn('a')) == 'a!'";

assertThat(derivedCel.createProgram(derivedCel.compile(expression).getAst()).eval())
.isEqualTo(true);
assertThat(derivedCel.createProgram(derivedCel.parse(expression).getAst()).eval())
.isEqualTo(true);
}

@Test
public void toRuntimeBuilder_optionalLibrary_updatesRuntimeEquality() throws Exception {
Cel defaultCel =
CelFactory.plannerCelBuilder()
.addCompilerLibraries(CelExtensions.optional())
.addRuntimeLibraries(CelExtensions.optional())
.build();
CelAbstractSyntaxTree ast = defaultCel.compile("{1: 'a'}[?dyn(1.0)]").getAst();
CelRuntime strictMapKeyRuntime =
defaultCel
.toRuntimeBuilder()
.setOptions(CelOptions.current().disableCelStandardEquality(true).build())
.build();

assertThat(defaultCel.createProgram(ast).eval()).isEqualTo(Optional.of("a"));
assertThat(strictMapKeyRuntime.createProgram(ast).eval()).isEqualTo(Optional.empty());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ public CelLiteRuntimeBuilder addFunctionBindings(CelFunctionBinding... bindings)

@Override
public CelLiteRuntimeBuilder addFunctionBindings(Iterable<CelFunctionBinding> bindings) {
bindings.forEach(o -> customFunctionBindings.putIfAbsent(o.getOverloadId(), o));
bindings.forEach(
o -> customFunctionBindings.merge(o.getOverloadId(), o, FunctionBindingImpl::merge));
return this;
}

Expand Down
15 changes: 11 additions & 4 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,8 @@ public Builder addFunctionBindings(CelFunctionBinding... bindings) {
@CanIgnoreReturnValue
public Builder addFunctionBindings(Iterable<CelFunctionBinding> bindings) {
checkNotNull(bindings);
bindings.forEach(o -> mutableFunctionBindings.putIfAbsent(o.getOverloadId(), o));
bindings.forEach(
o -> mutableFunctionBindings.merge(o.getOverloadId(), o, FunctionBindingImpl::merge));
return this;
}

Expand Down Expand Up @@ -517,6 +518,14 @@ public CelRuntime build() {
CelValueProvider protoMessageValueProvider =
ProtoMessageValueProvider.newInstance(options(), dynamicProto);
RuntimeEquality runtimeEquality = ProtoMessageRuntimeEquality.create(dynamicProto, options());
functionBindings()
.forEach((overloadId, baseBinding) ->
mutableFunctionBindings.merge(
overloadId,
baseBinding,
(newBinding, oldBinding) -> FunctionBindingImpl.merge(oldBinding, newBinding)));
ImmutableMap<String, CelFunctionBinding> userFunctionBindings =
ImmutableMap.copyOf(mutableFunctionBindings);
ImmutableSet<CelRuntimeLibrary> runtimeLibraries = runtimeLibrariesBuilder().build();
// Add libraries, such as extensions
for (CelRuntimeLibrary celLibrary : runtimeLibraries) {
Expand Down Expand Up @@ -549,8 +558,6 @@ public CelRuntime build() {
new CelTypeProvider.CombinedCelTypeProvider(combinedTypeProvider, typeProvider());
}

mutableFunctionBindings.putAll(functionBindings());

for (CelFunctionBinding binding :
TypeFunction.create()
.newFunctionBindings(
Expand All @@ -576,7 +583,7 @@ public CelRuntime build() {
asyncExecutor().orElse(null));
setPlanner(planner);

setFunctionBindings(ImmutableMap.copyOf(mutableFunctionBindings));
setFunctionBindings(userFunctionBindings);
return autoBuild();
}
}
Expand Down
31 changes: 18 additions & 13 deletions runtime/src/main/java/dev/cel/runtime/FunctionBindingImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import java.util.LinkedHashMap;
import java.util.Map;

@Immutable
final class FunctionBindingImpl implements InternalCelFunctionBinding {
Expand Down Expand Up @@ -107,23 +108,27 @@ static ImmutableSet<CelFunctionBinding> groupOverloadsToFunction(
overloadBindings.stream().anyMatch(b -> b.getOverloadId().equals(functionName));

if (!hasSingletonBinding) {
if (overloadBindings.size() == 1) {
CelFunctionBinding singleBinding = Iterables.getOnlyElement(overloadBindings);
builder.add(
new FunctionBindingImpl(
functionName,
functionName,
singleBinding.getArgTypes(),
singleBinding.getDefinition(),
singleBinding.isStrict()));
} else if (overloadBindings.size() > 1) {
builder.add(new DynamicDispatchBinding(functionName, functionBindings));
}
builder.add(new DynamicDispatchBinding(functionName, functionBindings));
}

return builder.build();
}

static CelFunctionBinding merge(CelFunctionBinding existing, CelFunctionBinding incoming) {
if (existing instanceof DynamicDispatchBinding && incoming instanceof DynamicDispatchBinding) {
DynamicDispatchOverload existingOverload =
((DynamicDispatchBinding) existing).dynamicDispatchOverload;
DynamicDispatchOverload incomingOverload =
((DynamicDispatchBinding) incoming).dynamicDispatchOverload;
Map<String, FunctionBindingImpl> merged = new LinkedHashMap<>();
existingOverload.overloadBindings.forEach(b -> merged.put(b.getOverloadId(), b));
incomingOverload.overloadBindings.forEach(b -> merged.putIfAbsent(b.getOverloadId(), b));
return new DynamicDispatchBinding(
existingOverload.functionName, ImmutableSet.copyOf(merged.values()));
}
return existing;
}

@Immutable
static final class DynamicDispatchBinding implements InternalCelFunctionBinding {

Expand Down
31 changes: 31 additions & 0 deletions runtime/src/test/java/dev/cel/runtime/FunctionBindingImplTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -364,4 +364,35 @@ public void fromOverloads_varargsAndCollection_success() {
assertThat(varargsBindings).isNotEmpty();
assertThat(collectionBindings).isNotEmpty();
}

@Test
public void merge_combinesDynamicDispatchAndDeduplicatesByOverloadId() throws Exception {
CelFunctionBinding standalone = CelFunctionBinding.from("fn", Long.class, x -> x);
CelFunctionBinding dynInt =
Iterables.find(
CelFunctionBinding.fromOverloads(
"fn", CelFunctionBinding.from("fn_int", Long.class, x -> x + 1L)),
b -> b.getOverloadId().equals("fn"));
CelFunctionBinding dynDupIntAndStr =
Iterables.find(
CelFunctionBinding.fromOverloads(
"fn",
CelFunctionBinding.from("fn_int", Long.class, x -> x + 100L),
CelFunctionBinding.from("fn_str", String.class, s -> s + "!")),
b -> b.getOverloadId().equals("fn"));

OptimizedFunctionOverload merged =
(OptimizedFunctionOverload)
FunctionBindingImpl.merge(dynInt, dynDupIntAndStr).getDefinition();
CelOverloadNotFoundException mismatch =
assertThrows(CelOverloadNotFoundException.class, () -> merged.apply(1.5d));

assertThat(merged.apply(1L)).isEqualTo(2L);
assertThat(merged.apply("hi")).isEqualTo("hi!");
assertThat(mismatch)
.hasMessageThat()
.isEqualTo("No matching overload for function 'fn'. Overload candidates: fn_int, fn_str");
assertThat(FunctionBindingImpl.merge(standalone, dynInt)).isSameInstanceAs(standalone);
assertThat(FunctionBindingImpl.merge(dynInt, standalone)).isSameInstanceAs(dynInt);
}
}
Loading