Skip to content

Commit 9942770

Browse files
l46kokl46kok
committed
POC: Const fold times
1 parent f773edf commit 9942770

4 files changed

Lines changed: 66 additions & 13 deletions

File tree

‎checker/src/main/java/dev/cel/checker/CelStandardDeclarations.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1488,7 +1488,7 @@ public CelFunctionDecl functionDecl() {
14881488
return celFunctionDecl;
14891489
}
14901490

1491-
String functionName() {
1491+
public String functionName() {
14921492
return functionName;
14931493
}
14941494

‎optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ java_library(
1919
":default_optimizer_constants",
2020
"//:auto_value",
2121
"//bundle:cel",
22+
"//checker:standard_decl",
2223
"//common:cel_ast",
2324
"//common:cel_source",
2425
"//common:compiler_common",
@@ -35,6 +36,7 @@ java_library(
3536
"//runtime",
3637
"@maven//:com_google_errorprone_error_prone_annotations",
3738
"@maven//:com_google_guava_guava",
39+
"@maven//:org_threeten_threeten_extra",
3840
],
3941
)
4042

‎optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java‎

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import static com.google.common.base.Preconditions.checkNotNull;
1717
import static com.google.common.collect.ImmutableList.toImmutableList;
1818
import static com.google.common.collect.MoreCollectors.onlyElement;
19+
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
20+
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.TIMESTAMP;
1921

2022
import com.google.auto.value.AutoValue;
2123
import com.google.common.collect.ImmutableList;
@@ -45,6 +47,9 @@
4547
import dev.cel.optimizer.CelOptimizationException;
4648
import dev.cel.parser.Operator;
4749
import dev.cel.runtime.CelEvaluationException;
50+
import java.math.BigDecimal;
51+
import java.time.Duration;
52+
import java.time.Instant;
4853
import java.util.ArrayList;
4954
import java.util.Arrays;
5055
import java.util.Collection;
@@ -142,6 +147,14 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
142147
return false;
143148
}
144149

150+
// Timestamps/durations in CEL are calls, but they are effectively treated as literals.
151+
// Expressions like timestamp(123) cannot be folded directly, but arithmetics involving timestamps
152+
// can be folded.
153+
// Ex: timestamp(123) - timestamp(100) = duration("23s")
154+
if (isExprTimestampOrDuration(navigableExpr)) {
155+
return false;
156+
}
157+
145158
CelMutableCall mutableCall = navigableExpr.expr().call();
146159
String functionName = mutableCall.function();
147160

@@ -197,14 +210,19 @@ private boolean canFold(CelNavigableMutableExpr navigableExpr) {
197210
private boolean containsFoldableFunctionOnly(CelNavigableMutableExpr navigableExpr) {
198211
return navigableExpr
199212
.allNodes()
213+
.filter(node -> node.getKind().equals(Kind.CALL))
214+
.map(node -> node.expr().call())
200215
.allMatch(
201-
node -> {
202-
if (node.getKind().equals(Kind.CALL)) {
203-
return foldableFunctions.contains(node.expr().call().function());
204-
}
216+
call -> foldableFunctions.contains(call.function()));
217+
}
218+
219+
private static boolean isExprTimestampOrDuration(CelNavigableMutableExpr navigableExpr) {
220+
if (!navigableExpr.getKind().equals(Kind.CALL)) {
221+
return true;
222+
}
205223

206-
return true;
207-
});
224+
CelMutableCall call = navigableExpr.expr().call();
225+
return call.function().equals(TIMESTAMP.functionName()) || call.function().equals(DURATION.functionName());
208226
}
209227

210228
private static boolean canFoldInOperator(CelNavigableMutableExpr navigableExpr) {
@@ -318,12 +336,32 @@ private Optional<CelMutableExpr> maybeAdaptEvaluatedResult(Object result) {
318336
}
319337

320338
return Optional.of(CelMutableExpr.ofMap(CelMutableMap.create(mapEntries)));
339+
} else if (result instanceof Duration) {
340+
String durationStrArg = formatDurationArgument((Duration) result);
341+
CelMutableCall durationCall = CelMutableCall.create(DURATION.functionName(), CelMutableExpr.ofConstant(CelConstant.ofValue(durationStrArg)));
342+
return Optional.of(CelMutableExpr.ofCall(durationCall));
343+
} else if (result instanceof Instant) {
344+
String timestampStrArg = ((Instant) result).toString();
345+
CelMutableCall timestampCall = CelMutableCall.create(TIMESTAMP.functionName(), CelMutableExpr.ofConstant(CelConstant.ofValue(timestampStrArg)));
346+
return Optional.of(CelMutableExpr.ofCall(timestampCall));
321347
}
322348

323349
// Evaluated result cannot be folded (e.g: unknowns)
324350
return Optional.empty();
325351
}
326352

353+
private static String formatDurationArgument(Duration duration) {
354+
if (duration.isZero()) {
355+
return "0";
356+
}
357+
358+
BigDecimal seconds = BigDecimal.valueOf(duration.getSeconds());
359+
BigDecimal nanos = BigDecimal.valueOf(duration.getNano(), 9);
360+
BigDecimal totalSeconds = seconds.add(nanos);
361+
362+
return totalSeconds.stripTrailingZeros().toPlainString() + "s";
363+
}
364+
327365
private Optional<CelMutableAst> maybeRewriteOptional(
328366
Optional<?> optResult, CelMutableAst mutableAst, CelMutableExpr expr) {
329367
if (!optResult.isPresent()) {
@@ -352,6 +390,8 @@ private Optional<CelMutableAst> maybeRewriteOptional(
352390
return Optional.empty();
353391
}
354392

393+
394+
355395
/** Inspects the non-strict calls to determine whether a branch can be removed. */
356396
private Optional<CelMutableAst> maybePruneBranches(
357397
CelMutableAst mutableAst, CelMutableExpr expr) {

‎optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@
4646

4747
@RunWith(TestParameterInjector.class)
4848
public class ConstantFoldingOptimizerTest {
49+
private static final CelOptions CEL_OPTIONS = CelOptions.current()
50+
.enableTimestampEpoch(true)
51+
.evaluateCanonicalTypesToNativeValues(true)
52+
.build();
4953
private static final Cel CEL =
5054
CelFactory.standardCelBuilder()
5155
.addVar("x", SimpleType.DYN)
@@ -60,19 +64,20 @@ public class ConstantFoldingOptimizerTest {
6064
CelFunctionBinding.from("get_true_overload", ImmutableList.of(), unused -> true))
6165
.addMessageTypes(TestAllTypes.getDescriptor())
6266
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
67+
.setOptions(CEL_OPTIONS)
6368
.addCompilerLibraries(
6469
CelExtensions.bindings(),
6570
CelOptionalLibrary.INSTANCE,
66-
CelExtensions.math(CelOptions.DEFAULT),
71+
CelExtensions.math(CEL_OPTIONS),
6772
CelExtensions.strings(),
68-
CelExtensions.sets(CelOptions.DEFAULT),
69-
CelExtensions.encoders(CelOptions.DEFAULT))
73+
CelExtensions.sets(CEL_OPTIONS),
74+
CelExtensions.encoders(CEL_OPTIONS))
7075
.addRuntimeLibraries(
7176
CelOptionalLibrary.INSTANCE,
72-
CelExtensions.math(CelOptions.DEFAULT),
77+
CelExtensions.math(CEL_OPTIONS),
7378
CelExtensions.strings(),
74-
CelExtensions.sets(CelOptions.DEFAULT),
75-
CelExtensions.encoders(CelOptions.DEFAULT))
79+
CelExtensions.sets(CEL_OPTIONS),
80+
CelExtensions.encoders(CEL_OPTIONS))
7681
.build();
7782

7883
private static final CelOptimizer CEL_OPTIMIZER =
@@ -211,6 +216,10 @@ public class ConstantFoldingOptimizerTest {
211216
@TestParameters("{source: '42 != 42', expected: 'false'}")
212217
@TestParameters("{source: '[\"foo\",\"bar\"] == [\"foo\",\"bar\"]', expected: 'true'}")
213218
@TestParameters("{source: '[\"bar\",\"foo\"] == [\"foo\",\"bar\"]', expected: 'false'}")
219+
@TestParameters("{source: 'duration(\"1h\") - duration(\"60m\")', expected: 'duration(\"0\")'}")
220+
@TestParameters("{source: 'duration(\"2h23m42s12ms42us92ns\") + duration(\"129481231298125ns\")', expected: 'duration(\"138103.243340217s\")'}")
221+
@TestParameters("{source: 'timestamp(900000) - timestamp(100)', expected: 'duration(\"899900s\")'}")
222+
@TestParameters("{source: 'timestamp(\"2000-01-01T00:02:03.2123Z\") + duration(\"25h2m32s42ms53us29ns\")', expected: 'timestamp(\"2000-01-02T01:04:35.254353029Z\")'}")
214223
// TODO: Support folding lists with mixed types. This requires mutable lists.
215224
// @TestParameters("{source: 'dyn([1]) + [1.0]'}")
216225
public void constantFold_success(String source, String expected) throws Exception {
@@ -348,6 +357,8 @@ public void constantFold_macros_withoutMacroCallMetadata(String source) throws E
348357
@TestParameters("{source: 'get_true() == true'}")
349358
@TestParameters("{source: 'x == x'}")
350359
@TestParameters("{source: 'x == 42'}")
360+
@TestParameters("{source: 'timestamp(100)'}")
361+
@TestParameters("{source: 'duration(\"1h\")'}")
351362
public void constantFold_noOp(String source) throws Exception {
352363
CelAbstractSyntaxTree ast = CEL.compile(source).getAst();
353364

0 commit comments

Comments
 (0)