Merge pull request #4764 from proller/fix23

 Move Interpreters/Settings* -> Core/Settings*

dbms/programs/local/LocalServer.h

 #pragma once
 
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Poco/Util/Application.h>
 #include <memory>
 

dbms/programs/performance-test/PerformanceTestInfo.h

@@ -2,7 +2,7 @@
 #include <string>
 #include <vector>
 #include <map>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Poco/Util/XMLConfiguration.h>
 #include <Poco/AutoPtr.h>
 

dbms/programs/performance-test/PerformanceTestSuite.cpp

@@ -25,7 +25,7 @@
 #include <Interpreters/Context.h>
 #include <IO/ConnectionTimeouts.h>
 #include <IO/UseSSL.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Common/Exception.h>
 #include <Common/InterruptListener.h>
 

dbms/programs/performance-test/executeQuery.h

@@ -4,7 +4,7 @@
 #include "TestStopConditions.h"
 #include <Common/InterruptListener.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Client/Connection.h>
 
 namespace DB

dbms/src/Client/Connection.h

@@ -18,7 +18,7 @@
 
 #include <IO/ConnectionTimeouts.h>
 
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Interpreters/TablesStatus.h>
 
 #include <Compression/ICompressionCodec.h>

dbms/src/Client/ConnectionPoolWithFailover.cpp

@@ -6,7 +6,7 @@
 #include <Common/getFQDNOrHostName.h>
 #include <Common/isLocalAddress.h>
 #include <Common/ProfileEvents.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 
 
 namespace ProfileEvents

dbms/src/Interpreters/Settings.cpp → dbms/src/Core/Settings.cpp

+#include "Settings.h"
+
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Core/Field.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <Interpreters/Settings.h>
 #include <Columns/ColumnArray.h>
 #include <Common/typeid_cast.h>
 #include <string.h>

dbms/src/Interpreters/Settings.h → dbms/src/Core/Settings.h

 #pragma once
 
+#include "SettingsCommon.h"
 #include <Core/Defines.h>
-#include <Interpreters/SettingsCommon.h>
 
 
 namespace Poco

dbms/src/Interpreters/SettingsCommon.cpp → dbms/src/Core/SettingsCommon.cpp

-#include <Core/Field.h>
+#include "SettingsCommon.h"
 
+#include <Core/Field.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Common/FieldVisitors.h>
-
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 
-#include <Interpreters/SettingsCommon.h>
 
 
 namespace DB

dbms/src/DataStreams/IBlockInputStream.h

@@ -5,7 +5,7 @@
 #include <DataStreams/BlockStreamProfileInfo.h>
 #include <DataStreams/SizeLimits.h>
 #include <IO/Progress.h>
-#include <Interpreters/SettingsCommon.h>
+#include <Core/SettingsCommon.h>
 #include <Storages/TableStructureLockHolder.h>
 
 #include <atomic>

dbms/src/Databases/DatabaseOrdinary.cpp

@@ -16,7 +16,7 @@
 #include <Parsers/parseQuery.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadBufferFromFile.h>

dbms/src/Formats/FormatFactory.cpp

 #include <Common/Exception.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <DataStreams/MaterializingBlockOutputStream.h>
 #include <Formats/FormatSettings.h>
 #include <Formats/FormatFactory.h>

dbms/src/IO/ConnectionTimeouts.h

 #pragma once
 
 #include <Poco/Timespan.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 
 namespace DB
 {

dbms/src/Interpreters/Cluster.h

 #pragma once
 
 #include <map>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Client/ConnectionPool.h>
 #include <Client/ConnectionPoolWithFailover.h>
 #include <Poco/Net/SocketAddress.h>

dbms/src/Interpreters/ClusterProxy/executeQuery.cpp

 #include <Interpreters/ClusterProxy/executeQuery.h>
 #include <Interpreters/ClusterProxy/IStreamFactory.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/Cluster.h>
 #include <Interpreters/IInterpreter.h>

dbms/src/Interpreters/Context.cpp

@@ -23,7 +23,7 @@
 #include <Storages/CompressionCodecSelector.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Interpreters/ActionLocksManager.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Interpreters/ExpressionJIT.h>
 #include <Interpreters/RuntimeComponentsFactory.h>
 #include <Interpreters/ISecurityManager.h>

dbms/src/Interpreters/Context.h

@@ -4,7 +4,7 @@
 #include <Core/NamesAndTypes.h>
 #include <Core/Types.h>
 #include <Interpreters/ClientInfo.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Parsers/IAST_fwd.h>
 #include <Common/LRUCache.h>
 #include <Common/MultiVersion.h>

dbms/src/Interpreters/ExpressionActions.h

@@ -3,7 +3,7 @@
 #include <Interpreters/Context.h>
 #include <Common/config.h>
 #include <Common/SipHash.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Core/Names.h>
 #include <Core/ColumnWithTypeAndName.h>
 #include <Core/Block.h>

dbms/src/Interpreters/ExpressionAnalyzer.h

@@ -2,7 +2,7 @@
 
 #include <Interpreters/ActionsVisitor.h>
 #include <Interpreters/AggregateDescription.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Interpreters/SyntaxAnalyzer.h>
 #include <Parsers/IAST_fwd.h>
 

dbms/src/Interpreters/InJoinSubqueriesPreprocessor.h

@@ -2,7 +2,7 @@
 
 #include <string>
 #include <Core/Types.h>
-#include <Interpreters/SettingsCommon.h>
+#include <Core/SettingsCommon.h>
 
 
 namespace DB

dbms/src/Interpreters/Join.h

@@ -5,7 +5,7 @@
 #include <Parsers/ASTTablesInSelectQuery.h>
 
 #include <Interpreters/AggregationCommon.h>
-#include <Interpreters/SettingsCommon.h>
+#include <Core/SettingsCommon.h>
 
 #include <Common/Arena.h>
 #include <Common/ColumnsHashing.h>

dbms/src/Interpreters/LogicalExpressionsOptimizer.cpp

 #include <Interpreters/LogicalExpressionsOptimizer.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTSelectQuery.h>

dbms/src/Interpreters/ProcessList.cpp

 #include <Interpreters/ProcessList.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>

dbms/src/Interpreters/SyntaxAnalyzer.cpp

 #include <Interpreters/SyntaxAnalyzer.h>
 #include <Interpreters/InJoinSubqueriesPreprocessor.h>
 #include <Interpreters/LogicalExpressionsOptimizer.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Interpreters/QueryAliasesVisitor.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/ArrayJoinedColumnsVisitor.h>

dbms/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp

@@ -6,7 +6,7 @@
 #include <Parsers/queryToString.h>
 #include <Interpreters/InJoinSubqueriesPreprocessor.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Storages/IStorage.h>
 #include <Databases/IDatabase.h>
 #include <Databases/DatabaseOrdinary.h>

dbms/src/Interpreters/tests/logical_expressions_optimizer.cpp

@@ -3,7 +3,7 @@
 #include <Parsers/parseQuery.h>
 #include <Parsers/queryToString.h>
 #include <Interpreters/LogicalExpressionsOptimizer.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Common/typeid_cast.h>
 
 #include <iostream>

dbms/src/Storages/Kafka/KafkaSettings.h

@@ -3,7 +3,7 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Core/Defines.h>
 #include <Core/Types.h>
-#include <Interpreters/SettingsCommon.h>
+#include <Core/SettingsCommon.h>
 
 
 namespace DB

dbms/src/Storages/MergeTree/MergeTreeSettings.h

@@ -3,7 +3,7 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Core/Defines.h>
 #include <Core/Types.h>
-#include <Interpreters/SettingsCommon.h>
+#include <Core/SettingsCommon.h>
 
 
 namespace DB

dbms/src/Storages/StorageDistributed.h

@@ -6,7 +6,7 @@
 #include <Common/SimpleIncrement.h>
 #include <Client/ConnectionPool.h>
 #include <Client/ConnectionPoolWithFailover.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Interpreters/Cluster.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Parsers/ASTFunction.h>

dbms/src/Storages/StorageMerge.cpp

@@ -22,7 +22,7 @@
 #include <Columns/ColumnString.h>
 #include <Common/typeid_cast.h>
 #include <Databases/IDatabase.h>
-#include <Interpreters/SettingsCommon.h>
+#include <Core/SettingsCommon.h>
 #include <DataStreams/MaterializingBlockInputStream.h>
 #include <DataStreams/FilterBlockInputStream.h>
 #include <ext/range.h>

dbms/src/Storages/StorageMySQL.cpp

@@ -6,7 +6,7 @@
 #include <Storages/transformQueryForExternalDatabase.h>
 #include <Formats/MySQLBlockInputStream.h>
 #include <Interpreters/evaluateConstantExpression.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <DataStreams/IBlockOutputStream.h>
 #include <Formats/FormatFactory.h>

dbms/src/Storages/System/StorageSystemBuildOptions.cpp

 #include "StorageSystemBuildOptions.h"
 
 #include <DataTypes/DataTypeString.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 
 extern const char * auto_config_build[];
 

dbms/src/Storages/System/StorageSystemProcesses.cpp

@@ -4,7 +4,7 @@
 #include <Interpreters/ProcessList.h>
 #include <Storages/System/StorageSystemProcesses.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/Settings.h>
+#include <Core/Settings.h>
 #include <Interpreters/ProfileEventsExt.h>
 #include <Common/typeid_cast.h>
 #include <Columns/ColumnsNumber.h>