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

Merge pull request #36767 from azat/clickhouse-test-compat

Browse Source 
Fix clickhouse-test for server without `is_all_data_sent` in system.processes
This commit is contained in:
Alexey Milovidov 2022-04-29 05:42:05 +03:00 committed by GitHub
commit b1fa88c821
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/clickhouse-test
View File

@ -225,7 +225,7 @@ def get_processlist_after_test(args):
FROM clusterAllReplicas('test_cluster_database_replicated', system.processes)
WHERE
query NOT LIKE '%system.processes%' AND
NOT is_all_data_sent AND
{'NOT is_all_data_sent AND' if args.suppport_system_processes_is_all_data_sent else ''}
Settings['log_comment'] = '{log_comment}' AND
current_database = '{database}'
""")
@ -235,7 +235,7 @@ def get_processlist_after_test(args):
FROM system.processes
WHERE
query NOT LIKE '%system.processes%' AND
NOT is_all_data_sent AND
{'NOT is_all_data_sent AND' if args.suppport_system_processes_is_all_data_sent else ''}
Settings['log_comment'] = '{log_comment}' AND
current_database = '{database}'
""")
@ -1235,6 +1235,12 @@ def collect_build_flags(args):
return result
def check_table_column(args, database, table, column):
return int(clickhouse_execute(args, f"""
SELECT count()
FROM system.columns
WHERE database = '{database}' AND table = '{table}' AND name = '{column}'
""")) > 0
def suite_key_func(item: str) -> Union[int, Tuple[int, str]]:
if args.order == 'random':
@ -1338,6 +1344,7 @@ def main(args):
raise Exception(msg)
args.build_flags = collect_build_flags(args)
args.suppport_system_processes_is_all_data_sent = check_table_column(args, 'system', 'processes', 'is_all_data_sent')
if args.skip:
args.skip = set(args.skip)