Skip to content

Optimize scoped variable access using an unmodifiable map #274

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
1 commit merged into from
Mar 18, 2024
Merged

Optimize scoped variable access using an unmodifiable map #274

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
23 changes: 11 additions & 12 deletions runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import com.google.auto.value.AutoValue;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.errorprone.annotations.Immutable;
import javax.annotation.concurrent.ThreadSafe;
import dev.cel.common.CelAbstractSyntaxTree;
Expand All @@ -43,6 +42,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
Expand Down Expand Up @@ -852,14 +852,12 @@ private IntermediateResult evalComprehension(
}
i++;

ImmutableMap<String, IntermediateResult> loopVars =
ImmutableMap.of(
iterVar,
IntermediateResult.create(iterAttr, RuntimeHelpers.maybeAdaptPrimitive(elem)),
accuVar,
accuValue);
Map<String, IntermediateResult> loopVars = new HashMap<>();
loopVars.put(
iterVar, IntermediateResult.create(iterAttr, RuntimeHelpers.maybeAdaptPrimitive(elem)));
loopVars.put(accuVar, accuValue);

frame.pushScope(loopVars);
frame.pushScope(Collections.unmodifiableMap(loopVars));
IntermediateResult evalObject = evalBooleanStrict(frame, compre.loopCondition());
if (!isUnknownValue(evalObject.value()) && !(boolean) evalObject.value()) {
frame.popScope();
Expand All @@ -869,7 +867,7 @@ private IntermediateResult evalComprehension(
frame.popScope();
}

frame.pushScope(ImmutableMap.of(accuVar, accuValue));
frame.pushScope(Collections.singletonMap(accuVar, accuValue));
IntermediateResult result = evalInternal(frame, compre.result());
frame.popScope();
return result;
Expand All @@ -878,14 +876,14 @@ private IntermediateResult evalComprehension(
private IntermediateResult evalCelBlock(
ExecutionFrame frame, CelExpr unusedExpr, CelCall blockCall) throws InterpreterException {
CelCreateList exprList = blockCall.args().get(0).createList();
ImmutableMap.Builder<String, IntermediateResult> blockList = ImmutableMap.builder();
Map<String, IntermediateResult> blockList = new HashMap<>();
for (int index = 0; index < exprList.elements().size(); index++) {
// Register the block indices as lazily evaluated expressions stored as unique identifiers.
blockList.put(
"@index" + index,
IntermediateResult.create(new LazyExpression(exprList.elements().get(index))));
}
frame.pushScope(blockList.buildOrThrow());
frame.pushScope(Collections.unmodifiableMap(blockList));

return evalInternal(frame, blockCall.args().get(1));
}
Expand Down Expand Up @@ -970,7 +968,8 @@ private void cacheLazilyEvaluatedResult(
currentResolver.cacheLazilyEvaluatedResult(name, result);
}

private void pushScope(ImmutableMap<String, IntermediateResult> scope) {
/** Note: we utilize a HashMap instead of ImmutableMap to make lookups faster on string keys. */
private void pushScope(Map<String, IntermediateResult> scope) {
RuntimeUnknownResolver scopedResolver = currentResolver.withScope(scope);
currentResolver = scopedResolver;
resolvers.addLast(scopedResolver);
Expand Down