thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45873 from FFFFFFFHHHHHHH/dev_format

Browse Source 
Allow a three-argument version for table function format
This commit is contained in:
Alexey Milovidov 2023-02-02 02:40:31 +03:00 committed by GitHub
commit 1682078f1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 73 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/TableFunctions/TableFunctionFormat.cpp
View File

@ -4,6 +4,7 @@
#include <Interpreters/Context.h>
#include <Interpreters/evaluateConstantExpression.h>
#include <Interpreters/parseColumnsListForTableFunction.h>
#include <Parsers/ASTLiteral.h>
@ -38,23 +39,29 @@ void TableFunctionFormat::parseArguments(const ASTPtr & ast_function, ContextPtr
ASTs & args = args_func.at(0)->children;
if (args.size() != 2)
throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Table function '{}' requires 2 arguments: format and data", getName());
if (args.size() != 2 && args.size() != 3)
throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Table function '{}' requires 2 or 3 arguments: format, [structure], data", getName());
for (auto & arg : args)
arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
format = checkAndGetLiteralArgument<String>(args[0], "format");
data = checkAndGetLiteralArgument<String>(args[1], "data");
data = checkAndGetLiteralArgument<String>(args.back(), "data");
if (args.size() == 3)
structure = checkAndGetLiteralArgument<String>(args[1], "structure");
}
ColumnsDescription TableFunctionFormat::getActualTableStructure(ContextPtr context) const
{
ReadBufferIterator read_buffer_iterator = [&](ColumnsDescription &)
if (structure == "auto")
{
return std::make_unique<ReadBufferFromString>(data);
};
return readSchemaFromFormat(format, std::nullopt, read_buffer_iterator, false, context);
ReadBufferIterator read_buffer_iterator = [&](ColumnsDescription &)
{
return std::make_unique<ReadBufferFromString>(data);
};
return readSchemaFromFormat(format, std::nullopt, read_buffer_iterator, false, context);
}
return parseColumnsListFromString(structure, context);
}
Block TableFunctionFormat::parseData(ColumnsDescription columns, ContextPtr context) const

1
src/TableFunctions/TableFunctionFormat.h
View File

@ -28,6 +28,7 @@ private:
String format;
String data;
String structure = "auto";
};
}

22
tests/queries/0_stateless/02542_table_function_format.reference Normal file
View File

@ -0,0 +1,22 @@
a Nullable(String)
b Nullable(Int64)
a String
b Int64
Hello 111
World 123
Hello 111
World 123
c1 Nullable(Int64)
c2 Nullable(Int64)
c3 Array(Nullable(Int64))
c4 Array(Array(Nullable(String)))
a1 Int32
a2 UInt64
a3 Array(Int32)
a4 Array(Array(String))
1 2 [1,2,3] [['abc'],[],['d','e']]
1 2 [1,2,3] [['abc'],[],['d','e']]
20210129005809043707
123456789
987654321
cust_id UInt128

36
tests/queries/0_stateless/02542_table_function_format.sql Normal file
View File

@ -0,0 +1,36 @@
desc format(JSONEachRow,
$$
{"a": "Hello", "b": 111}
{"a": "World", "b": 123}
{"a": "Hello", "b": 111}
{"a": "World", "b": 123}
$$);
desc format(JSONEachRow, 'a String, b Int64',
$$
{"a": "Hello", "b": 111}
{"a": "World", "b": 123}
{"a": "Hello", "b": 111}
{"a": "World", "b": 123}
$$);
select * from format(JSONEachRow, 'a String, b Int64',
$$
{"a": "Hello", "b": 111}
{"a": "World", "b": 123}
{"a": "Hello", "b": 111}
{"a": "World", "b": 123}
$$);
desc format(CSV, '1,2,"[1,2,3]","[[\'abc\'], [], [\'d\', \'e\']]"');
desc format(CSV, 'a1 Int32, a2 UInt64, a3 Array(Int32), a4 Array(Array(String))', '1,2,"[1,2,3]","[[\'abc\'], [], [\'d\', \'e\']]"');
select * from format(CSV, '1,2,"[1,2,3]","[[\'abc\'], [], [\'d\', \'e\']]"');
select * from format(CSV, 'a1 Int32, a2 UInt64, a3 Array(Int32), a4 Array(Array(String))', '1,2,"[1,2,3]","[[\'abc\'], [], [\'d\', \'e\']]"');
drop table if exists test;
create table test as format(TSV, 'cust_id UInt128', '20210129005809043707\n123456789\n987654321');
select * from test;
desc table test;
drop table test;