Optimize list/map adaptations#1041

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
May 14, 2026
Merged

Optimize list/map adaptations #1041

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
32 changes: 23 additions & 9 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,6 @@ java_library(
deps = [
"//common/values",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
)

Expand All@@ -72,7 +71,6 @@ cel_android_library(
deps = [
"//common/values:values_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
)

Expand DownExpand Up@@ -118,7 +116,6 @@ java_library(
deps = [
":values",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:org_jspecify_jspecify",
],
Expand All@@ -134,12 +131,31 @@ cel_android_library(
deps = [
":values_android",
"//common/annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
],
)

java_library(
name = "preadapted_list",
srcs = [
"CelPreAdaptedList.java",
],
tags = [
],
deps = ["//common/annotations"],
)

cel_android_library(
name = "preadapted_list_android",
srcs = [
"CelPreAdaptedList.java",
],
tags = [
],
deps = ["//common/annotations"],
)

java_library(
name = "values",
srcs = CEL_VALUES_SOURCES,
Expand All@@ -148,6 +164,7 @@ java_library(
deps = [
":cel_byte_string",
":cel_value",
":preadapted_list",
"//:auto_value",
"//common/annotations",
"//common/types",
Expand DownExpand Up@@ -198,6 +215,7 @@ cel_android_library(
deps = [
":cel_byte_string",
":cel_value_android",
":preadapted_list_android",
"//:auto_value",
"//common/annotations",
"//common/types:type_providers_android",
Expand DownExpand Up@@ -226,7 +244,6 @@ java_library(
],
deps = [
":cel_byte_string",
":values",
"//common/annotations",
"//common/internal:proto_time_utils",
"//common/internal:well_known_proto",
Expand DownExpand Up@@ -261,6 +278,7 @@ java_library(
],
deps = [
":base_proto_cel_value_converter",
":preadapted_list",
":values",
"//:auto_value",
"//common:options",
Expand All@@ -273,7 +291,6 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
],
)

Expand DownExpand Up@@ -316,8 +333,6 @@ java_library(
"//protobuf:cel_lite_descriptor",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)
Expand All@@ -343,7 +358,6 @@ cel_android_library(
"//protobuf:cel_lite_descriptor",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:org_jspecify_jspecify",
"@maven_android//:com_google_guava_guava",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
Expand Down
49 changes: 49 additions & 0 deletions common/src/main/java/dev/cel/common/values/CelPreAdaptedList.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.values;

import dev.cel.common.annotations.Internal;
import java.util.AbstractList;
import java.util.List;
import java.util.RandomAccess;

/**
* A zero-allocation view over a list we know is already adapted.
*
* <p>This class purely exists as an optimization scheme to avoid redundant collection traversals in
* {@link CelValueConverter}, and is not intended for general use.
*/
@Internal
final class CelPreAdaptedList<E> extends AbstractList<E> implements RandomAccess {
private final List<E> delegate;

private CelPreAdaptedList(List<E> delegate) {
this.delegate = delegate;
}

static <E> CelPreAdaptedList<E> wrap(List<E> safeList) {
return new CelPreAdaptedList<>(safeList);
}

@Override
public E get(int index) {
return delegate.get(index);
}

@Override
public int size() {
return delegate.size();
}
}
74 changes: 60 additions & 14 deletions common/src/main/java/dev/cel/common/values/CelValueConverter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,11 @@
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.RandomAccess;
import java.util.function.Function;

/**
Expand DownExpand Up@@ -53,23 +56,46 @@ public static CelValueConverter getDefaultInstance() {
* <p>The value may be a {@link CelValue}, a {@link Collection} or a {@link Map}.
*/
public Object maybeUnwrap(Object value) {
if (value instanceof CelValue) {
return unwrap((CelValue) value);
if (value instanceof CelValue || value instanceof CelPreAdaptedList) {
return value instanceof CelValue ? unwrap((CelValue) value) : value;
}

Object mapped = mapContainer(value, maybeUnwrapFunction);
if (mapped != value) {
return mapped;
}

return value;
return mapContainer(value, maybeUnwrapFunction);
}

/**
* Maps a container (Collection or Map) by applying the provided mapper function to its elements.
* Returns the original value if it's not a supported container.
*/
protected Object mapContainer(Object value, Function<Object, Object> mapper) {

// Zero allocation path for standard lists that support O(1) indexing
// Generally, protobuf lists (backed by arrays) fall into this category
if (value instanceof List && value instanceof RandomAccess) {
List<Object> list = (List<Object>) value;
for (int i = 0; i < list.size(); i++) {
Object element = list.get(i);
Object mapped = mapper.apply(element);

if (mapped != element) {
ImmutableList.Builder<Object> builder =
ImmutableList.builderWithExpectedSize(list.size());
for (int j = 0; j < i; j++) {
builder.add(list.get(j));
}
builder.add(mapped);
for (int j = i + 1; j < list.size(); j++) {
builder.add(mapper.apply(list.get(j)));
}
return builder.build();
}
}

// Zero allocations if unmodified
return value;
}

// Fallback for lists that are unordered
if (value instanceof Collection) {
Collection<Object> collection = (Collection<Object>) value;
ImmutableList.Builder<Object> builder =
Expand All@@ -82,12 +108,32 @@ protected Object mapContainer(Object value, Function<Object, Object> mapper) {

if (value instanceof Map) {
Map<Object, Object> map = (Map<Object, Object>) value;
ImmutableMap.Builder<Object, Object> builder =
ImmutableMap.builderWithExpectedSize(map.size());
for (Map.Entry<Object, Object> entry : map.entrySet()) {
builder.put(mapper.apply(entry.getKey()), mapper.apply(entry.getValue()));
Iterator<Map.Entry<Object, Object>> iterator = map.entrySet().iterator();

while (iterator.hasNext()) {
Map.Entry<Object, Object> entry = iterator.next();
Object mappedKey = mapper.apply(entry.getKey());
Object mappedValue = mapper.apply(entry.getValue());

if (mappedKey != entry.getKey() || mappedValue != entry.getValue()) {
ImmutableMap.Builder<Object, Object> builder =
ImmutableMap.builderWithExpectedSize(map.size());

for (Map.Entry<Object, Object> prevEntry : map.entrySet()) {
if (prevEntry.getKey() == entry.getKey()) {
break;
}
builder.put(mapper.apply(prevEntry.getKey()), mapper.apply(prevEntry.getValue()));
}
builder.put(mappedKey, mappedValue);
while (iterator.hasNext()) {
Map.Entry<Object, Object> nextEntry = iterator.next();
builder.put(mapper.apply(nextEntry.getKey()), mapper.apply(nextEntry.getValue()));
}
return builder.buildOrThrow();
}
}
return builder.buildOrThrow();
return value;
}

return value;
Expand All@@ -96,7 +142,7 @@ protected Object mapContainer(Object value, Function<Object, Object> mapper) {
public Object toRuntimeValue(Object value) {
Preconditions.checkNotNull(value);

if (value instanceof CelValue) {
if (value instanceof CelValue || value instanceof CelPreAdaptedList) {
return value;
}

Expand Down
12 changes: 12 additions & 0 deletions common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,18 @@ public Object fromProtoMessageFieldToCelValue(Message message, FieldDescriptor f
break;
}

if (fieldDescriptor.isRepeated()) {
switch (fieldDescriptor.getType()) {
case INT64:
case BOOL:
case STRING:
case DOUBLE:
return CelPreAdaptedList.wrap((List<?>) result);
default:
break;
}
}

return toRuntimeValue(result);
}

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
Optimize list/map adaptations#1041

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

May 14, 2026
 Merged


Optimize list/map adaptations
#1041
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


32 changes: 23 additions & 9 deletions
common/src/main/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,6 @@ java_library(
 deps = [
 "//common/values",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

Expand All@@ -72,7 +71,6 @@ cel_android_library(
 deps = [
 "//common/values:values_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

Expand DownExpand Up@@ -118,7 +116,6 @@ java_library(
 deps = [
 ":values",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 ],
Expand All@@ -134,12 +131,31 @@ cel_android_library(
 deps = [
 ":values_android",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "preadapted_list",
 srcs = [
 "CelPreAdaptedList.java",
 ],
 tags = [
 ],
 deps = ["//common/annotations"],
)

cel_android_library(
 name = "preadapted_list_android",
 srcs = [
 "CelPreAdaptedList.java",
 ],
 tags = [
 ],
 deps = ["//common/annotations"],
)

java_library(
 name = "values",
 srcs = CEL_VALUES_SOURCES,
Expand All@@ -148,6 +164,7 @@ java_library(
 deps = [
 ":cel_byte_string",
 ":cel_value",
 ":preadapted_list",
 "//:auto_value",
 "//common/annotations",
 "//common/types",
Expand DownExpand Up@@ -198,6 +215,7 @@ cel_android_library(
 deps = [
 ":cel_byte_string",
 ":cel_value_android",
 ":preadapted_list_android",
 "//:auto_value",
 "//common/annotations",
 "//common/types:type_providers_android",
Expand DownExpand Up@@ -226,7 +244,6 @@ java_library(
 ],
 deps = [
 ":cel_byte_string",
 ":values",
 "//common/annotations",
 "//common/internal:proto_time_utils",
 "//common/internal:well_known_proto",
Expand DownExpand Up@@ -261,6 +278,7 @@ java_library(
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":preadapted_list",
 ":values",
 "//:auto_value",
 "//common:options",
Expand All@@ -273,7 +291,6 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand DownExpand Up@@ -316,8 +333,6 @@ java_library(
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)
Expand All@@ -343,7 +358,6 @@ cel_android_library(
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
Expand Down

49 changes: 49 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CelPreAdaptedList.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.values;

import dev.cel.common.annotations.Internal;
import java.util.AbstractList;
import java.util.List;
import java.util.RandomAccess;

/**
 * A zero-allocation view over a list we know is already adapted.
 *
 * <p>This class purely exists as an optimization scheme to avoid redundant collection traversals in
 * {@link CelValueConverter}, and is not intended for general use.
 */
@Internal
final class CelPreAdaptedList<E> extends AbstractList<E> implements RandomAccess {
 private final List<E> delegate;

 private CelPreAdaptedList(List<E> delegate) {
 this.delegate = delegate;
 }

 static <E> CelPreAdaptedList<E> wrap(List<E> safeList) {
 return new CelPreAdaptedList<>(safeList);
 }

 @Override
 public E get(int index) {
 return delegate.get(index);
 }

 @Override
 public int size() {
 return delegate.size();
 }
}

74 changes: 60 additions & 14 deletions
common/src/main/java/dev/cel/common/values/CelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,11 @@
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.RandomAccess;
import java.util.function.Function;

/**
Expand DownExpand Up@@ -53,23 +56,46 @@ public static CelValueConverter getDefaultInstance() {
 * <p>The value may be a {@link CelValue}, a {@link Collection} or a {@link Map}.
 */
 public Object maybeUnwrap(Object value) {
 if (value instanceof CelValue) {
 return unwrap((CelValue) value);
 if (value instanceof CelValue || value instanceof CelPreAdaptedList) {
 return value instanceof CelValue ? unwrap((CelValue) value) : value;
 }

 Object mapped = mapContainer(value, maybeUnwrapFunction);
 if (mapped != value) {
 return mapped;
 }

 return value;
 return mapContainer(value, maybeUnwrapFunction);
 }

 /**
 * Maps a container (Collection or Map) by applying the provided mapper function to its elements.
 * Returns the original value if it's not a supported container.
 */
 protected Object mapContainer(Object value, Function<Object, Object> mapper) {

 // Zero allocation path for standard lists that support O(1) indexing
 // Generally, protobuf lists (backed by arrays) fall into this category
 if (value instanceof List && value instanceof RandomAccess) {
 List<Object> list = (List<Object>) value;
 for (int i = 0; i < list.size(); i++) {
 Object element = list.get(i);
 Object mapped = mapper.apply(element);

 if (mapped != element) {
 ImmutableList.Builder<Object> builder =
 ImmutableList.builderWithExpectedSize(list.size());
 for (int j = 0; j < i; j++) {
 builder.add(list.get(j));
 }
 builder.add(mapped);
 for (int j = i + 1; j < list.size(); j++) {
 builder.add(mapper.apply(list.get(j)));
 }
 return builder.build();
 }
 }

 // Zero allocations if unmodified
 return value;
 }

 // Fallback for lists that are unordered
 if (value instanceof Collection) {
 Collection<Object> collection = (Collection<Object>) value;
 ImmutableList.Builder<Object> builder =
Expand All@@ -82,12 +108,32 @@ protected Object mapContainer(Object value, Function<Object, Object> mapper) {

 if (value instanceof Map) {
 Map<Object, Object> map = (Map<Object, Object>) value;
 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size());
 for (Map.Entry<Object, Object> entry : map.entrySet()) {
 builder.put(mapper.apply(entry.getKey()), mapper.apply(entry.getValue()));
 Iterator<Map.Entry<Object, Object>> iterator = map.entrySet().iterator();

 while (iterator.hasNext()) {
 Map.Entry<Object, Object> entry = iterator.next();
 Object mappedKey = mapper.apply(entry.getKey());
 Object mappedValue = mapper.apply(entry.getValue());

 if (mappedKey != entry.getKey() || mappedValue != entry.getValue()) {
 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size());

 for (Map.Entry<Object, Object> prevEntry : map.entrySet()) {
 if (prevEntry.getKey() == entry.getKey()) {
 break;
 }
 builder.put(mapper.apply(prevEntry.getKey()), mapper.apply(prevEntry.getValue()));
 }
 builder.put(mappedKey, mappedValue);
 while (iterator.hasNext()) {
 Map.Entry<Object, Object> nextEntry = iterator.next();
 builder.put(mapper.apply(nextEntry.getKey()), mapper.apply(nextEntry.getValue()));
 }
 return builder.buildOrThrow();
 }
 }
 return builder.buildOrThrow();
 return value;
 }

 return value;
Expand All@@ -96,7 +142,7 @@ protected Object mapContainer(Object value, Function<Object, Object> mapper) {
 public Object toRuntimeValue(Object value) {
 Preconditions.checkNotNull(value);

 if (value instanceof CelValue) {
 if (value instanceof CelValue || value instanceof CelPreAdaptedList) {
 return value;
 }

Expand Down

12 changes: 12 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,18 @@ public Object fromProtoMessageFieldToCelValue(Message message, FieldDescriptor f
 break;
 }

 if (fieldDescriptor.isRepeated()) {
 switch (fieldDescriptor.getType()) {
 case INT64:
 case BOOL:
 case STRING:
 case DOUBLE:
 return CelPreAdaptedList.wrap((List<?>) result);
 default:
 break;
 }
 }

 return toRuntimeValue(result);
 }

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
Optimize list/map adaptations#1041

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

May 14, 2026
 Merged


Optimize list/map adaptations
#1041
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


32 changes: 23 additions & 9 deletions
common/src/main/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,6 @@ java_library(
 deps = [
 "//common/values",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

Expand All@@ -72,7 +71,6 @@ cel_android_library(
 deps = [
 "//common/values:values_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

Expand DownExpand Up@@ -118,7 +116,6 @@ java_library(
 deps = [
 ":values",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 ],
Expand All@@ -134,12 +131,31 @@ cel_android_library(
 deps = [
 ":values_android",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "preadapted_list",
 srcs = [
 "CelPreAdaptedList.java",
 ],
 tags = [
 ],
 deps = ["//common/annotations"],
)

cel_android_library(
 name = "preadapted_list_android",
 srcs = [
 "CelPreAdaptedList.java",
 ],
 tags = [
 ],
 deps = ["//common/annotations"],
)

java_library(
 name = "values",
 srcs = CEL_VALUES_SOURCES,
Expand All@@ -148,6 +164,7 @@ java_library(
 deps = [
 ":cel_byte_string",
 ":cel_value",
 ":preadapted_list",
 "//:auto_value",
 "//common/annotations",
 "//common/types",
Expand DownExpand Up@@ -198,6 +215,7 @@ cel_android_library(
 deps = [
 ":cel_byte_string",
 ":cel_value_android",
 ":preadapted_list_android",
 "//:auto_value",
 "//common/annotations",
 "//common/types:type_providers_android",
Expand DownExpand Up@@ -226,7 +244,6 @@ java_library(
 ],
 deps = [
 ":cel_byte_string",
 ":values",
 "//common/annotations",
 "//common/internal:proto_time_utils",
 "//common/internal:well_known_proto",
Expand DownExpand Up@@ -261,6 +278,7 @@ java_library(
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":preadapted_list",
 ":values",
 "//:auto_value",
 "//common:options",
Expand All@@ -273,7 +291,6 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand DownExpand Up@@ -316,8 +333,6 @@ java_library(
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)
Expand All@@ -343,7 +358,6 @@ cel_android_library(
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
Expand Down

49 changes: 49 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CelPreAdaptedList.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.values;

import dev.cel.common.annotations.Internal;
import java.util.AbstractList;
import java.util.List;
import java.util.RandomAccess;

/**
 * A zero-allocation view over a list we know is already adapted.
 *
 * <p>This class purely exists as an optimization scheme to avoid redundant collection traversals in
 * {@link CelValueConverter}, and is not intended for general use.
 */
@Internal
final class CelPreAdaptedList<E> extends AbstractList<E> implements RandomAccess {
 private final List<E> delegate;

 private CelPreAdaptedList(List<E> delegate) {
 this.delegate = delegate;
 }

 static <E> CelPreAdaptedList<E> wrap(List<E> safeList) {
 return new CelPreAdaptedList<>(safeList);
 }

 @Override
 public E get(int index) {
 return delegate.get(index);
 }

 @Override
 public int size() {
 return delegate.size();
 }
}

74 changes: 60 additions & 14 deletions
common/src/main/java/dev/cel/common/values/CelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,11 @@
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.RandomAccess;
import java.util.function.Function;

/**
Expand DownExpand Up@@ -53,23 +56,46 @@ public static CelValueConverter getDefaultInstance() {
 * <p>The value may be a {@link CelValue}, a {@link Collection} or a {@link Map}.
 */
 public Object maybeUnwrap(Object value) {
 if (value instanceof CelValue) {
 return unwrap((CelValue) value);
 if (value instanceof CelValue || value instanceof CelPreAdaptedList) {
 return value instanceof CelValue ? unwrap((CelValue) value) : value;
 }

 Object mapped = mapContainer(value, maybeUnwrapFunction);
 if (mapped != value) {
 return mapped;
 }

 return value;
 return mapContainer(value, maybeUnwrapFunction);
 }

 /**
 * Maps a container (Collection or Map) by applying the provided mapper function to its elements.
 * Returns the original value if it's not a supported container.
 */
 protected Object mapContainer(Object value, Function<Object, Object> mapper) {

 // Zero allocation path for standard lists that support O(1) indexing
 // Generally, protobuf lists (backed by arrays) fall into this category
 if (value instanceof List && value instanceof RandomAccess) {
 List<Object> list = (List<Object>) value;
 for (int i = 0; i < list.size(); i++) {
 Object element = list.get(i);
 Object mapped = mapper.apply(element);

 if (mapped != element) {
 ImmutableList.Builder<Object> builder =
 ImmutableList.builderWithExpectedSize(list.size());
 for (int j = 0; j < i; j++) {
 builder.add(list.get(j));
 }
 builder.add(mapped);
 for (int j = i + 1; j < list.size(); j++) {
 builder.add(mapper.apply(list.get(j)));
 }
 return builder.build();
 }
 }

 // Zero allocations if unmodified
 return value;
 }

 // Fallback for lists that are unordered
 if (value instanceof Collection) {
 Collection<Object> collection = (Collection<Object>) value;
 ImmutableList.Builder<Object> builder =
Expand All@@ -82,12 +108,32 @@ protected Object mapContainer(Object value, Function<Object, Object> mapper) {

 if (value instanceof Map) {
 Map<Object, Object> map = (Map<Object, Object>) value;
 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size());
 for (Map.Entry<Object, Object> entry : map.entrySet()) {
 builder.put(mapper.apply(entry.getKey()), mapper.apply(entry.getValue()));
 Iterator<Map.Entry<Object, Object>> iterator = map.entrySet().iterator();

 while (iterator.hasNext()) {
 Map.Entry<Object, Object> entry = iterator.next();
 Object mappedKey = mapper.apply(entry.getKey());
 Object mappedValue = mapper.apply(entry.getValue());

 if (mappedKey != entry.getKey() || mappedValue != entry.getValue()) {
 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size());

 for (Map.Entry<Object, Object> prevEntry : map.entrySet()) {
 if (prevEntry.getKey() == entry.getKey()) {
 break;
 }
 builder.put(mapper.apply(prevEntry.getKey()), mapper.apply(prevEntry.getValue()));
 }
 builder.put(mappedKey, mappedValue);
 while (iterator.hasNext()) {
 Map.Entry<Object, Object> nextEntry = iterator.next();
 builder.put(mapper.apply(nextEntry.getKey()), mapper.apply(nextEntry.getValue()));
 }
 return builder.buildOrThrow();
 }
 }
 return builder.buildOrThrow();
 return value;
 }

 return value;
Expand All@@ -96,7 +142,7 @@ protected Object mapContainer(Object value, Function<Object, Object> mapper) {
 public Object toRuntimeValue(Object value) {
 Preconditions.checkNotNull(value);

 if (value instanceof CelValue) {
 if (value instanceof CelValue || value instanceof CelPreAdaptedList) {
 return value;
 }

Expand Down

12 changes: 12 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,18 @@ public Object fromProtoMessageFieldToCelValue(Message message, FieldDescriptor f
 break;
 }

 if (fieldDescriptor.isRepeated()) {
 switch (fieldDescriptor.getType()) {
 case INT64:
 case BOOL:
 case STRING:
 case DOUBLE:
 return CelPreAdaptedList.wrap((List<?>) result);
 default:
 break;
 }
 }

 return toRuntimeValue(result);
 }

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
Optimize list/map adaptations#1041

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

May 14, 2026
 Merged


Optimize list/map adaptations
#1041
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


32 changes: 23 additions & 9 deletions
common/src/main/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,6 @@ java_library(
 deps = [
 "//common/values",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

Expand All@@ -72,7 +71,6 @@ cel_android_library(
 deps = [
 "//common/values:values_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

Expand DownExpand Up@@ -118,7 +116,6 @@ java_library(
 deps = [
 ":values",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 ],
Expand All@@ -134,12 +131,31 @@ cel_android_library(
 deps = [
 ":values_android",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "preadapted_list",
 srcs = [
 "CelPreAdaptedList.java",
 ],
 tags = [
 ],
 deps = ["//common/annotations"],
)

cel_android_library(
 name = "preadapted_list_android",
 srcs = [
 "CelPreAdaptedList.java",
 ],
 tags = [
 ],
 deps = ["//common/annotations"],
)

java_library(
 name = "values",
 srcs = CEL_VALUES_SOURCES,
Expand All@@ -148,6 +164,7 @@ java_library(
 deps = [
 ":cel_byte_string",
 ":cel_value",
 ":preadapted_list",
 "//:auto_value",
 "//common/annotations",
 "//common/types",
Expand DownExpand Up@@ -198,6 +215,7 @@ cel_android_library(
 deps = [
 ":cel_byte_string",
 ":cel_value_android",
 ":preadapted_list_android",
 "//:auto_value",
 "//common/annotations",
 "//common/types:type_providers_android",
Expand DownExpand Up@@ -226,7 +244,6 @@ java_library(
 ],
 deps = [
 ":cel_byte_string",
 ":values",
 "//common/annotations",
 "//common/internal:proto_time_utils",
 "//common/internal:well_known_proto",
Expand DownExpand Up@@ -261,6 +278,7 @@ java_library(
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":preadapted_list",
 ":values",
 "//:auto_value",
 "//common:options",
Expand All@@ -273,7 +291,6 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand DownExpand Up@@ -316,8 +333,6 @@ java_library(
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)
Expand All@@ -343,7 +358,6 @@ cel_android_library(
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
Expand Down

49 changes: 49 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CelPreAdaptedList.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.values;

import dev.cel.common.annotations.Internal;
import java.util.AbstractList;
import java.util.List;
import java.util.RandomAccess;

/**
 * A zero-allocation view over a list we know is already adapted.
 *
 * <p>This class purely exists as an optimization scheme to avoid redundant collection traversals in
 * {@link CelValueConverter}, and is not intended for general use.
 */
@Internal
final class CelPreAdaptedList<E> extends AbstractList<E> implements RandomAccess {
 private final List<E> delegate;

 private CelPreAdaptedList(List<E> delegate) {
 this.delegate = delegate;
 }

 static <E> CelPreAdaptedList<E> wrap(List<E> safeList) {
 return new CelPreAdaptedList<>(safeList);
 }

 @Override
 public E get(int index) {
 return delegate.get(index);
 }

 @Override
 public int size() {
 return delegate.size();
 }
}

74 changes: 60 additions & 14 deletions
common/src/main/java/dev/cel/common/values/CelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,11 @@
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.RandomAccess;
import java.util.function.Function;

/**
Expand DownExpand Up@@ -53,23 +56,46 @@ public static CelValueConverter getDefaultInstance() {
 * <p>The value may be a {@link CelValue}, a {@link Collection} or a {@link Map}.
 */
 public Object maybeUnwrap(Object value) {
 if (value instanceof CelValue) {
 return unwrap((CelValue) value);
 if (value instanceof CelValue || value instanceof CelPreAdaptedList) {
 return value instanceof CelValue ? unwrap((CelValue) value) : value;
 }

 Object mapped = mapContainer(value, maybeUnwrapFunction);
 if (mapped != value) {
 return mapped;
 }

 return value;
 return mapContainer(value, maybeUnwrapFunction);
 }

 /**
 * Maps a container (Collection or Map) by applying the provided mapper function to its elements.
 * Returns the original value if it's not a supported container.
 */
 protected Object mapContainer(Object value, Function<Object, Object> mapper) {

 // Zero allocation path for standard lists that support O(1) indexing
 // Generally, protobuf lists (backed by arrays) fall into this category
 if (value instanceof List && value instanceof RandomAccess) {
 List<Object> list = (List<Object>) value;
 for (int i = 0; i < list.size(); i++) {
 Object element = list.get(i);
 Object mapped = mapper.apply(element);

 if (mapped != element) {
 ImmutableList.Builder<Object> builder =
 ImmutableList.builderWithExpectedSize(list.size());
 for (int j = 0; j < i; j++) {
 builder.add(list.get(j));
 }
 builder.add(mapped);
 for (int j = i + 1; j < list.size(); j++) {
 builder.add(mapper.apply(list.get(j)));
 }
 return builder.build();
 }
 }

 // Zero allocations if unmodified
 return value;
 }

 // Fallback for lists that are unordered
 if (value instanceof Collection) {
 Collection<Object> collection = (Collection<Object>) value;
 ImmutableList.Builder<Object> builder =
Expand All@@ -82,12 +108,32 @@ protected Object mapContainer(Object value, Function<Object, Object> mapper) {

 if (value instanceof Map) {
 Map<Object, Object> map = (Map<Object, Object>) value;
 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size());
 for (Map.Entry<Object, Object> entry : map.entrySet()) {
 builder.put(mapper.apply(entry.getKey()), mapper.apply(entry.getValue()));
 Iterator<Map.Entry<Object, Object>> iterator = map.entrySet().iterator();

 while (iterator.hasNext()) {
 Map.Entry<Object, Object> entry = iterator.next();
 Object mappedKey = mapper.apply(entry.getKey());
 Object mappedValue = mapper.apply(entry.getValue());

 if (mappedKey != entry.getKey() || mappedValue != entry.getValue()) {
 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size());

 for (Map.Entry<Object, Object> prevEntry : map.entrySet()) {
 if (prevEntry.getKey() == entry.getKey()) {
 break;
 }
 builder.put(mapper.apply(prevEntry.getKey()), mapper.apply(prevEntry.getValue()));
 }
 builder.put(mappedKey, mappedValue);
 while (iterator.hasNext()) {
 Map.Entry<Object, Object> nextEntry = iterator.next();
 builder.put(mapper.apply(nextEntry.getKey()), mapper.apply(nextEntry.getValue()));
 }
 return builder.buildOrThrow();
 }
 }
 return builder.buildOrThrow();
 return value;
 }

 return value;
Expand All@@ -96,7 +142,7 @@ protected Object mapContainer(Object value, Function<Object, Object> mapper) {
 public Object toRuntimeValue(Object value) {
 Preconditions.checkNotNull(value);

 if (value instanceof CelValue) {
 if (value instanceof CelValue || value instanceof CelPreAdaptedList) {
 return value;
 }

Expand Down

12 changes: 12 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,18 @@ public Object fromProtoMessageFieldToCelValue(Message message, FieldDescriptor f
 break;
 }

 if (fieldDescriptor.isRepeated()) {
 switch (fieldDescriptor.getType()) {
 case INT64:
 case BOOL:
 case STRING:
 case DOUBLE:
 return CelPreAdaptedList.wrap((List<?>) result);
 default:
 break;
 }
 }

 return toRuntimeValue(result);
 }

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
Optimize list/map adaptations#1041

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

May 14, 2026
 Merged


Optimize list/map adaptations
#1041
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


32 changes: 23 additions & 9 deletions
common/src/main/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,6 @@ java_library(
 deps = [
 "//common/values",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

Expand All@@ -72,7 +71,6 @@ cel_android_library(
 deps = [
 "//common/values:values_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

Expand DownExpand Up@@ -118,7 +116,6 @@ java_library(
 deps = [
 ":values",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 ],
Expand All@@ -134,12 +131,31 @@ cel_android_library(
 deps = [
 ":values_android",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "preadapted_list",
 srcs = [
 "CelPreAdaptedList.java",
 ],
 tags = [
 ],
 deps = ["//common/annotations"],
)

cel_android_library(
 name = "preadapted_list_android",
 srcs = [
 "CelPreAdaptedList.java",
 ],
 tags = [
 ],
 deps = ["//common/annotations"],
)

java_library(
 name = "values",
 srcs = CEL_VALUES_SOURCES,
Expand All@@ -148,6 +164,7 @@ java_library(
 deps = [
 ":cel_byte_string",
 ":cel_value",
 ":preadapted_list",
 "//:auto_value",
 "//common/annotations",
 "//common/types",
Expand DownExpand Up@@ -198,6 +215,7 @@ cel_android_library(
 deps = [
 ":cel_byte_string",
 ":cel_value_android",
 ":preadapted_list_android",
 "//:auto_value",
 "//common/annotations",
 "//common/types:type_providers_android",
Expand DownExpand Up@@ -226,7 +244,6 @@ java_library(
 ],
 deps = [
 ":cel_byte_string",
 ":values",
 "//common/annotations",
 "//common/internal:proto_time_utils",
 "//common/internal:well_known_proto",
Expand DownExpand Up@@ -261,6 +278,7 @@ java_library(
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":preadapted_list",
 ":values",
 "//:auto_value",
 "//common:options",
Expand All@@ -273,7 +291,6 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand DownExpand Up@@ -316,8 +333,6 @@ java_library(
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)
Expand All@@ -343,7 +358,6 @@ cel_android_library(
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
Expand Down

49 changes: 49 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CelPreAdaptedList.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.values;

import dev.cel.common.annotations.Internal;
import java.util.AbstractList;
import java.util.List;
import java.util.RandomAccess;

/**
 * A zero-allocation view over a list we know is already adapted.
 *
 * <p>This class purely exists as an optimization scheme to avoid redundant collection traversals in
 * {@link CelValueConverter}, and is not intended for general use.
 */
@Internal
final class CelPreAdaptedList<E> extends AbstractList<E> implements RandomAccess {
 private final List<E> delegate;

 private CelPreAdaptedList(List<E> delegate) {
 this.delegate = delegate;
 }

 static <E> CelPreAdaptedList<E> wrap(List<E> safeList) {
 return new CelPreAdaptedList<>(safeList);
 }

 @Override
 public E get(int index) {
 return delegate.get(index);
 }

 @Override
 public int size() {
 return delegate.size();
 }
}

74 changes: 60 additions & 14 deletions
common/src/main/java/dev/cel/common/values/CelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,11 @@
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.RandomAccess;
import java.util.function.Function;

/**
Expand DownExpand Up@@ -53,23 +56,46 @@ public static CelValueConverter getDefaultInstance() {
 * <p>The value may be a {@link CelValue}, a {@link Collection} or a {@link Map}.
 */
 public Object maybeUnwrap(Object value) {
 if (value instanceof CelValue) {
 return unwrap((CelValue) value);
 if (value instanceof CelValue || value instanceof CelPreAdaptedList) {
 return value instanceof CelValue ? unwrap((CelValue) value) : value;
 }

 Object mapped = mapContainer(value, maybeUnwrapFunction);
 if (mapped != value) {
 return mapped;
 }

 return value;
 return mapContainer(value, maybeUnwrapFunction);
 }

 /**
 * Maps a container (Collection or Map) by applying the provided mapper function to its elements.
 * Returns the original value if it's not a supported container.
 */
 protected Object mapContainer(Object value, Function<Object, Object> mapper) {

 // Zero allocation path for standard lists that support O(1) indexing
 // Generally, protobuf lists (backed by arrays) fall into this category
 if (value instanceof List && value instanceof RandomAccess) {
 List<Object> list = (List<Object>) value;
 for (int i = 0; i < list.size(); i++) {
 Object element = list.get(i);
 Object mapped = mapper.apply(element);

 if (mapped != element) {
 ImmutableList.Builder<Object> builder =
 ImmutableList.builderWithExpectedSize(list.size());
 for (int j = 0; j < i; j++) {
 builder.add(list.get(j));
 }
 builder.add(mapped);
 for (int j = i + 1; j < list.size(); j++) {
 builder.add(mapper.apply(list.get(j)));
 }
 return builder.build();
 }
 }

 // Zero allocations if unmodified
 return value;
 }

 // Fallback for lists that are unordered
 if (value instanceof Collection) {
 Collection<Object> collection = (Collection<Object>) value;
 ImmutableList.Builder<Object> builder =
Expand All@@ -82,12 +108,32 @@ protected Object mapContainer(Object value, Function<Object, Object> mapper) {

 if (value instanceof Map) {
 Map<Object, Object> map = (Map<Object, Object>) value;
 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size());
 for (Map.Entry<Object, Object> entry : map.entrySet()) {
 builder.put(mapper.apply(entry.getKey()), mapper.apply(entry.getValue()));
 Iterator<Map.Entry<Object, Object>> iterator = map.entrySet().iterator();

 while (iterator.hasNext()) {
 Map.Entry<Object, Object> entry = iterator.next();
 Object mappedKey = mapper.apply(entry.getKey());
 Object mappedValue = mapper.apply(entry.getValue());

 if (mappedKey != entry.getKey() || mappedValue != entry.getValue()) {
 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size());

 for (Map.Entry<Object, Object> prevEntry : map.entrySet()) {
 if (prevEntry.getKey() == entry.getKey()) {
 break;
 }
 builder.put(mapper.apply(prevEntry.getKey()), mapper.apply(prevEntry.getValue()));
 }
 builder.put(mappedKey, mappedValue);
 while (iterator.hasNext()) {
 Map.Entry<Object, Object> nextEntry = iterator.next();
 builder.put(mapper.apply(nextEntry.getKey()), mapper.apply(nextEntry.getValue()));
 }
 return builder.buildOrThrow();
 }
 }
 return builder.buildOrThrow();
 return value;
 }

 return value;
Expand All@@ -96,7 +142,7 @@ protected Object mapContainer(Object value, Function<Object, Object> mapper) {
 public Object toRuntimeValue(Object value) {
 Preconditions.checkNotNull(value);

 if (value instanceof CelValue) {
 if (value instanceof CelValue || value instanceof CelPreAdaptedList) {
 return value;
 }

Expand Down

12 changes: 12 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,18 @@ public Object fromProtoMessageFieldToCelValue(Message message, FieldDescriptor f
 break;
 }

 if (fieldDescriptor.isRepeated()) {
 switch (fieldDescriptor.getType()) {
 case INT64:
 case BOOL:
 case STRING:
 case DOUBLE:
 return CelPreAdaptedList.wrap((List<?>) result);
 default:
 break;
 }
 }

 return toRuntimeValue(result);
 }

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
Optimize list/map adaptations#1041

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

May 14, 2026
 Merged


Optimize list/map adaptations
#1041
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


32 changes: 23 additions & 9 deletions
common/src/main/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,6 @@ java_library(
 deps = [
 "//common/values",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

Expand All@@ -72,7 +71,6 @@ cel_android_library(
 deps = [
 "//common/values:values_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

Expand DownExpand Up@@ -118,7 +116,6 @@ java_library(
 deps = [
 ":values",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 ],
Expand All@@ -134,12 +131,31 @@ cel_android_library(
 deps = [
 ":values_android",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "preadapted_list",
 srcs = [
 "CelPreAdaptedList.java",
 ],
 tags = [
 ],
 deps = ["//common/annotations"],
)

cel_android_library(
 name = "preadapted_list_android",
 srcs = [
 "CelPreAdaptedList.java",
 ],
 tags = [
 ],
 deps = ["//common/annotations"],
)

java_library(
 name = "values",
 srcs = CEL_VALUES_SOURCES,
Expand All@@ -148,6 +164,7 @@ java_library(
 deps = [
 ":cel_byte_string",
 ":cel_value",
 ":preadapted_list",
 "//:auto_value",
 "//common/annotations",
 "//common/types",
Expand DownExpand Up@@ -198,6 +215,7 @@ cel_android_library(
 deps = [
 ":cel_byte_string",
 ":cel_value_android",
 ":preadapted_list_android",
 "//:auto_value",
 "//common/annotations",
 "//common/types:type_providers_android",
Expand DownExpand Up@@ -226,7 +244,6 @@ java_library(
 ],
 deps = [
 ":cel_byte_string",
 ":values",
 "//common/annotations",
 "//common/internal:proto_time_utils",
 "//common/internal:well_known_proto",
Expand DownExpand Up@@ -261,6 +278,7 @@ java_library(
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":preadapted_list",
 ":values",
 "//:auto_value",
 "//common:options",
Expand All@@ -273,7 +291,6 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand DownExpand Up@@ -316,8 +333,6 @@ java_library(
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)
Expand All@@ -343,7 +358,6 @@ cel_android_library(
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
Expand Down

49 changes: 49 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CelPreAdaptedList.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.values;

import dev.cel.common.annotations.Internal;
import java.util.AbstractList;
import java.util.List;
import java.util.RandomAccess;

/**
 * A zero-allocation view over a list we know is already adapted.
 *
 * <p>This class purely exists as an optimization scheme to avoid redundant collection traversals in
 * {@link CelValueConverter}, and is not intended for general use.
 */
@Internal
final class CelPreAdaptedList<E> extends AbstractList<E> implements RandomAccess {
 private final List<E> delegate;

 private CelPreAdaptedList(List<E> delegate) {
 this.delegate = delegate;
 }

 static <E> CelPreAdaptedList<E> wrap(List<E> safeList) {
 return new CelPreAdaptedList<>(safeList);
 }

 @Override
 public E get(int index) {
 return delegate.get(index);
 }

 @Override
 public int size() {
 return delegate.size();
 }
}

74 changes: 60 additions & 14 deletions
common/src/main/java/dev/cel/common/values/CelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,11 @@
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.RandomAccess;
import java.util.function.Function;

/**
Expand DownExpand Up@@ -53,23 +56,46 @@ public static CelValueConverter getDefaultInstance() {
 * <p>The value may be a {@link CelValue}, a {@link Collection} or a {@link Map}.
 */
 public Object maybeUnwrap(Object value) {
 if (value instanceof CelValue) {
 return unwrap((CelValue) value);
 if (value instanceof CelValue || value instanceof CelPreAdaptedList) {
 return value instanceof CelValue ? unwrap((CelValue) value) : value;
 }

 Object mapped = mapContainer(value, maybeUnwrapFunction);
 if (mapped != value) {
 return mapped;
 }

 return value;
 return mapContainer(value, maybeUnwrapFunction);
 }

 /**
 * Maps a container (Collection or Map) by applying the provided mapper function to its elements.
 * Returns the original value if it's not a supported container.
 */
 protected Object mapContainer(Object value, Function<Object, Object> mapper) {

 // Zero allocation path for standard lists that support O(1) indexing
 // Generally, protobuf lists (backed by arrays) fall into this category
 if (value instanceof List && value instanceof RandomAccess) {
 List<Object> list = (List<Object>) value;
 for (int i = 0; i < list.size(); i++) {
 Object element = list.get(i);
 Object mapped = mapper.apply(element);

 if (mapped != element) {
 ImmutableList.Builder<Object> builder =
 ImmutableList.builderWithExpectedSize(list.size());
 for (int j = 0; j < i; j++) {
 builder.add(list.get(j));
 }
 builder.add(mapped);
 for (int j = i + 1; j < list.size(); j++) {
 builder.add(mapper.apply(list.get(j)));
 }
 return builder.build();
 }
 }

 // Zero allocations if unmodified
 return value;
 }

 // Fallback for lists that are unordered
 if (value instanceof Collection) {
 Collection<Object> collection = (Collection<Object>) value;
 ImmutableList.Builder<Object> builder =
Expand All@@ -82,12 +108,32 @@ protected Object mapContainer(Object value, Function<Object, Object> mapper) {

 if (value instanceof Map) {
 Map<Object, Object> map = (Map<Object, Object>) value;
 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size());
 for (Map.Entry<Object, Object> entry : map.entrySet()) {
 builder.put(mapper.apply(entry.getKey()), mapper.apply(entry.getValue()));
 Iterator<Map.Entry<Object, Object>> iterator = map.entrySet().iterator();

 while (iterator.hasNext()) {
 Map.Entry<Object, Object> entry = iterator.next();
 Object mappedKey = mapper.apply(entry.getKey());
 Object mappedValue = mapper.apply(entry.getValue());

 if (mappedKey != entry.getKey() || mappedValue != entry.getValue()) {
 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size());

 for (Map.Entry<Object, Object> prevEntry : map.entrySet()) {
 if (prevEntry.getKey() == entry.getKey()) {
 break;
 }
 builder.put(mapper.apply(prevEntry.getKey()), mapper.apply(prevEntry.getValue()));
 }
 builder.put(mappedKey, mappedValue);
 while (iterator.hasNext()) {
 Map.Entry<Object, Object> nextEntry = iterator.next();
 builder.put(mapper.apply(nextEntry.getKey()), mapper.apply(nextEntry.getValue()));
 }
 return builder.buildOrThrow();
 }
 }
 return builder.buildOrThrow();
 return value;
 }

 return value;
Expand All@@ -96,7 +142,7 @@ protected Object mapContainer(Object value, Function<Object, Object> mapper) {
 public Object toRuntimeValue(Object value) {
 Preconditions.checkNotNull(value);

 if (value instanceof CelValue) {
 if (value instanceof CelValue || value instanceof CelPreAdaptedList) {
 return value;
 }

Expand Down

12 changes: 12 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,18 @@ public Object fromProtoMessageFieldToCelValue(Message message, FieldDescriptor f
 break;
 }

 if (fieldDescriptor.isRepeated()) {
 switch (fieldDescriptor.getType()) {
 case INT64:
 case BOOL:
 case STRING:
 case DOUBLE:
 return CelPreAdaptedList.wrap((List<?>) result);
 default:
 break;
 }
 }

 return toRuntimeValue(result);
 }

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
Optimize list/map adaptations#1041

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

May 14, 2026
 Merged


Optimize list/map adaptations
#1041
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


32 changes: 23 additions & 9 deletions
common/src/main/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,6 @@ java_library(
 deps = [
 "//common/values",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

Expand All@@ -72,7 +71,6 @@ cel_android_library(
 deps = [
 "//common/values:values_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

Expand DownExpand Up@@ -118,7 +116,6 @@ java_library(
 deps = [
 ":values",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 ],
Expand All@@ -134,12 +131,31 @@ cel_android_library(
 deps = [
 ":values_android",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "preadapted_list",
 srcs = [
 "CelPreAdaptedList.java",
 ],
 tags = [
 ],
 deps = ["//common/annotations"],
)

cel_android_library(
 name = "preadapted_list_android",
 srcs = [
 "CelPreAdaptedList.java",
 ],
 tags = [
 ],
 deps = ["//common/annotations"],
)

java_library(
 name = "values",
 srcs = CEL_VALUES_SOURCES,
Expand All@@ -148,6 +164,7 @@ java_library(
 deps = [
 ":cel_byte_string",
 ":cel_value",
 ":preadapted_list",
 "//:auto_value",
 "//common/annotations",
 "//common/types",
Expand DownExpand Up@@ -198,6 +215,7 @@ cel_android_library(
 deps = [
 ":cel_byte_string",
 ":cel_value_android",
 ":preadapted_list_android",
 "//:auto_value",
 "//common/annotations",
 "//common/types:type_providers_android",
Expand DownExpand Up@@ -226,7 +244,6 @@ java_library(
 ],
 deps = [
 ":cel_byte_string",
 ":values",
 "//common/annotations",
 "//common/internal:proto_time_utils",
 "//common/internal:well_known_proto",
Expand DownExpand Up@@ -261,6 +278,7 @@ java_library(
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":preadapted_list",
 ":values",
 "//:auto_value",
 "//common:options",
Expand All@@ -273,7 +291,6 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand DownExpand Up@@ -316,8 +333,6 @@ java_library(
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)
Expand All@@ -343,7 +358,6 @@ cel_android_library(
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
Expand Down

49 changes: 49 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CelPreAdaptedList.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.values;

import dev.cel.common.annotations.Internal;
import java.util.AbstractList;
import java.util.List;
import java.util.RandomAccess;

/**
 * A zero-allocation view over a list we know is already adapted.
 *
 * <p>This class purely exists as an optimization scheme to avoid redundant collection traversals in
 * {@link CelValueConverter}, and is not intended for general use.
 */
@Internal
final class CelPreAdaptedList<E> extends AbstractList<E> implements RandomAccess {
 private final List<E> delegate;

 private CelPreAdaptedList(List<E> delegate) {
 this.delegate = delegate;
 }

 static <E> CelPreAdaptedList<E> wrap(List<E> safeList) {
 return new CelPreAdaptedList<>(safeList);
 }

 @Override
 public E get(int index) {
 return delegate.get(index);
 }

 @Override
 public int size() {
 return delegate.size();
 }
}

74 changes: 60 additions & 14 deletions
common/src/main/java/dev/cel/common/values/CelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,11 @@
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.RandomAccess;
import java.util.function.Function;

/**
Expand DownExpand Up@@ -53,23 +56,46 @@ public static CelValueConverter getDefaultInstance() {
 * <p>The value may be a {@link CelValue}, a {@link Collection} or a {@link Map}.
 */
 public Object maybeUnwrap(Object value) {
 if (value instanceof CelValue) {
 return unwrap((CelValue) value);
 if (value instanceof CelValue || value instanceof CelPreAdaptedList) {
 return value instanceof CelValue ? unwrap((CelValue) value) : value;
 }

 Object mapped = mapContainer(value, maybeUnwrapFunction);
 if (mapped != value) {
 return mapped;
 }

 return value;
 return mapContainer(value, maybeUnwrapFunction);
 }

 /**
 * Maps a container (Collection or Map) by applying the provided mapper function to its elements.
 * Returns the original value if it's not a supported container.
 */
 protected Object mapContainer(Object value, Function<Object, Object> mapper) {

 // Zero allocation path for standard lists that support O(1) indexing
 // Generally, protobuf lists (backed by arrays) fall into this category
 if (value instanceof List && value instanceof RandomAccess) {
 List<Object> list = (List<Object>) value;
 for (int i = 0; i < list.size(); i++) {
 Object element = list.get(i);
 Object mapped = mapper.apply(element);

 if (mapped != element) {
 ImmutableList.Builder<Object> builder =
 ImmutableList.builderWithExpectedSize(list.size());
 for (int j = 0; j < i; j++) {
 builder.add(list.get(j));
 }
 builder.add(mapped);
 for (int j = i + 1; j < list.size(); j++) {
 builder.add(mapper.apply(list.get(j)));
 }
 return builder.build();
 }
 }

 // Zero allocations if unmodified
 return value;
 }

 // Fallback for lists that are unordered
 if (value instanceof Collection) {
 Collection<Object> collection = (Collection<Object>) value;
 ImmutableList.Builder<Object> builder =
Expand All@@ -82,12 +108,32 @@ protected Object mapContainer(Object value, Function<Object, Object> mapper) {

 if (value instanceof Map) {
 Map<Object, Object> map = (Map<Object, Object>) value;
 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size());
 for (Map.Entry<Object, Object> entry : map.entrySet()) {
 builder.put(mapper.apply(entry.getKey()), mapper.apply(entry.getValue()));
 Iterator<Map.Entry<Object, Object>> iterator = map.entrySet().iterator();

 while (iterator.hasNext()) {
 Map.Entry<Object, Object> entry = iterator.next();
 Object mappedKey = mapper.apply(entry.getKey());
 Object mappedValue = mapper.apply(entry.getValue());

 if (mappedKey != entry.getKey() || mappedValue != entry.getValue()) {
 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size());

 for (Map.Entry<Object, Object> prevEntry : map.entrySet()) {
 if (prevEntry.getKey() == entry.getKey()) {
 break;
 }
 builder.put(mapper.apply(prevEntry.getKey()), mapper.apply(prevEntry.getValue()));
 }
 builder.put(mappedKey, mappedValue);
 while (iterator.hasNext()) {
 Map.Entry<Object, Object> nextEntry = iterator.next();
 builder.put(mapper.apply(nextEntry.getKey()), mapper.apply(nextEntry.getValue()));
 }
 return builder.buildOrThrow();
 }
 }
 return builder.buildOrThrow();
 return value;
 }

 return value;
Expand All@@ -96,7 +142,7 @@ protected Object mapContainer(Object value, Function<Object, Object> mapper) {
 public Object toRuntimeValue(Object value) {
 Preconditions.checkNotNull(value);

 if (value instanceof CelValue) {
 if (value instanceof CelValue || value instanceof CelPreAdaptedList) {
 return value;
 }

Expand Down

12 changes: 12 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,18 @@ public Object fromProtoMessageFieldToCelValue(Message message, FieldDescriptor f
 break;
 }

 if (fieldDescriptor.isRepeated()) {
 switch (fieldDescriptor.getType()) {
 case INT64:
 case BOOL:
 case STRING:
 case DOUBLE:
 return CelPreAdaptedList.wrap((List<?>) result);
 default:
 break;
 }
 }

 return toRuntimeValue(result);
 }

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
Optimize list/map adaptations#1041

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

May 14, 2026
 Merged


Optimize list/map adaptations
#1041
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


32 changes: 23 additions & 9 deletions
common/src/main/java/dev/cel/common/values/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,6 @@ java_library(
 deps = [
 "//common/values",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 ],
)

Expand All@@ -72,7 +71,6 @@ cel_android_library(
 deps = [
 "//common/values:values_android",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven_android//:com_google_guava_guava",
 ],
)

Expand DownExpand Up@@ -118,7 +116,6 @@ java_library(
 deps = [
 ":values",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 ],
Expand All@@ -134,12 +131,31 @@ cel_android_library(
 deps = [
 ":values_android",
 "//common/annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 ],
)

java_library(
 name = "preadapted_list",
 srcs = [
 "CelPreAdaptedList.java",
 ],
 tags = [
 ],
 deps = ["//common/annotations"],
)

cel_android_library(
 name = "preadapted_list_android",
 srcs = [
 "CelPreAdaptedList.java",
 ],
 tags = [
 ],
 deps = ["//common/annotations"],
)

java_library(
 name = "values",
 srcs = CEL_VALUES_SOURCES,
Expand All@@ -148,6 +164,7 @@ java_library(
 deps = [
 ":cel_byte_string",
 ":cel_value",
 ":preadapted_list",
 "//:auto_value",
 "//common/annotations",
 "//common/types",
Expand DownExpand Up@@ -198,6 +215,7 @@ cel_android_library(
 deps = [
 ":cel_byte_string",
 ":cel_value_android",
 ":preadapted_list_android",
 "//:auto_value",
 "//common/annotations",
 "//common/types:type_providers_android",
Expand DownExpand Up@@ -226,7 +244,6 @@ java_library(
 ],
 deps = [
 ":cel_byte_string",
 ":values",
 "//common/annotations",
 "//common/internal:proto_time_utils",
 "//common/internal:well_known_proto",
Expand DownExpand Up@@ -261,6 +278,7 @@ java_library(
 ],
 deps = [
 ":base_proto_cel_value_converter",
 ":preadapted_list",
 ":values",
 "//:auto_value",
 "//common:options",
Expand All@@ -273,7 +291,6 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 ],
)

Expand DownExpand Up@@ -316,8 +333,6 @@ java_library(
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
)
Expand All@@ -343,7 +358,6 @@ cel_android_library(
 "//protobuf:cel_lite_descriptor",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:org_jspecify_jspecify",
 "@maven_android//:com_google_guava_guava",
 "@maven_android//:com_google_protobuf_protobuf_javalite",
 ],
Expand Down

49 changes: 49 additions & 0 deletions
common/src/main/java/dev/cel/common/values/CelPreAdaptedList.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.common.values;

import dev.cel.common.annotations.Internal;
import java.util.AbstractList;
import java.util.List;
import java.util.RandomAccess;

/**
 * A zero-allocation view over a list we know is already adapted.
 *
 * <p>This class purely exists as an optimization scheme to avoid redundant collection traversals in
 * {@link CelValueConverter}, and is not intended for general use.
 */
@Internal
final class CelPreAdaptedList<E> extends AbstractList<E> implements RandomAccess {
 private final List<E> delegate;

 private CelPreAdaptedList(List<E> delegate) {
 this.delegate = delegate;
 }

 static <E> CelPreAdaptedList<E> wrap(List<E> safeList) {
 return new CelPreAdaptedList<>(safeList);
 }

 @Override
 public E get(int index) {
 return delegate.get(index);
 }

 @Override
 public int size() {
 return delegate.size();
 }
}

74 changes: 60 additions & 14 deletions
common/src/main/java/dev/cel/common/values/CelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,11 @@
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.RandomAccess;
import java.util.function.Function;

/**
Expand DownExpand Up@@ -53,23 +56,46 @@ public static CelValueConverter getDefaultInstance() {
 * <p>The value may be a {@link CelValue}, a {@link Collection} or a {@link Map}.
 */
 public Object maybeUnwrap(Object value) {
 if (value instanceof CelValue) {
 return unwrap((CelValue) value);
 if (value instanceof CelValue || value instanceof CelPreAdaptedList) {
 return value instanceof CelValue ? unwrap((CelValue) value) : value;
 }

 Object mapped = mapContainer(value, maybeUnwrapFunction);
 if (mapped != value) {
 return mapped;
 }

 return value;
 return mapContainer(value, maybeUnwrapFunction);
 }

 /**
 * Maps a container (Collection or Map) by applying the provided mapper function to its elements.
 * Returns the original value if it's not a supported container.
 */
 protected Object mapContainer(Object value, Function<Object, Object> mapper) {

 // Zero allocation path for standard lists that support O(1) indexing
 // Generally, protobuf lists (backed by arrays) fall into this category
 if (value instanceof List && value instanceof RandomAccess) {
 List<Object> list = (List<Object>) value;
 for (int i = 0; i < list.size(); i++) {
 Object element = list.get(i);
 Object mapped = mapper.apply(element);

 if (mapped != element) {
 ImmutableList.Builder<Object> builder =
 ImmutableList.builderWithExpectedSize(list.size());
 for (int j = 0; j < i; j++) {
 builder.add(list.get(j));
 }
 builder.add(mapped);
 for (int j = i + 1; j < list.size(); j++) {
 builder.add(mapper.apply(list.get(j)));
 }
 return builder.build();
 }
 }

 // Zero allocations if unmodified
 return value;
 }

 // Fallback for lists that are unordered
 if (value instanceof Collection) {
 Collection<Object> collection = (Collection<Object>) value;
 ImmutableList.Builder<Object> builder =
Expand All@@ -82,12 +108,32 @@ protected Object mapContainer(Object value, Function<Object, Object> mapper) {

 if (value instanceof Map) {
 Map<Object, Object> map = (Map<Object, Object>) value;
 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size());
 for (Map.Entry<Object, Object> entry : map.entrySet()) {
 builder.put(mapper.apply(entry.getKey()), mapper.apply(entry.getValue()));
 Iterator<Map.Entry<Object, Object>> iterator = map.entrySet().iterator();

 while (iterator.hasNext()) {
 Map.Entry<Object, Object> entry = iterator.next();
 Object mappedKey = mapper.apply(entry.getKey());
 Object mappedValue = mapper.apply(entry.getValue());

 if (mappedKey != entry.getKey() || mappedValue != entry.getValue()) {
 ImmutableMap.Builder<Object, Object> builder =
 ImmutableMap.builderWithExpectedSize(map.size());

 for (Map.Entry<Object, Object> prevEntry : map.entrySet()) {
 if (prevEntry.getKey() == entry.getKey()) {
 break;
 }
 builder.put(mapper.apply(prevEntry.getKey()), mapper.apply(prevEntry.getValue()));
 }
 builder.put(mappedKey, mappedValue);
 while (iterator.hasNext()) {
 Map.Entry<Object, Object> nextEntry = iterator.next();
 builder.put(mapper.apply(nextEntry.getKey()), mapper.apply(nextEntry.getValue()));
 }
 return builder.buildOrThrow();
 }
 }
 return builder.buildOrThrow();
 return value;
 }

 return value;
Expand All@@ -96,7 +142,7 @@ protected Object mapContainer(Object value, Function<Object, Object> mapper) {
 public Object toRuntimeValue(Object value) {
 Preconditions.checkNotNull(value);

 if (value instanceof CelValue) {
 if (value instanceof CelValue || value instanceof CelPreAdaptedList) {
 return value;
 }

Expand Down

12 changes: 12 additions & 0 deletions
common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,6 +167,18 @@ public Object fromProtoMessageFieldToCelValue(Message message, FieldDescriptor f
 break;
 }

 if (fieldDescriptor.isRepeated()) {
 switch (fieldDescriptor.getType()) {
 case INT64:
 case BOOL:
 case STRING:
 case DOUBLE:
 return CelPreAdaptedList.wrap((List<?>) result);
 default:
 break;
 }
 }

 return toRuntimeValue(result);
 }

Expand Down
Loading