3 files changed, 150 insertions, 36 deletions

diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile
index 2144b6bc7060..f2951520dbc9 100644
--- a/databases/clickhouse/Makefile
+++ b/databases/clickhouse/Makefile
@@ -2,15 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	clickhouse
-PORTVERSION=	1.1.54342
+PORTVERSION=	1.1.54362
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	-stable
-PORTREVISION=	1
 CATEGORIES=	databases
 
-PATCH_SITES=	https://github.com/proller/${GH_PROJECT}/commit/
-PATCHFILES=	05b203574ae2.patch:-p1
-
 MAINTAINER=	proler@gmail.com
 COMMENT=	ClickHouse is an column-oriented database management system
 
diff --git a/databases/clickhouse/distinfo b/databases/clickhouse/distinfo
index 0e1dbe1c863e..08314f975ac5 100644
--- a/databases/clickhouse/distinfo
+++ b/databases/clickhouse/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1516666622
-SHA256 (yandex-ClickHouse-v1.1.54342-stable_GH0.tar.gz) = ca1fc97242ca10d5addb8842fd82d03dc43bb5c4c64aa6bbceb71146576c6588
-SIZE (yandex-ClickHouse-v1.1.54342-stable_GH0.tar.gz) = 9471756
-SHA256 (05b203574ae2.patch) = f1beeb1e1c407a4565ebce3b1cf4a84b1d5f18044dbf09ad2ba40a50926c806f
-SIZE (05b203574ae2.patch) = 1459
+TIMESTAMP = 1520953357
+SHA256 (yandex-ClickHouse-v1.1.54362-stable_GH0.tar.gz) = b3e98ca9fbc9eb81e757efeb6a2ce93945a8c1bf20848566ce8925884e736705
+SIZE (yandex-ClickHouse-v1.1.54362-stable_GH0.tar.gz) = 5776863
diff --git a/databases/clickhouse/pkg-plist b/databases/clickhouse/pkg-plist
index 99fca3ab3a2d..5570563ce97e 100644
--- a/databases/clickhouse/pkg-plist
+++ b/databases/clickhouse/pkg-plist
@@ -2,6 +2,7 @@ bin/clickhouse
 bin/clickhouse-benchmark
 bin/clickhouse-clang
 bin/clickhouse-client
+bin/clickhouse-copier
 bin/clickhouse-extract-from-config
 bin/clickhouse-format
 bin/clickhouse-lld
@@ -9,18 +10,18 @@ bin/clickhouse-local
 bin/clickhouse-performance-test
 bin/clickhouse-server
 bin/clickhouse-test
+bin/clickhouse-test-server
 bin/clickhouse-zookeeper-cli
 @dir(clickhouse,,) etc/clickhouse-server
 @dir(clickhouse,,) etc/clickhouse-client
 @sample etc/clickhouse-client/config.xml.sample
 @sample etc/clickhouse-server/config.xml.sample
 @sample etc/clickhouse-server/users.xml.sample
+etc/clickhouse-client/client-test.xml
+etc/clickhouse-server/server-test.xml
 lib/libclickhouse.so
 lib/libclickhouse.so.1
 lib/libclickhouse.so.%%SOVERSION%%
-@dir(clickhouse,clickhouse,700) /var/db/clickhouse
-@dir(clickhouse,clickhouse) /var/log/clickhouse
-@dir(clickhouse,clickhouse) /var/run/clickhouse
 %%DATADIR%%-test/external_dictionaries/CTestTestfile.cmake
 %%DATADIR%%-test/external_dictionaries/README.md
 %%DATADIR%%-test/external_dictionaries/cmake_install.cmake
@@ -69,6 +70,9 @@ lib/libclickhouse.so.%%SOVERSION%%
 %%DATADIR%%-test/external_dictionaries/run.sh
 %%DATADIR%%-test/external_dictionaries/source.tsv
 %%DATADIR%%-test/external_dictionaries/users.xml
+%%DATADIR%%-test/performance/array/array_element.xml
+%%DATADIR%%-test/performance/array/complex_array_creation.xml
+%%DATADIR%%-test/performance/consistent_hashes/consistent_hashes.xml
 %%DATADIR%%-test/performance/create_benchmark_page.py
 %%DATADIR%%-test/performance/date_parsing/date_parsing.xml
 %%DATADIR%%-test/performance/date_time/date_time.xml
@@ -250,8 +254,8 @@ lib/libclickhouse.so.%%SOVERSION%%
 %%DATADIR%%-test/queries/0_stateless/00078_string_concat.sql
 %%DATADIR%%-test/queries/0_stateless/00079_defaulted_columns.reference
 %%DATADIR%%-test/queries/0_stateless/00079_defaulted_columns.sql
-%%DATADIR%%-test/queries/0_stateless/00080_show_tables.reference
-%%DATADIR%%-test/queries/0_stateless/00080_show_tables.sql
+%%DATADIR%%-test/queries/0_stateless/00080_show_tables_and_system_tables.reference
+%%DATADIR%%-test/queries/0_stateless/00080_show_tables_and_system_tables.sql
 %%DATADIR%%-test/queries/0_stateless/00081_int_div_or_zero.reference
 %%DATADIR%%-test/queries/0_stateless/00081_int_div_or_zero.sql
 %%DATADIR%%-test/queries/0_stateless/00082_append_trailing_char_if_absent.reference
@@ -564,14 +568,14 @@ lib/libclickhouse.so.%%SOVERSION%%
 %%DATADIR%%-test/queries/0_stateless/00215_primary_key_order_zookeeper.sql
 %%DATADIR%%-test/queries/0_stateless/00216_bit_test_function_family.reference
 %%DATADIR%%-test/queries/0_stateless/00216_bit_test_function_family.sql
-%%DATADIR%%-test/queries/0_stateless/00217_global_subquery_columns_with_same_name.reference
-%%DATADIR%%-test/queries/0_stateless/00217_global_subquery_columns_with_same_name.sql
+%%DATADIR%%-test/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.reference
+%%DATADIR%%-test/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.sql
 %%DATADIR%%-test/queries/0_stateless/00218_like_regexp_newline.reference
 %%DATADIR%%-test/queries/0_stateless/00218_like_regexp_newline.sql
 %%DATADIR%%-test/queries/0_stateless/00219_full_right_join_column_order.reference
 %%DATADIR%%-test/queries/0_stateless/00219_full_right_join_column_order.sql
-%%DATADIR%%-test/queries/0_stateless/00220_with_totals_in_subquery_remote_and_limit.reference
-%%DATADIR%%-test/queries/0_stateless/00220_with_totals_in_subquery_remote_and_limit.sql
+%%DATADIR%%-test/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.reference
+%%DATADIR%%-test/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.sql
 %%DATADIR%%-test/queries/0_stateless/00222_sequence_aggregate_function_family.reference
 %%DATADIR%%-test/queries/0_stateless/00222_sequence_aggregate_function_family.sql
 %%DATADIR%%-test/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.reference
@@ -674,8 +678,8 @@ lib/libclickhouse.so.%%SOVERSION%%
 %%DATADIR%%-test/queries/0_stateless/00279_quantiles_permuted_args.sql
 %%DATADIR%%-test/queries/0_stateless/00280_hex_escape_sequence.reference
 %%DATADIR%%-test/queries/0_stateless/00280_hex_escape_sequence.sql
-%%DATADIR%%-test/queries/0_stateless/00281_gcc_clang_sizeof_packed.reference
-%%DATADIR%%-test/queries/0_stateless/00281_gcc_clang_sizeof_packed.sql
+%%DATADIR%%-test/queries/0_stateless/00281_compile_sizeof_packed.reference
+%%DATADIR%%-test/queries/0_stateless/00281_compile_sizeof_packed.sql
 %%DATADIR%%-test/queries/0_stateless/00282_merging.reference
 %%DATADIR%%-test/queries/0_stateless/00282_merging.sql
 %%DATADIR%%-test/queries/0_stateless/00283_column_cut.reference
@@ -698,8 +702,8 @@ lib/libclickhouse.so.%%SOVERSION%%
 %%DATADIR%%-test/queries/0_stateless/00292_parser_tuple_element.sql
 %%DATADIR%%-test/queries/0_stateless/00293_shard_max_subquery_depth.reference
 %%DATADIR%%-test/queries/0_stateless/00293_shard_max_subquery_depth.sql
-%%DATADIR%%-test/queries/0_stateless/00294_enums.reference
-%%DATADIR%%-test/queries/0_stateless/00294_enums.sql
+%%DATADIR%%-test/queries/0_stateless/00294_shard_enums.reference
+%%DATADIR%%-test/queries/0_stateless/00294_shard_enums.sql
 %%DATADIR%%-test/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.reference
 %%DATADIR%%-test/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.sql
 %%DATADIR%%-test/queries/0_stateless/00296_url_parameters.reference
@@ -947,8 +951,8 @@ lib/libclickhouse.so.%%SOVERSION%%
 %%DATADIR%%-test/queries/0_stateless/00414_time_zones_direct_conversion.sql
 %%DATADIR%%-test/queries/0_stateless/00415_into_outfile.reference
 %%DATADIR%%-test/queries/0_stateless/00415_into_outfile.sh
-%%DATADIR%%-test/queries/0_stateless/00416_progress_in_http_headers.reference
-%%DATADIR%%-test/queries/0_stateless/00416_progress_in_http_headers.sh
+%%DATADIR%%-test/queries/0_stateless/00416_pocopatch_progress_in_http_headers.reference
+%%DATADIR%%-test/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh
 %%DATADIR%%-test/queries/0_stateless/00417_kill_query.reference
 %%DATADIR%%-test/queries/0_stateless/00417_kill_query.sh
 %%DATADIR%%-test/queries/0_stateless/00417_system_build_options.reference
@@ -1089,10 +1093,10 @@ lib/libclickhouse.so.%%SOVERSION%%
 %%DATADIR%%-test/queries/0_stateless/00479_date_and_datetime_to_number.sql
 %%DATADIR%%-test/queries/0_stateless/00480_mac_addresses.reference
 %%DATADIR%%-test/queries/0_stateless/00480_mac_addresses.sql
+%%DATADIR%%-test/queries/0_stateless/00481_create_view_for_null.reference
+%%DATADIR%%-test/queries/0_stateless/00481_create_view_for_null.sql
 %%DATADIR%%-test/queries/0_stateless/00481_reading_from_last_granula.reference
 %%DATADIR%%-test/queries/0_stateless/00481_reading_from_last_granula.sql
-%%DATADIR%%-test/queries/0_stateless/00481_view.reference
-%%DATADIR%%-test/queries/0_stateless/00481_view.sql
 %%DATADIR%%-test/queries/0_stateless/00482_subqueries_and_aliases.reference
 %%DATADIR%%-test/queries/0_stateless/00482_subqueries_and_aliases.sql
 %%DATADIR%%-test/queries/0_stateless/00483_cast_syntax.reference
@@ -1121,8 +1125,8 @@ lib/libclickhouse.so.%%SOVERSION%%
 %%DATADIR%%-test/queries/0_stateless/00492_drop_temporary_table.sql
 %%DATADIR%%-test/queries/0_stateless/00493_substring_of_fixedstring.reference
 %%DATADIR%%-test/queries/0_stateless/00493_substring_of_fixedstring.sql
-%%DATADIR%%-test/queries/0_stateless/00494_alias_substitution_bug.reference
-%%DATADIR%%-test/queries/0_stateless/00494_alias_substitution_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00494_shard_alias_substitution_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00494_shard_alias_substitution_bug.sql
 %%DATADIR%%-test/queries/0_stateless/00495_reading_const_zero_column.reference
 %%DATADIR%%-test/queries/0_stateless/00495_reading_const_zero_column.sql
 %%DATADIR%%-test/queries/0_stateless/00496_substring_negative_offset.reference
@@ -1155,8 +1159,8 @@ lib/libclickhouse.so.%%SOVERSION%%
 %%DATADIR%%-test/queries/0_stateless/00504_mergetree_arrays_rw.sql
 %%DATADIR%%-test/queries/0_stateless/00505_tcp_ssl.reference
 %%DATADIR%%-test/queries/0_stateless/00505_tcp_ssl.sh
-%%DATADIR%%-test/queries/0_stateless/00506_global_in_union.reference
-%%DATADIR%%-test/queries/0_stateless/00506_global_in_union.sql
+%%DATADIR%%-test/queries/0_stateless/00506_shard_global_in_union.reference
+%%DATADIR%%-test/queries/0_stateless/00506_shard_global_in_union.sql
 %%DATADIR%%-test/queries/0_stateless/00506_union_distributed.reference
 %%DATADIR%%-test/queries/0_stateless/00506_union_distributed.sql
 %%DATADIR%%-test/queries/0_stateless/00507_array_no_params.reference
@@ -1177,12 +1181,12 @@ lib/libclickhouse.so.%%SOVERSION%%
 %%DATADIR%%-test/queries/0_stateless/00513_fractional_time_zones.sql
 %%DATADIR%%-test/queries/0_stateless/00514_interval_operators.reference
 %%DATADIR%%-test/queries/0_stateless/00514_interval_operators.sql
-%%DATADIR%%-test/queries/0_stateless/00515_desc_table_functions_and_subqueries.reference
-%%DATADIR%%-test/queries/0_stateless/00515_desc_table_functions_and_subqueries.sql
 %%DATADIR%%-test/queries/0_stateless/00515_enhanced_time_zones.reference
 %%DATADIR%%-test/queries/0_stateless/00515_enhanced_time_zones.sql
 %%DATADIR%%-test/queries/0_stateless/00515_gcd_lcm.reference
 %%DATADIR%%-test/queries/0_stateless/00515_gcd_lcm.sql
+%%DATADIR%%-test/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.reference
+%%DATADIR%%-test/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.sql
 %%DATADIR%%-test/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.reference
 %%DATADIR%%-test/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql
 %%DATADIR%%-test/queries/0_stateless/00516_is_inf_nan.reference
@@ -1223,9 +1227,6 @@ lib/libclickhouse.so.%%SOVERSION%%
 %%DATADIR%%-test/queries/0_stateless/00531_aggregate_over_nullable.sql
 %%DATADIR%%-test/queries/0_stateless/00531_client_ignore_error.reference
 %%DATADIR%%-test/queries/0_stateless/00531_client_ignore_error.sh
-%%DATADIR%%-test/queries/0_stateless/00532_pager_sigpipe.reference
-%%DATADIR%%-test/queries/0_stateless/00532_pager_sigpipe.sh
-%%DATADIR%%-test/queries/0_stateless/00532_pager_sigpipe.tcl
 %%DATADIR%%-test/queries/0_stateless/00532_topk_generic.reference
 %%DATADIR%%-test/queries/0_stateless/00532_topk_generic.sql
 %%DATADIR%%-test/queries/0_stateless/00533_uniq_array.reference
@@ -1302,12 +1303,18 @@ lib/libclickhouse.so.%%SOVERSION%%
 %%DATADIR%%-test/queries/0_stateless/00553_invalid_nested_name.sql
 %%DATADIR%%-test/queries/0_stateless/00554_nested_and_table_engines.reference
 %%DATADIR%%-test/queries/0_stateless/00554_nested_and_table_engines.sql
+%%DATADIR%%-test/queries/0_stateless/00555_hasAll_hasAny.reference
+%%DATADIR%%-test/queries/0_stateless/00555_hasAll_hasAny.sql
 %%DATADIR%%-test/queries/0_stateless/00555_right_join_excessive_rows.reference
 %%DATADIR%%-test/queries/0_stateless/00555_right_join_excessive_rows.sql
+%%DATADIR%%-test/queries/0_stateless/00556_array_intersect.reference
+%%DATADIR%%-test/queries/0_stateless/00556_array_intersect.sql
 %%DATADIR%%-test/queries/0_stateless/00556_remove_columns_from_subquery.reference
 %%DATADIR%%-test/queries/0_stateless/00556_remove_columns_from_subquery.sql
 %%DATADIR%%-test/queries/0_stateless/00557_alter_null_storage_tables.reference
 %%DATADIR%%-test/queries/0_stateless/00557_alter_null_storage_tables.sql
+%%DATADIR%%-test/queries/0_stateless/00557_array_resize.reference
+%%DATADIR%%-test/queries/0_stateless/00557_array_resize.sql
 %%DATADIR%%-test/queries/0_stateless/00557_remote_port.reference
 %%DATADIR%%-test/queries/0_stateless/00557_remote_port.sh
 %%DATADIR%%-test/queries/0_stateless/00558_aggregate_merge_totals_with_arenas.reference
@@ -1320,9 +1327,122 @@ lib/libclickhouse.so.%%SOVERSION%%
 %%DATADIR%%-test/queries/0_stateless/00560_float_leading_plus_in_exponent.sql
 %%DATADIR%%-test/queries/0_stateless/00561_storage_join.reference
 %%DATADIR%%-test/queries/0_stateless/00561_storage_join.sql
+%%DATADIR%%-test/queries/0_stateless/00562_in_subquery_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/00562_in_subquery_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/00562_rewrite_select_expression_with_union.reference
+%%DATADIR%%-test/queries/0_stateless/00562_rewrite_select_expression_with_union.sql
+%%DATADIR%%-test/queries/0_stateless/00563_complex_in_expression.reference
+%%DATADIR%%-test/queries/0_stateless/00563_complex_in_expression.sql
+%%DATADIR%%-test/queries/0_stateless/00563_insert_into_remote_and_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00563_insert_into_remote_and_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/00563_shard_insert_into_remote.reference
+%%DATADIR%%-test/queries/0_stateless/00563_shard_insert_into_remote.sql
+%%DATADIR%%-test/queries/0_stateless/00564_enum_order.reference
+%%DATADIR%%-test/queries/0_stateless/00564_enum_order.sh
+%%DATADIR%%-test/queries/0_stateless/00564_initial_column_values_with_default_expression.reference
+%%DATADIR%%-test/queries/0_stateless/00564_initial_column_values_with_default_expression.sql
+%%DATADIR%%-test/queries/0_stateless/00564_temporary_table_management.reference
+%%DATADIR%%-test/queries/0_stateless/00564_temporary_table_management.sql
+%%DATADIR%%-test/queries/0_stateless/00564_versioned_collapsing_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/00565_enum_order.reference
+%%DATADIR%%-test/queries/0_stateless/00565_enum_order.sh
+%%DATADIR%%-test/queries/0_stateless/00566_enum_min_max.reference
+%%DATADIR%%-test/queries/0_stateless/00566_enum_min_max.sql
+%%DATADIR%%-test/queries/0_stateless/00567_parse_datetime_as_unix_timestamp.reference
+%%DATADIR%%-test/queries/0_stateless/00567_parse_datetime_as_unix_timestamp.sql
+%%DATADIR%%-test/queries/0_stateless/00568_compile_catch_throw.reference
+%%DATADIR%%-test/queries/0_stateless/00568_compile_catch_throw.sh
+%%DATADIR%%-test/queries/0_stateless/00568_empty_function_with_fixed_string.reference
+%%DATADIR%%-test/queries/0_stateless/00568_empty_function_with_fixed_string.sql
+%%DATADIR%%-test/queries/0_stateless/00569_parse_date_time_best_effort.reference
+%%DATADIR%%-test/queries/0_stateless/00569_parse_date_time_best_effort.sql
+%%DATADIR%%-test/queries/0_stateless/00570_empty_array_is_const.reference
+%%DATADIR%%-test/queries/0_stateless/00570_empty_array_is_const.sql
+%%DATADIR%%-test/queries/0_stateless/00571_alter_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00571_alter_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.reference
+%%DATADIR%%-test/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.sql
+%%DATADIR%%-test/queries/0_stateless/00572_aggregation_by_empty_set.reference
+%%DATADIR%%-test/queries/0_stateless/00572_aggregation_by_empty_set.sql
+%%DATADIR%%-test/queries/0_stateless/00573_shard_aggregation_by_empty_set.reference
+%%DATADIR%%-test/queries/0_stateless/00573_shard_aggregation_by_empty_set.sql
+%%DATADIR%%-test/queries/0_stateless/00574_empty_strings_deserialization.reference
+%%DATADIR%%-test/queries/0_stateless/00574_empty_strings_deserialization.sh
+%%DATADIR%%-test/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.reference
+%%DATADIR%%-test/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh
+%%DATADIR%%-test/queries/0_stateless/00575_merge_and_index_with_function_in_in.reference
+%%DATADIR%%-test/queries/0_stateless/00575_merge_and_index_with_function_in_in.sql
+%%DATADIR%%-test/queries/0_stateless/00576_nested_and_prewhere.reference
+%%DATADIR%%-test/queries/0_stateless/00576_nested_and_prewhere.sql
+%%DATADIR%%-test/queries/0_stateless/00577_full_join_segfault.reference
+%%DATADIR%%-test/queries/0_stateless/00577_full_join_segfault.sql
+%%DATADIR%%-test/queries/0_stateless/00577_replacing_merge_tree_vertical_merge.reference
+%%DATADIR%%-test/queries/0_stateless/00577_replacing_merge_tree_vertical_merge.sql
+%%DATADIR%%-test/queries/0_stateless/00578_merge_table_and_table_virtual_column.reference
+%%DATADIR%%-test/queries/0_stateless/00578_merge_table_and_table_virtual_column.sql
+%%DATADIR%%-test/queries/0_stateless/00578_merge_trees_without_primary_key.reference
+%%DATADIR%%-test/queries/0_stateless/00578_merge_trees_without_primary_key.sql
+%%DATADIR%%-test/queries/0_stateless/00579_merge_tree_partition_and_primary_keys_using_same_expression.reference
+%%DATADIR%%-test/queries/0_stateless/00579_merge_tree_partition_and_primary_keys_using_same_expression.sql
+%%DATADIR%%-test/queries/0_stateless/00579_virtual_column_and_lazy.reference
+%%DATADIR%%-test/queries/0_stateless/00579_virtual_column_and_lazy.sql
+%%DATADIR%%-test/queries/0_stateless/00580_cast_nullable_to_non_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00580_cast_nullable_to_non_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00580_consistent_hashing_functions.reference
+%%DATADIR%%-test/queries/0_stateless/00580_consistent_hashing_functions.sql
+%%DATADIR%%-test/queries/0_stateless/00581_limit_on_result_and_subquery_and_insert.reference
+%%DATADIR%%-test/queries/0_stateless/00581_limit_on_result_and_subquery_and_insert.sql
+%%DATADIR%%-test/queries/0_stateless/00582_not_aliasing_functions.reference
+%%DATADIR%%-test/queries/0_stateless/00582_not_aliasing_functions.sql
+%%DATADIR%%-test/queries/0_stateless/00583_limit_by_expressions.reference
+%%DATADIR%%-test/queries/0_stateless/00583_limit_by_expressions.sql
+%%DATADIR%%-test/queries/0_stateless/00584_view_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/00584_view_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/00585_union_all_subquery_aggregation_column_removal.reference
+%%DATADIR%%-test/queries/0_stateless/00585_union_all_subquery_aggregation_column_removal.sql
+%%DATADIR%%-test/queries/0_stateless/00586_removing_unused_columns_from_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/00586_removing_unused_columns_from_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/00587_union_all_type_conversions.reference
+%%DATADIR%%-test/queries/0_stateless/00587_union_all_type_conversions.sql
+%%DATADIR%%-test/queries/0_stateless/00588_shard_distributed_prewhere.reference
+%%DATADIR%%-test/queries/0_stateless/00588_shard_distributed_prewhere.sql
+%%DATADIR%%-test/queries/0_stateless/00589_removal_unused_columns_aggregation.reference
+%%DATADIR%%-test/queries/0_stateless/00589_removal_unused_columns_aggregation.sql
+%%DATADIR%%-test/queries/0_stateless/00590_limit_by_column_removal.reference
+%%DATADIR%%-test/queries/0_stateless/00590_limit_by_column_removal.sql
+%%DATADIR%%-test/queries/0_stateless/00591_columns_removal_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/00591_columns_removal_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/00592_union_all_different_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/00592_union_all_different_aliases.sql
+%%DATADIR%%-test/queries/0_stateless/00593_union_all_assert_columns_removed.reference
+%%DATADIR%%-test/queries/0_stateless/00593_union_all_assert_columns_removed.sql
+%%DATADIR%%-test/queries/0_stateless/00594_alias_in_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/00594_alias_in_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/00595_insert_into_view.reference
+%%DATADIR%%-test/queries/0_stateless/00595_insert_into_view.sh
+%%DATADIR%%-test/queries/0_stateless/00596_limit_on_expanded_ast.reference
+%%DATADIR%%-test/queries/0_stateless/00596_limit_on_expanded_ast.sh
+%%DATADIR%%-test/queries/0_stateless/00597_with_totals_on_empty_set.reference
+%%DATADIR%%-test/queries/0_stateless/00597_with_totals_on_empty_set.sql
+%%DATADIR%%-test/queries/0_stateless/00598_create_as_select_http.reference
+%%DATADIR%%-test/queries/0_stateless/00598_create_as_select_http.sh
+%%DATADIR%%-test/queries/0_stateless/00599_create_view_with_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/00599_create_view_with_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/00600_replace_running_query.reference
+%%DATADIR%%-test/queries/0_stateless/00600_replace_running_query.sh
+%%DATADIR%%-test/queries/0_stateless/00601_kill_running_query.reference
+%%DATADIR%%-test/queries/0_stateless/00601_kill_running_query.sh
+%%DATADIR%%-test/queries/0_stateless/00602_throw_if.reference
+%%DATADIR%%-test/queries/0_stateless/00602_throw_if.sh
+%%DATADIR%%-test/queries/0_stateless/00603_system_parts_nonexistent_database.reference
+%%DATADIR%%-test/queries/0_stateless/00603_system_parts_nonexistent_database.sql
 %%DATADIR%%-test/queries/0_stateless/99999_prepare.reference
 %%DATADIR%%-test/queries/0_stateless/99999_prepare.sql
 %%DATADIR%%-test/queries/shell_config.sh
 @dir %%DATADIR%%-test/external_dictionaries/CMakeFiles
 @dir %%DATADIR%%-test/external_dictionaries/clickhouse
 @dir %%DATADIR%%-test/external_dictionaries/generated
+@dir /var/db/clickhouse
+@dir /var/log/clickhouse
+@dir /var/run/clickhouse