fix

apache · Sep 10, 2024 · e795dd1 · e795dd1
1 parent f1f25db
commit e795dd1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/be/src/runtime/exec_env.h b/be/src/runtime/exec_env.h
@@ -187,6 +187,7 @@ class ExecEnv {
  }
  std::shared_ptr<MemTrackerLimiter> stream_load_pipe_tracker() {
  return _stream_load_pipe_tracker;
+ }
  std::shared_ptr<MemTrackerLimiter> point_query_executor_mem_tracker() {
  return _point_query_executor_mem_tracker;
  }

diff --git a/be/src/runtime/stream_load/stream_load_context.h b/be/src/runtime/stream_load/stream_load_context.h
@@ -130,15 +130,6 @@ class StreamLoadContext {
 
  ByteBufferPtr schema_buffer() { return _schema_buffer; }
 
- ByteBufferPtr schema_buffer() {
- if (_schema_buffer == nullptr) {
- SCOPED_SWITCH_THREAD_MEM_TRACKER_LIMITER(
- ExecEnv::GetInstance()->stream_load_pipe_tracker());
- _schema_buffer = ByteBuffer::allocate(config::stream_tvf_buffer_size);
- }
- return _schema_buffer;
- }
-
 public:
  static const int default_txn_id = -1;
  // load type, eg: ROUTINE LOAD/MANUAL LOAD

diff --git a/be/src/vec/common/allocator.cpp b/be/src/vec/common/allocator.cpp
@@ -211,9 +211,9 @@ void Allocator<clear_memory_, mmap_populate, use_mmap, MemoryAllocator>::throw_b
 }
 
 #ifndef NDEBUG
-template <bool clear_memory_, bool mmap_populate, bool use_mmap>
-void Allocator<clear_memory_, mmap_populate, use_mmap>::add_address_sanitizers(void* buf,
-   size_t size) const {
+template <bool clear_memory_, bool mmap_populate, bool use_mmap, typename MemoryAllocator>
+void Allocator<clear_memory_, mmap_populate, use_mmap, MemoryAllocator>::add_address_sanitizers(
+ void* buf, size_t size) const {
 #ifdef BE_TEST
  if (!doris::ExecEnv::ready()) {
  return;
@@ -222,8 +222,8 @@ void Allocator<clear_memory_, mmap_populate, use_mmap>::add_address_sanitizers(v
  doris::thread_context()->thread_mem_tracker()->add_address_sanitizers(buf, size);
 }
 
-template <bool clear_memory_, bool mmap_populate, bool use_mmap>
-void Allocator<clear_memory_, mmap_populate, use_mmap>::remove_address_sanitizers(
+template <bool clear_memory_, bool mmap_populate, bool use_mmap, typename MemoryAllocator>
+void Allocator<clear_memory_, mmap_populate, use_mmap, MemoryAllocator>::remove_address_sanitizers(
  void* buf, size_t size) const {
 #ifdef BE_TEST
  if (!doris::ExecEnv::ready()) {

diff --git a/be/src/vec/exec/scan/group_commit_scan_node.cpp b/be/src/vec/exec/scan/group_commit_scan_node.cpp
@@ -43,8 +43,8 @@ Status GroupCommitScanNode::get_next(RuntimeState* state, vectorized::Block* blo
 Status GroupCommitScanNode::init(const TPlanNode& tnode, RuntimeState* state) {
  RETURN_IF_ERROR(VScanNode::init(tnode, state));
 #ifndef NDEBUG
-  DCHECK(state->get_query_ctx() != nullptr);
-  state->get_query_ctx()->query_mem_tracker->is_group_commit_load = true;
+ DCHECK(state->get_query_ctx() != nullptr);
+ state->get_query_ctx()->query_mem_tracker->is_group_commit_load = true;
 #endif
  return state->exec_env()->group_commit_mgr()->get_load_block_queue(
  _table_id, state->fragment_instance_id(), load_block_queue);