Remove unnecessary synchronization on dispatcher by making it immutable#851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Nov 3, 2025
Merged

Remove unnecessary synchronization on dispatcher by making it immutable #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,6 @@ INTERPRABLE_SOURCES = [
# keep sorted
DISPATCHER_SOURCES = [
"DefaultDispatcher.java",
"Dispatcher.java",
]

java_library(
Expand DownExpand Up@@ -125,7 +124,6 @@ java_library(
":resolved_overload_internal",
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//runtime:function_resolver",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -146,7 +144,6 @@ cel_android_library(
":resolved_overload_internal_android",
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand Down
6 changes: 3 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -287,12 +287,12 @@ public CelRuntimeLegacyImpl build() {

functionBindingsBuilder.putAll(customFunctionBindings);

DefaultDispatcher dispatcher = DefaultDispatcher.create();
DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
functionBindingsBuilder
.buildOrThrow()
.forEach(
(String overloadId, CelFunctionBinding func) ->
dispatcher.add(
dispatcherBuilder.addOverload(
overloadId, func.getArgTypes(), func.isStrict(), func.getDefinition()));

RuntimeTypeProvider runtimeTypeProvider;
Expand All@@ -313,7 +313,7 @@ public CelRuntimeLegacyImpl build() {
new DefaultInterpreter(
DescriptorTypeResolver.create(),
runtimeTypeProvider,
dispatcher.immutableCopy(),
dispatcherBuilder.build(),
options);

return new CelRuntimeLegacyImpl(
Expand Down
73 changes: 33 additions & 40 deletions runtime/src/main/java/dev/cel/runtime/DefaultDispatcher.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,41 +14,29 @@

package dev.cel.runtime;

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

import com.google.auto.value.AutoBuilder;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.Immutable;
import javax.annotation.concurrent.ThreadSafe;
import com.google.errorprone.annotations.concurrent.GuardedBy;
import dev.cel.common.CelErrorCode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

/**
* Default implementation of {@link Dispatcher}.
*
* <p>Should be final, do not mock; mocking {@link Dispatcher} instead.
*/
@ThreadSafe
final class DefaultDispatcher implements Dispatcher {
public static DefaultDispatcher create() {
return new DefaultDispatcher();
}
/** Default implementation of dispatcher. */
@Immutable
final class DefaultDispatcher implements CelFunctionResolver {

@GuardedBy("this")
private final Map<String, ResolvedOverload> overloads = new HashMap<>();

public synchronized void add(
String overloadId, List<Class<?>> argTypes, boolean isStrict, CelFunctionOverload overload) {
overloads.put(overloadId, CelResolvedOverload.of(overloadId, overload, isStrict, argTypes));
}
private final ImmutableMap<String, ResolvedOverload> overloads;

@Override
public synchronized Optional<ResolvedOverload> findOverload(
public Optional<ResolvedOverload> findOverload(
String functionName, List<String> overloadIds, Object[] args) throws CelEvaluationException {
return DefaultDispatcher.findOverload(functionName, overloadIds, overloads, args);
return findOverload(functionName, overloadIds, overloads, args);
}

/** Finds the overload that matches the given function name, overload IDs, and arguments. */
Expand DownExpand Up@@ -87,31 +75,36 @@ public static Optional<ResolvedOverload> findOverload(
return Optional.ofNullable(match);
}

@Override
public synchronized Dispatcher.ImmutableCopy immutableCopy() {
return new ImmutableCopy(overloads);
static Builder newBuilder() {
return new AutoBuilder_DefaultDispatcher_Builder();
}

@Immutable
private static final class ImmutableCopy implements Dispatcher.ImmutableCopy {
private final ImmutableMap<String, ResolvedOverload> overloads;
@AutoBuilder(ofClass = DefaultDispatcher.class)
abstract static class Builder {

private ImmutableCopy(Map<String, ResolvedOverload> overloads) {
this.overloads = ImmutableMap.copyOf(overloads);
}
abstract ImmutableMap<String, ResolvedOverload> overloads();

@Override
public Optional<ResolvedOverload> findOverload(
String functionName, List<String> overloadIds, Object[] args)
throws CelEvaluationException {
return DefaultDispatcher.findOverload(functionName, overloadIds, overloads, args);
}
abstract ImmutableMap.Builder<String, ResolvedOverload> overloadsBuilder();

@CanIgnoreReturnValue
Builder addOverload(
String overloadId,
List<Class<?>> argTypes,
boolean isStrict,
CelFunctionOverload overload) {
checkNotNull(overloadId);
checkNotNull(argTypes);
checkNotNull(overload);

@Override
public Dispatcher.ImmutableCopy immutableCopy() {
overloadsBuilder()
.put(overloadId, CelResolvedOverload.of(overloadId, overload, isStrict, argTypes));
return this;
}

abstract DefaultDispatcher build();
}

private DefaultDispatcher() {}
DefaultDispatcher(ImmutableMap<String, ResolvedOverload> overloads) {
this.overloads = overloads;
}
}
10 changes: 5 additions & 5 deletions runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ final class DefaultInterpreter implements Interpreter {

private final TypeResolver typeResolver;
private final RuntimeTypeProvider typeProvider;
private final Dispatcher dispatcher;
private final DefaultDispatcher dispatcher;
private final CelOptions celOptions;

/**
Expand DownExpand Up@@ -102,7 +102,7 @@ static IntermediateResult create(Object value) {
public DefaultInterpreter(
TypeResolver typeResolver,
RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
DefaultDispatcher dispatcher,
CelOptions celOptions) {
this.typeResolver = checkNotNull(typeResolver);
this.typeProvider = checkNotNull(typeProvider);
Expand All@@ -120,20 +120,20 @@ public Interpretable createInterpretable(CelAbstractSyntaxTree ast) {
static final class DefaultInterpretable implements Interpretable, UnknownTrackingInterpretable {
private final TypeResolver typeResolver;
private final RuntimeTypeProvider typeProvider;
private final Dispatcher.ImmutableCopy dispatcher;
private final DefaultDispatcher dispatcher;
private final Metadata metadata;
private final CelAbstractSyntaxTree ast;
private final CelOptions celOptions;

DefaultInterpretable(
TypeResolver typeResolver,
RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
DefaultDispatcher dispatcher,
CelAbstractSyntaxTree ast,
CelOptions celOptions) {
this.typeResolver = checkNotNull(typeResolver);
this.typeProvider = checkNotNull(typeProvider);
this.dispatcher = checkNotNull(dispatcher).immutableCopy();
this.dispatcher = checkNotNull(dispatcher);
this.ast = checkNotNull(ast);
this.metadata = new DefaultMetadata(ast);
this.celOptions = checkNotNull(celOptions);
Expand Down
48 changes: 0 additions & 48 deletions runtime/src/main/java/dev/cel/runtime/Dispatcher.java
View file
Open in desktop

This file was deleted.

11 changes: 4 additions & 7 deletions runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -176,22 +176,19 @@ public CelLiteRuntime build() {

functionBindingsBuilder.putAll(customFunctionBindings);

DefaultDispatcher dispatcher = DefaultDispatcher.create();
DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
functionBindingsBuilder
.buildOrThrow()
.forEach(
(String overloadId, CelFunctionBinding func) ->
dispatcher.add(
overloadId,
func.getArgTypes(),
func.isStrict(),
(args) -> func.getDefinition().apply(args)));
dispatcherBuilder.addOverload(
overloadId, func.getArgTypes(), func.isStrict(), func.getDefinition()));

Interpreter interpreter =
new DefaultInterpreter(
TypeResolver.create(),
CelValueRuntimeTypeProvider.newInstance(celValueProvider),
dispatcher,
dispatcherBuilder.build(),
celOptions);

return new LiteRuntimeImpl(
Expand Down
7 changes: 4 additions & 3 deletions runtime/src/test/java/dev/cel/runtime/DefaultInterpreterTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,14 +74,15 @@ public Object adapt(String messageName, Object message) {
}
};
CelAbstractSyntaxTree ast = celCompiler.compile("[1].all(x, [2].all(y, error()))").getAst();
DefaultDispatcher dispatcher = DefaultDispatcher.create();
dispatcher.add(
DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
dispatcherBuilder.addOverload(
"error",
ImmutableList.of(long.class),
/* isStrict= */ true,
(args) -> new IllegalArgumentException("Always throws"));
DefaultInterpreter defaultInterpreter =
new DefaultInterpreter(new TypeResolver(), emptyProvider, dispatcher, CelOptions.DEFAULT);
new DefaultInterpreter(
new TypeResolver(), emptyProvider, dispatcherBuilder.build(), CelOptions.DEFAULT);
DefaultInterpretable interpretable =
(DefaultInterpretable) defaultInterpreter.createInterpretable(ast);

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Remove unnecessary synchronization on dispatcher by making it immutable#851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Nov 3, 2025
 Merged


Remove unnecessary synchronization on dispatcher by making it immutable
#851
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 0 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,6 @@ INTERPRABLE_SOURCES = [
# keep sorted
DISPATCHER_SOURCES = [
 "DefaultDispatcher.java",
 "Dispatcher.java",
]

java_library(
Expand DownExpand Up@@ -125,7 +124,6 @@ java_library(
 ":resolved_overload_internal",
 "//:auto_value",
 "//common:error_codes",
 "//common/annotations",
 "//runtime:function_resolver",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -146,7 +144,6 @@ cel_android_library(
 ":resolved_overload_internal_android",
 "//:auto_value",
 "//common:error_codes",
 "//common/annotations",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
Expand Down

6 changes: 3 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -287,12 +287,12 @@ public CelRuntimeLegacyImpl build() {

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
dispatcher.add(
dispatcherBuilder.addOverload(
 overloadId, func.getArgTypes(), func.isStrict(), func.getDefinition()));

 RuntimeTypeProvider runtimeTypeProvider;
Expand All@@ -313,7 +313,7 @@ public CelRuntimeLegacyImpl build() {
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
dispatcher.immutableCopy(),
dispatcherBuilder.build(),
 options);

 return new CelRuntimeLegacyImpl(
Expand Down

73 changes: 33 additions & 40 deletions
runtime/src/main/java/dev/cel/runtime/DefaultDispatcher.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,41 +14,29 @@

package dev.cel.runtime;

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

import com.google.auto.value.AutoBuilder;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.Immutable;
import javax.annotation.concurrent.ThreadSafe;
import com.google.errorprone.annotations.concurrent.GuardedBy;
import dev.cel.common.CelErrorCode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

/**
 * Default implementation of {@link Dispatcher}.
 *
 * <p>Should be final, do not mock; mocking {@link Dispatcher} instead.
 */
@ThreadSafe
final class DefaultDispatcher implements Dispatcher {
 public static DefaultDispatcher create() {
 return new DefaultDispatcher();
 }
/** Default implementation of dispatcher. */
@Immutable
final class DefaultDispatcher implements CelFunctionResolver {

 @GuardedBy("this")
 private final Map<String, ResolvedOverload> overloads = new HashMap<>();

 public synchronized void add(
 String overloadId, List<Class<?>> argTypes, boolean isStrict, CelFunctionOverload overload) {
 overloads.put(overloadId, CelResolvedOverload.of(overloadId, overload, isStrict, argTypes));
 }
 private final ImmutableMap<String, ResolvedOverload> overloads;

 @Override
 public synchronized Optional<ResolvedOverload> findOverload(
 public Optional<ResolvedOverload> findOverload(
 String functionName, List<String> overloadIds, Object[] args) throws CelEvaluationException {
 return DefaultDispatcher.findOverload(functionName, overloadIds, overloads, args);
 return findOverload(functionName, overloadIds, overloads, args);
 }

 /** Finds the overload that matches the given function name, overload IDs, and arguments. */
Expand DownExpand Up@@ -87,31 +75,36 @@ public static Optional<ResolvedOverload> findOverload(
 return Optional.ofNullable(match);
 }

 @Override
 public synchronized Dispatcher.ImmutableCopy immutableCopy() {
 return new ImmutableCopy(overloads);
 static Builder newBuilder() {
 return new AutoBuilder_DefaultDispatcher_Builder();
 }

 @Immutable
 private static final class ImmutableCopy implements Dispatcher.ImmutableCopy {
 private final ImmutableMap<String, ResolvedOverload> overloads;
 @AutoBuilder(ofClass = DefaultDispatcher.class)
 abstract static class Builder {

 private ImmutableCopy(Map<String, ResolvedOverload> overloads) {
 this.overloads = ImmutableMap.copyOf(overloads);
 }
 abstract ImmutableMap<String, ResolvedOverload> overloads();

 @Override
 public Optional<ResolvedOverload> findOverload(
 String functionName, List<String> overloadIds, Object[] args)
 throws CelEvaluationException {
 return DefaultDispatcher.findOverload(functionName, overloadIds, overloads, args);
 }
 abstract ImmutableMap.Builder<String, ResolvedOverload> overloadsBuilder();

 @CanIgnoreReturnValue
 Builder addOverload(
 String overloadId,
 List<Class<?>> argTypes,
 boolean isStrict,
 CelFunctionOverload overload) {
 checkNotNull(overloadId);
 checkNotNull(argTypes);
 checkNotNull(overload);

@Override
public Dispatcher.ImmutableCopy immutableCopy() {
 overloadsBuilder()
 .put(overloadId, CelResolvedOverload.of(overloadId, overload, isStrict, argTypes));
 return this;
 }

 abstract DefaultDispatcher build();
 }

 private DefaultDispatcher() {}
 DefaultDispatcher(ImmutableMap<String, ResolvedOverload> overloads) {
 this.overloads = overloads;
 }
}

10 changes: 5 additions & 5 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ final class DefaultInterpreter implements Interpreter {

 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher dispatcher;
 private final DefaultDispatcher dispatcher;
 private final CelOptions celOptions;

 /**
Expand DownExpand Up@@ -102,7 +102,7 @@ static IntermediateResult create(Object value) {
 public DefaultInterpreter(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
DefaultDispatcher dispatcher,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
Expand All@@ -120,20 +120,20 @@ public Interpretable createInterpretable(CelAbstractSyntaxTree ast) {
 static final class DefaultInterpretable implements Interpretable, UnknownTrackingInterpretable {
 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher.ImmutableCopy dispatcher;
 private final DefaultDispatcher dispatcher;
 private final Metadata metadata;
 private final CelAbstractSyntaxTree ast;
 private final CelOptions celOptions;

 DefaultInterpretable(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
DefaultDispatcher dispatcher,
 CelAbstractSyntaxTree ast,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher).immutableCopy();
 this.dispatcher = checkNotNull(dispatcher);
 this.ast = checkNotNull(ast);
 this.metadata = new DefaultMetadata(ast);
 this.celOptions = checkNotNull(celOptions);
Expand Down

48 changes: 0 additions & 48 deletions
runtime/src/main/java/dev/cel/runtime/Dispatcher.java

View file


Open in desktop


This file was deleted.


11 changes: 4 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,22 +176,19 @@ public CelLiteRuntime build() {

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 func.isStrict(),
 (args) -> func.getDefinition().apply(args)));
 dispatcherBuilder.addOverload(
 overloadId, func.getArgTypes(), func.isStrict(), func.getDefinition()));

 Interpreter interpreter =
 new DefaultInterpreter(
 TypeResolver.create(),
 CelValueRuntimeTypeProvider.newInstance(celValueProvider),
dispatcher,
dispatcherBuilder.build(),
 celOptions);

 return new LiteRuntimeImpl(
Expand Down

7 changes: 4 additions & 3 deletions
runtime/src/test/java/dev/cel/runtime/DefaultInterpreterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,14 +74,15 @@ public Object adapt(String messageName, Object message) {
 }
 };
 CelAbstractSyntaxTree ast = celCompiler.compile("[1].all(x, [2].all(y, error()))").getAst();
 DefaultDispatcher dispatcher = DefaultDispatcher.create();
dispatcher.add(
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
dispatcherBuilder.addOverload(
 "error",
 ImmutableList.of(long.class),
 /* isStrict= */ true,
 (args) -> new IllegalArgumentException("Always throws"));
 DefaultInterpreter defaultInterpreter =
 new DefaultInterpreter(new TypeResolver(), emptyProvider, dispatcher, CelOptions.DEFAULT);
 new DefaultInterpreter(
 new TypeResolver(), emptyProvider, dispatcherBuilder.build(), CelOptions.DEFAULT);
 DefaultInterpretable interpretable =
 (DefaultInterpretable) defaultInterpreter.createInterpretable(ast);

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove unnecessary synchronization on dispatcher by making it immutable#851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Nov 3, 2025
 Merged


Remove unnecessary synchronization on dispatcher by making it immutable
#851
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 0 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,6 @@ INTERPRABLE_SOURCES = [
# keep sorted
DISPATCHER_SOURCES = [
 "DefaultDispatcher.java",
 "Dispatcher.java",
]

java_library(
Expand DownExpand Up@@ -125,7 +124,6 @@ java_library(
 ":resolved_overload_internal",
 "//:auto_value",
 "//common:error_codes",
 "//common/annotations",
 "//runtime:function_resolver",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -146,7 +144,6 @@ cel_android_library(
 ":resolved_overload_internal_android",
 "//:auto_value",
 "//common:error_codes",
 "//common/annotations",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
Expand Down

6 changes: 3 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -287,12 +287,12 @@ public CelRuntimeLegacyImpl build() {

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
dispatcher.add(
dispatcherBuilder.addOverload(
 overloadId, func.getArgTypes(), func.isStrict(), func.getDefinition()));

 RuntimeTypeProvider runtimeTypeProvider;
Expand All@@ -313,7 +313,7 @@ public CelRuntimeLegacyImpl build() {
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
dispatcher.immutableCopy(),
dispatcherBuilder.build(),
 options);

 return new CelRuntimeLegacyImpl(
Expand Down

73 changes: 33 additions & 40 deletions
runtime/src/main/java/dev/cel/runtime/DefaultDispatcher.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,41 +14,29 @@

package dev.cel.runtime;

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

import com.google.auto.value.AutoBuilder;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.Immutable;
import javax.annotation.concurrent.ThreadSafe;
import com.google.errorprone.annotations.concurrent.GuardedBy;
import dev.cel.common.CelErrorCode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

/**
 * Default implementation of {@link Dispatcher}.
 *
 * <p>Should be final, do not mock; mocking {@link Dispatcher} instead.
 */
@ThreadSafe
final class DefaultDispatcher implements Dispatcher {
 public static DefaultDispatcher create() {
 return new DefaultDispatcher();
 }
/** Default implementation of dispatcher. */
@Immutable
final class DefaultDispatcher implements CelFunctionResolver {

 @GuardedBy("this")
 private final Map<String, ResolvedOverload> overloads = new HashMap<>();

 public synchronized void add(
 String overloadId, List<Class<?>> argTypes, boolean isStrict, CelFunctionOverload overload) {
 overloads.put(overloadId, CelResolvedOverload.of(overloadId, overload, isStrict, argTypes));
 }
 private final ImmutableMap<String, ResolvedOverload> overloads;

 @Override
 public synchronized Optional<ResolvedOverload> findOverload(
 public Optional<ResolvedOverload> findOverload(
 String functionName, List<String> overloadIds, Object[] args) throws CelEvaluationException {
 return DefaultDispatcher.findOverload(functionName, overloadIds, overloads, args);
 return findOverload(functionName, overloadIds, overloads, args);
 }

 /** Finds the overload that matches the given function name, overload IDs, and arguments. */
Expand DownExpand Up@@ -87,31 +75,36 @@ public static Optional<ResolvedOverload> findOverload(
 return Optional.ofNullable(match);
 }

 @Override
 public synchronized Dispatcher.ImmutableCopy immutableCopy() {
 return new ImmutableCopy(overloads);
 static Builder newBuilder() {
 return new AutoBuilder_DefaultDispatcher_Builder();
 }

 @Immutable
 private static final class ImmutableCopy implements Dispatcher.ImmutableCopy {
 private final ImmutableMap<String, ResolvedOverload> overloads;
 @AutoBuilder(ofClass = DefaultDispatcher.class)
 abstract static class Builder {

 private ImmutableCopy(Map<String, ResolvedOverload> overloads) {
 this.overloads = ImmutableMap.copyOf(overloads);
 }
 abstract ImmutableMap<String, ResolvedOverload> overloads();

 @Override
 public Optional<ResolvedOverload> findOverload(
 String functionName, List<String> overloadIds, Object[] args)
 throws CelEvaluationException {
 return DefaultDispatcher.findOverload(functionName, overloadIds, overloads, args);
 }
 abstract ImmutableMap.Builder<String, ResolvedOverload> overloadsBuilder();

 @CanIgnoreReturnValue
 Builder addOverload(
 String overloadId,
 List<Class<?>> argTypes,
 boolean isStrict,
 CelFunctionOverload overload) {
 checkNotNull(overloadId);
 checkNotNull(argTypes);
 checkNotNull(overload);

@Override
public Dispatcher.ImmutableCopy immutableCopy() {
 overloadsBuilder()
 .put(overloadId, CelResolvedOverload.of(overloadId, overload, isStrict, argTypes));
 return this;
 }

 abstract DefaultDispatcher build();
 }

 private DefaultDispatcher() {}
 DefaultDispatcher(ImmutableMap<String, ResolvedOverload> overloads) {
 this.overloads = overloads;
 }
}

10 changes: 5 additions & 5 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ final class DefaultInterpreter implements Interpreter {

 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher dispatcher;
 private final DefaultDispatcher dispatcher;
 private final CelOptions celOptions;

 /**
Expand DownExpand Up@@ -102,7 +102,7 @@ static IntermediateResult create(Object value) {
 public DefaultInterpreter(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
DefaultDispatcher dispatcher,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
Expand All@@ -120,20 +120,20 @@ public Interpretable createInterpretable(CelAbstractSyntaxTree ast) {
 static final class DefaultInterpretable implements Interpretable, UnknownTrackingInterpretable {
 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher.ImmutableCopy dispatcher;
 private final DefaultDispatcher dispatcher;
 private final Metadata metadata;
 private final CelAbstractSyntaxTree ast;
 private final CelOptions celOptions;

 DefaultInterpretable(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
DefaultDispatcher dispatcher,
 CelAbstractSyntaxTree ast,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher).immutableCopy();
 this.dispatcher = checkNotNull(dispatcher);
 this.ast = checkNotNull(ast);
 this.metadata = new DefaultMetadata(ast);
 this.celOptions = checkNotNull(celOptions);
Expand Down

48 changes: 0 additions & 48 deletions
runtime/src/main/java/dev/cel/runtime/Dispatcher.java

View file


Open in desktop


This file was deleted.


11 changes: 4 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,22 +176,19 @@ public CelLiteRuntime build() {

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 func.isStrict(),
 (args) -> func.getDefinition().apply(args)));
 dispatcherBuilder.addOverload(
 overloadId, func.getArgTypes(), func.isStrict(), func.getDefinition()));

 Interpreter interpreter =
 new DefaultInterpreter(
 TypeResolver.create(),
 CelValueRuntimeTypeProvider.newInstance(celValueProvider),
dispatcher,
dispatcherBuilder.build(),
 celOptions);

 return new LiteRuntimeImpl(
Expand Down

7 changes: 4 additions & 3 deletions
runtime/src/test/java/dev/cel/runtime/DefaultInterpreterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,14 +74,15 @@ public Object adapt(String messageName, Object message) {
 }
 };
 CelAbstractSyntaxTree ast = celCompiler.compile("[1].all(x, [2].all(y, error()))").getAst();
 DefaultDispatcher dispatcher = DefaultDispatcher.create();
dispatcher.add(
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
dispatcherBuilder.addOverload(
 "error",
 ImmutableList.of(long.class),
 /* isStrict= */ true,
 (args) -> new IllegalArgumentException("Always throws"));
 DefaultInterpreter defaultInterpreter =
 new DefaultInterpreter(new TypeResolver(), emptyProvider, dispatcher, CelOptions.DEFAULT);
 new DefaultInterpreter(
 new TypeResolver(), emptyProvider, dispatcherBuilder.build(), CelOptions.DEFAULT);
 DefaultInterpretable interpretable =
 (DefaultInterpretable) defaultInterpreter.createInterpretable(ast);

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove unnecessary synchronization on dispatcher by making it immutable#851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Nov 3, 2025
 Merged


Remove unnecessary synchronization on dispatcher by making it immutable
#851
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 0 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,6 @@ INTERPRABLE_SOURCES = [
# keep sorted
DISPATCHER_SOURCES = [
 "DefaultDispatcher.java",
 "Dispatcher.java",
]

java_library(
Expand DownExpand Up@@ -125,7 +124,6 @@ java_library(
 ":resolved_overload_internal",
 "//:auto_value",
 "//common:error_codes",
 "//common/annotations",
 "//runtime:function_resolver",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -146,7 +144,6 @@ cel_android_library(
 ":resolved_overload_internal_android",
 "//:auto_value",
 "//common:error_codes",
 "//common/annotations",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
Expand Down

6 changes: 3 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -287,12 +287,12 @@ public CelRuntimeLegacyImpl build() {

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
dispatcher.add(
dispatcherBuilder.addOverload(
 overloadId, func.getArgTypes(), func.isStrict(), func.getDefinition()));

 RuntimeTypeProvider runtimeTypeProvider;
Expand All@@ -313,7 +313,7 @@ public CelRuntimeLegacyImpl build() {
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
dispatcher.immutableCopy(),
dispatcherBuilder.build(),
 options);

 return new CelRuntimeLegacyImpl(
Expand Down

73 changes: 33 additions & 40 deletions
runtime/src/main/java/dev/cel/runtime/DefaultDispatcher.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,41 +14,29 @@

package dev.cel.runtime;

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

import com.google.auto.value.AutoBuilder;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.Immutable;
import javax.annotation.concurrent.ThreadSafe;
import com.google.errorprone.annotations.concurrent.GuardedBy;
import dev.cel.common.CelErrorCode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

/**
 * Default implementation of {@link Dispatcher}.
 *
 * <p>Should be final, do not mock; mocking {@link Dispatcher} instead.
 */
@ThreadSafe
final class DefaultDispatcher implements Dispatcher {
 public static DefaultDispatcher create() {
 return new DefaultDispatcher();
 }
/** Default implementation of dispatcher. */
@Immutable
final class DefaultDispatcher implements CelFunctionResolver {

 @GuardedBy("this")
 private final Map<String, ResolvedOverload> overloads = new HashMap<>();

 public synchronized void add(
 String overloadId, List<Class<?>> argTypes, boolean isStrict, CelFunctionOverload overload) {
 overloads.put(overloadId, CelResolvedOverload.of(overloadId, overload, isStrict, argTypes));
 }
 private final ImmutableMap<String, ResolvedOverload> overloads;

 @Override
 public synchronized Optional<ResolvedOverload> findOverload(
 public Optional<ResolvedOverload> findOverload(
 String functionName, List<String> overloadIds, Object[] args) throws CelEvaluationException {
 return DefaultDispatcher.findOverload(functionName, overloadIds, overloads, args);
 return findOverload(functionName, overloadIds, overloads, args);
 }

 /** Finds the overload that matches the given function name, overload IDs, and arguments. */
Expand DownExpand Up@@ -87,31 +75,36 @@ public static Optional<ResolvedOverload> findOverload(
 return Optional.ofNullable(match);
 }

 @Override
 public synchronized Dispatcher.ImmutableCopy immutableCopy() {
 return new ImmutableCopy(overloads);
 static Builder newBuilder() {
 return new AutoBuilder_DefaultDispatcher_Builder();
 }

 @Immutable
 private static final class ImmutableCopy implements Dispatcher.ImmutableCopy {
 private final ImmutableMap<String, ResolvedOverload> overloads;
 @AutoBuilder(ofClass = DefaultDispatcher.class)
 abstract static class Builder {

 private ImmutableCopy(Map<String, ResolvedOverload> overloads) {
 this.overloads = ImmutableMap.copyOf(overloads);
 }
 abstract ImmutableMap<String, ResolvedOverload> overloads();

 @Override
 public Optional<ResolvedOverload> findOverload(
 String functionName, List<String> overloadIds, Object[] args)
 throws CelEvaluationException {
 return DefaultDispatcher.findOverload(functionName, overloadIds, overloads, args);
 }
 abstract ImmutableMap.Builder<String, ResolvedOverload> overloadsBuilder();

 @CanIgnoreReturnValue
 Builder addOverload(
 String overloadId,
 List<Class<?>> argTypes,
 boolean isStrict,
 CelFunctionOverload overload) {
 checkNotNull(overloadId);
 checkNotNull(argTypes);
 checkNotNull(overload);

@Override
public Dispatcher.ImmutableCopy immutableCopy() {
 overloadsBuilder()
 .put(overloadId, CelResolvedOverload.of(overloadId, overload, isStrict, argTypes));
 return this;
 }

 abstract DefaultDispatcher build();
 }

 private DefaultDispatcher() {}
 DefaultDispatcher(ImmutableMap<String, ResolvedOverload> overloads) {
 this.overloads = overloads;
 }
}

10 changes: 5 additions & 5 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ final class DefaultInterpreter implements Interpreter {

 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher dispatcher;
 private final DefaultDispatcher dispatcher;
 private final CelOptions celOptions;

 /**
Expand DownExpand Up@@ -102,7 +102,7 @@ static IntermediateResult create(Object value) {
 public DefaultInterpreter(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
DefaultDispatcher dispatcher,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
Expand All@@ -120,20 +120,20 @@ public Interpretable createInterpretable(CelAbstractSyntaxTree ast) {
 static final class DefaultInterpretable implements Interpretable, UnknownTrackingInterpretable {
 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher.ImmutableCopy dispatcher;
 private final DefaultDispatcher dispatcher;
 private final Metadata metadata;
 private final CelAbstractSyntaxTree ast;
 private final CelOptions celOptions;

 DefaultInterpretable(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
DefaultDispatcher dispatcher,
 CelAbstractSyntaxTree ast,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher).immutableCopy();
 this.dispatcher = checkNotNull(dispatcher);
 this.ast = checkNotNull(ast);
 this.metadata = new DefaultMetadata(ast);
 this.celOptions = checkNotNull(celOptions);
Expand Down

48 changes: 0 additions & 48 deletions
runtime/src/main/java/dev/cel/runtime/Dispatcher.java

View file


Open in desktop


This file was deleted.


11 changes: 4 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,22 +176,19 @@ public CelLiteRuntime build() {

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 func.isStrict(),
 (args) -> func.getDefinition().apply(args)));
 dispatcherBuilder.addOverload(
 overloadId, func.getArgTypes(), func.isStrict(), func.getDefinition()));

 Interpreter interpreter =
 new DefaultInterpreter(
 TypeResolver.create(),
 CelValueRuntimeTypeProvider.newInstance(celValueProvider),
dispatcher,
dispatcherBuilder.build(),
 celOptions);

 return new LiteRuntimeImpl(
Expand Down

7 changes: 4 additions & 3 deletions
runtime/src/test/java/dev/cel/runtime/DefaultInterpreterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,14 +74,15 @@ public Object adapt(String messageName, Object message) {
 }
 };
 CelAbstractSyntaxTree ast = celCompiler.compile("[1].all(x, [2].all(y, error()))").getAst();
 DefaultDispatcher dispatcher = DefaultDispatcher.create();
dispatcher.add(
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
dispatcherBuilder.addOverload(
 "error",
 ImmutableList.of(long.class),
 /* isStrict= */ true,
 (args) -> new IllegalArgumentException("Always throws"));
 DefaultInterpreter defaultInterpreter =
 new DefaultInterpreter(new TypeResolver(), emptyProvider, dispatcher, CelOptions.DEFAULT);
 new DefaultInterpreter(
 new TypeResolver(), emptyProvider, dispatcherBuilder.build(), CelOptions.DEFAULT);
 DefaultInterpretable interpretable =
 (DefaultInterpretable) defaultInterpreter.createInterpretable(ast);

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Remove unnecessary synchronization on dispatcher by making it immutable#851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Nov 3, 2025
 Merged


Remove unnecessary synchronization on dispatcher by making it immutable
#851
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 0 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,6 @@ INTERPRABLE_SOURCES = [
# keep sorted
DISPATCHER_SOURCES = [
 "DefaultDispatcher.java",
 "Dispatcher.java",
]

java_library(
Expand DownExpand Up@@ -125,7 +124,6 @@ java_library(
 ":resolved_overload_internal",
 "//:auto_value",
 "//common:error_codes",
 "//common/annotations",
 "//runtime:function_resolver",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -146,7 +144,6 @@ cel_android_library(
 ":resolved_overload_internal_android",
 "//:auto_value",
 "//common:error_codes",
 "//common/annotations",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
Expand Down

6 changes: 3 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -287,12 +287,12 @@ public CelRuntimeLegacyImpl build() {

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
dispatcher.add(
dispatcherBuilder.addOverload(
 overloadId, func.getArgTypes(), func.isStrict(), func.getDefinition()));

 RuntimeTypeProvider runtimeTypeProvider;
Expand All@@ -313,7 +313,7 @@ public CelRuntimeLegacyImpl build() {
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
dispatcher.immutableCopy(),
dispatcherBuilder.build(),
 options);

 return new CelRuntimeLegacyImpl(
Expand Down

73 changes: 33 additions & 40 deletions
runtime/src/main/java/dev/cel/runtime/DefaultDispatcher.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,41 +14,29 @@

package dev.cel.runtime;

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

import com.google.auto.value.AutoBuilder;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.Immutable;
import javax.annotation.concurrent.ThreadSafe;
import com.google.errorprone.annotations.concurrent.GuardedBy;
import dev.cel.common.CelErrorCode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

/**
 * Default implementation of {@link Dispatcher}.
 *
 * <p>Should be final, do not mock; mocking {@link Dispatcher} instead.
 */
@ThreadSafe
final class DefaultDispatcher implements Dispatcher {
 public static DefaultDispatcher create() {
 return new DefaultDispatcher();
 }
/** Default implementation of dispatcher. */
@Immutable
final class DefaultDispatcher implements CelFunctionResolver {

 @GuardedBy("this")
 private final Map<String, ResolvedOverload> overloads = new HashMap<>();

 public synchronized void add(
 String overloadId, List<Class<?>> argTypes, boolean isStrict, CelFunctionOverload overload) {
 overloads.put(overloadId, CelResolvedOverload.of(overloadId, overload, isStrict, argTypes));
 }
 private final ImmutableMap<String, ResolvedOverload> overloads;

 @Override
 public synchronized Optional<ResolvedOverload> findOverload(
 public Optional<ResolvedOverload> findOverload(
 String functionName, List<String> overloadIds, Object[] args) throws CelEvaluationException {
 return DefaultDispatcher.findOverload(functionName, overloadIds, overloads, args);
 return findOverload(functionName, overloadIds, overloads, args);
 }

 /** Finds the overload that matches the given function name, overload IDs, and arguments. */
Expand DownExpand Up@@ -87,31 +75,36 @@ public static Optional<ResolvedOverload> findOverload(
 return Optional.ofNullable(match);
 }

 @Override
 public synchronized Dispatcher.ImmutableCopy immutableCopy() {
 return new ImmutableCopy(overloads);
 static Builder newBuilder() {
 return new AutoBuilder_DefaultDispatcher_Builder();
 }

 @Immutable
 private static final class ImmutableCopy implements Dispatcher.ImmutableCopy {
 private final ImmutableMap<String, ResolvedOverload> overloads;
 @AutoBuilder(ofClass = DefaultDispatcher.class)
 abstract static class Builder {

 private ImmutableCopy(Map<String, ResolvedOverload> overloads) {
 this.overloads = ImmutableMap.copyOf(overloads);
 }
 abstract ImmutableMap<String, ResolvedOverload> overloads();

 @Override
 public Optional<ResolvedOverload> findOverload(
 String functionName, List<String> overloadIds, Object[] args)
 throws CelEvaluationException {
 return DefaultDispatcher.findOverload(functionName, overloadIds, overloads, args);
 }
 abstract ImmutableMap.Builder<String, ResolvedOverload> overloadsBuilder();

 @CanIgnoreReturnValue
 Builder addOverload(
 String overloadId,
 List<Class<?>> argTypes,
 boolean isStrict,
 CelFunctionOverload overload) {
 checkNotNull(overloadId);
 checkNotNull(argTypes);
 checkNotNull(overload);

@Override
public Dispatcher.ImmutableCopy immutableCopy() {
 overloadsBuilder()
 .put(overloadId, CelResolvedOverload.of(overloadId, overload, isStrict, argTypes));
 return this;
 }

 abstract DefaultDispatcher build();
 }

 private DefaultDispatcher() {}
 DefaultDispatcher(ImmutableMap<String, ResolvedOverload> overloads) {
 this.overloads = overloads;
 }
}

10 changes: 5 additions & 5 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ final class DefaultInterpreter implements Interpreter {

 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher dispatcher;
 private final DefaultDispatcher dispatcher;
 private final CelOptions celOptions;

 /**
Expand DownExpand Up@@ -102,7 +102,7 @@ static IntermediateResult create(Object value) {
 public DefaultInterpreter(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
DefaultDispatcher dispatcher,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
Expand All@@ -120,20 +120,20 @@ public Interpretable createInterpretable(CelAbstractSyntaxTree ast) {
 static final class DefaultInterpretable implements Interpretable, UnknownTrackingInterpretable {
 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher.ImmutableCopy dispatcher;
 private final DefaultDispatcher dispatcher;
 private final Metadata metadata;
 private final CelAbstractSyntaxTree ast;
 private final CelOptions celOptions;

 DefaultInterpretable(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
DefaultDispatcher dispatcher,
 CelAbstractSyntaxTree ast,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher).immutableCopy();
 this.dispatcher = checkNotNull(dispatcher);
 this.ast = checkNotNull(ast);
 this.metadata = new DefaultMetadata(ast);
 this.celOptions = checkNotNull(celOptions);
Expand Down

48 changes: 0 additions & 48 deletions
runtime/src/main/java/dev/cel/runtime/Dispatcher.java

View file


Open in desktop


This file was deleted.


11 changes: 4 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,22 +176,19 @@ public CelLiteRuntime build() {

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 func.isStrict(),
 (args) -> func.getDefinition().apply(args)));
 dispatcherBuilder.addOverload(
 overloadId, func.getArgTypes(), func.isStrict(), func.getDefinition()));

 Interpreter interpreter =
 new DefaultInterpreter(
 TypeResolver.create(),
 CelValueRuntimeTypeProvider.newInstance(celValueProvider),
dispatcher,
dispatcherBuilder.build(),
 celOptions);

 return new LiteRuntimeImpl(
Expand Down

7 changes: 4 additions & 3 deletions
runtime/src/test/java/dev/cel/runtime/DefaultInterpreterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,14 +74,15 @@ public Object adapt(String messageName, Object message) {
 }
 };
 CelAbstractSyntaxTree ast = celCompiler.compile("[1].all(x, [2].all(y, error()))").getAst();
 DefaultDispatcher dispatcher = DefaultDispatcher.create();
dispatcher.add(
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
dispatcherBuilder.addOverload(
 "error",
 ImmutableList.of(long.class),
 /* isStrict= */ true,
 (args) -> new IllegalArgumentException("Always throws"));
 DefaultInterpreter defaultInterpreter =
 new DefaultInterpreter(new TypeResolver(), emptyProvider, dispatcher, CelOptions.DEFAULT);
 new DefaultInterpreter(
 new TypeResolver(), emptyProvider, dispatcherBuilder.build(), CelOptions.DEFAULT);
 DefaultInterpretable interpretable =
 (DefaultInterpretable) defaultInterpreter.createInterpretable(ast);

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove unnecessary synchronization on dispatcher by making it immutable#851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Nov 3, 2025
 Merged


Remove unnecessary synchronization on dispatcher by making it immutable
#851
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 0 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,6 @@ INTERPRABLE_SOURCES = [
# keep sorted
DISPATCHER_SOURCES = [
 "DefaultDispatcher.java",
 "Dispatcher.java",
]

java_library(
Expand DownExpand Up@@ -125,7 +124,6 @@ java_library(
 ":resolved_overload_internal",
 "//:auto_value",
 "//common:error_codes",
 "//common/annotations",
 "//runtime:function_resolver",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -146,7 +144,6 @@ cel_android_library(
 ":resolved_overload_internal_android",
 "//:auto_value",
 "//common:error_codes",
 "//common/annotations",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
Expand Down

6 changes: 3 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -287,12 +287,12 @@ public CelRuntimeLegacyImpl build() {

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
dispatcher.add(
dispatcherBuilder.addOverload(
 overloadId, func.getArgTypes(), func.isStrict(), func.getDefinition()));

 RuntimeTypeProvider runtimeTypeProvider;
Expand All@@ -313,7 +313,7 @@ public CelRuntimeLegacyImpl build() {
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
dispatcher.immutableCopy(),
dispatcherBuilder.build(),
 options);

 return new CelRuntimeLegacyImpl(
Expand Down

73 changes: 33 additions & 40 deletions
runtime/src/main/java/dev/cel/runtime/DefaultDispatcher.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,41 +14,29 @@

package dev.cel.runtime;

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

import com.google.auto.value.AutoBuilder;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.Immutable;
import javax.annotation.concurrent.ThreadSafe;
import com.google.errorprone.annotations.concurrent.GuardedBy;
import dev.cel.common.CelErrorCode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

/**
 * Default implementation of {@link Dispatcher}.
 *
 * <p>Should be final, do not mock; mocking {@link Dispatcher} instead.
 */
@ThreadSafe
final class DefaultDispatcher implements Dispatcher {
 public static DefaultDispatcher create() {
 return new DefaultDispatcher();
 }
/** Default implementation of dispatcher. */
@Immutable
final class DefaultDispatcher implements CelFunctionResolver {

 @GuardedBy("this")
 private final Map<String, ResolvedOverload> overloads = new HashMap<>();

 public synchronized void add(
 String overloadId, List<Class<?>> argTypes, boolean isStrict, CelFunctionOverload overload) {
 overloads.put(overloadId, CelResolvedOverload.of(overloadId, overload, isStrict, argTypes));
 }
 private final ImmutableMap<String, ResolvedOverload> overloads;

 @Override
 public synchronized Optional<ResolvedOverload> findOverload(
 public Optional<ResolvedOverload> findOverload(
 String functionName, List<String> overloadIds, Object[] args) throws CelEvaluationException {
 return DefaultDispatcher.findOverload(functionName, overloadIds, overloads, args);
 return findOverload(functionName, overloadIds, overloads, args);
 }

 /** Finds the overload that matches the given function name, overload IDs, and arguments. */
Expand DownExpand Up@@ -87,31 +75,36 @@ public static Optional<ResolvedOverload> findOverload(
 return Optional.ofNullable(match);
 }

 @Override
 public synchronized Dispatcher.ImmutableCopy immutableCopy() {
 return new ImmutableCopy(overloads);
 static Builder newBuilder() {
 return new AutoBuilder_DefaultDispatcher_Builder();
 }

 @Immutable
 private static final class ImmutableCopy implements Dispatcher.ImmutableCopy {
 private final ImmutableMap<String, ResolvedOverload> overloads;
 @AutoBuilder(ofClass = DefaultDispatcher.class)
 abstract static class Builder {

 private ImmutableCopy(Map<String, ResolvedOverload> overloads) {
 this.overloads = ImmutableMap.copyOf(overloads);
 }
 abstract ImmutableMap<String, ResolvedOverload> overloads();

 @Override
 public Optional<ResolvedOverload> findOverload(
 String functionName, List<String> overloadIds, Object[] args)
 throws CelEvaluationException {
 return DefaultDispatcher.findOverload(functionName, overloadIds, overloads, args);
 }
 abstract ImmutableMap.Builder<String, ResolvedOverload> overloadsBuilder();

 @CanIgnoreReturnValue
 Builder addOverload(
 String overloadId,
 List<Class<?>> argTypes,
 boolean isStrict,
 CelFunctionOverload overload) {
 checkNotNull(overloadId);
 checkNotNull(argTypes);
 checkNotNull(overload);

@Override
public Dispatcher.ImmutableCopy immutableCopy() {
 overloadsBuilder()
 .put(overloadId, CelResolvedOverload.of(overloadId, overload, isStrict, argTypes));
 return this;
 }

 abstract DefaultDispatcher build();
 }

 private DefaultDispatcher() {}
 DefaultDispatcher(ImmutableMap<String, ResolvedOverload> overloads) {
 this.overloads = overloads;
 }
}

10 changes: 5 additions & 5 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ final class DefaultInterpreter implements Interpreter {

 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher dispatcher;
 private final DefaultDispatcher dispatcher;
 private final CelOptions celOptions;

 /**
Expand DownExpand Up@@ -102,7 +102,7 @@ static IntermediateResult create(Object value) {
 public DefaultInterpreter(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
DefaultDispatcher dispatcher,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
Expand All@@ -120,20 +120,20 @@ public Interpretable createInterpretable(CelAbstractSyntaxTree ast) {
 static final class DefaultInterpretable implements Interpretable, UnknownTrackingInterpretable {
 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher.ImmutableCopy dispatcher;
 private final DefaultDispatcher dispatcher;
 private final Metadata metadata;
 private final CelAbstractSyntaxTree ast;
 private final CelOptions celOptions;

 DefaultInterpretable(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
DefaultDispatcher dispatcher,
 CelAbstractSyntaxTree ast,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher).immutableCopy();
 this.dispatcher = checkNotNull(dispatcher);
 this.ast = checkNotNull(ast);
 this.metadata = new DefaultMetadata(ast);
 this.celOptions = checkNotNull(celOptions);
Expand Down

48 changes: 0 additions & 48 deletions
runtime/src/main/java/dev/cel/runtime/Dispatcher.java

View file


Open in desktop


This file was deleted.


11 changes: 4 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,22 +176,19 @@ public CelLiteRuntime build() {

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 func.isStrict(),
 (args) -> func.getDefinition().apply(args)));
 dispatcherBuilder.addOverload(
 overloadId, func.getArgTypes(), func.isStrict(), func.getDefinition()));

 Interpreter interpreter =
 new DefaultInterpreter(
 TypeResolver.create(),
 CelValueRuntimeTypeProvider.newInstance(celValueProvider),
dispatcher,
dispatcherBuilder.build(),
 celOptions);

 return new LiteRuntimeImpl(
Expand Down

7 changes: 4 additions & 3 deletions
runtime/src/test/java/dev/cel/runtime/DefaultInterpreterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,14 +74,15 @@ public Object adapt(String messageName, Object message) {
 }
 };
 CelAbstractSyntaxTree ast = celCompiler.compile("[1].all(x, [2].all(y, error()))").getAst();
 DefaultDispatcher dispatcher = DefaultDispatcher.create();
dispatcher.add(
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
dispatcherBuilder.addOverload(
 "error",
 ImmutableList.of(long.class),
 /* isStrict= */ true,
 (args) -> new IllegalArgumentException("Always throws"));
 DefaultInterpreter defaultInterpreter =
 new DefaultInterpreter(new TypeResolver(), emptyProvider, dispatcher, CelOptions.DEFAULT);
 new DefaultInterpreter(
 new TypeResolver(), emptyProvider, dispatcherBuilder.build(), CelOptions.DEFAULT);
 DefaultInterpretable interpretable =
 (DefaultInterpretable) defaultInterpreter.createInterpretable(ast);

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove unnecessary synchronization on dispatcher by making it immutable#851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Nov 3, 2025
 Merged


Remove unnecessary synchronization on dispatcher by making it immutable
#851
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 0 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,6 @@ INTERPRABLE_SOURCES = [
# keep sorted
DISPATCHER_SOURCES = [
 "DefaultDispatcher.java",
 "Dispatcher.java",
]

java_library(
Expand DownExpand Up@@ -125,7 +124,6 @@ java_library(
 ":resolved_overload_internal",
 "//:auto_value",
 "//common:error_codes",
 "//common/annotations",
 "//runtime:function_resolver",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -146,7 +144,6 @@ cel_android_library(
 ":resolved_overload_internal_android",
 "//:auto_value",
 "//common:error_codes",
 "//common/annotations",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
Expand Down

6 changes: 3 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -287,12 +287,12 @@ public CelRuntimeLegacyImpl build() {

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
dispatcher.add(
dispatcherBuilder.addOverload(
 overloadId, func.getArgTypes(), func.isStrict(), func.getDefinition()));

 RuntimeTypeProvider runtimeTypeProvider;
Expand All@@ -313,7 +313,7 @@ public CelRuntimeLegacyImpl build() {
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
dispatcher.immutableCopy(),
dispatcherBuilder.build(),
 options);

 return new CelRuntimeLegacyImpl(
Expand Down

73 changes: 33 additions & 40 deletions
runtime/src/main/java/dev/cel/runtime/DefaultDispatcher.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,41 +14,29 @@

package dev.cel.runtime;

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

import com.google.auto.value.AutoBuilder;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.Immutable;
import javax.annotation.concurrent.ThreadSafe;
import com.google.errorprone.annotations.concurrent.GuardedBy;
import dev.cel.common.CelErrorCode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

/**
 * Default implementation of {@link Dispatcher}.
 *
 * <p>Should be final, do not mock; mocking {@link Dispatcher} instead.
 */
@ThreadSafe
final class DefaultDispatcher implements Dispatcher {
 public static DefaultDispatcher create() {
 return new DefaultDispatcher();
 }
/** Default implementation of dispatcher. */
@Immutable
final class DefaultDispatcher implements CelFunctionResolver {

 @GuardedBy("this")
 private final Map<String, ResolvedOverload> overloads = new HashMap<>();

 public synchronized void add(
 String overloadId, List<Class<?>> argTypes, boolean isStrict, CelFunctionOverload overload) {
 overloads.put(overloadId, CelResolvedOverload.of(overloadId, overload, isStrict, argTypes));
 }
 private final ImmutableMap<String, ResolvedOverload> overloads;

 @Override
 public synchronized Optional<ResolvedOverload> findOverload(
 public Optional<ResolvedOverload> findOverload(
 String functionName, List<String> overloadIds, Object[] args) throws CelEvaluationException {
 return DefaultDispatcher.findOverload(functionName, overloadIds, overloads, args);
 return findOverload(functionName, overloadIds, overloads, args);
 }

 /** Finds the overload that matches the given function name, overload IDs, and arguments. */
Expand DownExpand Up@@ -87,31 +75,36 @@ public static Optional<ResolvedOverload> findOverload(
 return Optional.ofNullable(match);
 }

 @Override
 public synchronized Dispatcher.ImmutableCopy immutableCopy() {
 return new ImmutableCopy(overloads);
 static Builder newBuilder() {
 return new AutoBuilder_DefaultDispatcher_Builder();
 }

 @Immutable
 private static final class ImmutableCopy implements Dispatcher.ImmutableCopy {
 private final ImmutableMap<String, ResolvedOverload> overloads;
 @AutoBuilder(ofClass = DefaultDispatcher.class)
 abstract static class Builder {

 private ImmutableCopy(Map<String, ResolvedOverload> overloads) {
 this.overloads = ImmutableMap.copyOf(overloads);
 }
 abstract ImmutableMap<String, ResolvedOverload> overloads();

 @Override
 public Optional<ResolvedOverload> findOverload(
 String functionName, List<String> overloadIds, Object[] args)
 throws CelEvaluationException {
 return DefaultDispatcher.findOverload(functionName, overloadIds, overloads, args);
 }
 abstract ImmutableMap.Builder<String, ResolvedOverload> overloadsBuilder();

 @CanIgnoreReturnValue
 Builder addOverload(
 String overloadId,
 List<Class<?>> argTypes,
 boolean isStrict,
 CelFunctionOverload overload) {
 checkNotNull(overloadId);
 checkNotNull(argTypes);
 checkNotNull(overload);

@Override
public Dispatcher.ImmutableCopy immutableCopy() {
 overloadsBuilder()
 .put(overloadId, CelResolvedOverload.of(overloadId, overload, isStrict, argTypes));
 return this;
 }

 abstract DefaultDispatcher build();
 }

 private DefaultDispatcher() {}
 DefaultDispatcher(ImmutableMap<String, ResolvedOverload> overloads) {
 this.overloads = overloads;
 }
}

10 changes: 5 additions & 5 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ final class DefaultInterpreter implements Interpreter {

 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher dispatcher;
 private final DefaultDispatcher dispatcher;
 private final CelOptions celOptions;

 /**
Expand DownExpand Up@@ -102,7 +102,7 @@ static IntermediateResult create(Object value) {
 public DefaultInterpreter(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
DefaultDispatcher dispatcher,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
Expand All@@ -120,20 +120,20 @@ public Interpretable createInterpretable(CelAbstractSyntaxTree ast) {
 static final class DefaultInterpretable implements Interpretable, UnknownTrackingInterpretable {
 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher.ImmutableCopy dispatcher;
 private final DefaultDispatcher dispatcher;
 private final Metadata metadata;
 private final CelAbstractSyntaxTree ast;
 private final CelOptions celOptions;

 DefaultInterpretable(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
DefaultDispatcher dispatcher,
 CelAbstractSyntaxTree ast,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher).immutableCopy();
 this.dispatcher = checkNotNull(dispatcher);
 this.ast = checkNotNull(ast);
 this.metadata = new DefaultMetadata(ast);
 this.celOptions = checkNotNull(celOptions);
Expand Down

48 changes: 0 additions & 48 deletions
runtime/src/main/java/dev/cel/runtime/Dispatcher.java

View file


Open in desktop


This file was deleted.


11 changes: 4 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,22 +176,19 @@ public CelLiteRuntime build() {

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 func.isStrict(),
 (args) -> func.getDefinition().apply(args)));
 dispatcherBuilder.addOverload(
 overloadId, func.getArgTypes(), func.isStrict(), func.getDefinition()));

 Interpreter interpreter =
 new DefaultInterpreter(
 TypeResolver.create(),
 CelValueRuntimeTypeProvider.newInstance(celValueProvider),
dispatcher,
dispatcherBuilder.build(),
 celOptions);

 return new LiteRuntimeImpl(
Expand Down

7 changes: 4 additions & 3 deletions
runtime/src/test/java/dev/cel/runtime/DefaultInterpreterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,14 +74,15 @@ public Object adapt(String messageName, Object message) {
 }
 };
 CelAbstractSyntaxTree ast = celCompiler.compile("[1].all(x, [2].all(y, error()))").getAst();
 DefaultDispatcher dispatcher = DefaultDispatcher.create();
dispatcher.add(
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
dispatcherBuilder.addOverload(
 "error",
 ImmutableList.of(long.class),
 /* isStrict= */ true,
 (args) -> new IllegalArgumentException("Always throws"));
 DefaultInterpreter defaultInterpreter =
 new DefaultInterpreter(new TypeResolver(), emptyProvider, dispatcher, CelOptions.DEFAULT);
 new DefaultInterpreter(
 new TypeResolver(), emptyProvider, dispatcherBuilder.build(), CelOptions.DEFAULT);
 DefaultInterpretable interpretable =
 (DefaultInterpretable) defaultInterpreter.createInterpretable(ast);

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Remove unnecessary synchronization on dispatcher by making it immutable#851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Nov 3, 2025
 Merged


Remove unnecessary synchronization on dispatcher by making it immutable
#851
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 0 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,6 @@ INTERPRABLE_SOURCES = [
# keep sorted
DISPATCHER_SOURCES = [
 "DefaultDispatcher.java",
 "Dispatcher.java",
]

java_library(
Expand DownExpand Up@@ -125,7 +124,6 @@ java_library(
 ":resolved_overload_internal",
 "//:auto_value",
 "//common:error_codes",
 "//common/annotations",
 "//runtime:function_resolver",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand All@@ -146,7 +144,6 @@ cel_android_library(
 ":resolved_overload_internal_android",
 "//:auto_value",
 "//common:error_codes",
 "//common/annotations",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
Expand Down

6 changes: 3 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -287,12 +287,12 @@ public CelRuntimeLegacyImpl build() {

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
dispatcher.add(
dispatcherBuilder.addOverload(
 overloadId, func.getArgTypes(), func.isStrict(), func.getDefinition()));

 RuntimeTypeProvider runtimeTypeProvider;
Expand All@@ -313,7 +313,7 @@ public CelRuntimeLegacyImpl build() {
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
dispatcher.immutableCopy(),
dispatcherBuilder.build(),
 options);

 return new CelRuntimeLegacyImpl(
Expand Down

73 changes: 33 additions & 40 deletions
runtime/src/main/java/dev/cel/runtime/DefaultDispatcher.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,41 +14,29 @@

package dev.cel.runtime;

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

import com.google.auto.value.AutoBuilder;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.Immutable;
import javax.annotation.concurrent.ThreadSafe;
import com.google.errorprone.annotations.concurrent.GuardedBy;
import dev.cel.common.CelErrorCode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

/**
 * Default implementation of {@link Dispatcher}.
 *
 * <p>Should be final, do not mock; mocking {@link Dispatcher} instead.
 */
@ThreadSafe
final class DefaultDispatcher implements Dispatcher {
 public static DefaultDispatcher create() {
 return new DefaultDispatcher();
 }
/** Default implementation of dispatcher. */
@Immutable
final class DefaultDispatcher implements CelFunctionResolver {

 @GuardedBy("this")
 private final Map<String, ResolvedOverload> overloads = new HashMap<>();

 public synchronized void add(
 String overloadId, List<Class<?>> argTypes, boolean isStrict, CelFunctionOverload overload) {
 overloads.put(overloadId, CelResolvedOverload.of(overloadId, overload, isStrict, argTypes));
 }
 private final ImmutableMap<String, ResolvedOverload> overloads;

 @Override
 public synchronized Optional<ResolvedOverload> findOverload(
 public Optional<ResolvedOverload> findOverload(
 String functionName, List<String> overloadIds, Object[] args) throws CelEvaluationException {
 return DefaultDispatcher.findOverload(functionName, overloadIds, overloads, args);
 return findOverload(functionName, overloadIds, overloads, args);
 }

 /** Finds the overload that matches the given function name, overload IDs, and arguments. */
Expand DownExpand Up@@ -87,31 +75,36 @@ public static Optional<ResolvedOverload> findOverload(
 return Optional.ofNullable(match);
 }

 @Override
 public synchronized Dispatcher.ImmutableCopy immutableCopy() {
 return new ImmutableCopy(overloads);
 static Builder newBuilder() {
 return new AutoBuilder_DefaultDispatcher_Builder();
 }

 @Immutable
 private static final class ImmutableCopy implements Dispatcher.ImmutableCopy {
 private final ImmutableMap<String, ResolvedOverload> overloads;
 @AutoBuilder(ofClass = DefaultDispatcher.class)
 abstract static class Builder {

 private ImmutableCopy(Map<String, ResolvedOverload> overloads) {
 this.overloads = ImmutableMap.copyOf(overloads);
 }
 abstract ImmutableMap<String, ResolvedOverload> overloads();

 @Override
 public Optional<ResolvedOverload> findOverload(
 String functionName, List<String> overloadIds, Object[] args)
 throws CelEvaluationException {
 return DefaultDispatcher.findOverload(functionName, overloadIds, overloads, args);
 }
 abstract ImmutableMap.Builder<String, ResolvedOverload> overloadsBuilder();

 @CanIgnoreReturnValue
 Builder addOverload(
 String overloadId,
 List<Class<?>> argTypes,
 boolean isStrict,
 CelFunctionOverload overload) {
 checkNotNull(overloadId);
 checkNotNull(argTypes);
 checkNotNull(overload);

@Override
public Dispatcher.ImmutableCopy immutableCopy() {
 overloadsBuilder()
 .put(overloadId, CelResolvedOverload.of(overloadId, overload, isStrict, argTypes));
 return this;
 }

 abstract DefaultDispatcher build();
 }

 private DefaultDispatcher() {}
 DefaultDispatcher(ImmutableMap<String, ResolvedOverload> overloads) {
 this.overloads = overloads;
 }
}

10 changes: 5 additions & 5 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ final class DefaultInterpreter implements Interpreter {

 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher dispatcher;
 private final DefaultDispatcher dispatcher;
 private final CelOptions celOptions;

 /**
Expand DownExpand Up@@ -102,7 +102,7 @@ static IntermediateResult create(Object value) {
 public DefaultInterpreter(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
DefaultDispatcher dispatcher,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
Expand All@@ -120,20 +120,20 @@ public Interpretable createInterpretable(CelAbstractSyntaxTree ast) {
 static final class DefaultInterpretable implements Interpretable, UnknownTrackingInterpretable {
 private final TypeResolver typeResolver;
 private final RuntimeTypeProvider typeProvider;
 private final Dispatcher.ImmutableCopy dispatcher;
 private final DefaultDispatcher dispatcher;
 private final Metadata metadata;
 private final CelAbstractSyntaxTree ast;
 private final CelOptions celOptions;

 DefaultInterpretable(
 TypeResolver typeResolver,
 RuntimeTypeProvider typeProvider,
Dispatcher dispatcher,
DefaultDispatcher dispatcher,
 CelAbstractSyntaxTree ast,
 CelOptions celOptions) {
 this.typeResolver = checkNotNull(typeResolver);
 this.typeProvider = checkNotNull(typeProvider);
 this.dispatcher = checkNotNull(dispatcher).immutableCopy();
 this.dispatcher = checkNotNull(dispatcher);
 this.ast = checkNotNull(ast);
 this.metadata = new DefaultMetadata(ast);
 this.celOptions = checkNotNull(celOptions);
Expand Down

48 changes: 0 additions & 48 deletions
runtime/src/main/java/dev/cel/runtime/Dispatcher.java

View file


Open in desktop


This file was deleted.


11 changes: 4 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/LiteRuntimeImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,22 +176,19 @@ public CelLiteRuntime build() {

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 func.isStrict(),
 (args) -> func.getDefinition().apply(args)));
 dispatcherBuilder.addOverload(
 overloadId, func.getArgTypes(), func.isStrict(), func.getDefinition()));

 Interpreter interpreter =
 new DefaultInterpreter(
 TypeResolver.create(),
 CelValueRuntimeTypeProvider.newInstance(celValueProvider),
dispatcher,
dispatcherBuilder.build(),
 celOptions);

 return new LiteRuntimeImpl(
Expand Down

7 changes: 4 additions & 3 deletions
runtime/src/test/java/dev/cel/runtime/DefaultInterpreterTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,14 +74,15 @@ public Object adapt(String messageName, Object message) {
 }
 };
 CelAbstractSyntaxTree ast = celCompiler.compile("[1].all(x, [2].all(y, error()))").getAst();
 DefaultDispatcher dispatcher = DefaultDispatcher.create();
dispatcher.add(
 DefaultDispatcher.Builder dispatcherBuilder = DefaultDispatcher.newBuilder();
dispatcherBuilder.addOverload(
 "error",
 ImmutableList.of(long.class),
 /* isStrict= */ true,
 (args) -> new IllegalArgumentException("Always throws"));
 DefaultInterpreter defaultInterpreter =
 new DefaultInterpreter(new TypeResolver(), emptyProvider, dispatcher, CelOptions.DEFAULT);
 new DefaultInterpreter(
 new TypeResolver(), emptyProvider, dispatcherBuilder.build(), CelOptions.DEFAULT);
 DefaultInterpretable interpretable =
 (DefaultInterpretable) defaultInterpreter.createInterpretable(ast);

Expand Down
Loading