thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-12 01:12:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow all formats

Browse Source
This commit is contained in:
Amos Bird 2020-07-22 10:28:20 +08:00
parent b30240efc0
commit 0e6f9568a7
No known key found for this signature in database
GPG Key ID: 80D430DCBECFEDB4
2 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Functions/formatRow.cpp
View File

@ -18,7 +18,6 @@ namespace ErrorCodes
{ {
extern const int ILLEGAL_TYPE_OF_ARGUMENT; extern const int ILLEGAL_TYPE_OF_ARGUMENT;
extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH; extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
extern const int NOT_IMPLEMENTED;
extern const int UNKNOWN_FORMAT; extern const int UNKNOWN_FORMAT;
} }
@ -38,31 +37,6 @@ public:
{ {
if (!FormatFactory::instance().getAllFormats().count(format_name)) if (!FormatFactory::instance().getAllFormats().count(format_name))
throw Exception("Unknown format " + format_name, ErrorCodes::UNKNOWN_FORMAT); throw Exception("Unknown format " + format_name, ErrorCodes::UNKNOWN_FORMAT);
static constexpr auto supported_formats = {"CSV", "TSV", "JSONEachRow", "TabSeparated", "TabSeparatedRaw", "TSKV"};
bool valid_format = false;
for (const auto & format : supported_formats)
{
if (format_name == format)
{
valid_format = true;
break;
}
}
if constexpr (!no_newline)
{
static constexpr auto supported_formats_no_newline = {"Values", "RowBinray"};
for (const auto & format : supported_formats_no_newline)
{
if (format_name == format)
{
valid_format = true;
break;
}
}
}
if (!valid_format)
throw Exception("Function " + name + " doesn't support format " + format_name, ErrorCodes::NOT_IMPLEMENTED);
} }
String getName() const override { return name; } String getName() const override { return name; }
@ -71,7 +45,7 @@ public:
bool useDefaultImplementationForConstants() const override { return true; } bool useDefaultImplementationForConstants() const override { return true; }
ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; } ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; }
void executeImpl(Block & block, const ColumnNumbers & arguments, size_t result, size_t input_rows_count) override void executeImpl(Block & block, const ColumnNumbers & arguments, size_t result, size_t input_rows_count) const override
{ {
auto col_str = ColumnString::create(); auto col_str = ColumnString::create();
ColumnString::Chars & vec = col_str->getChars(); ColumnString::Chars & vec = col_str->getChars();
@ -85,14 +59,16 @@ public:
auto out = FormatFactory::instance().getOutputFormat(format_name, buffer, arg_block, context, [&](const Columns &, size_t row) auto out = FormatFactory::instance().getOutputFormat(format_name, buffer, arg_block, context, [&](const Columns &, size_t row)
{ {
if constexpr (no_newline) if constexpr (no_newline)
*buffer.position() = '\0'; // replace '\n' with '\0' {
// replace '\n' with '\0'
if (buffer.available() && *buffer.position() == '\n')
*buffer.position() = '\0';
}
else else
writeChar('\0', buffer); writeChar('\0', buffer);
offsets[row] = buffer.count(); offsets[row] = buffer.count();
}); });
out->setAutoFlush();
out->write(arg_block); out->write(arg_block);
out->flush();
block.getByPosition(result).column = std::move(col_str); block.getByPosition(result).column = std::move(col_str);
} }

3
tests/queries/0_stateless/01420_format_row.sql
View File

@ -5,6 +5,3 @@ select formatRowNoNewline('JSONEachRow', *) from numbers(3);
-- unknown format -- unknown format
select formatRow('aaa', *) from numbers(3); -- { serverError 73 } select formatRow('aaa', *) from numbers(3); -- { serverError 73 }
-- unsupported format
select formatRowNoNewline('Values', *) from numbers(3); -- { serverError 48 }