Skip to content

Fix merge bugs due to path error #47

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

Open
ucasfl wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix merge bugs due to path error #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 5 additions & 6 deletions src/Storages/MergeTree/MergeTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,16 +637,16 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::generateRowIdsMap()

/// inverted_row_ids_map file write buffer
global_ctx->inverted_row_ids_map_uncompressed_buf = global_ctx->new_data_part->getDataPartStorage().writeFile(
global_ctx->inverted_row_ids_map_file_path, 4096, global_ctx->context->getWriteSettings());
fileName(global_ctx->inverted_row_ids_map_file_path), 4096, global_ctx->context->getWriteSettings());
global_ctx->inverted_row_ids_map_buf = std::make_unique<CompressedWriteBuffer>(*global_ctx->inverted_row_ids_map_uncompressed_buf);

/// row_ids_map file write buffers
global_ctx->row_ids_map_bufs.clear();
global_ctx->row_ids_map_uncompressed_bufs.clear();
for (const auto & row_ids_map_file : global_ctx->row_ids_map_files)
{
auto row_ids_map_uncompressed_buf
= global_ctx->new_data_part->getDataPartStorage().writeFile(row_ids_map_file, 4096, global_ctx->context->getWriteSettings());
auto row_ids_map_uncompressed_buf = global_ctx->new_data_part->getDataPartStorage().writeFile(
fileName(row_ids_map_file), 4096, global_ctx->context->getWriteSettings());
global_ctx->row_ids_map_bufs.emplace_back(std::make_unique<CompressedWriteBuffer>(*row_ids_map_uncompressed_buf));
global_ctx->row_ids_map_uncompressed_bufs.emplace_back(std::move(row_ids_map_uncompressed_buf));
}
Expand Down Expand Up @@ -823,7 +823,6 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::generateRowIdsMap()

global_ctx->inverted_row_ids_map_buf.reset();
global_ctx->inverted_row_ids_map_uncompressed_buf.reset();

throw;
}

Expand Down Expand Up @@ -1171,7 +1170,7 @@ bool MergeTask::MergeProjectionsStage::finalizeProjectionsAndWholeMerge() const
String inverted_row_sources_file_path
= global_ctx->new_data_part->getDataPartStorage().getFullPath() + "merged-inverted_row_sources_map" + VECTOR_INDEX_FILE_SUFFIX;
auto inverted_row_sources_map_uncompressed_buf = global_ctx->new_data_part->getDataPartStorage().writeFile(
inverted_row_sources_file_path, 4096, global_ctx->context->getWriteSettings());
fileName(inverted_row_sources_file_path), 4096, global_ctx->context->getWriteSettings());
auto inverted_row_sources_map_buf = std::make_unique<CompressedWriteBuffer>(*inverted_row_sources_map_uncompressed_buf);

DB::copyData(*rows_sources_read_buf, *inverted_row_sources_map_buf);
Expand All @@ -1180,7 +1179,7 @@ bool MergeTask::MergeProjectionsStage::finalizeProjectionsAndWholeMerge() const
inverted_row_sources_map_uncompressed_buf->finalize();

/// Previously we marked this tmp file to be kept
global_ctx->context->getTemporaryVolume()->getDisk()->removeFile(global_ctx->inverted_row_sources_map_file_path);
global_ctx->context->getTemporaryVolume()->getDisk()->removeFile(fileName(global_ctx->inverted_row_sources_map_file_path));

/// add merged-inverted_row_ids_map and merged-inverted_row_sources_map to vector_index_checksums_map
NameSet index_map_filenames
Expand Down