KE-43703 Fix bug caused by cancelFlag during CBO process leading to o…

…ptimization errors
Kyligence · Apr 22, 2024 · 04ab416 · 04ab416
1 parent 16397a3
commit 04ab416
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/main/java/org/apache/calcite/plan/AbstractRelOptPlanner.java b/core/src/main/java/org/apache/calcite/plan/AbstractRelOptPlanner.java
@@ -101,9 +101,9 @@ protected AbstractRelOptPlanner(RelOptCostFactory costFactory,
 
     this.cancelFlag =
         context.maybeUnwrap(CancelFlag.class)
-            .map(flag -> flag)
             .orElseGet(CancelFlag::getContextCancelFlag)
             .atomicBoolean;
+    this.cancelFlag.set(false);
 
     // Add abstract RelNode classes. No RelNodes will ever be registered with
     // these types, but some operands may use them.

diff --git a/gradle.properties b/gradle.properties
@@ -27,7 +27,7 @@ systemProp.org.gradle.internal.publish.checksums.insecure=true
 # This is version for Calcite itself
 # Note: it should not include "-SNAPSHOT" as it is automatically added by build.gradle.kts
 # Release version can be generated by using -Prelease or -Prc=<int> arguments
-calcite.version=1.30.0-kylin-4.x-r07
+calcite.version=1.30.0-kylin-4.x-r08
 # This is a version to be used from Maven repository. It can be overridden by localAvatica below
 calcite.avatica.version=1.20.0