From 4040e156b5dcce9d82b1dacdd1d14857f950f989 Mon Sep 17 00:00:00 2001 From: Nikolai Kochetov Date: Fri, 2 Feb 2018 15:34:45 +0300 Subject: [PATCH] added checks and comments for FixedSizeDequeWithGaps; review fixes [#CLICKHOUSE-3479] --- .../VersionedCollapsingSortedBlockInputStream.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dbms/src/DataStreams/VersionedCollapsingSortedBlockInputStream.cpp b/dbms/src/DataStreams/VersionedCollapsingSortedBlockInputStream.cpp index 61b74dbc10d..81ecb6c342f 100644 --- a/dbms/src/DataStreams/VersionedCollapsingSortedBlockInputStream.cpp +++ b/dbms/src/DataStreams/VersionedCollapsingSortedBlockInputStream.cpp @@ -147,12 +147,6 @@ void VersionedCollapsingSortedBlockInputStream::merge(MutableColumns & merged_co while (rows_to_merge) { - if (merged_rows >= max_block_size) - { - ++blocks_written; - return; - } - const auto & row = current_keys.front(); auto gap = current_keys.frontGap(); @@ -162,6 +156,12 @@ void VersionedCollapsingSortedBlockInputStream::merge(MutableColumns & merged_co ++merged_rows; --rows_to_merge; + + if (merged_rows >= max_block_size) + { + ++blocks_written; + return; + } } }