From d7a6148828d92d6b34bc3ab076d6f517c47cff22 Mon Sep 17 00:00:00 2001 From: Alexander Tokmakov Date: Wed, 27 Dec 2023 18:13:51 +0100 Subject: [PATCH] partially revert #54706 (135df6870c65d896fb015cbc1963a4972f76a93d) --- .../Merges/Algorithms/ReplacingSortedAlgorithm.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp index 0c0598171b3..4d2443b1e46 100644 --- a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp +++ b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp @@ -28,6 +28,7 @@ ReplacingSortedAlgorithm::ReplacingSortedAlgorithm( , cleanup(cleanup_) , cleanedup_rows_count(cleanedup_rows_count_) { + if (!is_deleted_column.empty()) is_deleted_column_number = header_.getPositionByName(is_deleted_column); if (!version_column.empty()) @@ -82,11 +83,8 @@ IMergingAlgorithm::Status ReplacingSortedAlgorithm::merge() uint8_t value = assert_cast(*(*selected_row.all_columns)[is_deleted_column_number]).getData()[selected_row.row_num]; if (!cleanup || !value) insertRow(); - else if (cleanup && cleanedup_rows_count != nullptr) - { + else if (cleanedup_rows_count != nullptr) *cleanedup_rows_count += current_row_sources.size(); - current_row_sources.resize(0); - } } else insertRow(); @@ -143,11 +141,8 @@ IMergingAlgorithm::Status ReplacingSortedAlgorithm::merge() uint8_t value = assert_cast(*(*selected_row.all_columns)[is_deleted_column_number]).getData()[selected_row.row_num]; if (!cleanup || !value) insertRow(); - else if (cleanup && cleanedup_rows_count != nullptr) - { + else if (cleanedup_rows_count != nullptr) *cleanedup_rows_count += current_row_sources.size(); - current_row_sources.resize(0); - } } else insertRow();