This is an automated email from the ASF dual-hosted git repository. dataroaring pushed a commit to branch branch-3.0 in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push: new f662722abe9 branch-3.0-pick: [Fix](mow) Fix some logs for mow (#48523) (#48664) f662722abe9 is described below commit f662722abe97c60c2de140744ddec1fe46698628 Author: bobhan1 <bao...@selectdb.com> AuthorDate: Mon Mar 10 20:03:24 2025 +0800 branch-3.0-pick: [Fix](mow) Fix some logs for mow (#48523) (#48664) pick https://github.com/apache/doris/pull/48523 --- be/src/common/config.cpp | 2 ++ be/src/common/config.h | 2 ++ be/src/olap/base_tablet.cpp | 12 ++++-------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/be/src/common/config.cpp b/be/src/common/config.cpp index e038887cf84..bdcadef7820 100644 --- a/be/src/common/config.cpp +++ b/be/src/common/config.cpp @@ -1451,6 +1451,8 @@ DEFINE_mInt32(check_tablet_delete_bitmap_interval_seconds, "300"); DEFINE_mInt32(check_tablet_delete_bitmap_score_top_n, "10"); DEFINE_mBool(enable_check_tablet_delete_bitmap_score, "true"); +DEFINE_mBool(enable_mow_verbose_log, "false"); + // clang-format off #ifdef BE_TEST // test s3 diff --git a/be/src/common/config.h b/be/src/common/config.h index 0d61c03ef1e..2edf21b17d0 100644 --- a/be/src/common/config.h +++ b/be/src/common/config.h @@ -1524,6 +1524,8 @@ DECLARE_mInt32(check_tablet_delete_bitmap_interval_seconds); DECLARE_mInt32(check_tablet_delete_bitmap_score_top_n); DECLARE_mBool(enable_check_tablet_delete_bitmap_score); +DECLARE_mBool(enable_mow_verbose_log); + #ifdef BE_TEST // test s3 DECLARE_String(test_s3_resource); diff --git a/be/src/olap/base_tablet.cpp b/be/src/olap/base_tablet.cpp index 895899b9ca6..a7e9126344c 100644 --- a/be/src/olap/base_tablet.cpp +++ b/be/src/olap/base_tablet.cpp @@ -767,13 +767,8 @@ Status BaseTablet::calc_segment_delete_bitmap(RowsetSharedPtr rowset, rsid_to_rowset, &block)); RETURN_IF_ERROR(sort_block(block, ordered_block)); RETURN_IF_ERROR(rowset_writer->flush_single_block(&ordered_block)); - if (new_generated_rows != rowset_writer->num_rows()) { - LOG(WARNING) << "partial update correctness warning: conflict new generated rows (" - << new_generated_rows << ") not equal to the new flushed rows (" - << rowset_writer->num_rows() << "), tablet: " << tablet_id(); - } auto cost_us = watch.get_elapse_time_us(); - if (cost_us > 10 * 1000) { + if (config::enable_mow_verbose_log || cost_us > 10 * 1000) { LOG(INFO) << "calc segment delete bitmap for partial update, tablet: " << tablet_id() << " rowset: " << rowset_id << " seg_id: " << seg->id() << " dummy_version: " << end_version + 1 << " rows: " << seg->num_rows() @@ -785,7 +780,7 @@ Status BaseTablet::calc_segment_delete_bitmap(RowsetSharedPtr rowset, return Status::OK(); } auto cost_us = watch.get_elapse_time_us(); - if (cost_us > 10 * 1000) { + if (config::enable_mow_verbose_log || cost_us > 10 * 1000) { LOG(INFO) << "calc segment delete bitmap, tablet: " << tablet_id() << " rowset: " << rowset_id << " seg_id: " << seg->id() << " dummy_version: " << end_version + 1 << " rows: " << seg->num_rows() @@ -1352,7 +1347,8 @@ Status BaseTablet::update_delete_bitmap(const BaseTabletSPtr& self, TabletTxnInf RETURN_IF_ERROR(self->save_delete_bitmap(txn_info, txn_id, delete_bitmap, transient_rs_writer.get(), cur_rowset_ids)); LOG(INFO) << "[Publish] construct delete bitmap tablet: " << self->tablet_id() - << ", rowset_ids to add: " << rowset_ids_to_add.size() + << ", rowset_ids to add: " + << (specified_rowsets.size() + rowsets_skip_alignment.size()) << ", rowset_ids to del: " << rowset_ids_to_del.size() << ", cur version: " << cur_version << ", transaction_id: " << txn_id << "," << ss.str() << " , total rows: " << total_rows --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org