From 0df08dcb36ecb0bd4715834301f4bf3b15d3361a Mon Sep 17 00:00:00 2001 From: Nikolai Kochetov Date: Sun, 11 Oct 2020 21:11:39 +0300 Subject: [PATCH] Rename columns() to size(). --- src/Functions/FunctionsConversion.h | 8 ++++---- src/Functions/IFunctionImpl.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h index 18b775b1f7f..755e19f02cc 100644 --- a/src/Functions/FunctionsConversion.h +++ b/src/Functions/FunctionsConversion.h @@ -2234,7 +2234,7 @@ private: } template - WrapperType createStringToEnumWrapper(bool source_is_nullable) const + WrapperType createStringToEnumWrapper(ssize_t source_is_nullable) const { const char * function_name = name; return [function_name, source_is_nullable] (Block & block, const ColumnNumbers & arguments, const size_t result, size_t /*input_rows_count*/) @@ -2248,10 +2248,10 @@ private: const ColumnNullable * nullable_col = nullptr; if (source_is_nullable) { - if (block.columns() <= arguments.front() + 1) + if (block.size() <= arguments.front() + 1) throw Exception("Not enough columns", ErrorCodes::LOGICAL_ERROR); - size_t nullable_pos = block.columns() - 1; + size_t nullable_pos = block.size() - 1; nullable_col = typeid_cast(block[nullable_pos].column.get()); if (col && nullable_col && nullable_col->size() != col->size()) throw Exception("ColumnNullable is not compatible with original", ErrorCodes::LOGICAL_ERROR); @@ -2431,7 +2431,7 @@ private: else tmp_block_columns = block.data; - size_t tmp_res_index = block.columns(); + size_t tmp_res_index = block.size(); tmp_block_columns.emplace_back(ColumnWithTypeAndName {nullptr, nested_type, ""}); /// Add original ColumnNullable for createStringToEnumWrapper() if (source_is_nullable) diff --git a/src/Functions/IFunctionImpl.h b/src/Functions/IFunctionImpl.h index 5ae9a52b6c6..8b802dbb386 100644 --- a/src/Functions/IFunctionImpl.h +++ b/src/Functions/IFunctionImpl.h @@ -32,7 +32,7 @@ public: ColumnWithTypeAndName & operator[] (size_t position) { return data[position]; } const ColumnWithTypeAndName & operator[] (size_t position) const { return data[position]; } - size_t columns() const { return data.size(); } + size_t size() const { return data.size(); } const ColumnsWithTypeAndName & getColumnsWithTypeAndName() const { return data; } ColumnsWithTypeAndName & data;