config: remove inclusions of db/config.hh from header files

Instead, distribute those inclusions to .cc files that require them. This reduces rebuilds when config.hh changes, and makes it easier to locate files that need config disaggregation.
scylladb · Dec 9, 2018 · 864f55e · 864f55e
1 parent 6a5d893
commit 864f55e
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 3 deletions.
diff --git a/cql3/query_processor.cc b/cql3/query_processor.cc
@@ -50,6 +50,7 @@
 #include "cql3/error_collector.hh"
 #include "cql3/statements/batch_statement.hh"
 #include "cql3/util.hh"
+#include "db/config.hh"
 
 namespace cql3 {
 

diff --git a/cql3/statements/create_table_statement.cc b/cql3/statements/create_table_statement.cc
@@ -53,6 +53,7 @@
 #include "auth/service.hh"
 #include "schema_builder.hh"
 #include "service/storage_service.hh"
+#include "db/config.hh"
 
 namespace cql3 {
 

diff --git a/db/commitlog/commitlog_replayer.cc b/db/commitlog/commitlog_replayer.cc
@@ -59,6 +59,7 @@
 #include "schema_registry.hh"
 #include "commitlog_entry.hh"
 #include "service/priority_manager.hh"
+#include "db/config.hh"
 
 static logging::logger rlogger("commitlog_replayer");
 

diff --git a/dht/boot_strapper.cc b/dht/boot_strapper.cc
@@ -41,6 +41,7 @@
 #include "dht/range_streamer.hh"
 #include "gms/failure_detector.hh"
 #include "log.hh"
+#include "db/config.hh"
 
 static logging::logger blogger("boot_strapper");
 

diff --git a/dht/boot_strapper.hh b/dht/boot_strapper.hh
@@ -41,7 +41,6 @@
 #include "dht/i_partitioner.hh"
 #include <unordered_set>
 #include "database.hh"
-#include "db/config.hh"
 
 namespace dht {
 

diff --git a/dht/range_streamer.cc b/dht/range_streamer.cc
@@ -46,6 +46,7 @@
 #include "streaming/stream_plan.hh"
 #include "streaming/stream_state.hh"
 #include "service/storage_service.hh"
+#include "db/config.hh"
 #include <seastar/core/semaphore.hh>
 #include <boost/range/adaptors.hpp>
 

diff --git a/gms/failure_detector.cc b/gms/failure_detector.cc
@@ -46,6 +46,7 @@
 #include "gms/inet_address.hh"
 #include "service/storage_service.hh"
 #include "log.hh"
+#include "db/config.hh"
 #include <iostream>
 #include <chrono>
 

diff --git a/gms/gossiper.cc b/gms/gossiper.cc
@@ -60,6 +60,7 @@
 #include <seastar/util/defer.hh>
 #include <chrono>
 #include "dht/i_partitioner.hh"
+#include "db/config.hh"
 #include <boost/range/algorithm/set_algorithm.hpp>
 #include <boost/range/adaptors.hpp>
 

diff --git a/init.cc b/init.cc
@@ -28,6 +28,7 @@
 #include "gms/inet_address.hh"
 #include "gms/feature_service.hh"
 #include "seastarx.hh"
+#include "db/config.hh"
 
 logging::logger startlog("init");
 

diff --git a/init.hh b/init.hh
@@ -24,14 +24,14 @@
 #include <seastar/core/future.hh>
 #include <seastar/core/distributed.hh>
 #include "auth/service.hh"
-#include "db/config.hh"
 #include "db/system_distributed_keyspace.hh"
 #include "database.hh"
 #include "log.hh"
 #include "seastarx.hh"
 
 namespace db {
 class extensions;
+class seed_provider_type;
 }
 
 namespace gms {

diff --git a/service/storage_proxy.hh b/service/storage_proxy.hh
@@ -55,7 +55,6 @@
 #include "tracing/trace_state.hh"
 #include <seastar/core/metrics.hh>
 #include "frozen_mutation.hh"
-#include "db/config.hh"
 #include "storage_proxy_stats.hh"
 
 namespace compat {

diff --git a/service/storage_service.cc b/service/storage_service.cc
@@ -74,6 +74,7 @@
 #include "supervisor.hh"
 #include "sstables/compaction_manager.hh"
 #include "sstables/sstables.hh"
+#include "db/config.hh"
 #include <seastar/core/metrics.hh>
 
 using token = dht::token;

diff --git a/sstables/sstables.cc b/sstables/sstables.cc
@@ -68,6 +68,7 @@
 #include "unimplemented.hh"
 #include "vint-serialization.hh"
 #include "db/large_partition_handler.hh"
+#include "db/config.hh"
 #include "sstables/random_access_reader.hh"
 #include "utils/UUID_gen.hh"
 #include <boost/algorithm/string/predicate.hpp>

diff --git a/tests/querier_cache.cc b/tests/querier_cache.cc
@@ -23,6 +23,7 @@
 #include "service/priority_manager.hh"
 #include "tests/simple_schema.hh"
 #include "tests/cql_test_env.hh"
+#include "db/config.hh"
 
 #include <seastar/core/sleep.hh>
 #include <seastar/core/thread.hh>

diff --git a/thrift/handler.cc b/thrift/handler.cc
@@ -53,6 +53,7 @@
 #include <boost/range/adaptor/indirected.hpp>
 #include "query-result-reader.hh"
 #include "thrift/server.hh"
+#include "db/config.hh"
 
 using namespace ::apache::thrift;
 using namespace ::apache::thrift::protocol;