thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3223 from veloman-yunkan/jsoneachrow_bugfix

Browse Source 
Fix for issue #3297
This commit is contained in:
alexey-milovidov 2018-10-09 21:05:51 +03:00 committed by GitHub
commit 052fc2b674
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dbms/src/Formats/JSONEachRowRowInputStream.cpp
View File

@ -68,7 +68,8 @@ size_t JSONEachRowRowInputStream::columnIndex(const StringRef& name) const
*/
StringRef JSONEachRowRowInputStream::readColumnName(ReadBuffer & buf)
{
// This is just an optimization: try to avoid copying the name into current_column_name
// This is just an optimization: try to avoid calling readJSONStringInto()
if (nested_prefix_length == 0 && buf.position() + 1 < buf.buffer().end())
{
const char * next_pos = find_first_symbols<'\\', '"'>(buf.position() + 1, buf.buffer().end());
@ -77,10 +78,10 @@ StringRef JSONEachRowRowInputStream::readColumnName(ReadBuffer & buf)
{
/// The most likely option is that there is no escape sequence in the key name, and the entire name is placed in the buffer.
assertChar('"', buf);
StringRef res(buf.position(), next_pos - buf.position());
current_column_name.assign(buf.position(), next_pos - buf.position());
buf.position() += next_pos - buf.position();
assertChar('"', buf);
return res;
return current_column_name;
}
}
@ -150,7 +151,6 @@ void JSONEachRowRowInputStream::readJSONObject(MutableColumns & columns)
for (size_t key_index = 0; advanceToNextKey(key_index); ++key_index)
{
StringRef name_ref = readColumnName(istr);
skipColonDelimeter(istr);
const size_t column_index = columnIndex(name_ref);