thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-28 20:50:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

ISSUES-4006 try fix build failure

Browse Source
This commit is contained in:
zhang2014 2020-07-15 13:30:25 +08:00
parent 94a2a7791c
commit 1c17878f31
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Databases/MySQL/DatabaseMaterializeTablesIterator.h
View File

@ -9,19 +9,19 @@ namespace DB
class DatabaseMaterializeTablesIterator final : public IDatabaseTablesIterator class DatabaseMaterializeTablesIterator final : public IDatabaseTablesIterator
{ {
public: 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<StorageMaterializeMySQL>(nested_iterator->table()); StoragePtr storage = std::make_shared<StorageMaterializeMySQL>(nested_iterator->table());
return tables.emplace_back(storage); 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_)) DatabaseMaterializeTablesIterator(DatabaseTablesIteratorPtr nested_iterator_) : nested_iterator(std::move(nested_iterator_))
{} {}

12
src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
View File

@ -465,15 +465,11 @@ MaterializeMySQLSyncThread::Buffers::BufferAndSortingColumnsPtr MaterializeMySQL
BufferAndSortingColumnsPtr & buffer_and_soring_columns = data.try_emplace( BufferAndSortingColumnsPtr & buffer_and_soring_columns = data.try_emplace(
table_name, std::make_shared<BufferAndSortingColumns>(metadata.getSampleBlockNonMaterialized(), std::vector<size_t>{})).first->second; table_name, std::make_shared<BufferAndSortingColumns>(metadata.getSampleBlockNonMaterialized(), std::vector<size_t>{})).first->second;
if (StorageMergeTree * table_merge_tree = storage->as<StorageMergeTree>()) 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) for (const auto & required_name_for_sorting_key : required_for_sorting_key)
buffer_and_soring_columns->second.emplace_back( buffer_and_soring_columns->second.emplace_back(
buffer_and_soring_columns->first.getPositionByName(required_name_for_sorting_key)); buffer_and_soring_columns->first.getPositionByName(required_name_for_sorting_key));
}
return buffer_and_soring_columns; return buffer_and_soring_columns;
} }