From 89595e184f89fda449d392966af57333275b3361 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Sat, 2 Jan 2021 00:26:41 +0300 Subject: [PATCH] Consistency --- src/Columns/ColumnMap.h | 4 ++-- src/DataTypes/DataTypeMap.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Columns/ColumnMap.h b/src/Columns/ColumnMap.h index d92522fc28f..abab522e68f 100644 --- a/src/Columns/ColumnMap.h +++ b/src/Columns/ColumnMap.h @@ -85,8 +85,8 @@ public: const ColumnArray & getNestedColumn() const { return assert_cast(*nested); } ColumnArray & getNestedColumn() { return assert_cast(*nested); } - const ColumnPtr & getNestedPtr() const { return nested; } - ColumnPtr & getNestedPtr() { return nested; } + const ColumnPtr & getNestedColumnPtr() const { return nested; } + ColumnPtr & getNestedColumnPtr() { return nested; } const ColumnTuple & getNestedData() const { return assert_cast(getNestedColumn().getData()); } ColumnTuple & getNestedData() { return assert_cast(getNestedColumn().getData()); } diff --git a/src/DataTypes/DataTypeMap.cpp b/src/DataTypes/DataTypeMap.cpp index 84152de65f6..3f59e1d3654 100644 --- a/src/DataTypes/DataTypeMap.cpp +++ b/src/DataTypes/DataTypeMap.cpp @@ -323,7 +323,7 @@ void DataTypeMap::deserializeBinaryBulkWithMultipleStreamsImpl( SubstreamsCache * cache) const { auto & column_map = assert_cast(column); - nested->deserializeBinaryBulkWithMultipleStreams(column_map.getNestedPtr(), limit, settings, state, cache); + nested->deserializeBinaryBulkWithMultipleStreams(column_map.getNestedColumnPtr(), limit, settings, state, cache); } void DataTypeMap::serializeProtobuf(const IColumn & column, size_t row_num, ProtobufWriter & protobuf, size_t & value_index) const