Merge pull request #60353 from Avogar/validate-nested-types-under-a-setting

Avogar · web-flow · commit f1b2dbaeb51c · 2024-02-28T13:36:11.000+01:00
Validate experimental and suspicious types inside nested types under a setting
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
@@ -1165,6 +1165,7 @@ class IColumn;
     M(Bool, dictionary_use_async_executor, false, "Execute a pipeline for reading dictionary source in several threads. It's supported only by dictionaries with local CLICKHOUSE source.", 0) \
     M(Bool, precise_float_parsing, false, "Prefer more precise (but slower) float parsing algorithm", 0) \
     M(DateTimeOverflowBehavior, date_time_overflow_behavior, "ignore", "Overflow mode for Date, Date32, DateTime, DateTime64 types. Possible values: 'ignore', 'throw', 'saturate'.", 0) \
+    M(Bool, validate_experimental_and_suspicious_types_inside_nested_types, true, "Validate usage of experimental and suspicious types inside nested types like Array/Map/Tuple", 0) \
 
 
 // End of FORMAT_FACTORY_SETTINGS
diff --git a/src/Core/SettingsChangesHistory.h b/src/Core/SettingsChangesHistory.h
@@ -86,6 +86,7 @@ namespace SettingsChangesHistory
 static std::map<ClickHouseVersion, SettingsChangesHistory::SettingsChanges> settings_changes_history =
 {
     {"24.2", {
+              {"validate_experimental_and_suspicious_types_inside_nested_types", false, true, "Validate usage of experimental and suspicious types inside nested types"},
               {"output_format_values_escape_quote_with_quote", false, false, "If true escape ' with '', otherwise quoted with \\'"},
               {"input_format_try_infer_exponent_floats", true, false, "Don't infer floats in exponential notation by default"},
               {"query_plan_optimize_prewhere", true, true, "Allow to push down filter to PREWHERE expression for supported storages"},
diff --git a/src/Interpreters/parseColumnsListForTableFunction.cpp b/src/Interpreters/parseColumnsListForTableFunction.cpp
@@ -76,7 +76,8 @@ void validateDataType(const DataTypePtr & type_to_check, const DataTypeValidatio
     };
 
     validate_callback(*type_to_check);
-    type_to_check->forEachChild(validate_callback);
+    if (settings.validate_nested_types)
+        type_to_check->forEachChild(validate_callback);
 }
 
 ColumnsDescription parseColumnsListFromString(const std::string & structure, const ContextPtr & context)
diff --git a/src/Interpreters/parseColumnsListForTableFunction.h b/src/Interpreters/parseColumnsListForTableFunction.h
@@ -19,13 +19,15 @@ struct DataTypeValidationSettings
         , allow_experimental_object_type(settings.allow_experimental_object_type)
         , allow_suspicious_fixed_string_types(settings.allow_suspicious_fixed_string_types)
         , allow_experimental_variant_type(settings.allow_experimental_variant_type)
+        , validate_nested_types(settings.validate_experimental_and_suspicious_types_inside_nested_types)
     {
     }
 
     bool allow_suspicious_low_cardinality_types = true;
     bool allow_experimental_object_type = true;
     bool allow_suspicious_fixed_string_types = true;
     bool allow_experimental_variant_type = true;
+    bool validate_nested_types = true;
 };
 
 void validateDataType(const DataTypePtr & type, const DataTypeValidationSettings & settings);

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ namespace SettingsChangesHistory`
`86`	`86`	`static std::map<ClickHouseVersion, SettingsChangesHistory::SettingsChanges> settings_changes_history =`
`87`	`87`	`{`
`88`	`88`	`{"24.2", {`
	`89`	`+ {"validate_experimental_and_suspicious_types_inside_nested_types", false, true, "Validate usage of experimental and suspicious types inside nested types"},`
`89`	`90`	`{"output_format_values_escape_quote_with_quote", false, false, "If true escape ' with '', otherwise quoted with \\'"},`
`90`	`91`	`{"input_format_try_infer_exponent_floats", true, false, "Don't infer floats in exponential notation by default"},`
`91`	`92`	`{"query_plan_optimize_prewhere", true, true, "Allow to push down filter to PREWHERE expression for supported storages"},`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ void validateDataType(const DataTypePtr & type_to_check, const DataTypeValidatio`
`76`	`76`	`};`
`77`	`77`
`78`	`78`	`validate_callback(*type_to_check);`
`79`		`- type_to_check->forEachChild(validate_callback);`
	`79`	`+ if (settings.validate_nested_types)`
	`80`	`+ type_to_check->forEachChild(validate_callback);`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`ColumnsDescription parseColumnsListFromString(const std::string & structure, const ContextPtr & context)`
Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,15 @@ struct DataTypeValidationSettings`
`19`	`19`	`, allow_experimental_object_type(settings.allow_experimental_object_type)`
`20`	`20`	`, allow_suspicious_fixed_string_types(settings.allow_suspicious_fixed_string_types)`
`21`	`21`	`, allow_experimental_variant_type(settings.allow_experimental_variant_type)`
	`22`	`+ , validate_nested_types(settings.validate_experimental_and_suspicious_types_inside_nested_types)`
`22`	`23`	`{`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`bool allow_suspicious_low_cardinality_types = true;`
`26`	`27`	`bool allow_experimental_object_type = true;`
`27`	`28`	`bool allow_suspicious_fixed_string_types = true;`
`28`	`29`	`bool allow_experimental_variant_type = true;`
	`30`	`+ bool validate_nested_types = true;`
`29`	`31`	`};`
`30`	`32`
`31`	`33`	`void validateDataType(const DataTypePtr & type, const DataTypeValidationSettings & settings);`