This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 00a092dc625 [fix](partial update) only report error when in strict
mode partial update when finding missing rowsets during flushing memtable
(#28739)
00a092dc625 is described below
commit 00a092dc62599934c77fe21b00c91d5eab146d35
Author: bobhan1 <[email protected]>
AuthorDate: Wed Dec 20 20:46:31 2023 +0800
[fix](partial update) only report error when in strict mode partial update
when finding missing rowsets during flushing memtable (#28739)
---
be/src/olap/memtable.cpp | 11 -----------
be/src/olap/rowset/segment_v2/segment_writer.cpp | 13 ++++++++-----
2 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/be/src/olap/memtable.cpp b/be/src/olap/memtable.cpp
index 22900abd83e..ea3c0fcf6b6 100644
--- a/be/src/olap/memtable.cpp
+++ b/be/src/olap/memtable.cpp
@@ -473,17 +473,6 @@ Status MemTable::_generate_delete_bitmap(int32_t
segment_id) {
{
std::shared_lock meta_rlock(_tablet->get_header_lock());
specified_rowsets =
_tablet->get_rowset_by_ids(&_mow_context->rowset_ids);
- if (specified_rowsets.size() != _mow_context->rowset_ids.size()) {
- LOG(WARNING) << fmt::format(
- "[Memtable Flush] some rowsets have been deleted due to "
- "compaction(specified_rowsets.size()={}, but
rowset_ids.size()={}), reset "
- "rowset_ids to the latest value. tablet_id: {}, cur
max_version: {}, "
- "transaction_id: {}",
- specified_rowsets.size(), _mow_context->rowset_ids.size(),
_tablet->tablet_id(),
- _mow_context->max_version, _mow_context->txn_id);
- return Status::InternalError<false>(
- "[Memtable Flush] some rowsets have been deleted due to
compaction");
- }
}
OlapStopWatch watch;
RETURN_IF_ERROR(_tablet->calc_delete_bitmap(rowset, segments,
specified_rowsets,
diff --git a/be/src/olap/rowset/segment_v2/segment_writer.cpp
b/be/src/olap/rowset/segment_v2/segment_writer.cpp
index c7c6a85dd7a..02ea943818d 100644
--- a/be/src/olap/rowset/segment_v2/segment_writer.cpp
+++ b/be/src/olap/rowset/segment_v2/segment_writer.cpp
@@ -401,16 +401,19 @@ Status
SegmentWriter::append_block_with_partial_content(const vectorized::Block*
{
std::shared_lock rlock(_tablet->get_header_lock());
specified_rowsets =
_tablet->get_rowset_by_ids(&_mow_context->rowset_ids);
- if (specified_rowsets.size() != _mow_context->rowset_ids.size()) {
+ if (_opts.rowset_ctx->partial_update_info->is_strict_mode &&
+ specified_rowsets.size() != _mow_context->rowset_ids.size()) {
+ // Only when this is a strict mode partial update that missing
rowsets here will lead to problems.
+ // In other case, the missing rowsets will be calculated in later
phases(commit phase/publish phase)
LOG(WARNING) << fmt::format(
"[Memtable Flush] some rowsets have been deleted due to "
- "compaction(specified_rowsets.size()={}, but
rowset_ids.size()={}), reset "
- "rowset_ids to the latest value. tablet_id: {}, cur
max_version: {}, "
- "transaction_id: {}",
+ "compaction(specified_rowsets.size()={}, but
rowset_ids.size()={}) in strict "
+ "mode partial update. tablet_id: {}, cur max_version: {},
transaction_id: {}",
specified_rowsets.size(), _mow_context->rowset_ids.size(),
_tablet->tablet_id(),
_mow_context->max_version, _mow_context->txn_id);
return Status::InternalError<false>(
- "[Memtable Flush] some rowsets have been deleted due to
compaction");
+ "[Memtable Flush] some rowsets have been deleted due to "
+ "compaction in strict mode partial update");
}
}
std::vector<std::unique_ptr<SegmentCacheHandle>>
segment_caches(specified_rowsets.size());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
