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 894f9d598e5 [enhancement](merge-on-write) compaction should not check
correctness if tablet is not ready (#33435) (#33658)
894f9d598e5 is described below
commit 894f9d598e5a7f1c9d261286ee322ef74592ec98
Author: zhannngchen <48427519+zhannngc...@users.noreply.github.com>
AuthorDate: Mon Apr 15 23:03:24 2024 +0800
[enhancement](merge-on-write) compaction should not check correctness if
tablet is not ready (#33435) (#33658)
---
be/src/olap/compaction.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/be/src/olap/compaction.cpp b/be/src/olap/compaction.cpp
index 8928d471609..367702b4f76 100644
--- a/be/src/olap/compaction.cpp
+++ b/be/src/olap/compaction.cpp
@@ -437,6 +437,7 @@ Status Compaction::do_compaction_impl(int64_t permits) {
if (!allow_delete_in_cumu_compaction()) {
missed_rows_size = missed_rows.size();
if (compaction_type() == ReaderType::READER_CUMULATIVE_COMPACTION
&&
+ _tablet->tablet_state() == TABLET_RUNNING &&
stats.merged_rows != missed_rows_size) {
std::string err_msg = fmt::format(
"cumulative compaction: the merged rows({}) is not
equal to missed "
@@ -911,7 +912,8 @@ Status Compaction::modify_rowsets(const Merger::Statistics*
stats) {
&output_rowset_delete_bitmap);
if (!allow_delete_in_cumu_compaction()) {
missed_rows_size = missed_rows.size();
- if (compaction_type() == ReaderType::READER_CUMULATIVE_COMPACTION
&& stats != nullptr &&
+ if (compaction_type() == ReaderType::READER_CUMULATIVE_COMPACTION
&&
+ _tablet->tablet_state() == TABLET_RUNNING && stats != nullptr
&&
stats->merged_rows != missed_rows_size) {
std::string err_msg = fmt::format(
"cumulative compaction: the merged rows({}) is not
equal to missed "
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
