Merge pull request #17878 from ClickHouse/fix-bad-code

Fix bad code

src/Dictionaries/FileDictionarySource.cpp

@@ -4,11 +4,13 @@
 #include <Interpreters/Context.h>
 #include <Poco/File.h>
 #include <Common/StringUtils/StringUtils.h>
+#include <common/logger_useful.h>
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
 #include "registerDictionaries.h"
 #include "DictionarySourceHelpers.h"
 
+
 namespace DB
 {
 static const UInt64 max_block_size = 8192;

src/Disks/DiskLocal.cpp

@@ -8,8 +8,10 @@
 
 #include <IO/createReadBufferFromFileBase.h>
 #include <IO/createWriteBufferFromFileBase.h>
+#include <common/logger_useful.h>
 #include <unistd.h>
 
+
 namespace DB
 {
 

src/Disks/S3/registerDiskS3.cpp

@@ -3,6 +3,7 @@
 #include <IO/S3Common.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
+#include <common/logger_useful.h>
 #include "DiskS3.h"
 #include "Disks/DiskCacheWrapper.h"
 #include "Disks/DiskFactory.h"
@@ -10,6 +11,7 @@
 #include "ProxyListConfiguration.h"
 #include "ProxyResolverConfiguration.h"
 
+
 namespace DB
 {
 namespace ErrorCodes

src/Interpreters/Aggregator.h

@@ -16,7 +16,6 @@
 
 #include <Common/ThreadPool.h>
 #include <Common/UInt128.h>
-#include <Common/LRUCache.h>
 #include <Common/ColumnsHashing.h>
 #include <Common/assert_cast.h>
 #include <Common/filesystemHelpers.h>

src/Interpreters/Context.h

@@ -10,7 +10,6 @@
 #include <Interpreters/DatabaseCatalog.h>
 #include <Parsers/IAST_fwd.h>
 #include <Access/RowPolicy.h>
-#include <Common/LRUCache.h>
 #include <Common/MultiVersion.h>
 #include <Common/ThreadPool.h>
 #include <Common/OpenTelemetryTraceContext.h>

src/Interpreters/DatabaseCatalog.cpp

@@ -14,6 +14,7 @@
 #include <Poco/DirectoryIterator.h>
 #include <Common/renameat2.h>
 #include <Common/CurrentMetrics.h>
+#include <common/logger_useful.h>
 
 #include <filesystem>
 

src/Interpreters/ExpressionJIT.cpp

@@ -7,7 +7,6 @@
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnVector.h>
-#include <Common/LRUCache.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <Common/ProfileEvents.h>

src/Processors/Formats/Impl/AvroRowInputFormat.cpp

@@ -7,6 +7,8 @@
 #include <Core/Defines.h>
 #include <Core/Field.h>
 
+#include <Common/LRUCache.h>
+
 #include <IO/Operators.h>
 #include <IO/ReadHelpers.h>
 #include <IO/HTTPCommon.h>

tests/queries/0_stateless/01532_execute_merges_on_single_replica.reference

@@ -1,9 +1,9 @@
-############################
-### emulate normal feature operation - merges are distributed between replicas
-############################
-### emulate execute_merges_on_single_replica_time_threshold timeout
-############################
-### timeout not exceeded, r1 waits for r2
+****************************
+*** emulate normal feature operation - merges are distributed between replicas
+****************************
+*** emulate execute_merges_on_single_replica_time_threshold timeout
+****************************
+*** timeout not exceeded, r1 waits for r2
 Row 1:
 ──────
 table:           execute_on_single_replica_r1
@@ -19,8 +19,8 @@ type:            MERGE_PARTS
 new_part_name:   all_0_0_5
 has_postpones:   0
 postpone_reason: 
-############################
-### timeout exceeded, r1 failed to get the merged part from r2 and did the merge by its own
+****************************
+*** timeout exceeded, r1 failed to get the merged part from r2 and did the merge by its own
 Row 1:
 ──────
 table:           execute_on_single_replica_r2
@@ -28,12 +28,12 @@ type:            MERGE_PARTS
 new_part_name:   all_0_0_5
 has_postpones:   0
 postpone_reason: 
-############################
-### queue unfreeze
-############################
-### disable the feature
-############################
-### part_log
+****************************
+*** queue unfreeze
+****************************
+*** disable the feature
+****************************
+*** part_log
 Row 1:
 ──────
 part_name: all_0_0_1

tests/queries/0_stateless/01532_execute_merges_on_single_replica.sql

@@ -10,8 +10,8 @@ SYSTEM SYNC REPLICA execute_on_single_replica_r2;
 
 SET optimize_throw_if_noop=1;
 
-SELECT '############################';
-SELECT '### emulate normal feature operation - merges are distributed between replicas';
+SELECT '****************************';
+SELECT '*** emulate normal feature operation - merges are distributed between replicas';
 
 /* all_0_0_1 - will be merged by r1, and downloaded by r2 */
 OPTIMIZE TABLE execute_on_single_replica_r1 FINAL;
@@ -29,8 +29,8 @@ SYSTEM SYNC REPLICA execute_on_single_replica_r2;
 OPTIMIZE TABLE execute_on_single_replica_r2 FINAL;
 SYSTEM SYNC REPLICA execute_on_single_replica_r1;
 
-SELECT '############################';
-SELECT '### emulate execute_merges_on_single_replica_time_threshold timeout';
+SELECT '****************************';
+SELECT '*** emulate execute_merges_on_single_replica_time_threshold timeout';
 
 SYSTEM STOP REPLICATION QUEUES execute_on_single_replica_r2;
 
@@ -40,8 +40,8 @@ OPTIMIZE TABLE execute_on_single_replica_r1 FINAL SETTINGS replication_alter_par
 /* if we will check immediately we can find the log entry unchecked */
 SELECT * FROM numbers(4) where sleepEachRow(1);
 
-SELECT '############################';
-SELECT '### timeout not exceeded, r1 waits for r2';
+SELECT '****************************';
+SELECT '*** timeout not exceeded, r1 waits for r2';
 
 /* we can now check that r1 waits for r2 */
 SELECT
@@ -59,8 +59,8 @@ FORMAT Vertical;
 /* we have execute_merges_on_single_replica_time_threshold exceeded */
 SELECT * FROM numbers(10) where sleepEachRow(1);
 
-SELECT '############################';
-SELECT '### timeout exceeded, r1 failed to get the merged part from r2 and did the merge by its own';
+SELECT '****************************';
+SELECT '*** timeout exceeded, r1 failed to get the merged part from r2 and did the merge by its own';
 
 SELECT
     table,
@@ -77,8 +77,8 @@ FORMAT Vertical;
 SYSTEM START REPLICATION QUEUES execute_on_single_replica_r2;
 SYSTEM SYNC REPLICA execute_on_single_replica_r2;
 
-SELECT '############################';
-SELECT '### queue unfreeze';
+SELECT '****************************';
+SELECT '*** queue unfreeze';
 
 SELECT
     table,
@@ -92,8 +92,8 @@ AND database = currentDatabase()
 ORDER BY table
 FORMAT Vertical;
 
-SELECT '############################';
-SELECT '### disable the feature';
+SELECT '****************************';
+SELECT '*** disable the feature';
 
 ALTER TABLE execute_on_single_replica_r1 MODIFY SETTING execute_merges_on_single_replica_time_threshold=0;
 ALTER TABLE execute_on_single_replica_r2 MODIFY SETTING execute_merges_on_single_replica_time_threshold=0;
@@ -108,8 +108,8 @@ SYSTEM SYNC REPLICA execute_on_single_replica_r2;
 
 SYSTEM FLUSH LOGS;
 
-SELECT '############################';
-SELECT '### part_log';
+SELECT '****************************';
+SELECT '*** part_log';
 SELECT
     part_name,
     arraySort(groupArrayIf(table, event_type = 'MergeParts')) AS mergers,