diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version index 3e28ad21e9ad..79ca4eb69bb1 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 b4e0bb9ee8a3..3cc9cb69db93 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: