This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 1a25270918c [fix](group commit) Pick Fix the incorrect group commit
count in log; fix the core in get_first_block (#36408) (#37405)
1a25270918c is described below
commit 1a25270918c097254f1f74cbf986a92a8a082c28
Author: meiyi <[email protected]>
AuthorDate: Tue Jul 9 09:24:43 2024 +0800
[fix](group commit) Pick Fix the incorrect group commit count in log; fix
the core in get_first_block (#36408) (#37405)
Pick https://github.com/apache/doris/pull/36408/
---
be/src/runtime/group_commit_mgr.cpp | 3 ++-
be/src/vec/sink/group_commit_block_sink.cpp | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/be/src/runtime/group_commit_mgr.cpp
b/be/src/runtime/group_commit_mgr.cpp
index 32b28fd7657..f4f24146044 100644
--- a/be/src/runtime/group_commit_mgr.cpp
+++ b/be/src/runtime/group_commit_mgr.cpp
@@ -199,6 +199,7 @@ Status LoadBlockQueue::add_load_id(const UniqueId& load_id)
{
load_instance_id.to_string());
}
_load_ids.emplace(load_id);
+ group_commit_load_count.fetch_add(1);
return Status::OK();
}
@@ -265,7 +266,7 @@ Status GroupCommitTable::get_first_block_load_queue(
}
if (!_is_creating_plan_fragment) {
_is_creating_plan_fragment = true;
- RETURN_IF_ERROR(_thread_pool->submit_func([&] {
+ RETURN_IF_ERROR(_thread_pool->submit_func([this,
be_exe_version, mem_tracker] {
auto st = _create_group_commit_load(be_exe_version,
mem_tracker);
if (!st.ok()) {
LOG(WARNING) << "create group commit load error, st="
<< st.to_string();
diff --git a/be/src/vec/sink/group_commit_block_sink.cpp
b/be/src/vec/sink/group_commit_block_sink.cpp
index 97ab60a8801..a46be4760e7 100644
--- a/be/src/vec/sink/group_commit_block_sink.cpp
+++ b/be/src/vec/sink/group_commit_block_sink.cpp
@@ -50,7 +50,6 @@ GroupCommitBlockSink::~GroupCommitBlockSink() {
if (_load_block_queue) {
_remove_estimated_wal_bytes();
_load_block_queue->remove_load_id(_load_id);
- _load_block_queue->group_commit_load_count.fetch_add(1);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
