thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-30 05:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename fsync-related settings

Browse Source
This commit is contained in:
Anton Popov 2020-07-03 02:41:37 +03:00
parent b2aa565a37
commit ca346ea13c
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Storages/MergeTree/DataPartsExchange.cpp
View File

@ -248,8 +248,8 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
reservation = data.makeEmptyReservationOnLargestDisk();
}
bool sync = (data_settings->min_compressed_bytes_to_sync_after_fetch
&& sum_files_size >= data_settings->min_compressed_bytes_to_sync_after_fetch);
bool sync = (data_settings->min_compressed_bytes_to_fsync_after_fetch
&& sum_files_size >= data_settings->min_compressed_bytes_to_fsync_after_fetch);
return downloadPart(part_name, replica_path, to_detached, tmp_prefix_, sync, std::move(reservation), in);
}
@ -282,7 +282,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPart(
disk->createDirectories(part_download_path);
std::optional<FileSyncGuard> sync_guard;
if (data.getSettings()->sync_part_directory)
if (data.getSettings()->fsync_part_directory)
sync_guard.emplace(disk, part_download_path);
MergeTreeData::DataPart::Checksums checksums;

2
src/Storages/MergeTree/IMergeTreeDataPart.cpp
View File

@ -666,7 +666,7 @@ void IMergeTreeDataPart::renameTo(const String & new_relative_path, bool remove_
String to = storage.relative_data_path + new_relative_path + "/";
std::optional<FileSyncGuard> sync_guard;
if (storage.getSettings()->sync_part_directory)
if (storage.getSettings()->fsync_part_directory)
sync_guard.emplace(volume->getDisk(), to);
if (!volume->getDisk()->exists(from))

8
src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
View File

@ -579,8 +579,8 @@ public:
static bool needSyncPart(const size_t input_rows, size_t input_bytes, const MergeTreeSettings & settings)
{
return ((settings.min_rows_to_sync_after_merge && input_rows >= settings.min_rows_to_sync_after_merge)
|| (settings.min_compressed_bytes_to_sync_after_merge && input_bytes >= settings.min_compressed_bytes_to_sync_after_merge));
return ((settings.min_rows_to_fsync_after_merge && input_rows >= settings.min_rows_to_fsync_after_merge)
|| (settings.min_compressed_bytes_to_fsync_after_merge && input_bytes >= settings.min_compressed_bytes_to_fsync_after_merge));
}
@ -697,7 +697,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
}
std::optional<FileSyncGuard> sync_guard;
if (data.getSettings()->sync_part_directory)
if (data.getSettings()->fsync_part_directory)
sync_guard.emplace(disk, new_part_tmp_path);
/** Read from all parts, merge and write into a new one.
@ -1092,7 +1092,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
disk->createDirectories(new_part_tmp_path);
std::optional<FileSyncGuard> sync_guard;
if (data.getSettings()->sync_part_directory)
if (data.getSettings()->fsync_part_directory)
sync_guard.emplace(disk, new_part_tmp_path);
/// Don't change granularity type while mutating subset of columns

4
src/Storages/MergeTree/MergeTreeDataWriter.cpp
View File

@ -264,7 +264,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPa
disk->createDirectories(full_path);
std::optional<FileSyncGuard> sync_guard;
if (data.getSettings()->sync_part_directory)
if (data.getSettings()->fsync_part_directory)
sync_guard.emplace(disk, full_path);
/// If we need to calculate some columns to sort.
@ -309,7 +309,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPa
const auto & index_factory = MergeTreeIndexFactory::instance();
MergedBlockOutputStream out(new_data_part, metadata_snapshot, columns, index_factory.getMany(metadata_snapshot->getSecondaryIndices()), compression_codec);
bool sync_on_insert = data.getSettings()->sync_after_insert;
bool sync_on_insert = data.getSettings()->fsync_after_insert;
out.writePrefix();
out.writeWithPermutation(block, perm_ptr);

10
src/Storages/MergeTree/MergeTreeSettings.h
View File

@ -43,11 +43,11 @@ struct MergeTreeSettings : public SettingsCollection<MergeTreeSettings>
M(SettingSeconds, old_parts_lifetime, 8 * 60, "How many seconds to keep obsolete parts.", 0) \
M(SettingSeconds, temporary_directories_lifetime, 86400, "How many seconds to keep tmp_-directories.", 0) \
M(SettingSeconds, lock_acquire_timeout_for_background_operations, DBMS_DEFAULT_LOCK_ACQUIRE_TIMEOUT_SEC, "For background operations like merges, mutations etc. How many seconds before failing to acquire table locks.", 0) \
M(SettingUInt64, min_rows_to_sync_after_merge, 0, "Minimal number of rows to do fsync for part after merge (0 - disabled)", 0) \
M(SettingUInt64, min_compressed_bytes_to_sync_after_merge, 0, "Minimal number of compressed bytes to do fsync for part after merge (0 - disabled)", 0) \
M(SettingUInt64, min_compressed_bytes_to_sync_after_fetch, 0, "Minimal number of compressed bytes to do fsync for part after fetch (0 - disabled)", 0) \
M(SettingBool, sync_after_insert, false, "Do fsync for every inserted part. Significantly decreases performance of inserts, not recommended to use with wide parts.", 0) \
M(SettingBool, sync_part_directory, false, "Do fsync for part directory after all part operations (writes, renames, etc.).", 0) \
M(SettingUInt64, min_rows_to_fsync_after_merge, 0, "Minimal number of rows to do fsync for part after merge (0 - disabled)", 0) \
M(SettingUInt64, min_compressed_bytes_to_fsync_after_merge, 0, "Minimal number of compressed bytes to do fsync for part after merge (0 - disabled)", 0) \
M(SettingUInt64, min_compressed_bytes_to_fsync_after_fetch, 0, "Minimal number of compressed bytes to do fsync for part after fetch (0 - disabled)", 0) \
M(SettingBool, fsync_after_insert, false, "Do fsync for every inserted part. Significantly decreases performance of inserts, not recommended to use with wide parts.", 0) \
M(SettingBool, fsync_part_directory, false, "Do fsync for part directory after all part operations (writes, renames, etc.).", 0) \
\
/** Inserts settings. */ \
M(SettingUInt64, parts_to_delay_insert, 150, "If table contains at least that many active parts in single partition, artificially slow down insert into table.", 0) \