Fix filter/map macro to be linear in time and space complexity

PiperOrigin-RevId: 781245388

Author: l46kok

runtime/src/main/java/dev/cel/runtime/BUILD.bazel

@@ -272,6 +272,7 @@ java_library(
     exports = [":base"],
     deps = [
         ":base",
+        ":concatenated_list_view",
         ":dispatcher",
         ":evaluation_exception",
         ":evaluation_exception_builder",
@@ -306,6 +307,7 @@ cel_android_library(
     visibility = ["//visibility:private"],
     deps = [
         ":base_android",
+        ":concatenated_list_view",
         ":dispatcher_android",
         ":evaluation_exception",
         ":evaluation_exception_builder",
@@ -398,6 +400,7 @@ cel_android_library(
     tags = [
     ],
     deps = [
+        ":concatenated_list_view",
         "//common:error_codes",
         "//common:options",
         "//common:runtime_exception",
@@ -419,6 +422,7 @@ java_library(
     tags = [
     ],
     deps = [
+        ":concatenated_list_view",
         "//common:error_codes",
         "//common:options",
         "//common:runtime_exception",
@@ -1094,3 +1098,10 @@ cel_android_library(
         "@maven_android//:com_google_guava_guava",
     ],
 )
+
+java_library(
+    name = "concatenated_list_view",
+    srcs = ["ConcatenatedListView.java"],
+    # used_by_android
+    visibility = ["//visibility:private"],
+)

runtime/src/main/java/dev/cel/runtime/ConcatenatedListView.java

@@ -0,0 +1,102 @@
+// Copyright 2025 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 aj
+//
+//      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.runtime;
+
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+/**
+ * A custom list view implementation that allows O(1) concatenation of two lists. Its primary
+ * purpose is to facilitate efficient accumulation of lists for later materialization. (ex:
+ * comprehensions that dispatch `add_list` to concat N lists together).
+ *
+ * <p>This does not support any of the standard list operations from {@link java.util.List}.
+ */
+final class ConcatenatedListView<E> extends AbstractList<E> {
+  private final List<List<? extends E>> sourceLists;
+  private int totalSize = 0;
+
+  ConcatenatedListView() {
+    this.sourceLists = new ArrayList<>();
+  }
+
+  ConcatenatedListView(Collection<? extends E> collection) {
+    this();
+    addAll(collection);
+  }
+
+  @Override
+  public boolean addAll(Collection<? extends E> collection) {
+    if (!(collection instanceof List)) {
+      // size() is O(1) iff it's a list
+      throw new IllegalStateException("addAll must be called with lists, not collections");
+    }
+
+    sourceLists.add((List<? extends E>) collection);
+    totalSize += collection.size();
+    return true;
+  }
+
+  @Override
+  public E get(int index) {
+    throw new UnsupportedOperationException("get method not supported.");
+  }
+
+  @Override
+  public int size() {
+    return totalSize;
+  }
+
+  @Override
+  public Iterator<E> iterator() {
+    return new ConcatenatingIterator();
+  }
+
+  /** Custom iterator to provide a flat view of all concatenated collections */
+  private class ConcatenatingIterator implements Iterator<E> {
+    private int index = 0;
+    private Iterator<? extends E> iterator = null;
+
+    @Override
+    public boolean hasNext() {
+      while (iterator == null || !iterator.hasNext()) {
+        if (index < sourceLists.size()) {
+          iterator = sourceLists.get(index).iterator();
+          index++;
+        } else {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    @Override
+    public E next() {
+      if (!hasNext()) {
+        throw new NoSuchElementException();
+      }
+      return iterator.next();
+    }
+
+    @Override
+    public void remove() {
+      throw new UnsupportedOperationException("remove method not supported");
+    }
+  }
+}

runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

@@ -173,6 +173,7 @@ public Object evalTrackingUnknowns(
         throws CelEvaluationException {
       ExecutionFrame frame = newExecutionFrame(resolver, functionResolver, listener);
       IntermediateResult internalResult = evalInternal(frame, ast.getExpr());
+
       return internalResult.value();
     }
 
@@ -896,6 +897,32 @@ private IntermediateResult evalNonstrictly(ExecutionFrame frame, CelExpr expr) {
       }
     }
 
+    @SuppressWarnings("unchecked") // All type-erased elements are object compatible
+    private IntermediateResult maybeAdaptToListView(IntermediateResult accuValue) {
+      // ListView uses a mutable reference internally. Macros such as `filter` uses conditionals
+      // under the hood. In situations where short circuiting is disabled, we don't want to evaluate
+      // both LHS and RHS, as evaluating LHS can mutate the accu value, which also affects RHS.
+      if (!(accuValue.value() instanceof List) || !celOptions.enableShortCircuiting()) {
+        return accuValue;
+      }
+
+      ConcatenatedListView<Object> lv =
+          new ConcatenatedListView<>((List<Object>) accuValue.value());
+      return IntermediateResult.create(lv);
+    }
+
+    @SuppressWarnings("unchecked") // All type-erased elements are object compatible
+    private IntermediateResult maybeAdaptViewToList(IntermediateResult accuValue) {
+      if ((accuValue.value() instanceof ConcatenatedListView)) {
+        // Materialize view back into a list to facilitate O(1) lookups.
+        List<Object> copiedList = new ArrayList<>((List<Object>) accuValue.value());
+
+        accuValue = IntermediateResult.create(copiedList);
+      }
+
+      return accuValue;
+    }
+
     @SuppressWarnings("unchecked")
     private IntermediateResult evalComprehension(
         ExecutionFrame frame, CelExpr unusedExpr, CelComprehension compre)
@@ -924,6 +951,9 @@ private IntermediateResult evalComprehension(
         accuValue = IntermediateResult.create(new LazyExpression(compre.accuInit()));
       } else {
         accuValue = evalNonstrictly(frame, compre.accuInit());
+        // This ensures macros such as filter/map that uses "add_list" functions under the hood
+        // remain linear in time complexity
+        accuValue = maybeAdaptToListView(accuValue);
       }
       int i = 0;
       for (Object elem : iterRange) {
@@ -950,6 +980,8 @@ private IntermediateResult evalComprehension(
         frame.popScope();
       }
 
+      accuValue = maybeAdaptViewToList(accuValue);
+
       frame.pushScope(Collections.singletonMap(accuVar, accuValue));
       IntermediateResult result;
       try {

runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java

@@ -91,7 +91,12 @@ public static boolean matches(String string, String regexp, CelOptions celOption
 
   /** Concatenates two lists into a new list. */
   public static <E> List<E> concat(List<E> first, List<E> second) {
-    // TODO: return a view instead of an actual copy.
+    if (first instanceof ConcatenatedListView) {
+      // Comprehensions use a more efficient list view for performing O(1) concatenation
+      first.addAll(second);
+      return first;
+    }
+
     List<E> result = new ArrayList<>(first.size() + second.size());
     result.addAll(first);
     result.addAll(second);