Resolve conflicts with master

This commit is contained in:
Anastasiya Rodigina 2019-05-18 15:29:57 +03:00
parent b5eab916f5
commit 31f5cb1eee

View File

@ -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.