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 98f131122 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240828)
(#7040)
98f131122 is described below
commit 98f131122a2b592fdc5d6f9760e15eabfbcdb691
Author: Kyligence Git <[email protected]>
AuthorDate: Wed Aug 28 03:17:44 2024 -0500
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240828) (#7040)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240828)
* Fix UT due to https://github.com/ClickHouse/ClickHouse/pull/68366
* Fix conflict due to https://github.com/apache/incubator-gluten/pull/6978
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Storages/Mergetree/MetaDataHelper.cpp | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 7e7d12cc6..e7a0e17e4 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20240823
-CH_COMMIT=6feb101b7b9
+CH_BRANCH=rebase_ch/20240828
+CH_COMMIT=ed25251b0d3
\ No newline at end of file
diff --git a/cpp-ch/local-engine/Storages/Mergetree/MetaDataHelper.cpp
b/cpp-ch/local-engine/Storages/Mergetree/MetaDataHelper.cpp
index bcb130259..affdce2b9 100644
--- a/cpp-ch/local-engine/Storages/Mergetree/MetaDataHelper.cpp
+++ b/cpp-ch/local-engine/Storages/Mergetree/MetaDataHelper.cpp
@@ -162,6 +162,7 @@ std::vector<MergeTreeDataPartPtr> mergeParts(
future_part->uuid = UUIDHelpers::generateV4();
future_part->assign(std::move(selected_parts));
+ future_part->part_info = MergeListElement::FAKE_RESULT_PART_FOR_PROJECTION;
future_part->name = "";
if(!partition_dir.empty())
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
