From 00ae32c94625f31eadccea821a4e28a923432c9c Mon Sep 17 00:00:00 2001 From: Nikolai Kochetov Date: Thu, 20 Jul 2017 14:43:12 +0300 Subject: [PATCH] renamed approximate_number_of_rows_in_part to number_of_rows_in_part --- dbms/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp | 4 ++-- dbms/src/Storages/MergeTree/MergeTreeBlockReadUtils.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dbms/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp b/dbms/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp index 5c2030ffad..ec2ad691b3 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp +++ b/dbms/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp @@ -82,7 +82,7 @@ MergeTreeBlockSizePredictor::MergeTreeBlockSizePredictor( const MergeTreeData::DataPartPtr & data_part_, const Names & columns, const Block & sample_block) : data_part(data_part_) { - approximate_number_of_rows_in_part = data_part->getExactSizeRows(); + number_of_rows_in_part = data_part->getExactSizeRows(); /// Initialize with sample block untill update won't called. initialize(sample_block); } @@ -124,7 +124,7 @@ void MergeTreeBlockSizePredictor::initialize(const Block & sample_block) bytes_per_row_global = fixed_columns_bytes_per_row; for (auto & info : dynamic_columns_infos) { - info.bytes_per_row_global /= approximate_number_of_rows_in_part; + info.bytes_per_row_global /= number_of_rows_in_part; info.bytes_per_row = info.bytes_per_row_global; bytes_per_row_global += info.bytes_per_row_global; diff --git a/dbms/src/Storages/MergeTree/MergeTreeBlockReadUtils.h b/dbms/src/Storages/MergeTree/MergeTreeBlockReadUtils.h index 9cd8c14230..7ad5b4c25e 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeBlockReadUtils.h +++ b/dbms/src/Storages/MergeTree/MergeTreeBlockReadUtils.h @@ -137,7 +137,7 @@ protected: size_t max_size_per_row_fixed = 0; double max_size_per_row_dynamic = 0; - size_t approximate_number_of_rows_in_part; + size_t number_of_rows_in_part; bool is_initialized_in_update = false; -- GitLab