Merge pull request ClickHouse#89574 from ClickHouse/backport/25.8/88008

Backport ClickHouse#88008 to 25.8: Fix reading mixed array of Floats and Bools in JSON

Author: Avogar

src/Formats/JSONExtractTree.cpp

@@ -131,7 +131,7 @@ void jsonElementToString(const typename JSONParser::Element & element, WriteBuff
 
 template <typename JSONParser, typename NumberType>
 bool tryGetNumericValueFromJSONElement(
-    NumberType & value, const typename JSONParser::Element & element, bool convert_bool_to_integer, bool allow_type_conversion, String & error)
+    NumberType & value, const typename JSONParser::Element & element, bool convert_bool_to_number, bool allow_type_conversion, String & error)
 {
     switch (element.type())
     {
@@ -164,13 +164,10 @@ bool tryGetNumericValueFromJSONElement(
             }
             break;
         case ElementType::BOOL:
-            if constexpr (is_integer<NumberType>)
+            if (convert_bool_to_number && allow_type_conversion)
             {
-                if (convert_bool_to_integer && allow_type_conversion)
-                {
-                    value = static_cast<NumberType>(element.getBool());
-                    break;
-                }
+                value = static_cast<NumberType>(element.getBool());
+                break;
             }
             error = fmt::format("cannot convert bool value to {}", TypeName<NumberType>);
             return false;
@@ -262,7 +259,7 @@ class NumericNode : public JSONExtractTreeNode<JSONParser>
         }
 
         NumberType value;
-        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, insert_settings.convert_bool_to_integer || is_bool_type, insert_settings.allow_type_conversion, error))
+        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, /*convert_bool_to_number=*/ true, insert_settings.allow_type_conversion, error))
         {
             if (error.empty())
                 error = fmt::format("cannot read {} value from JSON element: {}", TypeName<NumberType>, jsonElementToString<JSONParser>(element, format_settings));
@@ -319,7 +316,7 @@ class LowCardinalityNumericNode : public NumericNode<JSONParser, NumberType>
         }
 
         NumberType value;
-        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, insert_settings.convert_bool_to_integer || this->is_bool_type, insert_settings.allow_type_conversion, error))
+        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, /*convert_bool_to_number=*/ true, insert_settings.allow_type_conversion, error))
         {
             if (error.empty())
                 error = fmt::format("cannot read {} value from JSON element: {}", TypeName<NumberType>, jsonElementToString<JSONParser>(element, format_settings));
@@ -2218,13 +2215,13 @@ template std::unique_ptr<JSONExtractTreeNode<SimdJSONParser>> buildJSONExtractTr
 #if USE_RAPIDJSON
 template void jsonElementToString<RapidJSONParser>(const RapidJSONParser::Element & element, WriteBuffer & buf, const FormatSettings & format_settings);
 template std::unique_ptr<JSONExtractTreeNode<RapidJSONParser>> buildJSONExtractTree<RapidJSONParser>(const DataTypePtr & type, const char * source_for_exception_message);
-template bool tryGetNumericValueFromJSONElement<RapidJSONParser, Float64>(Float64 & value, const RapidJSONParser::Element & element, bool convert_bool_to_integer, bool allow_type_conversion, String & error);
+template bool tryGetNumericValueFromJSONElement<RapidJSONParser, Float64>(Float64 & value, const RapidJSONParser::Element & element, bool convert_bool_to_number, bool allow_type_conversion, String & error);
 #else
 template void jsonElementToString<DummyJSONParser>(const DummyJSONParser::Element & element, WriteBuffer & buf, const FormatSettings & format_settings);
 template std::unique_ptr<JSONExtractTreeNode<DummyJSONParser>> buildJSONExtractTree<DummyJSONParser>(const DataTypePtr & type, const char * source_for_exception_message);
-template bool tryGetNumericValueFromJSONElement<DummyJSONParser, Float64>(Float64 & value, const DummyJSONParser::Element & element, bool convert_bool_to_integer, bool allow_type_conversion, String & error);
-template bool tryGetNumericValueFromJSONElement<DummyJSONParser, Int64>(Int64 & value, const DummyJSONParser::Element & element, bool convert_bool_to_integer, bool allow_type_conversion, String & error);
-template bool tryGetNumericValueFromJSONElement<DummyJSONParser, UInt64>(UInt64 & value, const DummyJSONParser::Element & element, bool convert_bool_to_integer, bool allow_type_conversion, String & error);
+template bool tryGetNumericValueFromJSONElement<DummyJSONParser, Float64>(Float64 & value, const DummyJSONParser::Element & element, bool convert_bool_to_number, bool allow_type_conversion, String & error);
+template bool tryGetNumericValueFromJSONElement<DummyJSONParser, Int64>(Int64 & value, const DummyJSONParser::Element & element, bool convert_bool_to_number, bool allow_type_conversion, String & error);
+template bool tryGetNumericValueFromJSONElement<DummyJSONParser, UInt64>(UInt64 & value, const DummyJSONParser::Element & element, bool convert_bool_to_number, bool allow_type_conversion, String & error);
 #endif
 
 }

src/Formats/JSONExtractTree.h

@@ -9,9 +9,6 @@ struct FormatSettings;
 
 struct JSONExtractInsertSettings
 {
-    /// If false, JSON boolean values won't be inserted into columns with integer types
-    /// It's used in JSONExtractInt64/JSONExtractUInt64/... functions.
-    bool convert_bool_to_integer = true;
     /// If true, when complex type like Array/Map has both valid and invalid elements,
     /// the default value will be inserted on invalid elements.
     /// For example, if we have [1, "hello", 2] and type Array(UInt32),
@@ -44,6 +41,6 @@ template <typename JSONParser>
 void jsonElementToString(const typename JSONParser::Element & element, WriteBuffer & buf, const FormatSettings & format_settings);
 
 template <typename JSONParser, typename NumberType>
-bool tryGetNumericValueFromJSONElement(NumberType & value, const typename JSONParser::Element & element, bool convert_bool_to_integer, bool allow_type_conversion, String & error);
+bool tryGetNumericValueFromJSONElement(NumberType & value, const typename JSONParser::Element & element, bool convert_bool_to_number, bool allow_type_conversion, String & error);
 
 }

src/Functions/FunctionsJSON.cpp

@@ -772,7 +772,7 @@ class JSONTypeImpl
 };
 
 
-template <typename JSONParser, typename NumberType, bool convert_bool_to_integer = false>
+template <typename JSONParser, typename NumberType>
 class JSONExtractNumericImpl
 {
 public:
@@ -794,7 +794,7 @@ class JSONExtractNumericImpl
     {
         NumberType value;
 
-        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, convert_bool_to_integer, /*allow_type_conversion=*/true, error))
+        if (!tryGetNumericValueFromJSONElement<JSONParser, NumberType>(value, element, /*convert_bool_to_number=*/false, /*allow_type_conversion=*/true, error))
             return false;
         auto & col_vec = assert_cast<ColumnVector<NumberType> &>(dest);
         col_vec.insertValue(value);

tests/queries/0_stateless/03641_json_array_of_float_and_bool.reference

@@ -0,0 +1,2 @@
+{"a":[42.42,0]}	Array(Nullable(Float64))
+{"a":[42.42,false]}	Array(Dynamic)

tests/queries/0_stateless/03641_json_array_of_float_and_bool.sql

@@ -0,0 +1,4 @@
+set enable_analyzer=1;
+
+select '{"a" : [42.42, false]}'::JSON as json, dynamicType(json.a) settings input_format_json_read_bools_as_numbers=1;
+select '{"a" : [42.42, false]}'::JSON as json, dynamicType(json.a) settings input_format_json_read_bools_as_numbers=0;