fix and test

apache · Apr 17, 2024 · ff77b2f · ff77b2f
1 parent d6e0d1e
commit ff77b2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/be/src/pipeline/exec/partitioned_hash_join_sink_operator.cpp b/be/src/pipeline/exec/partitioned_hash_join_sink_operator.cpp
@@ -143,6 +143,7 @@ Status PartitionedHashJoinSinkLocalState::_revoke_unpartitioned_block(RuntimeSta
             LOG(INFO) << "execution_context released, maybe query was cancelled.";
             return;
         }
+        SCOPED_ATTACH_TASK(state);
         auto& p = _parent->cast<PartitionedHashJoinSinkOperatorX>();
         SCOPED_TIMER(_partition_shuffle_timer);
         auto* channel_ids = reinterpret_cast<uint32_t*>(_partitioner->get_channel_ids());

diff --git a/be/src/runtime/thread_context.h b/be/src/runtime/thread_context.h
@@ -200,9 +200,9 @@ class ThreadContext {
 
     void consume_memory(const int64_t size) const {
 #ifdef USE_MEM_TRACKER
-        DCHECK(!doris::config::enable_memory_orphan_check ||
-               thread_mem_tracker()->label() != "Orphan")
-                << doris::memory_orphan_check_msg;
+        // DCHECK(!doris::config::enable_memory_orphan_check ||
+        //        thread_mem_tracker()->label() != "Orphan")
+        //         << doris::memory_orphan_check_msg;
 #endif
         thread_mem_tracker_mgr->consume(size, skip_large_memory_check);
     }