From 36de8a2911fdfe1fce8c40c565d66ac1e82782a0 Mon Sep 17 00:00:00 2001 From: Nikolai Kochetov Date: Fri, 9 Feb 2018 17:37:02 +0300 Subject: [PATCH] added secondary sort expression [#CLICKHOUSE-3479] --- dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp b/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp index b1d6835b69d..0bc73afc690 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp +++ b/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp @@ -331,9 +331,12 @@ static void extractMergingAndGatheringColumns(const NamesAndTypesList & all_colu ) { Names primary_key_columns_dup = primary_key_expressions->getRequiredColumns(); - Names secondary_key_columns_dup = secondary_key_expressions->getRequiredColumns(); std::set key_columns(primary_key_columns_dup.cbegin(), primary_key_columns_dup.cend()); - key_columns.insert(secondary_key_columns_dup.begin(), secondary_key_columns_dup.end()); + if (secondary_key_expressions) + { + Names secondary_key_columns_dup = secondary_key_expressions->getRequiredColumns(); + key_columns.insert(secondary_key_columns_dup.begin(), secondary_key_columns_dup.end()); + } /// Force sign column for Collapsing mode if (merging_params.mode == MergeTreeData::MergingParams::Collapsing)