diff --git a/src/Storages/MergeTree/MovesList.cpp b/src/Storages/MergeTree/MovesList.cpp index fda8b22f608..730cd44a697 100644 --- a/src/Storages/MergeTree/MovesList.cpp +++ b/src/Storages/MergeTree/MovesList.cpp @@ -7,12 +7,12 @@ namespace DB MovesListElement::MovesListElement( const StorageID & table_id_, - const std::string & partition_id_, + const std::string & part_name_, const std::string & target_disk_name_, const std::string & target_disk_path_, UInt64 part_size_) : table_id(table_id_) - , partition_id(partition_id_) + , part_name(part_name_) , target_disk_name(target_disk_name_) , target_disk_path(target_disk_path_) , part_size(part_size_) @@ -25,7 +25,7 @@ MoveInfo MovesListElement::getInfo() const MoveInfo res; res.database = table_id.database_name; res.table = table_id.table_name; - res.partition_id = partition_id; + res.part_name = part_name; res.target_disk_name = target_disk_name; res.target_disk_path = target_disk_path; res.part_size = part_size; diff --git a/src/Storages/MergeTree/MovesList.h b/src/Storages/MergeTree/MovesList.h index b5df6ee04b1..42f0901b41d 100644 --- a/src/Storages/MergeTree/MovesList.h +++ b/src/Storages/MergeTree/MovesList.h @@ -18,7 +18,7 @@ struct MoveInfo { std::string database; std::string table; - std::string partition_id; + std::string part_name; std::string target_disk_name; std::string target_disk_path; UInt64 part_size; @@ -30,7 +30,7 @@ struct MoveInfo struct MovesListElement : private boost::noncopyable { const StorageID table_id; - const std::string partition_id; + const std::string part_name; const std::string target_disk_name; const std::string target_disk_path; const UInt64 part_size; @@ -40,7 +40,7 @@ struct MovesListElement : private boost::noncopyable MovesListElement( const StorageID & table_id_, - const std::string & partition_id_, + const std::string & part_name_, const std::string & target_disk_name_, const std::string & target_disk_path_, UInt64 part_size_); diff --git a/src/Storages/System/StorageSystemMoves.cpp b/src/Storages/System/StorageSystemMoves.cpp index dfcddff4b81..6ecc9e7f373 100644 --- a/src/Storages/System/StorageSystemMoves.cpp +++ b/src/Storages/System/StorageSystemMoves.cpp @@ -15,7 +15,7 @@ NamesAndTypesList StorageSystemMoves::getNamesAndTypes() {"elapsed", std::make_shared()}, {"target_disk_name", std::make_shared()}, {"target_disk_path", std::make_shared()}, - {"partition_id", std::make_shared()}, + {"part_name", std::make_shared()}, {"part_size", std::make_shared()}, {"thread_id", std::make_shared()}, }; @@ -38,7 +38,7 @@ void StorageSystemMoves::fillData(MutableColumns & res_columns, ContextPtr conte res_columns[i++]->insert(move.elapsed); res_columns[i++]->insert(move.target_disk_name); res_columns[i++]->insert(move.target_disk_path); - res_columns[i++]->insert(move.partition_id); + res_columns[i++]->insert(move.part_name); res_columns[i++]->insert(move.part_size); res_columns[i++]->insert(move.thread_id); } diff --git a/tests/queries/0_stateless/02117_show_create_table_system.reference b/tests/queries/0_stateless/02117_show_create_table_system.reference index cef308c9e33..1769e12b6bc 100644 --- a/tests/queries/0_stateless/02117_show_create_table_system.reference +++ b/tests/queries/0_stateless/02117_show_create_table_system.reference @@ -374,7 +374,7 @@ CREATE TABLE system.moves `elapsed` Float64, `target_disk_name` String, `target_disk_path` String, - `partition_id` String, + `part_name` String, `part_size` UInt64, `thread_id` UInt64 )