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 535faa4fa6f [branch-2.0-pick] [Hotfix](merge-on-write) Fix when
DeltaWriter don't report num_filtered_rows in TTabletCommitInfo #24352 (#24497)
535faa4fa6f is described below
commit 535faa4fa6fa24a85fb05bcad29c31f4ff0cb312
Author: bobhan1 <[email protected]>
AuthorDate: Mon Sep 18 15:14:08 2023 +0800
[branch-2.0-pick] [Hotfix](merge-on-write) Fix when DeltaWriter don't
report num_filtered_rows in TTabletCommitInfo #24352 (#24497)
---
be/src/vec/sink/vtablet_sink.cpp | 2 +-
be/src/vec/sink/vtablet_sink.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/be/src/vec/sink/vtablet_sink.cpp b/be/src/vec/sink/vtablet_sink.cpp
index ba720967a20..25013a831b5 100644
--- a/be/src/vec/sink/vtablet_sink.cpp
+++ b/be/src/vec/sink/vtablet_sink.cpp
@@ -1559,7 +1559,7 @@ Status VOlapTableSink::close(RuntimeState* state, Status
exec_status) {
// Due to the non-determinism of compaction, the rowsets of
each replica may be different from each other on different
// BE nodes. The number of rows filtered in SegmentWriter
depends on the historical rowsets located in the correspoding
// BE node. So we check the number of rows filtered on each
succeccful BE to ensure the consistency of the current load
- if (!_write_single_replica && _schema->is_strict_mode() &&
+ if (status.ok() && !_write_single_replica &&
_schema->is_strict_mode() &&
_schema->is_partial_update()) {
if (Status st =
index_channel->check_tablet_filtered_rows_consistency();
!st.ok()) {
diff --git a/be/src/vec/sink/vtablet_sink.h b/be/src/vec/sink/vtablet_sink.h
index 26d2ba55f32..acde67e38e7 100644
--- a/be/src/vec/sink/vtablet_sink.h
+++ b/be/src/vec/sink/vtablet_sink.h
@@ -424,7 +424,7 @@ public:
void set_tablets_filtered_rows(
const std::vector<std::pair<int64_t, int64_t>>&
tablets_filtered_rows, int64_t node_id);
int64_t num_rows_filtered() {
- CHECK(!_tablets_filtered_rows.empty());
+ DCHECK(!_tablets_filtered_rows.empty());
// the Unique table has no roll up or materilized view
// we just add up filtered rows from all partitions
return std::accumulate(_tablets_filtered_rows.cbegin(),
_tablets_filtered_rows.cend(), 0,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
