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 6c60fd3af6 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250110)
(#8490)
6c60fd3af6 is described below
commit 6c60fd3af69b444c4a8ec2c02e2894b6c567570a
Author: Kyligence Git <[email protected]>
AuthorDate: Fri Jan 10 08:50:55 2025 -0600
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250110) (#8490)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250110)
* fix build due to https://github.com/ClickHouse/ClickHouse/pull/74271
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
.../Storages/MergeTree/SparkStorageMergeTree.cpp | 28 ++++++++++------------
2 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 3e28ad21e9..79ca4eb69b 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250107
-CH_COMMIT=01d2a08fb01
+CH_BRANCH=rebase_ch/20250110
+CH_COMMIT=eafc5ef70b3
diff --git a/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.cpp
b/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.cpp
index b4e0bb9ee8..3cc9cb69db 100644
--- a/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.cpp
+++ b/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.cpp
@@ -469,24 +469,22 @@ MergeTreeDataWriter::TemporaryPart
SparkMergeTreeDataWriter::writeTempPart(
new_data_part->uuid = UUIDHelpers::generateV4();
SyncGuardPtr sync_guard;
- if (new_data_part->isStoredOnDisk())
- {
- /// The name could be non-unique in case of stale files from previous
runs.
- String full_path = new_data_part->getDataPartStorage().getFullPath();
- if (new_data_part->getDataPartStorage().exists())
- {
- // LOG_WARNING(log, "Removing old temporary directory {}",
full_path);
- data_part_storage->removeRecursive();
- }
+ /// The name could be non-unique in case of stale files from previous runs.
+ String full_path = new_data_part->getDataPartStorage().getFullPath();
- data_part_storage->createDirectories();
+ if (new_data_part->getDataPartStorage().exists())
+ {
+ LOG_WARNING(log, "Removing old temporary directory {}", full_path);
+ data_part_storage->removeRecursive();
+ }
- if ((*data.getSettings())[MergeTreeSetting::fsync_part_directory])
- {
- const auto disk = data_part_volume->getDisk();
- sync_guard = disk->getDirectorySyncGuard(full_path);
- }
+ data_part_storage->createDirectories();
+
+ if ((*data.getSettings())[MergeTreeSetting::fsync_part_directory])
+ {
+ const auto disk = data_part_volume->getDisk();
+ sync_guard = disk->getDirectorySyncGuard(full_path);
}
/// This effectively chooses minimal compression method:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
