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 48e05f780 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240527)
(#5871)
48e05f780 is described below
commit 48e05f780920a174842034f47b25921f8c3d2b93
Author: Kyligence Git <[email protected]>
AuthorDate: Mon May 27 04:58:30 2024 -0500
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240527) (#5871)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240527)
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/63620
* Support Sum0
---------
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/SparkMergeTreeWriter.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 775667afb..b5d3aac8b 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20240526
-CH_COMMIT=ff17e067fac
\ No newline at end of file
+CH_BRANCH=rebase_ch/20240527
+CH_COMMIT=dd16f9435bf
diff --git a/cpp-ch/local-engine/Storages/Mergetree/SparkMergeTreeWriter.cpp
b/cpp-ch/local-engine/Storages/Mergetree/SparkMergeTreeWriter.cpp
index c709a5f24..cdb7d3455 100644
--- a/cpp-ch/local-engine/Storages/Mergetree/SparkMergeTreeWriter.cpp
+++ b/cpp-ch/local-engine/Storages/Mergetree/SparkMergeTreeWriter.cpp
@@ -352,7 +352,7 @@ void
SparkMergeTreeWriter::writeTempPart(MergeTreeDataWriter::TemporaryPart & te
/// This effectively chooses minimal compression method:
/// either default lz4 or compression method with zero thresholds on
absolute and relative part size.
auto compression_codec = storage->getContext()->chooseCompressionCodec(0,
0);
-
+ auto txn = context->getCurrentTransaction();
auto out = std::make_unique<MergedBlockOutputStream>(
new_data_part,
metadata_snapshot,
@@ -360,7 +360,7 @@ void
SparkMergeTreeWriter::writeTempPart(MergeTreeDataWriter::TemporaryPart & te
indices,
MergeTreeStatisticsFactory::instance().getMany(metadata_snapshot->getColumns()),
compression_codec,
- context->getCurrentTransaction(),
+ txn ? txn->tid : Tx::PrehistoricTID,
false,
false,
context->getWriteSettings());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
