thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-10 17:44:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed error after merge [#CLICKHOUSE-3150].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-07-21 09:46:50 +03:00
parent c7b1e92522
commit e1cc8289b2
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dbms/src/Functions/FunctionsMiscellaneous.cpp
View File

@ -1755,35 +1755,33 @@ void FunctionHasColumnInTable::executeImpl(Block & block, const ColumnNumbers &
};
size_t arg = 0;
const String * host_name = nullptr;
const String * user_name = nullptr;
const String * password = nullptr;
String host_name;
String user_name;
String password;
if (arguments.size() > 3)
{
host_name = &get_string_from_block(arguments[arg++]);
}
host_name = get_string_from_block(arguments[arg++]);
if (arguments.size() > 4)
{
user_name = &get_string_from_block(arguments[arg++]);
}
user_name = get_string_from_block(arguments[arg++]);
if (arguments.size() > 5)
{
password = &get_string_from_block(arguments[arg++]);
}
const String & database_name = get_string_from_block(arguments[arg++]);
const String & table_name = get_string_from_block(arguments[arg++]);
const String & column_name = get_string_from_block(arguments[arg++]);
password = get_string_from_block(arguments[arg++]);
String database_name = get_string_from_block(arguments[arg++]);
String table_name = get_string_from_block(arguments[arg++]);
String column_name = get_string_from_block(arguments[arg++]);
bool has_column;
if (host_name == nullptr)
if (host_name.empty())
{
const StoragePtr & table = global_context.getTable(database_name, table_name);
has_column = table->hasColumn(column_name);
}
else
{
std::vector<std::vector<String>> host_names = {{ *host_name }};
auto cluster = std::make_shared<Cluster>(global_context.getSettings(), host_names, user_name != nullptr ? *user_name : "default", password != nullptr ? *password : "");
std::vector<std::vector<String>> host_names = {{ host_name }};
auto cluster = std::make_shared<Cluster>(global_context.getSettings(), host_names, !user_name.empty() ? *user_name : "default", password);
auto names_and_types_list = std::make_shared<NamesAndTypesList>(getStructureOfRemoteTable(*cluster, database_name, table_name, global_context));
const auto & names = names_and_types_list->getNames();
has_column = std::find(names.begin(), names.end(), column_name) != names.end();

2
dbms/src/IO/ReadHelpers.cpp
View File

@ -20,7 +20,7 @@ namespace ErrorCodes
}
template <class IteratorSrc, class IteratorDst>
void parseHex(IteratorSrc __restrict src, IteratorDst __restrict dst, const size_t num_bytes)
void parseHex(IteratorSrc src, IteratorDst dst, const size_t num_bytes)
{
size_t src_pos = 0;
size_t dst_pos = 0;

2
dbms/src/IO/WriteHelpers.h
View File

@ -476,7 +476,7 @@ inline void writeXMLString(const StringRef & s, WriteBuffer & buf)
}
template <typename IteratorSrc, typename IteratorDst>
void formatHex(IteratorSrc __restrict src, IteratorDst __restrict dst, const size_t num_bytes);
void formatHex(IteratorSrc src, IteratorDst dst, const size_t num_bytes);
void formatUUID(const UInt8 * src16, UInt8 * dst36);
void formatUUID(std::reverse_iterator<const UInt8 *> dst16, UInt8 * dst36);