From 31240aa24348fce46be562fc1244573e674c64b4 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 24 Aug 2020 23:35:38 +0300
Subject: [PATCH] Minor modifications

---
 .gitignore                                      | 1 -
 src/Storages/ya.make                            | 1 -
 src/Storages/ya.make.in                         | 2 +-
 tests/queries/0_stateless/01455_time_zones.sql  | 8 ++++----
 tests/queries/0_stateless/arcadia_skip_list.txt | 1 +
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index edab4d46086..0716fb1ac09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@
 
 # auto generated files
 *.logrt
-src/Storages/System/StorageSystemTimeZones.generated.cpp
 
 /build
 /build_*
diff --git a/src/Storages/ya.make b/src/Storages/ya.make
index b407747365b..3054d5b9cc7 100644
--- a/src/Storages/ya.make
+++ b/src/Storages/ya.make
@@ -182,7 +182,6 @@ SRCS(
     System/StorageSystemTableEngines.cpp
     System/StorageSystemTableFunctions.cpp
     System/StorageSystemTables.cpp
-    System/StorageSystemTimeZones.cpp
     System/StorageSystemUserDirectories.cpp
     System/StorageSystemUsers.cpp
     System/StorageSystemZeros.cpp
diff --git a/src/Storages/ya.make.in b/src/Storages/ya.make.in
index 5295cc5fc8a..363747b9b80 100644
--- a/src/Storages/ya.make.in
+++ b/src/Storages/ya.make.in
@@ -7,7 +7,7 @@ PEERDIR(
 )
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -P 'Kafka|RabbitMQ|S3|HDFS|Licenses' | sed 's/^\.\//    /' | sort ?>
+<? find . -name '*.cpp' | grep -v -F tests | grep -v -P 'Kafka|RabbitMQ|S3|HDFS|Licenses|TimeZones' | sed 's/^\.\//    /' | sort ?>
 )
 
 END()
diff --git a/tests/queries/0_stateless/01455_time_zones.sql b/tests/queries/0_stateless/01455_time_zones.sql
index 288e64383eb..4024dbb3348 100644
--- a/tests/queries/0_stateless/01455_time_zones.sql
+++ b/tests/queries/0_stateless/01455_time_zones.sql
@@ -1,9 +1,9 @@
--- There are currently 562 timezones which are used from the binary embedded inside the ClickHouse binary
--- Refer: contrib/cctz-cmake/CMakeLists.txt for the complete list. The count should match when queried.
+-- There are currently 594 timezones which are used from the binary embedded inside the ClickHouse binary
+-- Refer: contrib/cctz-cmake/CMakeLists.txt for the complete list. The count may change but we expect there will be at least 500 timezones.
 -- SELECT count(*)
 -- FROM system.time_zones
 --
 -- ┌─count()─┐
--- │     562 │
+-- │     594 │
 -- └─────────┘
-SELECT if ((SELECT count(*) FROM system.time_zones) = 562, 'ok', 'fail');
+SELECT if ((SELECT count(*) FROM system.time_zones) > 500, 'ok', 'fail');
diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt
index 0c3ce88b439..b5cdf9c2eba 100644
--- a/tests/queries/0_stateless/arcadia_skip_list.txt
+++ b/tests/queries/0_stateless/arcadia_skip_list.txt
@@ -135,3 +135,4 @@
 01391_join_on_dict_crash
 01401_FORMAT_SETTINGS
 01411_bayesian_ab_testing
+01455_time_zones