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

Update setting name

Browse Source
This commit is contained in:
Shaun Struwig 2024-05-15 02:13:53 +00:00
parent 467366af99
commit 4066c6bc54
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Settings.h
View File

@ -1066,7 +1066,7 @@ class IColumn;
M(Bool, input_format_json_defaults_for_missing_elements_in_named_tuple, true, "Insert default value in named tuple element if it's missing in json object", 0) \
M(Bool, input_format_json_throw_on_bad_escape_sequence, true, "Throw an exception if JSON string contains bad escape sequence in JSON input formats. If disabled, bad escape sequences will remain as is in the data", 0) \
M(Bool, input_format_json_ignore_unnecessary_fields, true, "Ignore unnecessary fields and not parse them. Enabling this may not throw exceptions on json strings of invalid format or with duplicated fields", 0) \
M(Bool, input_format_json_infer_variant_from_multitype_array, false, "Try to infer variant type rather than tuple when column/array has multiple", 0) \
M(Bool, input_format_json_infer_variant_from_multi_type_array, false, "Try to infer variant type rather than tuple when column/array has multiple", 0) \
M(Bool, input_format_try_infer_integers, true, "Try to infer integers instead of floats while schema inference in text formats", 0) \
M(Bool, input_format_try_infer_dates, true, "Try to infer dates from string fields while schema inference in text formats", 0) \
M(Bool, input_format_try_infer_datetimes, true, "Try to infer datetimes from string fields while schema inference in text formats", 0) \

2
src/Formats/FormatFactory.cpp
View File

@ -137,7 +137,7 @@ FormatSettings getFormatSettings(const ContextPtr & context, const Settings & se
format_settings.json.read_arrays_as_strings = settings.input_format_json_read_arrays_as_strings;
format_settings.json.try_infer_numbers_from_strings = settings.input_format_json_try_infer_numbers_from_strings;
format_settings.json.infer_incomplete_types_as_strings = settings.input_format_json_infer_incomplete_types_as_strings;
format_settings.json.infer_variant_from_multitype_array = settings.input_format_json_infer_variant_from_multitype_array;
format_settings.json.infer_variant_from_multi_type_array = settings.input_format_json_infer_variant_from_multi_type_array;
format_settings.json.validate_types_from_metadata = settings.input_format_json_validate_types_from_metadata;
format_settings.json.validate_utf8 = settings.output_format_json_validate_utf8;
format_settings.json_object_each_row.column_for_object_name = settings.format_json_object_each_row_column_for_object_name;

2
src/Formats/FormatSettings.h
View File

@ -223,7 +223,7 @@ struct FormatSettings
bool compact_allow_variable_number_of_columns = false;
bool try_infer_objects_as_tuples = false;
bool infer_incomplete_types_as_strings = true;
bool infer_variant_from_multitype_array = false;
bool infer_variant_from_multi_type_array = false;
bool throw_on_bad_escape_sequence = true;
bool ignore_unnecessary_fields = true;
} json{};

6
src/Formats/SchemaInferenceUtils.cpp
View File

@ -308,7 +308,7 @@ namespace
type_indexes.erase(TypeIndex::UInt64);
}
/// if setting input_format_json_infer_variant_from_multitype_array is true
/// if setting input_format_json_infer_variant_from_multi_type_array is true
/// and nested types are not equal then we convert to type variant.
void transformVariant(DataTypes & data_types, TypeIndexesSet & type_indexes)
{
@ -666,7 +666,7 @@ namespace
/// Check settings specific for JSON formats.
if (settings.json.infer_variant_from_multitype_array)
if (settings.json.infer_variant_from_multi_type_array)
{
transformVariant(data_types, type_indexes);
}
@ -699,7 +699,7 @@ namespace
if constexpr (!is_json)
return;
if (settings.json.infer_variant_from_multitype_array)
if (settings.json.infer_variant_from_multi_type_array)
{
transformVariant(data_types, type_indexes);
}

2
tests/queries/0_stateless/03150_infer_type_variant.sql
View File

@ -1,4 +1,4 @@
SET input_format_json_infer_variant_from_multitype_array=1;
SET input_format_json_infer_variant_from_multi_type_array=1;
SELECT arr, toTypeName(arr) FROM format('JSONEachRow', '{"arr" : [1, "Hello", {"a" : 32}]}');
SELECT x, toTypeName(x) FROM format('JSONEachRow', '{"x" : 42}, {"x" : "Hello"}');
SELECT x, toTypeName(x) FROM format('JSONEachRow', '{"x" : [1, 2, 3]}, {"x" : {"a" : 42}}');