From 210f14aaba1667606cb975bd203213f35578bd5a Mon Sep 17 00:00:00 2001 From: Nikolai Kochetov Date: Thu, 13 Jul 2017 21:54:17 +0300 Subject: [PATCH] renamed IDataType::updateAvgValueSizeHints to IDataType::updateAvgValueSizeHint --- dbms/src/DataStreams/NativeBlockInputStream.cpp | 2 +- dbms/src/DataTypes/IDataType.h | 2 +- dbms/src/Storages/MergeTree/MergeTreeReader.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dbms/src/DataStreams/NativeBlockInputStream.cpp b/dbms/src/DataStreams/NativeBlockInputStream.cpp index 2100b5d1276..38780065811 100644 --- a/dbms/src/DataStreams/NativeBlockInputStream.cpp +++ b/dbms/src/DataStreams/NativeBlockInputStream.cpp @@ -187,7 +187,7 @@ void NativeBlockInputStream::updateAvgValueSizeHints(const Block & block) for (auto idx : ext::range(0, block.columns())) { auto & avg_value_size_hint = avg_value_size_hints[idx]; - IDataType::updateAvgValueSizeHints(*block.getByPosition(idx).column, avg_value_size_hint); + IDataType::updateAvgValueSizeHint(*block.getByPosition(idx).column, avg_value_size_hint); } } diff --git a/dbms/src/DataTypes/IDataType.h b/dbms/src/DataTypes/IDataType.h index 83fcdb8c8b9..b10fa3b0b45 100644 --- a/dbms/src/DataTypes/IDataType.h +++ b/dbms/src/DataTypes/IDataType.h @@ -156,7 +156,7 @@ public: virtual ~IDataType() {} /// Updates avg_value_size_hint for newly read column. Uses to optimize deserialization. Zero expected for first column. - static void updateAvgValueSizeHints(const IColumn & column, double & avg_value_size_hint); + static void updateAvgValueSizeHint(const IColumn & column, double & avg_value_size_hint); }; diff --git a/dbms/src/Storages/MergeTree/MergeTreeReader.cpp b/dbms/src/Storages/MergeTree/MergeTreeReader.cpp index c62fbdad236..8201f60b04c 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeReader.cpp +++ b/dbms/src/Storages/MergeTree/MergeTreeReader.cpp @@ -513,7 +513,7 @@ void MergeTreeReader::readData( stream.seekToMark(from_mark); type.deserializeBinaryBulk(column, *stream.data_buffer, max_rows_to_read, avg_value_size_hint); - IDataType::updateAvgValueSizeHints(column, avg_value_size_hint); + IDataType::updateAvgValueSizeHint(column, avg_value_size_hint); } }