Skip to content

Commit 803a309

Browse files
committed
save max threads as well
1 parent 8460775 commit 803a309

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/Storages/MergeTree/MergeTreeData.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6246,7 +6246,8 @@ void MergeTreeData::exportPartToTable(const PartitionCommand & command, ContextP
62466246
part,
62476247
query_context->getSettingsRef()[Setting::export_merge_tree_part_overwrite_file_if_exists],
62486248
query_context->getSettingsRef()[Setting::output_format_parallel_formatting],
6249-
query_context->getSettingsRef()[Setting::output_format_parquet_parallel_encoding]);
6249+
query_context->getSettingsRef()[Setting::output_format_parquet_parallel_encoding],
6250+
query_context->getSettingsRef()[Setting::max_threads]);
62506251

62516252
std::lock_guard lock(export_manifests_mutex);
62526253

@@ -6295,6 +6296,7 @@ void MergeTreeData::exportPartToTableImpl(
62956296
auto context_copy = Context::createCopy(local_context);
62966297
context_copy->setSetting("output_format_parallel_formatting", manifest.parallel_formatting);
62976298
context_copy->setSetting("output_format_parquet_parallel_encoding", manifest.parallel_formatting_parquet);
6299+
context_copy->setSetting("max_threads", manifest.max_threads);
62986300

62996301
sink = destination_storage->import(
63006302
manifest.data_part->name + "_" + manifest.data_part->checksums.getTotalChecksumHex(),

src/Storages/MergeTree/MergeTreeExportManifest.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ struct MergeTreeExportManifest
1414
const DataPartPtr & data_part_,
1515
bool overwrite_file_if_exists_,
1616
bool parallel_formatting_,
17-
bool parallel_formatting_parquet_)
17+
bool parallel_formatting_parquet_,
18+
std::size_t max_threads_)
1819
: destination_storage_id(destination_storage_id_),
1920
data_part(data_part_),
2021
overwrite_file_if_exists(overwrite_file_if_exists_),
2122
parallel_formatting(parallel_formatting_),
2223
parallel_formatting_parquet(parallel_formatting_parquet_),
24+
max_threads(max_threads_),
2325
create_time(time(nullptr)) {}
2426

2527
StorageID destination_storage_id;
@@ -28,6 +30,7 @@ struct MergeTreeExportManifest
2830
bool parallel_formatting;
2931
/// parquet has a different setting for parallel formatting
3032
bool parallel_formatting_parquet;
33+
std::size_t max_threads;
3134

3235
time_t create_time;
3336
mutable bool in_progress = false;

0 commit comments

Comments
 (0)