Skip to content

Commit

Permalink
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240828) (#7040)
Browse files Browse the repository at this point in the history
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240828)

* Fix UT due to ClickHouse/ClickHouse#68366

* Fix conflict due to #6978

---------

Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
  • Loading branch information
3 people authored Aug 28, 2024
1 parent de51f7c commit 98f1311
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cpp-ch/clickhouse.version
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
CH_BRANCH=rebase_ch/20240823
CH_COMMIT=6feb101b7b9
CH_BRANCH=rebase_ch/20240828
CH_COMMIT=ed25251b0d3
1 change: 1 addition & 0 deletions cpp-ch/local-engine/Storages/Mergetree/MetaDataHelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down

0 comments on commit 98f1311

Please sign in to comment.