Fix build without s3 in fast test

kssenii · kssenii · commit 1790c85465da · 2024-06-04T19:42:31.000+02:00
diff --git a/src/Storages/S3Queue/S3QueueSource.cpp b/src/Storages/S3Queue/S3QueueSource.cpp
@@ -1,6 +1,5 @@
 #include "config.h"
 
-#if USE_AWS_S3
 #include <Common/ProfileEvents.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
@@ -513,5 +512,3 @@ void StorageS3QueueSource::appendLogElement(
 }
 
 }
-
-#endif
diff --git a/src/Storages/S3Queue/S3QueueSource.h b/src/Storages/S3Queue/S3QueueSource.h
@@ -1,7 +1,6 @@
 #pragma once
 #include "config.h"
 
-#if USE_AWS_S3
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Processors/ISource.h>
 #include <Storages/S3Queue/S3QueueMetadata.h>
@@ -131,4 +130,3 @@ class StorageS3QueueSource : public ISource, WithContext
 };
 
 }
-#endif
diff --git a/src/Storages/S3Queue/S3QueueTableMetadata.cpp b/src/Storages/S3Queue/S3QueueTableMetadata.cpp
@@ -1,7 +1,5 @@
 #include <config.h>
 
-#if USE_AWS_S3
-
 #include <Poco/JSON/JSON.h>
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Parser.h>
@@ -252,5 +250,3 @@ void S3QueueTableMetadata::checkEquals(const S3QueueSettings & current, const S3
     }
 }
 }
-
-#endif
diff --git a/src/Storages/S3Queue/S3QueueTableMetadata.h b/src/Storages/S3Queue/S3QueueTableMetadata.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#if USE_AWS_S3
-
 #include <Storages/S3Queue/S3QueueSettings.h>
 #include <Storages/StorageInMemoryMetadata.h>
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
@@ -48,5 +46,3 @@ struct S3QueueTableMetadata
 
 
 }
-
-#endif
diff --git a/src/Storages/S3Queue/StorageS3Queue.cpp b/src/Storages/S3Queue/StorageS3Queue.cpp
@@ -1,7 +1,6 @@
 #include <optional>
 #include "config.h"
 
-#if USE_AWS_S3
 #include <Common/ProfileEvents.h>
 #include <IO/S3Common.h>
 #include <IO/CompressionMethod.h>
@@ -494,6 +493,7 @@ std::shared_ptr<StorageS3Queue::FileIterator> StorageS3Queue::createFileIterator
     return std::make_shared<FileIterator>(files_metadata, std::move(glob_iterator), shutdown_called, log);
 }
 
+#if USE_AWS_S3
 void registerStorageS3Queue(StorageFactory & factory)
 {
     factory.registerStorage(
@@ -560,8 +560,6 @@ void registerStorageS3Queue(StorageFactory & factory)
             .source_access_type = AccessType::S3,
         });
 }
+#endif
 
 }
-
-
-#endif
diff --git a/src/Storages/S3Queue/StorageS3Queue.h b/src/Storages/S3Queue/StorageS3Queue.h
@@ -1,7 +1,6 @@
 #pragma once
 #include "config.h"
 
-#if USE_AWS_S3
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/logger_useful.h>
 #include <Core/BackgroundSchedulePool.h>
@@ -97,5 +96,3 @@ class StorageS3Queue : public IStorage, WithContext
 };
 
 }
-
-#endif

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`#include "config.h"`
`2`	`2`
`3`		`-#if USE_AWS_S3`
`4`	`3`	`#include <Common/ProfileEvents.h>`
`5`	`4`	`#include <Common/CurrentMetrics.h>`
`6`	`5`	`#include <Common/ZooKeeper/ZooKeeper.h>`
`@@ -513,5 +512,3 @@ void StorageS3QueueSource::appendLogElement(`
`513`	`512`	`}`
`514`	`513`
`515`	`514`	`}`
`516`		`-`
`517`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`#include <config.h>`
`2`	`2`
`3`		`-#if USE_AWS_S3`
`4`		`-`
`5`	`3`	`#include <Poco/JSON/JSON.h>`
`6`	`4`	`#include <Poco/JSON/Object.h>`
`7`	`5`	`#include <Poco/JSON/Parser.h>`
`@@ -252,5 +250,3 @@ void S3QueueTableMetadata::checkEquals(const S3QueueSettings & current, const S3`
`252`	`250`	`}`
`253`	`251`	`}`
`254`	`252`	`}`
`255`		`-`
`256`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`#include <optional>`
`2`	`2`	`#include "config.h"`
`3`	`3`
`4`		`-#if USE_AWS_S3`
`5`	`4`	`#include <Common/ProfileEvents.h>`
`6`	`5`	`#include <IO/S3Common.h>`
`7`	`6`	`#include <IO/CompressionMethod.h>`
`@@ -494,6 +493,7 @@ std::shared_ptr<StorageS3Queue::FileIterator> StorageS3Queue::createFileIterator`
`494`	`493`	`return std::make_shared<FileIterator>(files_metadata, std::move(glob_iterator), shutdown_called, log);`
`495`	`494`	`}`
`496`	`495`
	`496`	`+#if USE_AWS_S3`
`497`	`497`	`void registerStorageS3Queue(StorageFactory & factory)`
`498`	`498`	`{`
`499`	`499`	`factory.registerStorage(`
`@@ -560,8 +560,6 @@ void registerStorageS3Queue(StorageFactory & factory)`
`560`	`560`	`.source_access_type = AccessType::S3,`
`561`	`561`	`});`
`562`	`562`	`}`
	`563`	`+#endif`
`563`	`564`
`564`	`565`	`}`
`565`		`-`
`566`		`-`
`567`		`-#endif`