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 7f809f1ca3 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250621)
(#10024)
7f809f1ca3 is described below
commit 7f809f1ca378d3d37e223f5ac3e610ce0320d90d
Author: Kyligence Git <[email protected]>
AuthorDate: Sat Jun 21 06:32:08 2025 -0500
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250621) (#10024)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250621)
* Fix Build due to https://github.com/ClickHouse/ClickHouse/pull/82194
* [TMP] Partially revert "Merge pull request #81754 from
ClickHouse/parallel_hash_empty_using"
Due to https://github.com/ClickHouse/ClickHouse/pull/81754
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Common/CHUtil.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index b5deb19d7a..af948e3a3c 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250611
-CH_COMMIT=6dc897a845d
+CH_BRANCH=rebase_ch/20250621
+CH_COMMIT=8960b38d0bf
diff --git a/cpp-ch/local-engine/Common/CHUtil.cpp
b/cpp-ch/local-engine/Common/CHUtil.cpp
index 926a3948d5..c83842e515 100644
--- a/cpp-ch/local-engine/Common/CHUtil.cpp
+++ b/cpp-ch/local-engine/Common/CHUtil.cpp
@@ -188,7 +188,7 @@ BlockUtil::flattenBlock(const DB::Block & block, UInt64
flags, bool recursively,
if (const DB::DataTypeArray * type_arr = typeid_cast<const
DB::DataTypeArray *>(nested_type.get()))
{
const DB::DataTypeTuple * type_tuple = typeid_cast<const
DB::DataTypeTuple *>(type_arr->getNestedType().get());
- if (type_tuple && type_tuple->haveExplicitNames() && (flags &
FLAT_NESTED_TABLE))
+ if (type_tuple && type_tuple->hasExplicitNames() && (flags &
FLAT_NESTED_TABLE))
{
const DB::DataTypes & element_types =
type_tuple->getElements();
const DB::Strings & names = type_tuple->getElementNames();
@@ -239,7 +239,7 @@ BlockUtil::flattenBlock(const DB::Block & block, UInt64
flags, bool recursively,
}
else if (const DB::DataTypeTuple * type_tuple = typeid_cast<const
DB::DataTypeTuple *>(nested_type.get()))
{
- if ((flags & FLAT_STRUCT_FORCE) ||
(type_tuple->haveExplicitNames() && (flags & FLAT_STRUCT)))
+ if ((flags & FLAT_STRUCT_FORCE) || (type_tuple->hasExplicitNames()
&& (flags & FLAT_STRUCT)))
{
const DB::DataTypes & element_types =
type_tuple->getElements();
DB::Strings element_names = type_tuple->getElementNames();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
