From 9da8cbbb770c47bfbb7e598e7c698369dae16972 Mon Sep 17 00:00:00 2001 From: Guillaume Tassery Date: Tue, 12 Nov 2019 04:34:34 +0100 Subject: [PATCH] fix build --- dbms/src/Storages/StorageMergeTree.cpp | 2 +- .../test_consistant_parts_after_move_partition/test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dbms/src/Storages/StorageMergeTree.cpp b/dbms/src/Storages/StorageMergeTree.cpp index 262a6091973..64abf21626c 100644 --- a/dbms/src/Storages/StorageMergeTree.cpp +++ b/dbms/src/Storages/StorageMergeTree.cpp @@ -1208,7 +1208,7 @@ void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const MergeTreePartInfo dst_part_info(partition_id, temp_index, temp_index, src_part->info.level); std::shared_lock part_lock(src_part->columns_lock); - dst_parts.emplace_back(dest_table_storage->cloneAndLoadDataPart(src_part, TMP_PREFIX, dst_part_info)); + dst_parts.emplace_back(dest_table_storage->cloneAndLoadDataPartOnSameDisk(src_part, TMP_PREFIX, dst_part_info)); } /// ATTACH empty part set diff --git a/dbms/tests/integration/test_consistant_parts_after_move_partition/test.py b/dbms/tests/integration/test_consistant_parts_after_move_partition/test.py index 5744bea7e40..c27af6a7bd8 100644 --- a/dbms/tests/integration/test_consistant_parts_after_move_partition/test.py +++ b/dbms/tests/integration/test_consistant_parts_after_move_partition/test.py @@ -31,7 +31,7 @@ node2 = cluster.add_instance('node2', main_configs=['configs/remote_servers.xml' @pytest.fixture(scope="module") -def setup_cluster(): +def start_cluster(): try: cluster.start() initialize_database([node1, node2], 1)