From 1c17878f310e9ccd578d8cf35255417f6a995004 Mon Sep 17 00:00:00 2001 From: zhang2014 Date: Wed, 15 Jul 2020 13:30:25 +0800 Subject: [PATCH] ISSUES-4006 try fix build failure --- .../MySQL/DatabaseMaterializeTablesIterator.h | 10 +++++----- src/Databases/MySQL/MaterializeMySQLSyncThread.cpp | 12 ++++-------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/Databases/MySQL/DatabaseMaterializeTablesIterator.h b/src/Databases/MySQL/DatabaseMaterializeTablesIterator.h index 16fd86fc59a..bc46e4da46e 100644 --- a/src/Databases/MySQL/DatabaseMaterializeTablesIterator.h +++ b/src/Databases/MySQL/DatabaseMaterializeTablesIterator.h @@ -9,19 +9,19 @@ namespace DB class DatabaseMaterializeTablesIterator final : public IDatabaseTablesIterator { public: - virtual void next() { nested_iterator->next(); } + void next() override { nested_iterator->next(); } - virtual bool isValid() const { return nested_iterator->isValid(); } + bool isValid() const override { return nested_iterator->isValid(); } - virtual const String & name() const { return nested_iterator->name(); } + const String & name() const override { return nested_iterator->name(); } - virtual const StoragePtr & table() const + const StoragePtr & table() const override { StoragePtr storage = std::make_shared(nested_iterator->table()); return tables.emplace_back(storage); } - virtual UUID uuid() const { return nested_iterator->uuid(); } + UUID uuid() const override { return nested_iterator->uuid(); } DatabaseMaterializeTablesIterator(DatabaseTablesIteratorPtr nested_iterator_) : nested_iterator(std::move(nested_iterator_)) {} diff --git a/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp b/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp index e0baf98e252..b6e63e8f412 100644 --- a/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp +++ b/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp @@ -465,15 +465,11 @@ MaterializeMySQLSyncThread::Buffers::BufferAndSortingColumnsPtr MaterializeMySQL BufferAndSortingColumnsPtr & buffer_and_soring_columns = data.try_emplace( table_name, std::make_shared(metadata.getSampleBlockNonMaterialized(), std::vector{})).first->second; - if (StorageMergeTree * table_merge_tree = storage->as()) - { - Names required_for_sorting_key = metadata.getColumnsRequiredForSortingKey(); + Names required_for_sorting_key = metadata.getColumnsRequiredForSortingKey(); - for (const auto & required_name_for_sorting_key : required_for_sorting_key) - buffer_and_soring_columns->second.emplace_back( - buffer_and_soring_columns->first.getPositionByName(required_name_for_sorting_key)); - - } + for (const auto & required_name_for_sorting_key : required_for_sorting_key) + buffer_and_soring_columns->second.emplace_back( + buffer_and_soring_columns->first.getPositionByName(required_name_for_sorting_key)); return buffer_and_soring_columns; }