From 314cfb06fe53e3fd6dcbc9a240482d7cb3eacd34 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Tue, 31 Mar 2020 04:14:32 +0300 Subject: [PATCH] Merged with master --- dbms/src/Storages/getStructureOfRemoteTable.cpp | 5 ++--- dbms/src/Storages/getStructureOfRemoteTable.h | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dbms/src/Storages/getStructureOfRemoteTable.cpp b/dbms/src/Storages/getStructureOfRemoteTable.cpp index 5e2afa9f85d..56f7cb24d31 100644 --- a/dbms/src/Storages/getStructureOfRemoteTable.cpp +++ b/dbms/src/Storages/getStructureOfRemoteTable.cpp @@ -38,7 +38,7 @@ ColumnsDescription getStructureOfRemoteTable( { try { - const auto & res = getStructureOfRemoteTableInShard(shard_info, database, table, context, table_func_ptr); + const auto & res = getStructureOfRemoteTableInShard(shard_info, table_id, context, table_func_ptr); /// Expect at least some columns. /// This is a hack to handle the empty block case returned by Connection when skip_unavailable_shards is set. @@ -67,8 +67,7 @@ ColumnsDescription getStructureOfRemoteTable( ColumnsDescription getStructureOfRemoteTableInShard( const Cluster::ShardInfo & shard_info, - const std::string & database, - const std::string & table, + const StorageID & table_id, const Context & context, const ASTPtr & table_func_ptr) { diff --git a/dbms/src/Storages/getStructureOfRemoteTable.h b/dbms/src/Storages/getStructureOfRemoteTable.h index 2db97669270..fa7c80c2800 100644 --- a/dbms/src/Storages/getStructureOfRemoteTable.h +++ b/dbms/src/Storages/getStructureOfRemoteTable.h @@ -21,8 +21,7 @@ ColumnsDescription getStructureOfRemoteTable( ColumnsDescription getStructureOfRemoteTableInShard( const Cluster::ShardInfo & shard_info, - const std::string & database, - const std::string & table, + const StorageID & table_id, const Context & context, const ASTPtr & table_func_ptr = nullptr);