thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix more settings, add random settings for .sh tests

Browse Source
This commit is contained in:
avogar 2022-02-16 10:35:46 +00:00
parent 8f6ca035d9
commit be5efc33d4
9 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tests/clickhouse-test
View File

@ -445,11 +445,22 @@ class TestCase:
return testcase_args
def configure_test_settings(self, client_options):
def add_random_settings(self, client_options):
if self.tags and 'no-random-settings' in self.tags:
return client_options
return client_options + " --" + " --".join(self.random_settings)
if len(self.base_url_params) == 0:
os.environ['CLICKHOUSE_URL_PARAMS'] = '&'.join(self.random_settings)
else:
os.environ['CLICKHOUSE_URL_PARAMS'] = self.base_url_params + '&' + '&'.join(self.random_settings)
new_options = " --" + " --".join(self.random_settings)
os.environ['CLICKHOUSE_CLIENT_OPT'] = self.base_client_options + new_options
return client_options + new_options
def remove_random_settings_from_env(self):
os.environ['CLICKHOUSE_URL_PARAMS'] = self.base_url_params
os.environ['CLICKHOUSE_CLIENT_OPT'] = self.base_client_options
def add_info_about_settings(self, description):
if self.tags and 'no-random-settings' in self.tags:
@ -471,7 +482,10 @@ class TestCase:
self.testcase_args = None
self.runs_count = 0
self.random_settings = SettingsRandomizer.get_random_settings()
self.base_url_params = os.environ['CLICKHOUSE_URL_PARAMS'] if 'CLICKHOUSE_URL_PARAMS' in os.environ else ''
self.base_client_options = os.environ['CLICKHOUSE_CLIENT_OPT'] if 'CLICKHOUSE_CLIENT_OPT' in os.environ else ''
# should skip test, should increment skipped_total, skip reason
def should_skip_test(self, suite) -> Optional[FailureReason]:
@ -710,7 +724,7 @@ class TestCase:
self.runs_count += 1
self.testcase_args = self.configure_testcase_args(args, self.case_file, suite.suite_tmp_path)
client_options = self.configure_test_settings(client_options)
client_options = self.add_random_settings(client_options)
proc, stdout, stderr, total_time = self.run_single_test(server_logs_level, client_options)
result = self.process_result_impl(proc, stdout, stderr, total_time)
@ -735,6 +749,9 @@ class TestCase:
FailureReason.INTERNAL_ERROR,
0.,
self.get_description_from_exception_info(sys.exc_info()))
finally:
self.remove_random_settings_from_env()
class TestSuite:
@staticmethod
@ -1502,16 +1519,6 @@ if __name__ == '__main__':
else:
args.client_database = 'default'
# Add random settings to url parameters
if 'CLICKHOUSE_URL_PARAMS' in os.environ:
os.environ['CLICKHOUSE_URL_PARAMS'] += '&'
else:
os.environ['CLICKHOUSE_URL_PARAMS'] = ''
random_settings = SettingsRandomizer.get_random_settings()
print("Add random settings to CLICKHOUSE_URL_PARAMS:", ', '.join(random_settings))
os.environ['CLICKHOUSE_URL_PARAMS'] += '&'.join(random_settings)
if args.client_option:
# Set options for client
if 'CLICKHOUSE_CLIENT_OPT' in os.environ:
@ -1521,10 +1528,15 @@ if __name__ == '__main__':
os.environ['CLICKHOUSE_CLIENT_OPT'] += get_additional_client_options(args)
# Set options for curl
if 'CLICKHOUSE_URL_PARAMS' in os.environ:
os.environ['CLICKHOUSE_URL_PARAMS'] += '&'
else:
os.environ['CLICKHOUSE_URL_PARAMS'] = ''
client_options_query_str = get_additional_client_options_url(args)
args.client_options_query_str = client_options_query_str + '&'
# Set options for curl
os.environ['CLICKHOUSE_URL_PARAMS'] += '&' + client_options_query_str
os.environ['CLICKHOUSE_URL_PARAMS'] += client_options_query_str
else:
args.client_options_query_str = ''

1
tests/queries/0_stateless/00124_shard_distributed_with_many_replicas.sql
View File

@ -1,5 +1,6 @@
-- Tags: replica, distributed
SET allow_experimental_parallel_reading_from_replicas = 0;
SET max_parallel_replicas = 2;
DROP TABLE IF EXISTS report;

2
tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql
View File

@ -1,4 +1,4 @@
-- Tags: no-tsan, no-asan, no-msan, no-replicated-database
-- Tags: no-tsan, no-asan, no-msan, no-replicated-database, no-random-settings
-- Tag no-tsan: Fine thresholds on memory usage
-- Tag no-asan: Fine thresholds on memory usage
-- Tag no-msan: Fine thresholds on memory usage

2
tests/queries/0_stateless/01308_row_policy_and_trivial_count_query.sql
View File

@ -1,3 +1,5 @@
SET optimize_move_to_prewhere = 1;
DROP TABLE IF EXISTS t;
CREATE TABLE t (x UInt8) ENGINE = MergeTree ORDER BY x;

2
tests/queries/0_stateless/01457_create_as_table_function_structure.sql
View File

@ -1,5 +1,7 @@
-- Tags: no-parallel
SET prefer_localhost_replica = 1;
DROP DATABASE IF EXISTS test_01457;
CREATE DATABASE test_01457;

2
tests/queries/0_stateless/01475_read_subcolumns.sql
View File

@ -1,3 +1,5 @@
SET use_uncompressed_cache = 0;
SELECT '====array====';
DROP TABLE IF EXISTS t_arr;
CREATE TABLE t_arr (a Array(UInt32)) ENGINE = MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part = 0;

1
tests/queries/0_stateless/01533_multiple_nested.sql
View File

@ -1,6 +1,7 @@
DROP TABLE IF EXISTS nested;
SET flatten_nested = 0;
SET use_uncompressed_cache = 0;
CREATE TABLE nested
(

2
tests/queries/0_stateless/01951_distributed_push_down_limit.sql
View File

@ -1,5 +1,7 @@
-- Tags: distributed
set prefer_localhost_replica = 1;
-- { echo }
explain select * from remote('127.{1,2}', view(select * from numbers(1e6))) order by number limit 10 settings distributed_push_down_limit=0;
explain select * from remote('127.{1,2}', view(select * from numbers(1e6))) order by number limit 10 settings distributed_push_down_limit=1;

1
tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql
View File

@ -2,6 +2,7 @@
set optimize_skip_unused_shards=1;
set optimize_distributed_group_by_sharding_key=1;
set prefer_localhost_replica=1;
-- { echo }
explain select distinct k1 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- not optimized