From cf9e794ab2a8916db5bf06bc385f3b011309ae18 Mon Sep 17 00:00:00 2001 From: Guoliang Sun Date: Tue, 23 Apr 2024 14:34:14 +0800 Subject: [PATCH] KE-43703 Fix bug caused by cancelFlag during CBO process leading to optimization errors (#346) --- .../java/org/apache/calcite/plan/AbstractRelOptPlanner.java | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 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 index a3d61937bb86..cbc97fc61698 100644 --- 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 index 8494f145f46b..309593ed7add 100644 --- 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= 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