Skip to content

[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250110) #8490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baibaichen merged 2 commits into from
Jan 10, 2025
Merged

[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250110) #8490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
534a9b5
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250110)
Jan 9, 2025
22cf6e5
fix build due to https://github.com/ClickHouse/ClickHouse/pull/74271
baibaichen Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cpp-ch/clickhouse.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
CH_BRANCH=rebase_ch/20250107
CH_COMMIT=01d2a08fb01
CH_BRANCH=rebase_ch/20250110
CH_COMMIT=eafc5ef70b3
28 changes: 13 additions & 15 deletions cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down