Prevent errors during constant reduction from crashing the compiler

Signed-off-by: Mihai Budiu <[email protected]>
apache · Oct 30, 2024 · 9b88b5b · 9b88b5b
1 parent b3d0b03
commit 9b88b5b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/core/src/main/java/org/apache/calcite/rex/RexExecutorImpl.java b/core/src/main/java/org/apache/calcite/rex/RexExecutorImpl.java
@@ -135,12 +135,10 @@ public static RexExecutable getExecutable(RexBuilder rexBuilder, List<RexNode> e
    */
   @Override public void reduce(RexBuilder rexBuilder, List<RexNode> constExps,
       List<RexNode> reducedValues) {
-    assert reducedValues.isEmpty();
     try {
       String code = compile(rexBuilder, constExps, (list, index, storageType) -> {
         throw new UnsupportedOperationException();
       });
-
       final RexExecutable executable = new RexExecutable(code, constExps);
       executable.setDataContext(dataContext);
       executable.reduce(rexBuilder, constExps, reducedValues);

diff --git a/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java b/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
@@ -8761,7 +8761,7 @@ private RelOptFixture spatial(String sql) {
   /**
    * Custom implementation of {@link Filter} for use
    * in test case to verify that {@link FilterMultiJoinMergeRule}
-   * can be created with any {@link Filter} and not limited to
+   Rex* can be created with any {@link Filter} and not limited to
    * {@link org.apache.calcite.rel.logical.LogicalFilter}.
    */
   private static class MyFilter extends Filter {