[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240823) (apache#6984

) * [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240823) * Fix Build due to ClickHouse/ClickHouse#68534 --------- Co-authored-by: kyligence-git <[email protected]> Co-authored-by: Chang Chen <[email protected]>
sharkdtu · Oct 14, 2024 · b6c7ce7 · b6c7ce7
1 parent 9d65c26
commit b6c7ce7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
 CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20240822
-CH_COMMIT=85d3b05e9e2
+CH_BRANCH=rebase_ch/20240823
+CH_COMMIT=8532edf7d75
diff --git a/cpp-ch/local-engine/Functions/SparkFunctionGetJsonObject.h b/cpp-ch/local-engine/Functions/SparkFunctionGetJsonObject.h
@@ -72,7 +72,7 @@ class GetJsonObjectImpl
 public:
     using Element = typename JSONParser::Element;
 
-    static DB::DataTypePtr getReturnType(const char *, const DB::ColumnsWithTypeAndName &, const DB::ContextPtr &)
+    static DB::DataTypePtr getReturnType(const char *, const DB::ColumnsWithTypeAndName &, bool )
     {
         auto nested_type = std::make_shared<DB::DataTypeString>();
         return std::make_shared<DB::DataTypeNullable>(nested_type);
@@ -81,7 +81,7 @@ class GetJsonObjectImpl
     static size_t getNumberOfIndexArguments(const DB::ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
 
     bool insertResultToColumn(
-        DB::IColumn & dest, const Element & root, DB::GeneratorJSONPath<JSONParser> & generator_json_path, const DB::ContextPtr &)
+        DB::IColumn & dest, const Element & root, DB::GeneratorJSONPath<JSONParser> & generator_json_path, bool )
     {
         Element current_element = root;
         DB::VisitorStatus status;
@@ -353,7 +353,7 @@ class FlattenJSONStringOnRequiredFunction : public DB::IFunction
                 for (size_t j = 0; j < tuple_size; ++j)
                 {
                     generator_json_paths[j]->reinitialize();
-                    if (!impl.insertResultToColumn(*tuple_columns[j], document, *generator_json_paths[j], context))
+                    if (!impl.insertResultToColumn(*tuple_columns[j], document, *generator_json_paths[j], true))
                     {
                         tuple_columns[j]->insertDefault();
                     }