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

Merged with master

Browse Source
This commit is contained in:
Alexey Milovidov 2020-03-31 04:14:32 +03:00
parent 3d42a5a874
commit 314cfb06fe
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dbms/src/Storages/getStructureOfRemoteTable.cpp
View File

@ -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)
{

3
dbms/src/Storages/getStructureOfRemoteTable.h
View File

@ -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);