From fbe7e56e93003005d9de47641e14545618a754e8 Mon Sep 17 00:00:00 2001 From: Dmitry Rubashkin Date: Wed, 31 Jul 2019 18:43:01 +0300 Subject: [PATCH] Changed name and added comments --- dbms/src/TableFunctions/ITableFunctionFileLike.cpp | 2 +- dbms/src/TableFunctions/TableFunctionValues.cpp | 2 +- dbms/src/TableFunctions/parseColumnsListForTableFunction.cpp | 2 +- dbms/src/TableFunctions/parseColumnsListForTableFunction.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dbms/src/TableFunctions/ITableFunctionFileLike.cpp b/dbms/src/TableFunctions/ITableFunctionFileLike.cpp index 5fe5da5c47d..0413839e819 100644 --- a/dbms/src/TableFunctions/ITableFunctionFileLike.cpp +++ b/dbms/src/TableFunctions/ITableFunctionFileLike.cpp @@ -46,7 +46,7 @@ StoragePtr ITableFunctionFileLike::executeImpl(const ASTPtr & ast_function, cons /// Create sample block Block sample_block; - parseColumnsList(structure, sample_block, context); + parseColumnsListFromString(structure, sample_block, context); /// Create table StoragePtr storage = getStorage(filename, format, sample_block, const_cast(context), table_name); diff --git a/dbms/src/TableFunctions/TableFunctionValues.cpp b/dbms/src/TableFunctions/TableFunctionValues.cpp index 90cfbce7682..a38eaf20ee8 100644 --- a/dbms/src/TableFunctions/TableFunctionValues.cpp +++ b/dbms/src/TableFunctions/TableFunctionValues.cpp @@ -75,7 +75,7 @@ StoragePtr TableFunctionValues::executeImpl(const ASTPtr & ast_function, const C std::string structure = args[0]->as().value.safeGet(); Block sample_block; - parseColumnsList(structure, sample_block, context); + parseColumnsListFromString(structure, sample_block, context); MutableColumns res_columns = sample_block.cloneEmptyColumns(); diff --git a/dbms/src/TableFunctions/parseColumnsListForTableFunction.cpp b/dbms/src/TableFunctions/parseColumnsListForTableFunction.cpp index d2d7906ede8..c55a5db9476 100644 --- a/dbms/src/TableFunctions/parseColumnsListForTableFunction.cpp +++ b/dbms/src/TableFunctions/parseColumnsListForTableFunction.cpp @@ -12,7 +12,7 @@ namespace ErrorCodes extern const int SYNTAX_ERROR; } -void parseColumnsList(const std::string & structure, Block & sample_block, const Context & context) +void parseColumnsListFromString(const std::string & structure, Block & sample_block, const Context & context) { Expected expected; diff --git a/dbms/src/TableFunctions/parseColumnsListForTableFunction.h b/dbms/src/TableFunctions/parseColumnsListForTableFunction.h index d5efa792dee..7a67633968c 100644 --- a/dbms/src/TableFunctions/parseColumnsListForTableFunction.h +++ b/dbms/src/TableFunctions/parseColumnsListForTableFunction.h @@ -5,8 +5,8 @@ namespace DB { - -void parseColumnsList(const std::string & structure, Block & sample_block, const Context & context); +/*Parses a common argument for table functions such as table structure given in string*/ +void parseColumnsListFromString(const std::string & structure, Block & sample_block, const Context & context); }