From ef85902daabdd93d864e0da4a6f2a6b524c0d47d Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Fri, 18 Nov 2016 06:15:49 +0300 Subject: [PATCH] Little better [#METR-22327]. --- dbms/src/Storages/MergeTree/MergeTreeData.cpp | 1 - dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dbms/src/Storages/MergeTree/MergeTreeData.cpp b/dbms/src/Storages/MergeTree/MergeTreeData.cpp index 1264552d48..6b5fefc965 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeData.cpp +++ b/dbms/src/Storages/MergeTree/MergeTreeData.cpp @@ -1157,7 +1157,6 @@ MergeTreeData::DataParts MergeTreeData::getDataParts() const MergeTreeData::DataPartsVector MergeTreeData::getDataPartsVector() const { std::lock_guard lock(data_parts_mutex); - return DataPartsVector(std::begin(data_parts), std::end(data_parts)); } diff --git a/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp b/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp index 431bd04c4e..67f9cd95cf 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp +++ b/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp @@ -105,7 +105,7 @@ bool MergeTreeDataMerger::selectPartsToMerge( { parts.clear(); - MergeTreeData::DataParts data_parts = data.getDataParts(); + MergeTreeData::DataPartsVector data_parts = data.getDataPartsVector(); if (data_parts.empty()) return false; -- GitLab