This is an automated email from the ASF dual-hosted git repository.
changchen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 433b4397c [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240823)
(#6984)
433b4397c is described below
commit 433b4397cc08084bf5203f8b8f4a62a7b54dd992
Author: Kyligence Git <[email protected]>
AuthorDate: Thu Aug 22 23:42:25 2024 -0500
[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 <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
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 3c9a18a1e..c4f9065ea 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 22b395536..5d73c52af 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<DB::DataTypeString>();
return std::make_shared<DB::DataTypeNullable>(nested_type);
@@ -81,7 +81,7 @@ public:
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 @@ private:
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();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
