Skip to content
Open
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: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ build --java_language_version=11
common --javacopt=-Xlint:-options

# Remove flag once https://github.com/google/cel-spec/issues/508 and rules_jvm_external is fixed.
common --incompatible_autoload_externally=proto_library,cc_proto_library,java_proto_library,java_test
common --incompatible_autoload_externally=proto_library,cc_proto_library,java_proto_library,java_test,java_import

# Limit repository cache size by not caching extracted repository contents
build --repo_contents_cache=
Expand Down
4 changes: 4 additions & 0 deletions publish/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ COMMON_TARGETS = [
# keep sorted
RUNTIME_TARGETS = [
"//runtime/src/main/java/dev/cel/runtime",
"//runtime/src/main/java/dev/cel/runtime:async_call",
"//runtime/src/main/java/dev/cel/runtime:async_drain_strategy",
"//runtime/src/main/java/dev/cel/runtime:async_observer",
"//runtime/src/main/java/dev/cel/runtime:async_options",
"//runtime/src/main/java/dev/cel/runtime:base",
"//runtime/src/main/java/dev/cel/runtime:interpreter",
"//runtime/src/main/java/dev/cel/runtime:late_function_binding",
Expand Down
49 changes: 49 additions & 0 deletions runtime/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ package(
java_library(
name = "runtime",
exports = [
":async_call",
":async_drain_strategy",
":async_observer",
":async_options",
":descriptor_message_provider",
":evaluation_exception",
":function_overload",
Expand Down Expand Up @@ -340,6 +344,11 @@ java_library(
exports = ["//runtime/src/main/java/dev/cel/runtime:function_overload"],
)

cel_android_library(
name = "function_overload_android",
exports = ["//runtime/src/main/java/dev/cel/runtime:function_overload_android"],
)

java_library(
name = "descriptor_message_provider",
visibility = ["//:internal"],
Expand Down Expand Up @@ -379,3 +388,43 @@ cel_android_library(
name = "partial_vars_android",
exports = ["//runtime/src/main/java/dev/cel/runtime:partial_vars_android"],
)

java_library(
name = "async_call",
exports = ["//runtime/src/main/java/dev/cel/runtime:async_call"],
)

cel_android_library(
name = "async_call_android",
exports = ["//runtime/src/main/java/dev/cel/runtime:async_call_android"],
)

java_library(
name = "async_drain_strategy",
exports = ["//runtime/src/main/java/dev/cel/runtime:async_drain_strategy"],
)

cel_android_library(
name = "async_drain_strategy_android",
exports = ["//runtime/src/main/java/dev/cel/runtime:async_drain_strategy_android"],
)

java_library(
name = "async_observer",
exports = ["//runtime/src/main/java/dev/cel/runtime:async_observer"],
)

cel_android_library(
name = "async_observer_android",
exports = ["//runtime/src/main/java/dev/cel/runtime:async_observer_android"],
)

java_library(
name = "async_options",
exports = ["//runtime/src/main/java/dev/cel/runtime:async_options"],
)

cel_android_library(
name = "async_options_android",
exports = ["//runtime/src/main/java/dev/cel/runtime:async_options_android"],
)
12 changes: 12 additions & 0 deletions runtime/planner/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,15 @@ java_library(
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:planned_program"],
)

java_library(
name = "async_call_state_tracker",
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:async_call_state_tracker"],
)

cel_android_library(
name = "async_call_state_tracker_android",
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:async_call_state_tracker_android"],
)
23 changes: 21 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/AccumulatedUnknowns.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import org.jspecify.annotations.Nullable;
Expand All @@ -35,6 +36,7 @@ public final class AccumulatedUnknowns {
private static final int MAX_UNKNOWN_ATTRIBUTE_SIZE = 500_000;
private final Set<Long> exprIds;
private final Set<CelAttribute> attributes;
private final Set<Long> callIds;

Set<Long> exprIds() {
return exprIds;
Expand All @@ -44,6 +46,14 @@ Set<CelAttribute> attributes() {
return attributes;
}

public Set<Long> callIds() {
return Collections.unmodifiableSet(callIds);
}

public boolean hasCallIds() {
return !callIds.isEmpty();
}

/**
* Evaluates if the right hand side is an accumulated unknown, and if so, merges it into the
* accumulator.
Expand All @@ -62,6 +72,7 @@ public AccumulatedUnknowns merge(AccumulatedUnknowns arg) {
enforceMaxAttributeSize(this.attributes, arg.attributes);
this.exprIds.addAll(arg.exprIds);
this.attributes.addAll(arg.attributes);
this.callIds.addAll(arg.callIds);
return this;
}

Expand All @@ -75,7 +86,14 @@ static AccumulatedUnknowns create(Collection<Long> ids) {

public static AccumulatedUnknowns create(
Collection<Long> exprIds, Collection<CelAttribute> attributes) {
return new AccumulatedUnknowns(new HashSet<>(exprIds), new HashSet<>(attributes));
return new AccumulatedUnknowns(
new HashSet<>(exprIds), new HashSet<>(attributes), new HashSet<>());
}

public static AccumulatedUnknowns createForAsyncCall(long callId) {
HashSet<Long> callIds = new HashSet<>();
callIds.add(callId);
return new AccumulatedUnknowns(new HashSet<>(), new HashSet<>(), callIds);
}

private static void enforceMaxAttributeSize(
Expand All @@ -88,8 +106,9 @@ private static void enforceMaxAttributeSize(
}
}

private AccumulatedUnknowns(Set<Long> exprIds, Set<CelAttribute> attributes) {
private AccumulatedUnknowns(Set<Long> exprIds, Set<CelAttribute> attributes, Set<Long> callIds) {
this.exprIds = exprIds;
this.attributes = attributes;
this.callIds = callIds;
}
}
128 changes: 127 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,7 @@ java_library(
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:org_jspecify_jspecify",
],
)

Expand All @@ -753,6 +754,7 @@ cel_android_library(
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)
Expand Down Expand Up @@ -784,6 +786,7 @@ cel_android_library(
java_library(
name = "function_overload",
srcs = [
"CelAsyncFunctionOverload.java",
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
Expand All @@ -800,9 +803,12 @@ java_library(
cel_android_library(
name = "function_overload_android",
srcs = [
"CelAsyncFunctionOverload.java",
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
tags = [
],
deps = [
":evaluation_exception",
":unknown_attributes_android",
Expand All @@ -817,14 +823,14 @@ java_library(
tags = [
],
deps = [
":async_options",
":descriptor_type_resolver",
":dispatcher",
":evaluation_exception",
":evaluation_listener",
":function_binding",
":function_resolver",
":partial_vars",
":program",
":proto_message_runtime_equality",
":runtime",
":runtime_equality",
Expand Down Expand Up @@ -922,6 +928,7 @@ java_library(
],
deps = [
":activation",
":async_options",
":evaluation_exception",
":evaluation_listener",
":function_binding",
Expand All @@ -946,6 +953,7 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
],
)

Expand Down Expand Up @@ -1277,17 +1285,130 @@ cel_android_library(
],
)

java_library(
name = "async_call",
srcs = ["CelAsyncCall.java"],
tags = [
],
deps = [
"@maven//:com_google_guava_guava",
],
)

cel_android_library(
name = "async_call_android",
srcs = ["CelAsyncCall.java"],
tags = [
],
deps = [
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "async_drain_strategy",
srcs = [
"CelAsyncDrainAction.java",
"CelAsyncDrainStrategy.java",
],
tags = [
],
deps = [
":async_call",
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
)

cel_android_library(
name = "async_drain_strategy_android",
srcs = [
"CelAsyncDrainAction.java",
"CelAsyncDrainStrategy.java",
],
tags = [
],
deps = [
":async_call_android",
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "async_observer",
srcs = ["CelAsyncObserver.java"],
tags = [
],
deps = [
":async_call",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

cel_android_library(
name = "async_observer_android",
srcs = ["CelAsyncObserver.java"],
tags = [
],
deps = [
":async_call_android",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

java_library(
name = "async_options",
srcs = ["CelAsyncEvaluationOptions.java"],
tags = [
],
deps = [
":async_drain_strategy",
":async_observer",
"//:auto_value",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

cel_android_library(
name = "async_options_android",
srcs = ["CelAsyncEvaluationOptions.java"],
tags = [
],
deps = [
":async_drain_strategy_android",
":async_observer_android",
"//:auto_value",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

java_library(
name = "program",
srcs = ["Program.java"],
tags = [
],
deps = [
":activation",
":async_options",
":evaluation_exception",
":function_resolver",
":interpretable",
":partial_vars",
":variable_resolver",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:org_jspecify_jspecify",
],
)

Expand All @@ -1297,11 +1418,16 @@ cel_android_library(
tags = [
],
deps = [
":activation_android",
":async_options_android",
":evaluation_exception",
":function_resolver_android",
":interpretable_android",
":partial_vars_android",
":variable_resolver",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

Expand Down
Loading
Loading