From 651f5b0e9ff63fe521992eb0f46cfb37cb326d6d Mon Sep 17 00:00:00 2001 From: CurtizJ Date: Wed, 18 Sep 2019 13:21:10 +0300 Subject: [PATCH] merging with master --- dbms/src/Common/ErrorCodes.cpp | 5 +---- dbms/tests/integration/helpers/cluster.py | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dbms/src/Common/ErrorCodes.cpp b/dbms/src/Common/ErrorCodes.cpp index 54b155c3872..0347f2c164a 100644 --- a/dbms/src/Common/ErrorCodes.cpp +++ b/dbms/src/Common/ErrorCodes.cpp @@ -451,16 +451,13 @@ namespace ErrorCodes extern const int INVALID_TEMPLATE_FORMAT = 474; extern const int INVALID_WITH_FILL_EXPRESSION = 475; extern const int WITH_TIES_WITHOUT_ORDER_BY = 476; -<<<<<<< HEAD - extern const int INTERNAL_REDIS_ERROR = 477; -======= extern const int INVALID_USAGE_OF_INPUT = 477; extern const int UNKNOWN_POLICY = 478; extern const int UNKNOWN_DISK = 479; extern const int UNKNOWN_PROTOCOL = 480; extern const int PATH_ACCESS_DENIED = 481; extern const int DICTIONARY_ACCESS_DENIED = 482; ->>>>>>> upstream/master + extern const int INTERNAL_REDIS_ERROR = 483; extern const int KEEPER_EXCEPTION = 999; extern const int POCO_EXCEPTION = 1000; diff --git a/dbms/tests/integration/helpers/cluster.py b/dbms/tests/integration/helpers/cluster.py index 14139ba43a8..0ba48c32a8d 100644 --- a/dbms/tests/integration/helpers/cluster.py +++ b/dbms/tests/integration/helpers/cluster.py @@ -115,11 +115,7 @@ class ClickHouseCluster: cmd += " client" return cmd -<<<<<<< HEAD - def add_instance(self, name, config_dir=None, main_configs=[], user_configs=[], macros={}, with_zookeeper=False, with_mysql=False, with_kafka=False, clickhouse_path_dir=None, with_odbc_drivers=False, with_postgres=False, with_hdfs=False, with_mongo=False, with_redis=False, hostname=None, env_variables={}, image="yandex/clickhouse-integration-test", stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False): -======= - def add_instance(self, name, config_dir=None, main_configs=[], user_configs=[], macros={}, with_zookeeper=False, with_mysql=False, with_kafka=False, clickhouse_path_dir=None, with_odbc_drivers=False, with_postgres=False, with_hdfs=False, with_mongo=False, hostname=None, env_variables={}, image="yandex/clickhouse-integration-test", stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=[]): ->>>>>>> upstream/master + def add_instance(self, name, config_dir=None, main_configs=[], user_configs=[], macros={}, with_zookeeper=False, with_mysql=False, with_kafka=False, clickhouse_path_dir=None, with_odbc_drivers=False, with_postgres=False, with_hdfs=False, with_mongo=False, with_redis=False, hostname=None, env_variables={}, image="yandex/clickhouse-integration-test", stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=[]): """Add an instance to the cluster. name - the name of the instance directory and the value of the 'instance' macro in ClickHouse.