thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 08:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added TSV format synonyms for the TabSeparated formats

Browse Source
This commit is contained in:
Igor Hatarist 2016-12-13 21:03:10 +03:00
parent b4da982fe0
commit 96fa052839
3 changed files with 62 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dbms/src/DataStreams/FormatFactory.cpp
View File

@ -50,11 +50,11 @@ BlockInputStreamPtr FormatFactory::getInput(const String & name, ReadBuffer & bu
return std::make_shared<NativeBlockInputStream>(buf);
else if (name == "RowBinary")
return std::make_shared<BlockInputStreamFromRowInputStream>(std::make_shared<BinaryRowInputStream>(buf), sample, max_block_size);
else if (name == "TabSeparated")
else if (name == "TabSeparated" || name == "TSV") /// TSV is a synonym/alias for the original TabSeparated format
return std::make_shared<BlockInputStreamFromRowInputStream>(std::make_shared<TabSeparatedRowInputStream>(buf, sample), sample, max_block_size);
else if (name == "TabSeparatedWithNames")
else if (name == "TabSeparatedWithNames" || name == "TSVWithNames")
return std::make_shared<BlockInputStreamFromRowInputStream>(std::make_shared<TabSeparatedRowInputStream>(buf, sample, true), sample, max_block_size);
else if (name == "TabSeparatedWithNamesAndTypes")
else if (name == "TabSeparatedWithNamesAndTypes" || name == "TSVWithNamesAndTypes")
return std::make_shared<BlockInputStreamFromRowInputStream>(std::make_shared<TabSeparatedRowInputStream>(buf, sample, true, true), sample, max_block_size);
else if (name == "Values")
return std::make_shared<BlockInputStreamFromRowInputStream>(std::make_shared<ValuesRowInputStream>(
@ -74,7 +74,9 @@ BlockInputStreamPtr FormatFactory::getInput(const String & name, ReadBuffer & bu
return std::make_shared<BlockInputStreamFromRowInputStream>(std::move(row_stream), sample, max_block_size);
}
else if (name == "TabSeparatedRaw"
|| name == "TSVRaw"
|| name == "BlockTabSeparated"
|| name == "TSVBlock"
|| name == "Pretty"
|| name == "PrettyCompact"
|| name == "PrettyCompactMonoBlock"
@ -104,15 +106,15 @@ static BlockOutputStreamPtr getOutputImpl(const String & name, WriteBuffer & buf
return std::make_shared<NativeBlockOutputStream>(buf);
else if (name == "RowBinary")
return std::make_shared<BlockOutputStreamFromRowOutputStream>(std::make_shared<BinaryRowOutputStream>(buf));
else if (name == "TabSeparated")
else if (name == "TabSeparated" || name == "TSV")
return std::make_shared<BlockOutputStreamFromRowOutputStream>(std::make_shared<TabSeparatedRowOutputStream>(buf, sample));
else if (name == "TabSeparatedWithNames")
else if (name == "TabSeparatedWithNames" || name == "TSVWithNames")
return std::make_shared<BlockOutputStreamFromRowOutputStream>(std::make_shared<TabSeparatedRowOutputStream>(buf, sample, true));
else if (name == "TabSeparatedWithNamesAndTypes")
else if (name == "TabSeparatedWithNamesAndTypes" || name == "TSVWithNamesAndTypes")
return std::make_shared<BlockOutputStreamFromRowOutputStream>(std::make_shared<TabSeparatedRowOutputStream>(buf, sample, true, true));
else if (name == "TabSeparatedRaw")
else if (name == "TabSeparatedRaw" || name == "TSVRaw")
return std::make_shared<BlockOutputStreamFromRowOutputStream>(std::make_shared<TabSeparatedRawRowOutputStream>(buf, sample));
else if (name == "BlockTabSeparated")
else if (name == "BlockTabSeparated" || name == "TSVBlock")
return std::make_shared<TabSeparatedBlockOutputStream>(buf);
else if (name == "CSV")
return std::make_shared<BlockOutputStreamFromRowOutputStream>(std::make_shared<CSVRowOutputStream>(buf, sample));

38
dbms/tests/queries/0_stateless/00397_tsv_format_synonym.reference Executable file
View File

@ -0,0 +1,38 @@
1 hello world
2 hello world
3 hello world
1 hello world
2 hello world
3 hello world
arrayJoin([1, 2, 3]) \'hello\' \'world\'
1 hello world
2 hello world
3 hello world
arrayJoin([1, 2, 3]) \'hello\' \'world\'
1 hello world
2 hello world
3 hello world
arrayJoin([1, 2, 3]) \'hello\' \'world\'
UInt8 String String
1 hello world
2 hello world
3 hello world
arrayJoin([1, 2, 3]) \'hello\' \'world\'
UInt8 String String
1 hello world
2 hello world
3 hello world
1 hello world
2 hello world
3 hello world
1 hello world
2 hello world
3 hello world
1 2 3
hello hello hello
world world world
1 2 3
hello hello hello
world world world

14
dbms/tests/queries/0_stateless/00397_tsv_format_synonym.sql Executable file
View File

@ -0,0 +1,14 @@
SELECT arrayJoin([1, 2, 3]), 'hello', 'world' FORMAT TabSeparated;
SELECT arrayJoin([1, 2, 3]), 'hello', 'world' FORMAT TSV;
SELECT arrayJoin([1, 2, 3]), 'hello', 'world' FORMAT TabSeparatedWithNames;
SELECT arrayJoin([1, 2, 3]), 'hello', 'world' FORMAT TSVWithNames;
SELECT arrayJoin([1, 2, 3]), 'hello', 'world' FORMAT TabSeparatedWithNamesAndTypes;
SELECT arrayJoin([1, 2, 3]), 'hello', 'world' FORMAT TSVWithNamesAndTypes;
SELECT arrayJoin([1, 2, 3]), 'hello', 'world' FORMAT TabSeparatedRaw;
SELECT arrayJoin([1, 2, 3]), 'hello', 'world' FORMAT TSVRaw;
SELECT arrayJoin([1, 2, 3]), 'hello', 'world' FORMAT BlockTabSeparated;
SELECT arrayJoin([1, 2, 3]), 'hello', 'world' FORMAT TSVBlock;