Enhance ConstantFoldingOptimizer to fold arithmetics involving timestamps and durations#825

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
Oct 1, 2025
Merged

Enhance ConstantFoldingOptimizer to fold arithmetics involving timestamps and durations #825

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
2 changes: 1 addition & 1 deletion checker/src/main/java/dev/cel/checker/CelStandardDeclarations.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1488,7 +1488,7 @@ public CelFunctionDecl functionDecl() {
return celFunctionDecl;
}

String functionName() {
public String functionName() {
return functionName;
}

Expand Down
2 changes: 2 additions & 0 deletions optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,12 +19,14 @@ java_library(
":default_optimizer_constants",
"//:auto_value",
"//bundle:cel",
"//checker:standard_decl",
"//common:cel_ast",
"//common:cel_source",
"//common:compiler_common",
"//common:mutable_ast",
"//common/ast",
"//common/ast:mutable_expr",
"//common/internal:date_time_helpers",
"//common/navigation:mutable_navigation",
"//common/types",
"//extensions:optional_library",
Expand Down
45 changes: 37 additions & 8 deletions optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.TIMESTAMP;

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
Expand All@@ -36,6 +38,7 @@
import dev.cel.common.ast.CelMutableExpr.CelMutableMap;
import dev.cel.common.ast.CelMutableExpr.CelMutableStruct;
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.internal.DateTimeHelpers;
import dev.cel.common.navigation.CelNavigableMutableAst;
import dev.cel.common.navigation.CelNavigableMutableExpr;
import dev.cel.common.types.SimpleType;
Expand All@@ -45,6 +48,8 @@
import dev.cel.optimizer.CelOptimizationException;
import dev.cel.parser.Operator;
import dev.cel.runtime.CelEvaluationException;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand DownExpand Up@@ -142,6 +147,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
return false;
}

// Timestamps/durations in CEL are calls, but they are effectively treated as literals.
// Expressions like timestamp(123) cannot be folded directly, but arithmetics involving
// timestamps can be optimized.
// Ex: timestamp(123) - timestamp(100) = duration("23s")
if (isCallTimestampOrDuration(navigableExpr.expr().call())) {
return false;
}

CelMutableCall mutableCall = navigableExpr.expr().call();
String functionName = mutableCall.function();

Expand DownExpand Up@@ -197,14 +210,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
private boolean containsFoldableFunctionOnly(CelNavigableMutableExpr navigableExpr) {
return navigableExpr
.allNodes()
.allMatch(
node -> {
if (node.getKind().equals(Kind.CALL)) {
return foldableFunctions.contains(node.expr().call().function());
}

return true;
});
.filter(node -> node.getKind().equals(Kind.CALL))
.map(node -> node.expr().call())
.allMatch(call -> foldableFunctions.contains(call.function()));
}

private static boolean isCallTimestampOrDuration(CelMutableCall call) {
return call.function().equals(TIMESTAMP.functionName())
|| call.function().equals(DURATION.functionName());
}

private static boolean canFoldInOperator(CelNavigableMutableExpr navigableExpr) {
Expand DownExpand Up@@ -318,6 +331,22 @@ private Optional<CelMutableExpr> maybeAdaptEvaluatedResult(Object result) {
}

return Optional.of(CelMutableExpr.ofMap(CelMutableMap.create(mapEntries)));
} else if (result instanceof Duration) {
String durationStrArg = DateTimeHelpers.toString((Duration) result);
CelMutableCall durationCall =
CelMutableCall.create(
DURATION.functionName(),
CelMutableExpr.ofConstant(CelConstant.ofValue(durationStrArg)));

return Optional.of(CelMutableExpr.ofCall(durationCall));
} else if (result instanceof Instant) {
String timestampStrArg = result.toString();
CelMutableCall timestampCall =
CelMutableCall.create(
TIMESTAMP.functionName(),
CelMutableExpr.ofConstant(CelConstant.ofValue(timestampStrArg)));

return Optional.of(CelMutableExpr.ofCall(timestampCall));
}

// Evaluated result cannot be folded (e.g: unknowns)
Expand Down
29 changes: 23 additions & 6 deletions optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,11 @@

@RunWith(TestParameterInjector.class)
public class ConstantFoldingOptimizerTest {
private static final CelOptions CEL_OPTIONS =
CelOptions.current()
.enableTimestampEpoch(true)
.evaluateCanonicalTypesToNativeValues(true)
.build();
private static final Cel CEL =
CelFactory.standardCelBuilder()
.addVar("x", SimpleType.DYN)
Expand All@@ -60,19 +65,20 @@ public class ConstantFoldingOptimizerTest {
CelFunctionBinding.from("get_true_overload", ImmutableList.of(), unused -> true))
.addMessageTypes(TestAllTypes.getDescriptor())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.setOptions(CEL_OPTIONS)
.addCompilerLibraries(
CelExtensions.bindings(),
CelOptionalLibrary.INSTANCE,
CelExtensions.math(CelOptions.DEFAULT),
CelExtensions.math(CEL_OPTIONS),
CelExtensions.strings(),
CelExtensions.sets(CelOptions.DEFAULT),
CelExtensions.encoders(CelOptions.DEFAULT))
CelExtensions.sets(CEL_OPTIONS),
CelExtensions.encoders(CEL_OPTIONS))
.addRuntimeLibraries(
CelOptionalLibrary.INSTANCE,
CelExtensions.math(CelOptions.DEFAULT),
CelExtensions.math(CEL_OPTIONS),
CelExtensions.strings(),
CelExtensions.sets(CelOptions.DEFAULT),
CelExtensions.encoders(CelOptions.DEFAULT))
CelExtensions.sets(CEL_OPTIONS),
CelExtensions.encoders(CEL_OPTIONS))
.build();

private static final CelOptimizer CEL_OPTIMIZER =
Expand DownExpand Up@@ -211,6 +217,15 @@ public class ConstantFoldingOptimizerTest {
@TestParameters("{source: '42 != 42', expected: 'false'}")
@TestParameters("{source: '[\"foo\",\"bar\"] == [\"foo\",\"bar\"]', expected: 'true'}")
@TestParameters("{source: '[\"bar\",\"foo\"] == [\"foo\",\"bar\"]', expected: 'false'}")
@TestParameters("{source: 'duration(\"1h\") - duration(\"60m\")', expected: 'duration(\"0s\")'}")
@TestParameters(
"{source: 'duration(\"2h23m42s12ms42us92ns\") + duration(\"129481231298125ns\")', expected:"
+ " 'duration(\"138103.243340217s\")'}")
@TestParameters(
"{source: 'timestamp(900000) - timestamp(100)', expected: 'duration(\"899900s\")'}")
@TestParameters(
"{source: 'timestamp(\"2000-01-01T00:02:03.2123Z\") + duration(\"25h2m32s42ms53us29ns\")',"
+ " expected: 'timestamp(\"2000-01-02T01:04:35.254353029Z\")'}")
// TODO: Support folding lists with mixed types. This requires mutable lists.
// @TestParameters("{source: 'dyn([1]) + [1.0]'}")
public void constantFold_success(String source, String expected) throws Exception {
Expand DownExpand Up@@ -348,6 +363,8 @@ public void constantFold_macros_withoutMacroCallMetadata(String source) throws E
@TestParameters("{source: 'get_true() == true'}")
@TestParameters("{source: 'x == x'}")
@TestParameters("{source: 'x == 42'}")
@TestParameters("{source: 'timestamp(100)'}")
@TestParameters("{source: 'duration(\"1h\")'}")
public void constantFold_noOp(String source) throws Exception {
CelAbstractSyntaxTree ast = CEL.compile(source).getAst();

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
Enhance ConstantFoldingOptimizer to fold arithmetics involving timestamps and durations#825

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

Oct 1, 2025
 Merged


Enhance ConstantFoldingOptimizer to fold arithmetics involving timestamps and durations
#825
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


2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/CelStandardDeclarations.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1488,7 +1488,7 @@ public CelFunctionDecl functionDecl() {
 return celFunctionDecl;
 }

 String functionName() {
public String functionName() {
 return functionName;
 }

Expand Down

2 changes: 2 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,12 +19,14 @@ java_library(
 ":default_optimizer_constants",
 "//:auto_value",
 "//bundle:cel",
 "//checker:standard_decl",
 "//common:cel_ast",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:mutable_ast",
 "//common/ast",
 "//common/ast:mutable_expr",
 "//common/internal:date_time_helpers",
 "//common/navigation:mutable_navigation",
 "//common/types",
 "//extensions:optional_library",
Expand Down

45 changes: 37 additions & 8 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.TIMESTAMP;

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
Expand All@@ -36,6 +38,7 @@
import dev.cel.common.ast.CelMutableExpr.CelMutableMap;
import dev.cel.common.ast.CelMutableExpr.CelMutableStruct;
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.internal.DateTimeHelpers;
import dev.cel.common.navigation.CelNavigableMutableAst;
import dev.cel.common.navigation.CelNavigableMutableExpr;
import dev.cel.common.types.SimpleType;
Expand All@@ -45,6 +48,8 @@
import dev.cel.optimizer.CelOptimizationException;
import dev.cel.parser.Operator;
import dev.cel.runtime.CelEvaluationException;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand DownExpand Up@@ -142,6 +147,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
 return false;
 }

 // Timestamps/durations in CEL are calls, but they are effectively treated as literals.
 // Expressions like timestamp(123) cannot be folded directly, but arithmetics involving
 // timestamps can be optimized.
 // Ex: timestamp(123) - timestamp(100) = duration("23s")
 if (isCallTimestampOrDuration(navigableExpr.expr().call())) {
 return false;
 }

 CelMutableCall mutableCall = navigableExpr.expr().call();
 String functionName = mutableCall.function();

Expand DownExpand Up@@ -197,14 +210,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
 private boolean containsFoldableFunctionOnly(CelNavigableMutableExpr navigableExpr) {
 return navigableExpr
 .allNodes()
 .allMatch(
node -> {
 if (node.getKind().equals(Kind.CALL)) {
 return foldableFunctions.contains(node.expr().call().function());
 }

return true;
 });
 .filter(node -> node.getKind().equals(Kind.CALL))
.map(node -> node.expr().call())
.allMatch(call -> foldableFunctions.contains(call.function()));
}

 private static boolean isCallTimestampOrDuration(CelMutableCall call) {
 return call.function().equals(TIMESTAMP.functionName())
|| call.function().equals(DURATION.functionName());
 }

 private static boolean canFoldInOperator(CelNavigableMutableExpr navigableExpr) {
Expand DownExpand Up@@ -318,6 +331,22 @@ private Optional<CelMutableExpr> maybeAdaptEvaluatedResult(Object result) {
 }

 return Optional.of(CelMutableExpr.ofMap(CelMutableMap.create(mapEntries)));
 } else if (result instanceof Duration) {
 String durationStrArg = DateTimeHelpers.toString((Duration) result);
 CelMutableCall durationCall =
 CelMutableCall.create(
 DURATION.functionName(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(durationStrArg)));

 return Optional.of(CelMutableExpr.ofCall(durationCall));
 } else if (result instanceof Instant) {
 String timestampStrArg = result.toString();
 CelMutableCall timestampCall =
 CelMutableCall.create(
 TIMESTAMP.functionName(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(timestampStrArg)));

 return Optional.of(CelMutableExpr.ofCall(timestampCall));
 }

 // Evaluated result cannot be folded (e.g: unknowns)
Expand Down

29 changes: 23 additions & 6 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,11 @@

@RunWith(TestParameterInjector.class)
public class ConstantFoldingOptimizerTest {
 private static final CelOptions CEL_OPTIONS =
 CelOptions.current()
 .enableTimestampEpoch(true)
 .evaluateCanonicalTypesToNativeValues(true)
 .build();
 private static final Cel CEL =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.DYN)
Expand All@@ -60,19 +65,20 @@ public class ConstantFoldingOptimizerTest {
 CelFunctionBinding.from("get_true_overload", ImmutableList.of(), unused -> true))
 .addMessageTypes(TestAllTypes.getDescriptor())
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
 .setOptions(CEL_OPTIONS)
 .addCompilerLibraries(
 CelExtensions.bindings(),
 CelOptionalLibrary.INSTANCE,
 CelExtensions.math(CelOptions.DEFAULT),
 CelExtensions.math(CEL_OPTIONS),
 CelExtensions.strings(),
 CelExtensions.sets(CelOptions.DEFAULT),
 CelExtensions.encoders(CelOptions.DEFAULT))
 CelExtensions.sets(CEL_OPTIONS),
 CelExtensions.encoders(CEL_OPTIONS))
 .addRuntimeLibraries(
 CelOptionalLibrary.INSTANCE,
 CelExtensions.math(CelOptions.DEFAULT),
 CelExtensions.math(CEL_OPTIONS),
 CelExtensions.strings(),
 CelExtensions.sets(CelOptions.DEFAULT),
 CelExtensions.encoders(CelOptions.DEFAULT))
 CelExtensions.sets(CEL_OPTIONS),
 CelExtensions.encoders(CEL_OPTIONS))
 .build();

 private static final CelOptimizer CEL_OPTIMIZER =
Expand DownExpand Up@@ -211,6 +217,15 @@ public class ConstantFoldingOptimizerTest {
 @TestParameters("{source: '42 != 42', expected: 'false'}")
 @TestParameters("{source: '[\"foo\",\"bar\"] == [\"foo\",\"bar\"]', expected: 'true'}")
 @TestParameters("{source: '[\"bar\",\"foo\"] == [\"foo\",\"bar\"]', expected: 'false'}")
 @TestParameters("{source: 'duration(\"1h\") - duration(\"60m\")', expected: 'duration(\"0s\")'}")
 @TestParameters(
 "{source: 'duration(\"2h23m42s12ms42us92ns\") + duration(\"129481231298125ns\")', expected:"
 + " 'duration(\"138103.243340217s\")'}")
 @TestParameters(
 "{source: 'timestamp(900000) - timestamp(100)', expected: 'duration(\"899900s\")'}")
 @TestParameters(
 "{source: 'timestamp(\"2000-01-01T00:02:03.2123Z\") + duration(\"25h2m32s42ms53us29ns\")',"
 + " expected: 'timestamp(\"2000-01-02T01:04:35.254353029Z\")'}")
 // TODO: Support folding lists with mixed types. This requires mutable lists.
 // @TestParameters("{source: 'dyn([1]) + [1.0]'}")
 public void constantFold_success(String source, String expected) throws Exception {
Expand DownExpand Up@@ -348,6 +363,8 @@ public void constantFold_macros_withoutMacroCallMetadata(String source) throws E
 @TestParameters("{source: 'get_true() == true'}")
 @TestParameters("{source: 'x == x'}")
 @TestParameters("{source: 'x == 42'}")
 @TestParameters("{source: 'timestamp(100)'}")
 @TestParameters("{source: 'duration(\"1h\")'}")
 public void constantFold_noOp(String source) throws Exception {
 CelAbstractSyntaxTree ast = CEL.compile(source).getAst();

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
Enhance ConstantFoldingOptimizer to fold arithmetics involving timestamps and durations#825

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

Oct 1, 2025
 Merged


Enhance ConstantFoldingOptimizer to fold arithmetics involving timestamps and durations
#825
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


2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/CelStandardDeclarations.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1488,7 +1488,7 @@ public CelFunctionDecl functionDecl() {
 return celFunctionDecl;
 }

 String functionName() {
public String functionName() {
 return functionName;
 }

Expand Down

2 changes: 2 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,12 +19,14 @@ java_library(
 ":default_optimizer_constants",
 "//:auto_value",
 "//bundle:cel",
 "//checker:standard_decl",
 "//common:cel_ast",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:mutable_ast",
 "//common/ast",
 "//common/ast:mutable_expr",
 "//common/internal:date_time_helpers",
 "//common/navigation:mutable_navigation",
 "//common/types",
 "//extensions:optional_library",
Expand Down

45 changes: 37 additions & 8 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.TIMESTAMP;

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
Expand All@@ -36,6 +38,7 @@
import dev.cel.common.ast.CelMutableExpr.CelMutableMap;
import dev.cel.common.ast.CelMutableExpr.CelMutableStruct;
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.internal.DateTimeHelpers;
import dev.cel.common.navigation.CelNavigableMutableAst;
import dev.cel.common.navigation.CelNavigableMutableExpr;
import dev.cel.common.types.SimpleType;
Expand All@@ -45,6 +48,8 @@
import dev.cel.optimizer.CelOptimizationException;
import dev.cel.parser.Operator;
import dev.cel.runtime.CelEvaluationException;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand DownExpand Up@@ -142,6 +147,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
 return false;
 }

 // Timestamps/durations in CEL are calls, but they are effectively treated as literals.
 // Expressions like timestamp(123) cannot be folded directly, but arithmetics involving
 // timestamps can be optimized.
 // Ex: timestamp(123) - timestamp(100) = duration("23s")
 if (isCallTimestampOrDuration(navigableExpr.expr().call())) {
 return false;
 }

 CelMutableCall mutableCall = navigableExpr.expr().call();
 String functionName = mutableCall.function();

Expand DownExpand Up@@ -197,14 +210,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
 private boolean containsFoldableFunctionOnly(CelNavigableMutableExpr navigableExpr) {
 return navigableExpr
 .allNodes()
 .allMatch(
node -> {
 if (node.getKind().equals(Kind.CALL)) {
 return foldableFunctions.contains(node.expr().call().function());
 }

return true;
 });
 .filter(node -> node.getKind().equals(Kind.CALL))
.map(node -> node.expr().call())
.allMatch(call -> foldableFunctions.contains(call.function()));
}

 private static boolean isCallTimestampOrDuration(CelMutableCall call) {
 return call.function().equals(TIMESTAMP.functionName())
|| call.function().equals(DURATION.functionName());
 }

 private static boolean canFoldInOperator(CelNavigableMutableExpr navigableExpr) {
Expand DownExpand Up@@ -318,6 +331,22 @@ private Optional<CelMutableExpr> maybeAdaptEvaluatedResult(Object result) {
 }

 return Optional.of(CelMutableExpr.ofMap(CelMutableMap.create(mapEntries)));
 } else if (result instanceof Duration) {
 String durationStrArg = DateTimeHelpers.toString((Duration) result);
 CelMutableCall durationCall =
 CelMutableCall.create(
 DURATION.functionName(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(durationStrArg)));

 return Optional.of(CelMutableExpr.ofCall(durationCall));
 } else if (result instanceof Instant) {
 String timestampStrArg = result.toString();
 CelMutableCall timestampCall =
 CelMutableCall.create(
 TIMESTAMP.functionName(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(timestampStrArg)));

 return Optional.of(CelMutableExpr.ofCall(timestampCall));
 }

 // Evaluated result cannot be folded (e.g: unknowns)
Expand Down

29 changes: 23 additions & 6 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,11 @@

@RunWith(TestParameterInjector.class)
public class ConstantFoldingOptimizerTest {
 private static final CelOptions CEL_OPTIONS =
 CelOptions.current()
 .enableTimestampEpoch(true)
 .evaluateCanonicalTypesToNativeValues(true)
 .build();
 private static final Cel CEL =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.DYN)
Expand All@@ -60,19 +65,20 @@ public class ConstantFoldingOptimizerTest {
 CelFunctionBinding.from("get_true_overload", ImmutableList.of(), unused -> true))
 .addMessageTypes(TestAllTypes.getDescriptor())
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
 .setOptions(CEL_OPTIONS)
 .addCompilerLibraries(
 CelExtensions.bindings(),
 CelOptionalLibrary.INSTANCE,
 CelExtensions.math(CelOptions.DEFAULT),
 CelExtensions.math(CEL_OPTIONS),
 CelExtensions.strings(),
 CelExtensions.sets(CelOptions.DEFAULT),
 CelExtensions.encoders(CelOptions.DEFAULT))
 CelExtensions.sets(CEL_OPTIONS),
 CelExtensions.encoders(CEL_OPTIONS))
 .addRuntimeLibraries(
 CelOptionalLibrary.INSTANCE,
 CelExtensions.math(CelOptions.DEFAULT),
 CelExtensions.math(CEL_OPTIONS),
 CelExtensions.strings(),
 CelExtensions.sets(CelOptions.DEFAULT),
 CelExtensions.encoders(CelOptions.DEFAULT))
 CelExtensions.sets(CEL_OPTIONS),
 CelExtensions.encoders(CEL_OPTIONS))
 .build();

 private static final CelOptimizer CEL_OPTIMIZER =
Expand DownExpand Up@@ -211,6 +217,15 @@ public class ConstantFoldingOptimizerTest {
 @TestParameters("{source: '42 != 42', expected: 'false'}")
 @TestParameters("{source: '[\"foo\",\"bar\"] == [\"foo\",\"bar\"]', expected: 'true'}")
 @TestParameters("{source: '[\"bar\",\"foo\"] == [\"foo\",\"bar\"]', expected: 'false'}")
 @TestParameters("{source: 'duration(\"1h\") - duration(\"60m\")', expected: 'duration(\"0s\")'}")
 @TestParameters(
 "{source: 'duration(\"2h23m42s12ms42us92ns\") + duration(\"129481231298125ns\")', expected:"
 + " 'duration(\"138103.243340217s\")'}")
 @TestParameters(
 "{source: 'timestamp(900000) - timestamp(100)', expected: 'duration(\"899900s\")'}")
 @TestParameters(
 "{source: 'timestamp(\"2000-01-01T00:02:03.2123Z\") + duration(\"25h2m32s42ms53us29ns\")',"
 + " expected: 'timestamp(\"2000-01-02T01:04:35.254353029Z\")'}")
 // TODO: Support folding lists with mixed types. This requires mutable lists.
 // @TestParameters("{source: 'dyn([1]) + [1.0]'}")
 public void constantFold_success(String source, String expected) throws Exception {
Expand DownExpand Up@@ -348,6 +363,8 @@ public void constantFold_macros_withoutMacroCallMetadata(String source) throws E
 @TestParameters("{source: 'get_true() == true'}")
 @TestParameters("{source: 'x == x'}")
 @TestParameters("{source: 'x == 42'}")
 @TestParameters("{source: 'timestamp(100)'}")
 @TestParameters("{source: 'duration(\"1h\")'}")
 public void constantFold_noOp(String source) throws Exception {
 CelAbstractSyntaxTree ast = CEL.compile(source).getAst();

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
Enhance ConstantFoldingOptimizer to fold arithmetics involving timestamps and durations#825

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

Oct 1, 2025
 Merged


Enhance ConstantFoldingOptimizer to fold arithmetics involving timestamps and durations
#825
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


2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/CelStandardDeclarations.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1488,7 +1488,7 @@ public CelFunctionDecl functionDecl() {
 return celFunctionDecl;
 }

 String functionName() {
public String functionName() {
 return functionName;
 }

Expand Down

2 changes: 2 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,12 +19,14 @@ java_library(
 ":default_optimizer_constants",
 "//:auto_value",
 "//bundle:cel",
 "//checker:standard_decl",
 "//common:cel_ast",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:mutable_ast",
 "//common/ast",
 "//common/ast:mutable_expr",
 "//common/internal:date_time_helpers",
 "//common/navigation:mutable_navigation",
 "//common/types",
 "//extensions:optional_library",
Expand Down

45 changes: 37 additions & 8 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.TIMESTAMP;

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
Expand All@@ -36,6 +38,7 @@
import dev.cel.common.ast.CelMutableExpr.CelMutableMap;
import dev.cel.common.ast.CelMutableExpr.CelMutableStruct;
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.internal.DateTimeHelpers;
import dev.cel.common.navigation.CelNavigableMutableAst;
import dev.cel.common.navigation.CelNavigableMutableExpr;
import dev.cel.common.types.SimpleType;
Expand All@@ -45,6 +48,8 @@
import dev.cel.optimizer.CelOptimizationException;
import dev.cel.parser.Operator;
import dev.cel.runtime.CelEvaluationException;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand DownExpand Up@@ -142,6 +147,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
 return false;
 }

 // Timestamps/durations in CEL are calls, but they are effectively treated as literals.
 // Expressions like timestamp(123) cannot be folded directly, but arithmetics involving
 // timestamps can be optimized.
 // Ex: timestamp(123) - timestamp(100) = duration("23s")
 if (isCallTimestampOrDuration(navigableExpr.expr().call())) {
 return false;
 }

 CelMutableCall mutableCall = navigableExpr.expr().call();
 String functionName = mutableCall.function();

Expand DownExpand Up@@ -197,14 +210,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
 private boolean containsFoldableFunctionOnly(CelNavigableMutableExpr navigableExpr) {
 return navigableExpr
 .allNodes()
 .allMatch(
node -> {
 if (node.getKind().equals(Kind.CALL)) {
 return foldableFunctions.contains(node.expr().call().function());
 }

return true;
 });
 .filter(node -> node.getKind().equals(Kind.CALL))
.map(node -> node.expr().call())
.allMatch(call -> foldableFunctions.contains(call.function()));
}

 private static boolean isCallTimestampOrDuration(CelMutableCall call) {
 return call.function().equals(TIMESTAMP.functionName())
|| call.function().equals(DURATION.functionName());
 }

 private static boolean canFoldInOperator(CelNavigableMutableExpr navigableExpr) {
Expand DownExpand Up@@ -318,6 +331,22 @@ private Optional<CelMutableExpr> maybeAdaptEvaluatedResult(Object result) {
 }

 return Optional.of(CelMutableExpr.ofMap(CelMutableMap.create(mapEntries)));
 } else if (result instanceof Duration) {
 String durationStrArg = DateTimeHelpers.toString((Duration) result);
 CelMutableCall durationCall =
 CelMutableCall.create(
 DURATION.functionName(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(durationStrArg)));

 return Optional.of(CelMutableExpr.ofCall(durationCall));
 } else if (result instanceof Instant) {
 String timestampStrArg = result.toString();
 CelMutableCall timestampCall =
 CelMutableCall.create(
 TIMESTAMP.functionName(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(timestampStrArg)));

 return Optional.of(CelMutableExpr.ofCall(timestampCall));
 }

 // Evaluated result cannot be folded (e.g: unknowns)
Expand Down

29 changes: 23 additions & 6 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,11 @@

@RunWith(TestParameterInjector.class)
public class ConstantFoldingOptimizerTest {
 private static final CelOptions CEL_OPTIONS =
 CelOptions.current()
 .enableTimestampEpoch(true)
 .evaluateCanonicalTypesToNativeValues(true)
 .build();
 private static final Cel CEL =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.DYN)
Expand All@@ -60,19 +65,20 @@ public class ConstantFoldingOptimizerTest {
 CelFunctionBinding.from("get_true_overload", ImmutableList.of(), unused -> true))
 .addMessageTypes(TestAllTypes.getDescriptor())
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
 .setOptions(CEL_OPTIONS)
 .addCompilerLibraries(
 CelExtensions.bindings(),
 CelOptionalLibrary.INSTANCE,
 CelExtensions.math(CelOptions.DEFAULT),
 CelExtensions.math(CEL_OPTIONS),
 CelExtensions.strings(),
 CelExtensions.sets(CelOptions.DEFAULT),
 CelExtensions.encoders(CelOptions.DEFAULT))
 CelExtensions.sets(CEL_OPTIONS),
 CelExtensions.encoders(CEL_OPTIONS))
 .addRuntimeLibraries(
 CelOptionalLibrary.INSTANCE,
 CelExtensions.math(CelOptions.DEFAULT),
 CelExtensions.math(CEL_OPTIONS),
 CelExtensions.strings(),
 CelExtensions.sets(CelOptions.DEFAULT),
 CelExtensions.encoders(CelOptions.DEFAULT))
 CelExtensions.sets(CEL_OPTIONS),
 CelExtensions.encoders(CEL_OPTIONS))
 .build();

 private static final CelOptimizer CEL_OPTIMIZER =
Expand DownExpand Up@@ -211,6 +217,15 @@ public class ConstantFoldingOptimizerTest {
 @TestParameters("{source: '42 != 42', expected: 'false'}")
 @TestParameters("{source: '[\"foo\",\"bar\"] == [\"foo\",\"bar\"]', expected: 'true'}")
 @TestParameters("{source: '[\"bar\",\"foo\"] == [\"foo\",\"bar\"]', expected: 'false'}")
 @TestParameters("{source: 'duration(\"1h\") - duration(\"60m\")', expected: 'duration(\"0s\")'}")
 @TestParameters(
 "{source: 'duration(\"2h23m42s12ms42us92ns\") + duration(\"129481231298125ns\")', expected:"
 + " 'duration(\"138103.243340217s\")'}")
 @TestParameters(
 "{source: 'timestamp(900000) - timestamp(100)', expected: 'duration(\"899900s\")'}")
 @TestParameters(
 "{source: 'timestamp(\"2000-01-01T00:02:03.2123Z\") + duration(\"25h2m32s42ms53us29ns\")',"
 + " expected: 'timestamp(\"2000-01-02T01:04:35.254353029Z\")'}")
 // TODO: Support folding lists with mixed types. This requires mutable lists.
 // @TestParameters("{source: 'dyn([1]) + [1.0]'}")
 public void constantFold_success(String source, String expected) throws Exception {
Expand DownExpand Up@@ -348,6 +363,8 @@ public void constantFold_macros_withoutMacroCallMetadata(String source) throws E
 @TestParameters("{source: 'get_true() == true'}")
 @TestParameters("{source: 'x == x'}")
 @TestParameters("{source: 'x == 42'}")
 @TestParameters("{source: 'timestamp(100)'}")
 @TestParameters("{source: 'duration(\"1h\")'}")
 public void constantFold_noOp(String source) throws Exception {
 CelAbstractSyntaxTree ast = CEL.compile(source).getAst();

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
Enhance ConstantFoldingOptimizer to fold arithmetics involving timestamps and durations#825

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

Oct 1, 2025
 Merged


Enhance ConstantFoldingOptimizer to fold arithmetics involving timestamps and durations
#825
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


2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/CelStandardDeclarations.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1488,7 +1488,7 @@ public CelFunctionDecl functionDecl() {
 return celFunctionDecl;
 }

 String functionName() {
public String functionName() {
 return functionName;
 }

Expand Down

2 changes: 2 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,12 +19,14 @@ java_library(
 ":default_optimizer_constants",
 "//:auto_value",
 "//bundle:cel",
 "//checker:standard_decl",
 "//common:cel_ast",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:mutable_ast",
 "//common/ast",
 "//common/ast:mutable_expr",
 "//common/internal:date_time_helpers",
 "//common/navigation:mutable_navigation",
 "//common/types",
 "//extensions:optional_library",
Expand Down

45 changes: 37 additions & 8 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.TIMESTAMP;

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
Expand All@@ -36,6 +38,7 @@
import dev.cel.common.ast.CelMutableExpr.CelMutableMap;
import dev.cel.common.ast.CelMutableExpr.CelMutableStruct;
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.internal.DateTimeHelpers;
import dev.cel.common.navigation.CelNavigableMutableAst;
import dev.cel.common.navigation.CelNavigableMutableExpr;
import dev.cel.common.types.SimpleType;
Expand All@@ -45,6 +48,8 @@
import dev.cel.optimizer.CelOptimizationException;
import dev.cel.parser.Operator;
import dev.cel.runtime.CelEvaluationException;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand DownExpand Up@@ -142,6 +147,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
 return false;
 }

 // Timestamps/durations in CEL are calls, but they are effectively treated as literals.
 // Expressions like timestamp(123) cannot be folded directly, but arithmetics involving
 // timestamps can be optimized.
 // Ex: timestamp(123) - timestamp(100) = duration("23s")
 if (isCallTimestampOrDuration(navigableExpr.expr().call())) {
 return false;
 }

 CelMutableCall mutableCall = navigableExpr.expr().call();
 String functionName = mutableCall.function();

Expand DownExpand Up@@ -197,14 +210,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
 private boolean containsFoldableFunctionOnly(CelNavigableMutableExpr navigableExpr) {
 return navigableExpr
 .allNodes()
 .allMatch(
node -> {
 if (node.getKind().equals(Kind.CALL)) {
 return foldableFunctions.contains(node.expr().call().function());
 }

return true;
 });
 .filter(node -> node.getKind().equals(Kind.CALL))
.map(node -> node.expr().call())
.allMatch(call -> foldableFunctions.contains(call.function()));
}

 private static boolean isCallTimestampOrDuration(CelMutableCall call) {
 return call.function().equals(TIMESTAMP.functionName())
|| call.function().equals(DURATION.functionName());
 }

 private static boolean canFoldInOperator(CelNavigableMutableExpr navigableExpr) {
Expand DownExpand Up@@ -318,6 +331,22 @@ private Optional<CelMutableExpr> maybeAdaptEvaluatedResult(Object result) {
 }

 return Optional.of(CelMutableExpr.ofMap(CelMutableMap.create(mapEntries)));
 } else if (result instanceof Duration) {
 String durationStrArg = DateTimeHelpers.toString((Duration) result);
 CelMutableCall durationCall =
 CelMutableCall.create(
 DURATION.functionName(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(durationStrArg)));

 return Optional.of(CelMutableExpr.ofCall(durationCall));
 } else if (result instanceof Instant) {
 String timestampStrArg = result.toString();
 CelMutableCall timestampCall =
 CelMutableCall.create(
 TIMESTAMP.functionName(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(timestampStrArg)));

 return Optional.of(CelMutableExpr.ofCall(timestampCall));
 }

 // Evaluated result cannot be folded (e.g: unknowns)
Expand Down

29 changes: 23 additions & 6 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,11 @@

@RunWith(TestParameterInjector.class)
public class ConstantFoldingOptimizerTest {
 private static final CelOptions CEL_OPTIONS =
 CelOptions.current()
 .enableTimestampEpoch(true)
 .evaluateCanonicalTypesToNativeValues(true)
 .build();
 private static final Cel CEL =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.DYN)
Expand All@@ -60,19 +65,20 @@ public class ConstantFoldingOptimizerTest {
 CelFunctionBinding.from("get_true_overload", ImmutableList.of(), unused -> true))
 .addMessageTypes(TestAllTypes.getDescriptor())
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
 .setOptions(CEL_OPTIONS)
 .addCompilerLibraries(
 CelExtensions.bindings(),
 CelOptionalLibrary.INSTANCE,
 CelExtensions.math(CelOptions.DEFAULT),
 CelExtensions.math(CEL_OPTIONS),
 CelExtensions.strings(),
 CelExtensions.sets(CelOptions.DEFAULT),
 CelExtensions.encoders(CelOptions.DEFAULT))
 CelExtensions.sets(CEL_OPTIONS),
 CelExtensions.encoders(CEL_OPTIONS))
 .addRuntimeLibraries(
 CelOptionalLibrary.INSTANCE,
 CelExtensions.math(CelOptions.DEFAULT),
 CelExtensions.math(CEL_OPTIONS),
 CelExtensions.strings(),
 CelExtensions.sets(CelOptions.DEFAULT),
 CelExtensions.encoders(CelOptions.DEFAULT))
 CelExtensions.sets(CEL_OPTIONS),
 CelExtensions.encoders(CEL_OPTIONS))
 .build();

 private static final CelOptimizer CEL_OPTIMIZER =
Expand DownExpand Up@@ -211,6 +217,15 @@ public class ConstantFoldingOptimizerTest {
 @TestParameters("{source: '42 != 42', expected: 'false'}")
 @TestParameters("{source: '[\"foo\",\"bar\"] == [\"foo\",\"bar\"]', expected: 'true'}")
 @TestParameters("{source: '[\"bar\",\"foo\"] == [\"foo\",\"bar\"]', expected: 'false'}")
 @TestParameters("{source: 'duration(\"1h\") - duration(\"60m\")', expected: 'duration(\"0s\")'}")
 @TestParameters(
 "{source: 'duration(\"2h23m42s12ms42us92ns\") + duration(\"129481231298125ns\")', expected:"
 + " 'duration(\"138103.243340217s\")'}")
 @TestParameters(
 "{source: 'timestamp(900000) - timestamp(100)', expected: 'duration(\"899900s\")'}")
 @TestParameters(
 "{source: 'timestamp(\"2000-01-01T00:02:03.2123Z\") + duration(\"25h2m32s42ms53us29ns\")',"
 + " expected: 'timestamp(\"2000-01-02T01:04:35.254353029Z\")'}")
 // TODO: Support folding lists with mixed types. This requires mutable lists.
 // @TestParameters("{source: 'dyn([1]) + [1.0]'}")
 public void constantFold_success(String source, String expected) throws Exception {
Expand DownExpand Up@@ -348,6 +363,8 @@ public void constantFold_macros_withoutMacroCallMetadata(String source) throws E
 @TestParameters("{source: 'get_true() == true'}")
 @TestParameters("{source: 'x == x'}")
 @TestParameters("{source: 'x == 42'}")
 @TestParameters("{source: 'timestamp(100)'}")
 @TestParameters("{source: 'duration(\"1h\")'}")
 public void constantFold_noOp(String source) throws Exception {
 CelAbstractSyntaxTree ast = CEL.compile(source).getAst();

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
Enhance ConstantFoldingOptimizer to fold arithmetics involving timestamps and durations#825

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

Oct 1, 2025
 Merged


Enhance ConstantFoldingOptimizer to fold arithmetics involving timestamps and durations
#825
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


2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/CelStandardDeclarations.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1488,7 +1488,7 @@ public CelFunctionDecl functionDecl() {
 return celFunctionDecl;
 }

 String functionName() {
public String functionName() {
 return functionName;
 }

Expand Down

2 changes: 2 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,12 +19,14 @@ java_library(
 ":default_optimizer_constants",
 "//:auto_value",
 "//bundle:cel",
 "//checker:standard_decl",
 "//common:cel_ast",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:mutable_ast",
 "//common/ast",
 "//common/ast:mutable_expr",
 "//common/internal:date_time_helpers",
 "//common/navigation:mutable_navigation",
 "//common/types",
 "//extensions:optional_library",
Expand Down

45 changes: 37 additions & 8 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.TIMESTAMP;

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
Expand All@@ -36,6 +38,7 @@
import dev.cel.common.ast.CelMutableExpr.CelMutableMap;
import dev.cel.common.ast.CelMutableExpr.CelMutableStruct;
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.internal.DateTimeHelpers;
import dev.cel.common.navigation.CelNavigableMutableAst;
import dev.cel.common.navigation.CelNavigableMutableExpr;
import dev.cel.common.types.SimpleType;
Expand All@@ -45,6 +48,8 @@
import dev.cel.optimizer.CelOptimizationException;
import dev.cel.parser.Operator;
import dev.cel.runtime.CelEvaluationException;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand DownExpand Up@@ -142,6 +147,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
 return false;
 }

 // Timestamps/durations in CEL are calls, but they are effectively treated as literals.
 // Expressions like timestamp(123) cannot be folded directly, but arithmetics involving
 // timestamps can be optimized.
 // Ex: timestamp(123) - timestamp(100) = duration("23s")
 if (isCallTimestampOrDuration(navigableExpr.expr().call())) {
 return false;
 }

 CelMutableCall mutableCall = navigableExpr.expr().call();
 String functionName = mutableCall.function();

Expand DownExpand Up@@ -197,14 +210,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
 private boolean containsFoldableFunctionOnly(CelNavigableMutableExpr navigableExpr) {
 return navigableExpr
 .allNodes()
 .allMatch(
node -> {
 if (node.getKind().equals(Kind.CALL)) {
 return foldableFunctions.contains(node.expr().call().function());
 }

return true;
 });
 .filter(node -> node.getKind().equals(Kind.CALL))
.map(node -> node.expr().call())
.allMatch(call -> foldableFunctions.contains(call.function()));
}

 private static boolean isCallTimestampOrDuration(CelMutableCall call) {
 return call.function().equals(TIMESTAMP.functionName())
|| call.function().equals(DURATION.functionName());
 }

 private static boolean canFoldInOperator(CelNavigableMutableExpr navigableExpr) {
Expand DownExpand Up@@ -318,6 +331,22 @@ private Optional<CelMutableExpr> maybeAdaptEvaluatedResult(Object result) {
 }

 return Optional.of(CelMutableExpr.ofMap(CelMutableMap.create(mapEntries)));
 } else if (result instanceof Duration) {
 String durationStrArg = DateTimeHelpers.toString((Duration) result);
 CelMutableCall durationCall =
 CelMutableCall.create(
 DURATION.functionName(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(durationStrArg)));

 return Optional.of(CelMutableExpr.ofCall(durationCall));
 } else if (result instanceof Instant) {
 String timestampStrArg = result.toString();
 CelMutableCall timestampCall =
 CelMutableCall.create(
 TIMESTAMP.functionName(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(timestampStrArg)));

 return Optional.of(CelMutableExpr.ofCall(timestampCall));
 }

 // Evaluated result cannot be folded (e.g: unknowns)
Expand Down

29 changes: 23 additions & 6 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,11 @@

@RunWith(TestParameterInjector.class)
public class ConstantFoldingOptimizerTest {
 private static final CelOptions CEL_OPTIONS =
 CelOptions.current()
 .enableTimestampEpoch(true)
 .evaluateCanonicalTypesToNativeValues(true)
 .build();
 private static final Cel CEL =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.DYN)
Expand All@@ -60,19 +65,20 @@ public class ConstantFoldingOptimizerTest {
 CelFunctionBinding.from("get_true_overload", ImmutableList.of(), unused -> true))
 .addMessageTypes(TestAllTypes.getDescriptor())
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
 .setOptions(CEL_OPTIONS)
 .addCompilerLibraries(
 CelExtensions.bindings(),
 CelOptionalLibrary.INSTANCE,
 CelExtensions.math(CelOptions.DEFAULT),
 CelExtensions.math(CEL_OPTIONS),
 CelExtensions.strings(),
 CelExtensions.sets(CelOptions.DEFAULT),
 CelExtensions.encoders(CelOptions.DEFAULT))
 CelExtensions.sets(CEL_OPTIONS),
 CelExtensions.encoders(CEL_OPTIONS))
 .addRuntimeLibraries(
 CelOptionalLibrary.INSTANCE,
 CelExtensions.math(CelOptions.DEFAULT),
 CelExtensions.math(CEL_OPTIONS),
 CelExtensions.strings(),
 CelExtensions.sets(CelOptions.DEFAULT),
 CelExtensions.encoders(CelOptions.DEFAULT))
 CelExtensions.sets(CEL_OPTIONS),
 CelExtensions.encoders(CEL_OPTIONS))
 .build();

 private static final CelOptimizer CEL_OPTIMIZER =
Expand DownExpand Up@@ -211,6 +217,15 @@ public class ConstantFoldingOptimizerTest {
 @TestParameters("{source: '42 != 42', expected: 'false'}")
 @TestParameters("{source: '[\"foo\",\"bar\"] == [\"foo\",\"bar\"]', expected: 'true'}")
 @TestParameters("{source: '[\"bar\",\"foo\"] == [\"foo\",\"bar\"]', expected: 'false'}")
 @TestParameters("{source: 'duration(\"1h\") - duration(\"60m\")', expected: 'duration(\"0s\")'}")
 @TestParameters(
 "{source: 'duration(\"2h23m42s12ms42us92ns\") + duration(\"129481231298125ns\")', expected:"
 + " 'duration(\"138103.243340217s\")'}")
 @TestParameters(
 "{source: 'timestamp(900000) - timestamp(100)', expected: 'duration(\"899900s\")'}")
 @TestParameters(
 "{source: 'timestamp(\"2000-01-01T00:02:03.2123Z\") + duration(\"25h2m32s42ms53us29ns\")',"
 + " expected: 'timestamp(\"2000-01-02T01:04:35.254353029Z\")'}")
 // TODO: Support folding lists with mixed types. This requires mutable lists.
 // @TestParameters("{source: 'dyn([1]) + [1.0]'}")
 public void constantFold_success(String source, String expected) throws Exception {
Expand DownExpand Up@@ -348,6 +363,8 @@ public void constantFold_macros_withoutMacroCallMetadata(String source) throws E
 @TestParameters("{source: 'get_true() == true'}")
 @TestParameters("{source: 'x == x'}")
 @TestParameters("{source: 'x == 42'}")
 @TestParameters("{source: 'timestamp(100)'}")
 @TestParameters("{source: 'duration(\"1h\")'}")
 public void constantFold_noOp(String source) throws Exception {
 CelAbstractSyntaxTree ast = CEL.compile(source).getAst();

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
Enhance ConstantFoldingOptimizer to fold arithmetics involving timestamps and durations#825

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

Oct 1, 2025
 Merged


Enhance ConstantFoldingOptimizer to fold arithmetics involving timestamps and durations
#825
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


2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/CelStandardDeclarations.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1488,7 +1488,7 @@ public CelFunctionDecl functionDecl() {
 return celFunctionDecl;
 }

 String functionName() {
public String functionName() {
 return functionName;
 }

Expand Down

2 changes: 2 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,12 +19,14 @@ java_library(
 ":default_optimizer_constants",
 "//:auto_value",
 "//bundle:cel",
 "//checker:standard_decl",
 "//common:cel_ast",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:mutable_ast",
 "//common/ast",
 "//common/ast:mutable_expr",
 "//common/internal:date_time_helpers",
 "//common/navigation:mutable_navigation",
 "//common/types",
 "//extensions:optional_library",
Expand Down

45 changes: 37 additions & 8 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.TIMESTAMP;

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
Expand All@@ -36,6 +38,7 @@
import dev.cel.common.ast.CelMutableExpr.CelMutableMap;
import dev.cel.common.ast.CelMutableExpr.CelMutableStruct;
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.internal.DateTimeHelpers;
import dev.cel.common.navigation.CelNavigableMutableAst;
import dev.cel.common.navigation.CelNavigableMutableExpr;
import dev.cel.common.types.SimpleType;
Expand All@@ -45,6 +48,8 @@
import dev.cel.optimizer.CelOptimizationException;
import dev.cel.parser.Operator;
import dev.cel.runtime.CelEvaluationException;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand DownExpand Up@@ -142,6 +147,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
 return false;
 }

 // Timestamps/durations in CEL are calls, but they are effectively treated as literals.
 // Expressions like timestamp(123) cannot be folded directly, but arithmetics involving
 // timestamps can be optimized.
 // Ex: timestamp(123) - timestamp(100) = duration("23s")
 if (isCallTimestampOrDuration(navigableExpr.expr().call())) {
 return false;
 }

 CelMutableCall mutableCall = navigableExpr.expr().call();
 String functionName = mutableCall.function();

Expand DownExpand Up@@ -197,14 +210,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
 private boolean containsFoldableFunctionOnly(CelNavigableMutableExpr navigableExpr) {
 return navigableExpr
 .allNodes()
 .allMatch(
node -> {
 if (node.getKind().equals(Kind.CALL)) {
 return foldableFunctions.contains(node.expr().call().function());
 }

return true;
 });
 .filter(node -> node.getKind().equals(Kind.CALL))
.map(node -> node.expr().call())
.allMatch(call -> foldableFunctions.contains(call.function()));
}

 private static boolean isCallTimestampOrDuration(CelMutableCall call) {
 return call.function().equals(TIMESTAMP.functionName())
|| call.function().equals(DURATION.functionName());
 }

 private static boolean canFoldInOperator(CelNavigableMutableExpr navigableExpr) {
Expand DownExpand Up@@ -318,6 +331,22 @@ private Optional<CelMutableExpr> maybeAdaptEvaluatedResult(Object result) {
 }

 return Optional.of(CelMutableExpr.ofMap(CelMutableMap.create(mapEntries)));
 } else if (result instanceof Duration) {
 String durationStrArg = DateTimeHelpers.toString((Duration) result);
 CelMutableCall durationCall =
 CelMutableCall.create(
 DURATION.functionName(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(durationStrArg)));

 return Optional.of(CelMutableExpr.ofCall(durationCall));
 } else if (result instanceof Instant) {
 String timestampStrArg = result.toString();
 CelMutableCall timestampCall =
 CelMutableCall.create(
 TIMESTAMP.functionName(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(timestampStrArg)));

 return Optional.of(CelMutableExpr.ofCall(timestampCall));
 }

 // Evaluated result cannot be folded (e.g: unknowns)
Expand Down

29 changes: 23 additions & 6 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,11 @@

@RunWith(TestParameterInjector.class)
public class ConstantFoldingOptimizerTest {
 private static final CelOptions CEL_OPTIONS =
 CelOptions.current()
 .enableTimestampEpoch(true)
 .evaluateCanonicalTypesToNativeValues(true)
 .build();
 private static final Cel CEL =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.DYN)
Expand All@@ -60,19 +65,20 @@ public class ConstantFoldingOptimizerTest {
 CelFunctionBinding.from("get_true_overload", ImmutableList.of(), unused -> true))
 .addMessageTypes(TestAllTypes.getDescriptor())
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
 .setOptions(CEL_OPTIONS)
 .addCompilerLibraries(
 CelExtensions.bindings(),
 CelOptionalLibrary.INSTANCE,
 CelExtensions.math(CelOptions.DEFAULT),
 CelExtensions.math(CEL_OPTIONS),
 CelExtensions.strings(),
 CelExtensions.sets(CelOptions.DEFAULT),
 CelExtensions.encoders(CelOptions.DEFAULT))
 CelExtensions.sets(CEL_OPTIONS),
 CelExtensions.encoders(CEL_OPTIONS))
 .addRuntimeLibraries(
 CelOptionalLibrary.INSTANCE,
 CelExtensions.math(CelOptions.DEFAULT),
 CelExtensions.math(CEL_OPTIONS),
 CelExtensions.strings(),
 CelExtensions.sets(CelOptions.DEFAULT),
 CelExtensions.encoders(CelOptions.DEFAULT))
 CelExtensions.sets(CEL_OPTIONS),
 CelExtensions.encoders(CEL_OPTIONS))
 .build();

 private static final CelOptimizer CEL_OPTIMIZER =
Expand DownExpand Up@@ -211,6 +217,15 @@ public class ConstantFoldingOptimizerTest {
 @TestParameters("{source: '42 != 42', expected: 'false'}")
 @TestParameters("{source: '[\"foo\",\"bar\"] == [\"foo\",\"bar\"]', expected: 'true'}")
 @TestParameters("{source: '[\"bar\",\"foo\"] == [\"foo\",\"bar\"]', expected: 'false'}")
 @TestParameters("{source: 'duration(\"1h\") - duration(\"60m\")', expected: 'duration(\"0s\")'}")
 @TestParameters(
 "{source: 'duration(\"2h23m42s12ms42us92ns\") + duration(\"129481231298125ns\")', expected:"
 + " 'duration(\"138103.243340217s\")'}")
 @TestParameters(
 "{source: 'timestamp(900000) - timestamp(100)', expected: 'duration(\"899900s\")'}")
 @TestParameters(
 "{source: 'timestamp(\"2000-01-01T00:02:03.2123Z\") + duration(\"25h2m32s42ms53us29ns\")',"
 + " expected: 'timestamp(\"2000-01-02T01:04:35.254353029Z\")'}")
 // TODO: Support folding lists with mixed types. This requires mutable lists.
 // @TestParameters("{source: 'dyn([1]) + [1.0]'}")
 public void constantFold_success(String source, String expected) throws Exception {
Expand DownExpand Up@@ -348,6 +363,8 @@ public void constantFold_macros_withoutMacroCallMetadata(String source) throws E
 @TestParameters("{source: 'get_true() == true'}")
 @TestParameters("{source: 'x == x'}")
 @TestParameters("{source: 'x == 42'}")
 @TestParameters("{source: 'timestamp(100)'}")
 @TestParameters("{source: 'duration(\"1h\")'}")
 public void constantFold_noOp(String source) throws Exception {
 CelAbstractSyntaxTree ast = CEL.compile(source).getAst();

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
Enhance ConstantFoldingOptimizer to fold arithmetics involving timestamps and durations#825

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

Oct 1, 2025
 Merged


Enhance ConstantFoldingOptimizer to fold arithmetics involving timestamps and durations
#825
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


2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/CelStandardDeclarations.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1488,7 +1488,7 @@ public CelFunctionDecl functionDecl() {
 return celFunctionDecl;
 }

 String functionName() {
public String functionName() {
 return functionName;
 }

Expand Down

2 changes: 2 additions & 0 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,12 +19,14 @@ java_library(
 ":default_optimizer_constants",
 "//:auto_value",
 "//bundle:cel",
 "//checker:standard_decl",
 "//common:cel_ast",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:mutable_ast",
 "//common/ast",
 "//common/ast:mutable_expr",
 "//common/internal:date_time_helpers",
 "//common/navigation:mutable_navigation",
 "//common/types",
 "//extensions:optional_library",
Expand Down

45 changes: 37 additions & 8 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.TIMESTAMP;

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
Expand All@@ -36,6 +38,7 @@
import dev.cel.common.ast.CelMutableExpr.CelMutableMap;
import dev.cel.common.ast.CelMutableExpr.CelMutableStruct;
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.internal.DateTimeHelpers;
import dev.cel.common.navigation.CelNavigableMutableAst;
import dev.cel.common.navigation.CelNavigableMutableExpr;
import dev.cel.common.types.SimpleType;
Expand All@@ -45,6 +48,8 @@
import dev.cel.optimizer.CelOptimizationException;
import dev.cel.parser.Operator;
import dev.cel.runtime.CelEvaluationException;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand DownExpand Up@@ -142,6 +147,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
 return false;
 }

 // Timestamps/durations in CEL are calls, but they are effectively treated as literals.
 // Expressions like timestamp(123) cannot be folded directly, but arithmetics involving
 // timestamps can be optimized.
 // Ex: timestamp(123) - timestamp(100) = duration("23s")
 if (isCallTimestampOrDuration(navigableExpr.expr().call())) {
 return false;
 }

 CelMutableCall mutableCall = navigableExpr.expr().call();
 String functionName = mutableCall.function();

Expand DownExpand Up@@ -197,14 +210,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
 private boolean containsFoldableFunctionOnly(CelNavigableMutableExpr navigableExpr) {
 return navigableExpr
 .allNodes()
 .allMatch(
node -> {
 if (node.getKind().equals(Kind.CALL)) {
 return foldableFunctions.contains(node.expr().call().function());
 }

return true;
 });
 .filter(node -> node.getKind().equals(Kind.CALL))
.map(node -> node.expr().call())
.allMatch(call -> foldableFunctions.contains(call.function()));
}

 private static boolean isCallTimestampOrDuration(CelMutableCall call) {
 return call.function().equals(TIMESTAMP.functionName())
|| call.function().equals(DURATION.functionName());
 }

 private static boolean canFoldInOperator(CelNavigableMutableExpr navigableExpr) {
Expand DownExpand Up@@ -318,6 +331,22 @@ private Optional<CelMutableExpr> maybeAdaptEvaluatedResult(Object result) {
 }

 return Optional.of(CelMutableExpr.ofMap(CelMutableMap.create(mapEntries)));
 } else if (result instanceof Duration) {
 String durationStrArg = DateTimeHelpers.toString((Duration) result);
 CelMutableCall durationCall =
 CelMutableCall.create(
 DURATION.functionName(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(durationStrArg)));

 return Optional.of(CelMutableExpr.ofCall(durationCall));
 } else if (result instanceof Instant) {
 String timestampStrArg = result.toString();
 CelMutableCall timestampCall =
 CelMutableCall.create(
 TIMESTAMP.functionName(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(timestampStrArg)));

 return Optional.of(CelMutableExpr.ofCall(timestampCall));
 }

 // Evaluated result cannot be folded (e.g: unknowns)
Expand Down

29 changes: 23 additions & 6 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,11 @@

@RunWith(TestParameterInjector.class)
public class ConstantFoldingOptimizerTest {
 private static final CelOptions CEL_OPTIONS =
 CelOptions.current()
 .enableTimestampEpoch(true)
 .evaluateCanonicalTypesToNativeValues(true)
 .build();
 private static final Cel CEL =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.DYN)
Expand All@@ -60,19 +65,20 @@ public class ConstantFoldingOptimizerTest {
 CelFunctionBinding.from("get_true_overload", ImmutableList.of(), unused -> true))
 .addMessageTypes(TestAllTypes.getDescriptor())
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
 .setOptions(CEL_OPTIONS)
 .addCompilerLibraries(
 CelExtensions.bindings(),
 CelOptionalLibrary.INSTANCE,
 CelExtensions.math(CelOptions.DEFAULT),
 CelExtensions.math(CEL_OPTIONS),
 CelExtensions.strings(),
 CelExtensions.sets(CelOptions.DEFAULT),
 CelExtensions.encoders(CelOptions.DEFAULT))
 CelExtensions.sets(CEL_OPTIONS),
 CelExtensions.encoders(CEL_OPTIONS))
 .addRuntimeLibraries(
 CelOptionalLibrary.INSTANCE,
 CelExtensions.math(CelOptions.DEFAULT),
 CelExtensions.math(CEL_OPTIONS),
 CelExtensions.strings(),
 CelExtensions.sets(CelOptions.DEFAULT),
 CelExtensions.encoders(CelOptions.DEFAULT))
 CelExtensions.sets(CEL_OPTIONS),
 CelExtensions.encoders(CEL_OPTIONS))
 .build();

 private static final CelOptimizer CEL_OPTIMIZER =
Expand DownExpand Up@@ -211,6 +217,15 @@ public class ConstantFoldingOptimizerTest {
 @TestParameters("{source: '42 != 42', expected: 'false'}")
 @TestParameters("{source: '[\"foo\",\"bar\"] == [\"foo\",\"bar\"]', expected: 'true'}")
 @TestParameters("{source: '[\"bar\",\"foo\"] == [\"foo\",\"bar\"]', expected: 'false'}")
 @TestParameters("{source: 'duration(\"1h\") - duration(\"60m\")', expected: 'duration(\"0s\")'}")
 @TestParameters(
 "{source: 'duration(\"2h23m42s12ms42us92ns\") + duration(\"129481231298125ns\")', expected:"
 + " 'duration(\"138103.243340217s\")'}")
 @TestParameters(
 "{source: 'timestamp(900000) - timestamp(100)', expected: 'duration(\"899900s\")'}")
 @TestParameters(
 "{source: 'timestamp(\"2000-01-01T00:02:03.2123Z\") + duration(\"25h2m32s42ms53us29ns\")',"
 + " expected: 'timestamp(\"2000-01-02T01:04:35.254353029Z\")'}")
 // TODO: Support folding lists with mixed types. This requires mutable lists.
 // @TestParameters("{source: 'dyn([1]) + [1.0]'}")
 public void constantFold_success(String source, String expected) throws Exception {
Expand DownExpand Up@@ -348,6 +363,8 @@ public void constantFold_macros_withoutMacroCallMetadata(String source) throws E
 @TestParameters("{source: 'get_true() == true'}")
 @TestParameters("{source: 'x == x'}")
 @TestParameters("{source: 'x == 42'}")
 @TestParameters("{source: 'timestamp(100)'}")
 @TestParameters("{source: 'duration(\"1h\")'}")
 public void constantFold_noOp(String source) throws Exception {
 CelAbstractSyntaxTree ast = CEL.compile(source).getAst();

Expand Down
Loading