Skip to content

Commit c5c00cd

Browse files
committed
tmp
1 parent 1b4135f commit c5c00cd

2 files changed

Lines changed: 6 additions & 19 deletions

File tree

src/Storages/MergeTree/MergeTreeData.cpp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6244,9 +6244,7 @@ void MergeTreeData::exportPartToTable(const PartitionCommand & command, ContextP
62446244
MergeTreeExportManifest manifest(
62456245
dest_storage->getStorageID(),
62466246
part,
6247-
query_context->getSettingsRef()[Setting::export_merge_tree_part_overwrite_file_if_exists],
6248-
query_context->getSettingsRef()[Setting::output_format_parallel_formatting],
6249-
query_context->getSettingsRef()[Setting::output_format_parallel_formatting_parquet]);
6247+
query_context);
62506248

62516249
std::lock_guard lock(export_manifests_mutex);
62526250

@@ -6291,17 +6289,14 @@ void MergeTreeData::exportPartToTableImpl(
62916289
std::string destination_file_path;
62926290

62936291
try
6294-
{
6295-
auto context_copy = Context::createCopy(local_context);
6296-
context_copy->setSetting("output_format_parallel_formatting", manifest.parallel_formatting);
6297-
context_copy->setSetting("output_format_parquet_parallel_encoding", manifest.parallel_formatting_parquet);
6292+
{
62986293

62996294
sink = destination_storage->import(
63006295
manifest.data_part->name + "_" + manifest.data_part->checksums.getTotalChecksumHex(),
63016296
block_with_partition_values,
63026297
destination_file_path,
63036298
manifest.overwrite_file_if_exists,
6304-
context_copy);
6299+
local_context);
63056300
}
63066301
catch (const Exception & e)
63076302
{

src/Storages/MergeTree/MergeTreeExportManifest.h

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,15 @@ struct MergeTreeExportManifest
1212
MergeTreeExportManifest(
1313
const StorageID & destination_storage_id_,
1414
const DataPartPtr & data_part_,
15-
bool overwrite_file_if_exists_,
16-
bool parallel_formatting_,
17-
bool parallel_formatting_parquet_)
15+
ContextPtr context_)
1816
: destination_storage_id(destination_storage_id_),
1917
data_part(data_part_),
20-
overwrite_file_if_exists(overwrite_file_if_exists_),
21-
parallel_formatting(parallel_formatting_),
22-
parallel_formatting_parquet(parallel_formatting_parquet_),
18+
context(context_),
2319
create_time(time(nullptr)) {}
2420

2521
StorageID destination_storage_id;
2622
DataPartPtr data_part;
27-
bool overwrite_file_if_exists;
28-
bool parallel_formatting;
29-
/// parquet has a different setting for parallel formatting
30-
bool parallel_formatting_parquet;
31-
23+
ContextPtr context;
3224
time_t create_time;
3325
mutable bool in_progress = false;
3426

0 commit comments

Comments
 (0)