From 6291c4098fc8de4e89514d2842a7272aea265627 Mon Sep 17 00:00:00 2001 From: Ivan <5627721+abyss7@users.noreply.github.com> Date: Mon, 29 Apr 2019 23:33:26 +0300 Subject: [PATCH] Revert "Merge pull request #5139 from abyss7/fix-self-move" (#5150) This reverts commit bd1f8fe97a354151b9c6e50bee6af15d2d67ac45, reversing changes made to 5d1091bfeea2937a1354d09651c6decb94e74866. --- dbms/src/Storages/ColumnsDescription.h | 1 + dbms/src/Storages/ITableDeclaration.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dbms/src/Storages/ColumnsDescription.h b/dbms/src/Storages/ColumnsDescription.h index 3712178156c..0ff98473c99 100644 --- a/dbms/src/Storages/ColumnsDescription.h +++ b/dbms/src/Storages/ColumnsDescription.h @@ -38,6 +38,7 @@ public: ColumnsDescription(const ColumnsDescription & other); ColumnsDescription & operator=(const ColumnsDescription & other); ColumnsDescription(ColumnsDescription &&) noexcept = default; + ColumnsDescription & operator=(ColumnsDescription &&) noexcept = default; /// `after_column` can be a Nested column name; void add(ColumnDescription column, const String & after_column = String()); diff --git a/dbms/src/Storages/ITableDeclaration.cpp b/dbms/src/Storages/ITableDeclaration.cpp index ec62b0a568a..c9385c24cbe 100644 --- a/dbms/src/Storages/ITableDeclaration.cpp +++ b/dbms/src/Storages/ITableDeclaration.cpp @@ -28,7 +28,7 @@ void ITableDeclaration::setColumns(ColumnsDescription columns_) { if (columns_.getOrdinary().empty()) throw Exception("Empty list of columns passed", ErrorCodes::EMPTY_LIST_OF_COLUMNS_PASSED); - columns = columns_; + columns = std::move(columns_); } void ITableDeclaration::setIndicesDescription(IndicesDescription indices_)