From fce9db12b9279e78e4f514112cf206a359761c90 Mon Sep 17 00:00:00 2001 From: proller Date: Fri, 22 Mar 2019 15:08:30 +0300 Subject: [PATCH] Move Interpreters/Settings* -> Core/Settings* --- dbms/programs/local/LocalServer.h | 2 +- dbms/programs/performance-test/PerformanceTestInfo.h | 2 +- dbms/programs/performance-test/PerformanceTestSuite.cpp | 2 +- dbms/programs/performance-test/executeQuery.h | 2 +- dbms/src/Client/Connection.h | 2 +- dbms/src/Client/ConnectionPoolWithFailover.cpp | 2 +- dbms/src/{Interpreters => Core}/Settings.cpp | 3 ++- dbms/src/{Interpreters => Core}/Settings.h | 2 +- dbms/src/{Interpreters => Core}/SettingsCommon.cpp | 5 ++--- dbms/src/{Interpreters => Core}/SettingsCommon.h | 0 dbms/src/DataStreams/IBlockInputStream.h | 2 +- dbms/src/Databases/DatabaseOrdinary.cpp | 2 +- dbms/src/Formats/FormatFactory.cpp | 2 +- dbms/src/IO/ConnectionTimeouts.h | 2 +- dbms/src/Interpreters/Cluster.h | 2 +- dbms/src/Interpreters/ClusterProxy/executeQuery.cpp | 2 +- dbms/src/Interpreters/Context.cpp | 2 +- dbms/src/Interpreters/Context.h | 2 +- dbms/src/Interpreters/ExpressionActions.h | 2 +- dbms/src/Interpreters/ExpressionAnalyzer.h | 2 +- dbms/src/Interpreters/InJoinSubqueriesPreprocessor.h | 2 +- dbms/src/Interpreters/Join.h | 2 +- dbms/src/Interpreters/LogicalExpressionsOptimizer.cpp | 2 +- dbms/src/Interpreters/ProcessList.cpp | 2 +- dbms/src/Interpreters/SyntaxAnalyzer.cpp | 2 +- .../Interpreters/tests/in_join_subqueries_preprocessor.cpp | 2 +- .../src/Interpreters/tests/logical_expressions_optimizer.cpp | 2 +- dbms/src/Storages/Kafka/KafkaSettings.h | 2 +- dbms/src/Storages/MergeTree/MergeTreeSettings.h | 2 +- dbms/src/Storages/StorageDistributed.h | 2 +- dbms/src/Storages/StorageMerge.cpp | 2 +- dbms/src/Storages/StorageMySQL.cpp | 2 +- dbms/src/Storages/System/StorageSystemBuildOptions.cpp | 2 +- dbms/src/Storages/System/StorageSystemProcesses.cpp | 2 +- 34 files changed, 35 insertions(+), 35 deletions(-) rename dbms/src/{Interpreters => Core}/Settings.cpp (99%) rename dbms/src/{Interpreters => Core}/Settings.h (99%) rename dbms/src/{Interpreters => Core}/SettingsCommon.cpp (99%) rename dbms/src/{Interpreters => Core}/SettingsCommon.h (100%) diff --git a/dbms/programs/local/LocalServer.h b/dbms/programs/local/LocalServer.h index cabd209717..2f59778490 100644 --- a/dbms/programs/local/LocalServer.h +++ b/dbms/programs/local/LocalServer.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/dbms/programs/performance-test/PerformanceTestInfo.h b/dbms/programs/performance-test/PerformanceTestInfo.h index b5e2f0c0ac..453bf0d30b 100644 --- a/dbms/programs/performance-test/PerformanceTestInfo.h +++ b/dbms/programs/performance-test/PerformanceTestInfo.h @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include diff --git a/dbms/programs/performance-test/PerformanceTestSuite.cpp b/dbms/programs/performance-test/PerformanceTestSuite.cpp index 88d46ddf6e..7a373d7bfb 100644 --- a/dbms/programs/performance-test/PerformanceTestSuite.cpp +++ b/dbms/programs/performance-test/PerformanceTestSuite.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/dbms/programs/performance-test/executeQuery.h b/dbms/programs/performance-test/executeQuery.h index 61494ca53b..d3b37a6a67 100644 --- a/dbms/programs/performance-test/executeQuery.h +++ b/dbms/programs/performance-test/executeQuery.h @@ -4,7 +4,7 @@ #include "TestStopConditions.h" #include #include -#include +#include #include namespace DB diff --git a/dbms/src/Client/Connection.h b/dbms/src/Client/Connection.h index 90979f8d31..094729f784 100644 --- a/dbms/src/Client/Connection.h +++ b/dbms/src/Client/Connection.h @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/dbms/src/Client/ConnectionPoolWithFailover.cpp b/dbms/src/Client/ConnectionPoolWithFailover.cpp index 7687742169..55859498c0 100644 --- a/dbms/src/Client/ConnectionPoolWithFailover.cpp +++ b/dbms/src/Client/ConnectionPoolWithFailover.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace ProfileEvents diff --git a/dbms/src/Interpreters/Settings.cpp b/dbms/src/Core/Settings.cpp similarity index 99% rename from dbms/src/Interpreters/Settings.cpp rename to dbms/src/Core/Settings.cpp index a15c0123e6..d5a8bab378 100644 --- a/dbms/src/Interpreters/Settings.cpp +++ b/dbms/src/Core/Settings.cpp @@ -1,8 +1,9 @@ +#include "Settings.h" + #include #include #include #include -#include #include #include #include diff --git a/dbms/src/Interpreters/Settings.h b/dbms/src/Core/Settings.h similarity index 99% rename from dbms/src/Interpreters/Settings.h rename to dbms/src/Core/Settings.h index 20e07d1591..fa76ea0263 100644 --- a/dbms/src/Interpreters/Settings.h +++ b/dbms/src/Core/Settings.h @@ -1,7 +1,7 @@ #pragma once +#include "SettingsCommon.h" #include -#include namespace Poco diff --git a/dbms/src/Interpreters/SettingsCommon.cpp b/dbms/src/Core/SettingsCommon.cpp similarity index 99% rename from dbms/src/Interpreters/SettingsCommon.cpp rename to dbms/src/Core/SettingsCommon.cpp index c1ca1bc55a..a44f8bfd20 100644 --- a/dbms/src/Interpreters/SettingsCommon.cpp +++ b/dbms/src/Core/SettingsCommon.cpp @@ -1,12 +1,11 @@ -#include +#include "SettingsCommon.h" +#include #include #include - #include #include -#include namespace DB diff --git a/dbms/src/Interpreters/SettingsCommon.h b/dbms/src/Core/SettingsCommon.h similarity index 100% rename from dbms/src/Interpreters/SettingsCommon.h rename to dbms/src/Core/SettingsCommon.h diff --git a/dbms/src/DataStreams/IBlockInputStream.h b/dbms/src/DataStreams/IBlockInputStream.h index dfcd1c3880..958891cc5f 100644 --- a/dbms/src/DataStreams/IBlockInputStream.h +++ b/dbms/src/DataStreams/IBlockInputStream.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/dbms/src/Databases/DatabaseOrdinary.cpp b/dbms/src/Databases/DatabaseOrdinary.cpp index e144ed9071..bd2786b89a 100644 --- a/dbms/src/Databases/DatabaseOrdinary.cpp +++ b/dbms/src/Databases/DatabaseOrdinary.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/dbms/src/Formats/FormatFactory.cpp b/dbms/src/Formats/FormatFactory.cpp index 9b54720bf4..8086236db5 100644 --- a/dbms/src/Formats/FormatFactory.cpp +++ b/dbms/src/Formats/FormatFactory.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include diff --git a/dbms/src/IO/ConnectionTimeouts.h b/dbms/src/IO/ConnectionTimeouts.h index fed1ec3f0e..d7c1ac7e8c 100644 --- a/dbms/src/IO/ConnectionTimeouts.h +++ b/dbms/src/IO/ConnectionTimeouts.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace DB { diff --git a/dbms/src/Interpreters/Cluster.h b/dbms/src/Interpreters/Cluster.h index 0d2d83f7bf..8179caf10a 100644 --- a/dbms/src/Interpreters/Cluster.h +++ b/dbms/src/Interpreters/Cluster.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/dbms/src/Interpreters/ClusterProxy/executeQuery.cpp b/dbms/src/Interpreters/ClusterProxy/executeQuery.cpp index 4b9aa713f0..1a202e064f 100644 --- a/dbms/src/Interpreters/ClusterProxy/executeQuery.cpp +++ b/dbms/src/Interpreters/ClusterProxy/executeQuery.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include diff --git a/dbms/src/Interpreters/Context.cpp b/dbms/src/Interpreters/Context.cpp index 42ef341a2f..86500b2bc6 100644 --- a/dbms/src/Interpreters/Context.cpp +++ b/dbms/src/Interpreters/Context.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/dbms/src/Interpreters/Context.h b/dbms/src/Interpreters/Context.h index 4f90a50e34..b8f2cadc55 100644 --- a/dbms/src/Interpreters/Context.h +++ b/dbms/src/Interpreters/Context.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/dbms/src/Interpreters/ExpressionActions.h b/dbms/src/Interpreters/ExpressionActions.h index 39eeaf4fc7..3e892be142 100644 --- a/dbms/src/Interpreters/ExpressionActions.h +++ b/dbms/src/Interpreters/ExpressionActions.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/dbms/src/Interpreters/ExpressionAnalyzer.h b/dbms/src/Interpreters/ExpressionAnalyzer.h index b9ec5c3ca7..02e8982ff3 100644 --- a/dbms/src/Interpreters/ExpressionAnalyzer.h +++ b/dbms/src/Interpreters/ExpressionAnalyzer.h @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/dbms/src/Interpreters/InJoinSubqueriesPreprocessor.h b/dbms/src/Interpreters/InJoinSubqueriesPreprocessor.h index a3e3140eeb..b98bdc4e57 100644 --- a/dbms/src/Interpreters/InJoinSubqueriesPreprocessor.h +++ b/dbms/src/Interpreters/InJoinSubqueriesPreprocessor.h @@ -2,7 +2,7 @@ #include #include -#include +#include namespace DB diff --git a/dbms/src/Interpreters/Join.h b/dbms/src/Interpreters/Join.h index b6ac8dc4fd..29e1a6b5eb 100644 --- a/dbms/src/Interpreters/Join.h +++ b/dbms/src/Interpreters/Join.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include diff --git a/dbms/src/Interpreters/LogicalExpressionsOptimizer.cpp b/dbms/src/Interpreters/LogicalExpressionsOptimizer.cpp index b0ddd669d6..917955ce1a 100644 --- a/dbms/src/Interpreters/LogicalExpressionsOptimizer.cpp +++ b/dbms/src/Interpreters/LogicalExpressionsOptimizer.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/dbms/src/Interpreters/ProcessList.cpp b/dbms/src/Interpreters/ProcessList.cpp index 007d77c649..8b3926e955 100644 --- a/dbms/src/Interpreters/ProcessList.cpp +++ b/dbms/src/Interpreters/ProcessList.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/dbms/src/Interpreters/SyntaxAnalyzer.cpp b/dbms/src/Interpreters/SyntaxAnalyzer.cpp index 34bec70223..e54026deb6 100644 --- a/dbms/src/Interpreters/SyntaxAnalyzer.cpp +++ b/dbms/src/Interpreters/SyntaxAnalyzer.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/dbms/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp b/dbms/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp index 1afdd644dd..74c370adbc 100644 --- a/dbms/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp +++ b/dbms/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/dbms/src/Interpreters/tests/logical_expressions_optimizer.cpp b/dbms/src/Interpreters/tests/logical_expressions_optimizer.cpp index f9ba76a667..aa033d33e5 100644 --- a/dbms/src/Interpreters/tests/logical_expressions_optimizer.cpp +++ b/dbms/src/Interpreters/tests/logical_expressions_optimizer.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include diff --git a/dbms/src/Storages/Kafka/KafkaSettings.h b/dbms/src/Storages/Kafka/KafkaSettings.h index 55242462dd..0ddc7ef04f 100644 --- a/dbms/src/Storages/Kafka/KafkaSettings.h +++ b/dbms/src/Storages/Kafka/KafkaSettings.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include namespace DB diff --git a/dbms/src/Storages/MergeTree/MergeTreeSettings.h b/dbms/src/Storages/MergeTree/MergeTreeSettings.h index e09c15108e..9713aa1e80 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeSettings.h +++ b/dbms/src/Storages/MergeTree/MergeTreeSettings.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include namespace DB diff --git a/dbms/src/Storages/StorageDistributed.h b/dbms/src/Storages/StorageDistributed.h index a628f2c542..404a9a7265 100644 --- a/dbms/src/Storages/StorageDistributed.h +++ b/dbms/src/Storages/StorageDistributed.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/dbms/src/Storages/StorageMerge.cpp b/dbms/src/Storages/StorageMerge.cpp index 225ae9c2a0..609aa38dd1 100644 --- a/dbms/src/Storages/StorageMerge.cpp +++ b/dbms/src/Storages/StorageMerge.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/dbms/src/Storages/StorageMySQL.cpp b/dbms/src/Storages/StorageMySQL.cpp index c565369745..4228809281 100644 --- a/dbms/src/Storages/StorageMySQL.cpp +++ b/dbms/src/Storages/StorageMySQL.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/dbms/src/Storages/System/StorageSystemBuildOptions.cpp b/dbms/src/Storages/System/StorageSystemBuildOptions.cpp index 1a19f2f00f..73d1c91f42 100644 --- a/dbms/src/Storages/System/StorageSystemBuildOptions.cpp +++ b/dbms/src/Storages/System/StorageSystemBuildOptions.cpp @@ -1,7 +1,7 @@ #include "StorageSystemBuildOptions.h" #include -#include +#include extern const char * auto_config_build[]; diff --git a/dbms/src/Storages/System/StorageSystemProcesses.cpp b/dbms/src/Storages/System/StorageSystemProcesses.cpp index 9c121d7911..2d871b4b26 100644 --- a/dbms/src/Storages/System/StorageSystemProcesses.cpp +++ b/dbms/src/Storages/System/StorageSystemProcesses.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include -- GitLab