thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-18 21:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tiny fix

Browse Source
This commit is contained in:
alesapin 2023-02-03 21:07:34 +01:00
parent 51b6154d68
commit fd4ae0990b
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp
View File

@ -683,6 +683,7 @@ void DataPartStorageOnDiskBase::clearDirectory(
request.emplace_back(fs::path(dir) / "default_compression_codec.txt", true);
request.emplace_back(fs::path(dir) / "delete-on-destroy.txt", true);
request.emplace_back(fs::path(dir) / "txn_version.txt", true);
request.emplace_back(fs::path(dir) / "metadata_version.txt", true);
disk->removeSharedFiles(request, !can_remove_shared_data, names_not_to_remove);
disk->removeDirectory(dir);

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

@ -661,6 +661,7 @@ void IMergeTreeDataPart::appendFilesOfColumnsChecksumsIndexes(Strings & files, b
appendFilesOfPartitionAndMinMaxIndex(files);
appendFilesOfTTLInfos(files);
appendFilesOfDefaultCompressionCodec(files);
appendFilesOfMetadataVersion(files);
}
if (!parent_part && include_projection)
@ -980,6 +981,11 @@ void IMergeTreeDataPart::appendFilesOfDefaultCompressionCodec(Strings & files)
files.push_back(DEFAULT_COMPRESSION_CODEC_FILE_NAME);
}
void IMergeTreeDataPart::appendFilesOfMetadataVersion(Strings & files)
{
files.push_back(METADATA_VERSION_FILE_NAME);
}
CompressionCodecPtr IMergeTreeDataPart::detectDefaultCompressionCodec() const
{
/// In memory parts doesn't have any compression
@ -1346,6 +1352,8 @@ void IMergeTreeDataPart::loadColumns(bool require)
setColumns(loaded_columns, infos, loaded_metadata_version);
}
/// Project part / part with project parts / compact part doesn't support LWD.
bool IMergeTreeDataPart::supportLightweightDeleteMutate() const
{

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

@ -589,6 +589,8 @@ private:
static void appendFilesOfDefaultCompressionCodec(Strings & files);
static void appendFilesOfMetadataVersion(Strings & files);
/// Found column without specific compression and return codec
/// for this column with default parameters.
CompressionCodecPtr detectDefaultCompressionCodec() const;

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

@ -7536,11 +7536,6 @@ AlterConversions MergeTreeData::getAlterConversionsForPart(const MergeTreeDataPa
/// and columns in storage.
if (command.type == MutationCommand::Type::RENAME_COLUMN)
{
if (!part_columns.has(command.column_name))
continue;
part_columns.rename(command.column_name, command.rename_to);
if (auto it = rename_map.find(command.column_name); it != rename_map.end())
{
auto rename_source = it->second;
@ -7548,7 +7543,6 @@ AlterConversions MergeTreeData::getAlterConversionsForPart(const MergeTreeDataPa
rename_map[command.rename_to] = rename_source;
}
else
rename_map[command.rename_to] = command.column_name;
}