save work

Signed-off-by: xufei <[email protected]>
pingcap · Sep 14, 2023 · fed8b2e · fed8b2e
1 parent 895fb5e
commit fed8b2e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dbms/src/Interpreters/Aggregator.cpp b/dbms/src/Interpreters/Aggregator.cpp
@@ -159,7 +159,7 @@ void AggregatedDataVariants::setResizeCallbackIfNeeded(size_t thread_num) const
         if (agg_spill_context->isSpillEnabled() && agg_spill_context->isInAutoSpillMode())
         {
             auto resize_callback = [agg_spill_context, thread_num]() {
-                return !agg_spill_context->isThreadMarkedForAutoSpill(thread_num);
+                return !(agg_spill_context->supportAutoTriggerSpill() && agg_spill_context->isThreadMarkedForAutoSpill(thread_num));
             };
 #define M(NAME)                                                                                         \
     case AggregationMethodType(NAME):                                                                   \

diff --git a/dbms/src/Interpreters/JoinPartition.cpp b/dbms/src/Interpreters/JoinPartition.cpp
@@ -236,7 +236,7 @@ void JoinPartition::setResizeCallbackIfNeeded()
     if (hash_join_spill_context->isSpillEnabled() && hash_join_spill_context->isInAutoSpillMode())
     {
         auto resize_callback = [this]() {
-            return !hash_join_spill_context->isPartitionMarkedForAutoSpill(partition_index);
+            return !(hash_join_spill_context->supportFurtherSpill() && hash_join_spill_context->isPartitionMarkedForAutoSpill(partition_index));
         };
         assert(pool != nullptr);
         pool->setResizeCallback(resize_callback);