From b6c7ce7db1009c377d5a456e33a1c0d286eabefa Mon Sep 17 00:00:00 2001 From: Kyligence Git Date: Thu, 22 Aug 2024 23:42:25 -0500 Subject: [PATCH] [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240823) (#6984) * [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240823) * Fix Build due to https://github.com/ClickHouse/ClickHouse/pull/68534 --------- Co-authored-by: kyligence-git Co-authored-by: Chang Chen --- cpp-ch/clickhouse.version | 4 ++-- cpp-ch/local-engine/Functions/SparkFunctionGetJsonObject.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version index 3c9a18a1eac9..c4f9065ea794 100644 --- 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 index 22b395536c23..5d73c52af499 100644 --- 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(); return std::make_shared(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 & generator_json_path, const DB::ContextPtr &) + DB::IColumn & dest, const Element & root, DB::GeneratorJSONPath & 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(); }