From fcfda4b983aec415aa63ce4e2e17b1c9873b74f4 Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
Date: Thu, 26 Aug 2021 13:12:42 +0000
Subject: [PATCH] Fix tests and update ya.make

---
 docker/test/stateless/run.sh                              | 8 ++++++++
 src/Parsers/ya.make                                       | 1 -
 src/Storages/ya.make                                      | 2 --
 .../queries/0_stateless/02012_settings_clause_for_s3.sql  | 3 +++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index e5ef72e747a..0bbe6ff4534 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -17,6 +17,14 @@ dpkg -i package_folder/clickhouse-test_*.deb
 # install test configs
 /usr/share/clickhouse-test/config/install.sh
 
+
+# FIXME: This is an ugly fix to enable S3 related features to test with Funcitonal tests
+# AWS SDK checks these variables in the constructor of ClientConfiguration
+# and in case of absence will log some warnings in server's logs.
+# And tests will fail in this case.
+export AWS_RETRY_MODE="standart"
+export AWS_MAX_ATTEMPTS=3
+
 # For flaky check we also enable thread fuzzer
 if [ "$NUM_TRIES" -gt "1" ]; then
     export THREAD_FUZZER_CPU_TIME_PERIOD_US=1000
diff --git a/src/Parsers/ya.make b/src/Parsers/ya.make
index d17b73104d6..8f1363e9e00 100644
--- a/src/Parsers/ya.make
+++ b/src/Parsers/ya.make
@@ -145,7 +145,6 @@ SRCS(
     TokenIterator.cpp
     formatAST.cpp
     formatSettingName.cpp
-    getInsertQuery.cpp
     iostream_debug_helpers.cpp
     makeASTForLogicalFunction.cpp
     obfuscateQueries.cpp
diff --git a/src/Storages/ya.make b/src/Storages/ya.make
index 10d9b035aae..789ebb4bf5f 100644
--- a/src/Storages/ya.make
+++ b/src/Storages/ya.make
@@ -222,8 +222,6 @@ SRCS(
     TTLDescription.cpp
     VirtualColumnUtils.cpp
     extractKeyExpressionList.cpp
-    fuzzers/columns_description_fuzzer.cpp
-    fuzzers/mergetree_checksum_fuzzer.cpp
     getStructureOfRemoteTable.cpp
     registerStorages.cpp
     transformQueryForExternalDatabase.cpp
diff --git a/tests/queries/0_stateless/02012_settings_clause_for_s3.sql b/tests/queries/0_stateless/02012_settings_clause_for_s3.sql
index 02ec7d178aa..88cd3d3c48f 100644
--- a/tests/queries/0_stateless/02012_settings_clause_for_s3.sql
+++ b/tests/queries/0_stateless/02012_settings_clause_for_s3.sql
@@ -1,3 +1,5 @@
+DROP TABLE IF EXISTS table_with_range;
+
 CREATE TABLE table_with_range
 (
     `name` String,
@@ -6,3 +8,4 @@ CREATE TABLE table_with_range
 ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/some_file_{1..3}', 'CSV')
 SETTINGS input_format_with_names_use_header = 0;
 
+DROP TABLE IF EXISTS table_with_range;