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

dbms: improvement [#METR-2944].

Browse Source
This commit is contained in:
Alexey Milovidov 2014-02-16 21:02:20 +00:00
parent 4a0ea10e01
commit 4cc8906d91
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/include/DB/DataStreams/RemoteBlockInputStream.h
View File

@ -108,13 +108,13 @@ public:
protected:
void populateBlock(Block & res)
{
if (_host_column != "" && !res.has(_host_column))
if (!_host_column.empty() && !res.has(_host_column))
{
ColumnPtr column_ptr = ColumnConst<String>(res.rows(), connection.getHost(), new DataTypeString).convertToFullColumn();
ColumnWithNameAndType column(column_ptr, new DataTypeString, _host_column);
res.insert(column);
}
if (_port_column != "" && !res.has(_port_column))
if (!_port_column.empty() && !res.has(_port_column))
{
ColumnPtr column_ptr = ColumnConst<UInt16>(res.rows(), connection.getPort(), new DataTypeUInt16).convertToFullColumn();
ColumnWithNameAndType column(column_ptr, new DataTypeUInt16, _port_column);

6
dbms/include/DB/Interpreters/ProcessList.h
View File

@ -85,7 +85,7 @@ private:
--parent.cur_size;
parent.have_space.signal();
/// В случае если запрос отменяется, данные о нем удаляются из мапа в момент отмены.
if (!it->is_cancelled && it->query_id != "")
if (!it->is_cancelled && !it->query_id.empty())
{
UserToQueries::iterator queries = parent.user_to_queries.find(it->user);
if (queries != parent.user_to_queries.end())
@ -121,7 +121,7 @@ public:
if (max_size && cur_size >= max_size && (!max_wait_milliseconds || !have_space.tryWait(mutex, max_wait_milliseconds)))
throw Exception("Too much simultaneous queries. Maximum: " + toString(max_size), ErrorCodes::TOO_MUCH_SIMULTANEOUS_QUERIES);
if (query_id_ != "")
if (!query_id_.empty())
{
UserToQueries::iterator queries = user_to_queries.find(user_);
@ -144,7 +144,7 @@ public:
res = new Entry(*this, cont.insert(cont.end(), Element(query_, user_, query_id_, ip_address_)));
if (query_id_ != "")
if (!query_id_.empty())
user_to_queries[user_][query_id_] = &res->get();
}