thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 09:32:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed several integration tests. [#CLICKHOUSE-2]

Browse Source
This commit is contained in:
Vitaliy Lyudvichenko 2018-03-07 16:52:09 +03:00
parent 68357f3534
commit d6635c3bf5
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dbms/src/Server/ClusterCopier.cpp
View File

@ -23,7 +23,7 @@
#include <Client/Connection.h>
#include <Interpreters/Context.h>
#include <Interpreters/Cluster.h>
#include <Interpreters/InterpreterSelectQuery.h>
#include <Interpreters/InterpreterFactory.h>
#include <Interpreters/InterpreterInsertQuery.h>
#include <Interpreters/InterpreterExistsQuery.h>
#include <Interpreters/InterpreterShowCreateQuery.h>
@ -1374,9 +1374,7 @@ protected:
local_context.getSettingsRef() = task_cluster->settings_pull;
local_context.getSettingsRef().skip_unavailable_shards = true;
InterpreterSelectQuery interperter(query_select_ast, local_context);
Block block = getBlockWithAllStreamData(interperter.execute().in);
Block block = getBlockWithAllStreamData(InterpreterFactory::get(query_select_ast, local_context)->execute().in);
count = (block) ? block.safeGetByPosition(0).column->getUInt(0) : 0;
}
@ -1465,11 +1463,8 @@ protected:
Context context_insert = context;
context_insert.getSettingsRef() = task_cluster->settings_push;
InterpreterSelectQuery interpreter_select(query_select_ast, context_select);
BlockIO io_select = interpreter_select.execute();
InterpreterInsertQuery interpreter_insert(query_insert_ast, context_insert);
BlockIO io_insert = interpreter_insert.execute();
BlockIO io_select = InterpreterFactory::get(query_select_ast, context_select)->execute();
BlockIO io_insert = InterpreterFactory::get(query_insert_ast, context_insert)->execute();
using ExistsFuture = zkutil::ZooKeeper::ExistsFuture;
auto future_is_dirty_checker = std::make_unique<ExistsFuture>(zookeeper->asyncExists(is_dirty_flag_path));
@ -1668,8 +1663,7 @@ protected:
ASTPtr query_ast = parseQuery(parser_query, query);
Context local_context = context;
InterpreterSelectQuery interp(query_ast, local_context);
Block block = getBlockWithAllStreamData(interp.execute().in);
Block block = getBlockWithAllStreamData(InterpreterFactory::get(query_ast, local_context)->execute().in);
std::set<String> res;
if (block)

2
dbms/tests/integration/test_system_queries/test.py
View File

@ -71,7 +71,7 @@ def test_DROP_DNS_CACHE(started_cluster):
instance.query("SELECT * FROM remote('lost_host', 'system', 'one')")
instance.query("SELECT * FROM distributed_lost_host")
assert TSV(instance.query("SELECT DISTINCT host_name, host_address FROM system.clusters")) == TSV("lost_host\t127.0.0.1\n")
assert TSV(instance.query("SELECT DISTINCT host_name, host_address FROM system.clusters WHERE cluster='lost_host_cluster'")) == TSV("lost_host\t127.0.0.1\n")
if __name__ == '__main__':