From 31f5cb1eee6c26ee91ce824c400f448a83d72602 Mon Sep 17 00:00:00 2001 From: Anastasiya Rodigina Date: Sat, 18 May 2019 15:29:57 +0300 Subject: [PATCH] Resolve conflicts with master --- dbms/src/Storages/IStorage.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/dbms/src/Storages/IStorage.h b/dbms/src/Storages/IStorage.h index 059daa7d6b4..6564f25de83 100644 --- a/dbms/src/Storages/IStorage.h +++ b/dbms/src/Storages/IStorage.h @@ -335,9 +335,6 @@ public: /// Returns additional columns that need to be read for FINAL to work. virtual Names getColumnsRequiredForFinal() const { return {}; } - /// Returns names of primary key + secondary sorting columns - virtual Names getSortingKeyColumns() const { return {}; } - protected: /// Returns whether the column is virtual - by default all columns are real. /// Initially reserved virtual column name may be shadowed by real column.