From 8dd6b41eadec4dbb4eca7d3ac3ce2dd9a06f9ba6 Mon Sep 17 00:00:00 2001
From: obdev <obdev@oceanbase.com>
Date: Wed, 22 Mar 2023 13:42:00 +0000
Subject: [PATCH] fix dtl channel can not detect interrupt && fix hash join
 memory dynamic leak

---
 src/sql/dtl/ob_dtl_channel_loop.cpp   | 2 +-
 src/sql/engine/join/ob_hash_join_op.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sql/dtl/ob_dtl_channel_loop.cpp b/src/sql/dtl/ob_dtl_channel_loop.cpp
index 8249a90000..aa5731f03d 100644
--- a/src/sql/dtl/ob_dtl_channel_loop.cpp
+++ b/src/sql/dtl/ob_dtl_channel_loop.cpp
@@ -312,7 +312,7 @@ int ObDtlChannelLoop::process_base(ObIDltChannelLoopPred *pred, int64_t &hinted_
         }
       }
     }
-    if (OB_FAIL(ret)) {
+    if (OB_UNLIKELY(OB_RPC_CONNECT_ERROR == ret)) {
     } else if (ignore_interrupt_) {
       // do nothing.
     } else if ((loop_times_ & (INTERRUPT_CHECK_TIMES - 1)) == 0 && OB_UNLIKELY(IS_INTERRUPTED())) {
diff --git a/src/sql/engine/join/ob_hash_join_op.h b/src/sql/engine/join/ob_hash_join_op.h
index 66e9fb06b8..a1c1f80228 100644
--- a/src/sql/engine/join/ob_hash_join_op.h
+++ b/src/sql/engine/join/ob_hash_join_op.h
@@ -1185,7 +1185,7 @@ private:
   common::ObIAllocator *alloc_; // for buckets
   ModulePageAllocator *bloom_filter_alloc_;
   ObGbyBloomFilter *bloom_filter_;
-  common::ObBitSet<common::OB_DEFAULT_BITSET_SIZE, common::ModulePageAllocator, true>
+  common::ObBitSet<common::OB_DEFAULT_BITSET_SIZE, common::ModulePageAllocator>
                                                                                     right_bit_set_;
   int64_t nth_right_row_;
   int64_t ltb_size_;
-- 
GitLab