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

Resolve conflicts

Browse Source
This commit is contained in:
avogar 2022-04-07 12:17:48 +00:00
parent d2017a63b1
commit 1c783ed88a
4 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
View File

@ -181,15 +181,10 @@ bool JSONCompactEachRowFormatReader::parseRowEndWithDiagnosticInfo(WriteBuffer &
return true; return true;
} }
JSONCompactEachRowRowSchemaReader::JSONCompactEachRowRowSchemaReader(ReadBuffer & in_, bool with_names_, bool with_types_, bool yield_strings_, const FormatSettings & format_settings_) JSONCompactEachRowRowSchemaReader::JSONCompactEachRowRowSchemaReader(
ReadBuffer & in_, bool with_names_, bool with_types_, bool yield_strings_, const FormatSettings & format_settings_)
: FormatWithNamesAndTypesSchemaReader( : FormatWithNamesAndTypesSchemaReader(
in_, in_, format_settings_, with_names_, with_types_, &reader, nullptr, format_settings_.json.read_bools_as_numbers)
format_settings_
with_names_,
with_types_,
&reader,
nullptr,
format_settings_.json.read_bools_as_numbers)
, reader(in_, yield_strings_, format_settings_) , reader(in_, yield_strings_, format_settings_)
{ {
} }

6
tests/queries/0_stateless/02149_schema_inference.reference
View File

@ -76,10 +76,10 @@ TSKV
a Nullable(Float64) a Nullable(Float64)
b Nullable(String) b Nullable(String)
c Array(Nullable(Float64)) c Array(Nullable(Float64))
1 s1 \N 1 s1 []
2 } [2] 2 } [2]
\N \N \N \N \N []
\N \N \N \N \N []
\N \N [3] \N \N [3]
Values Values
c1 Nullable(Float64) c1 Nullable(Float64)

6
tests/queries/0_stateless/02240_tskv_schema_inference_bug.reference
View File

@ -1,8 +1,8 @@
a Nullable(Float64) a Nullable(Float64)
b Nullable(String) b Nullable(String)
c Array(Nullable(Float64)) c Array(Nullable(Float64))
1 s1 \N 1 s1 []
2 } [2] 2 } [2]
\N \N \N \N \N []
\N \N \N \N \N []
\N \N [3] \N \N [3]

18
tests/queries/0_stateless/02247_names_order_in_json_and_tskv.reference
View File

@ -1,15 +1,15 @@
a Nullable(String) a Nullable(Float64)
b Nullable(String) b Nullable(String)
c Nullable(String) c Array(Nullable(Float64))
1 s1 \N 1 s1 []
2 } [2] 2 } [2]
\N \N \N \N \N []
\N \N \N \N \N []
\N \N [3] \N \N [3]
b Nullable(String) b Nullable(Float64)
a Nullable(String) a Nullable(Float64)
c Nullable(String) c Nullable(Float64)
e Nullable(String) e Nullable(Float64)
1 \N \N \N 1 \N \N \N
\N 2 3 \N \N 2 3 \N
\N \N \N \N \N \N \N \N