From 19059ef65062817eb3e9b8f4b05e4587c35ad9f5 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Mon, 8 Jul 2019 02:29:54 +0300 Subject: [PATCH] One more fix for PVS-Studio --- dbms/src/Storages/MergeTree/MergedBlockOutputStream.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dbms/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/dbms/src/Storages/MergeTree/MergedBlockOutputStream.cpp index 38c2a612b1d..8b38f1ff32e 100644 --- a/dbms/src/Storages/MergeTree/MergedBlockOutputStream.cpp +++ b/dbms/src/Storages/MergeTree/MergedBlockOutputStream.cpp @@ -392,7 +392,7 @@ void MergedBlockOutputStream::writeImpl(const Block & block, const IColumn::Perm auto & stream = *skip_indices_streams[i]; size_t prev_pos = 0; - size_t current_mark = 0; + size_t skip_index_current_mark = 0; while (prev_pos < rows) { UInt64 limit = 0; @@ -402,7 +402,7 @@ void MergedBlockOutputStream::writeImpl(const Block & block, const IColumn::Perm } else { - limit = index_granularity.getMarkRows(current_mark); + limit = index_granularity.getMarkRows(skip_index_current_mark); if (skip_indices_aggregators[i]->empty()) { skip_indices_aggregators[i] = index->createIndexAggregator(); @@ -435,7 +435,7 @@ void MergedBlockOutputStream::writeImpl(const Block & block, const IColumn::Perm } } prev_pos = pos; - current_mark++; + ++skip_index_current_mark; } } }