header: De-bloat schema.hh

The header sits in many other headers, but there's a handy
schema_fwd.hh that's tiny and contains needed declarations
for other headers. So replace shema.hh with schema_fwd.hh
in most of the headers (and remove completely from some).

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
Message-Id: <20200303102050.18462-1-xemul@scylladb.com>

alternator/serialization.hh

@@ -24,7 +24,7 @@
 #include <string>
 #include <string_view>
 #include "types.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "keys.hh"
 #include "rjson.hh"
 #include "utils/big_decimal.hh"

canonical_mutation.hh

@@ -22,7 +22,7 @@
 #pragma once
 
 #include "bytes.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "database_fwd.hh"
 #include "mutation_partition_visitor.hh"
 #include "mutation_partition_serializer.hh"

clustering_bounds_comparator.hh

@@ -24,7 +24,7 @@
 
 #include <functional>
 #include "keys.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "range.hh"
 
 /**

clustering_interval_set.hh

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "position_in_partition.hh"
 #include <boost/icl/interval_set.hpp>
 

clustering_key_filter.hh

@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "query-request.hh"
 
 namespace query {

compaction_garbage_collector.hh

@@ -21,7 +21,6 @@
 
 #pragma once
 
-#include "schema.hh"
 #include "collection_mutation.hh"
 
 class atomic_cell;

cql3/column_identifier.hh

@@ -43,7 +43,7 @@
 
 #include "cql3/selection/selectable.hh"
 
-#include "schema.hh"
+#include "schema_fwd.hh"
 
 #include <algorithm>
 #include <functional>

cql3/relation.hh

@@ -42,7 +42,7 @@
 #pragma once
 
 #include "operator.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "column_identifier.hh"
 #include "variable_specifications.hh"
 #include "restrictions/restriction.hh"

cql3/restrictions/restrictions.hh

@@ -46,7 +46,7 @@
 
 #include "cql3/query_options.hh"
 #include "types.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "index/secondary_index_manager.hh"
 #include "restriction.hh"
 

cql3/restrictions/single_column_primary_key_restrictions.hh

@@ -42,7 +42,7 @@
 #pragma once
 
 #include <vector>
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "cartesian_product.hh"
 #include "cql3/restrictions/primary_key_restrictions.hh"
 #include "cql3/restrictions/single_column_restrictions.hh"

cql3/restrictions/single_column_restriction.hh

@@ -48,7 +48,7 @@
 #include "cql3/term.hh"
 #include "cql3/abstract_marker.hh"
 #include <seastar/core/shared_ptr.hh>
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "to_string.hh"
 #include "exceptions/exceptions.hh"
 #include "keys.hh"

cql3/restrictions/single_column_restrictions.hh

@@ -43,7 +43,7 @@
 
 #include "cql3/restrictions/restrictions.hh"
 #include "cql3/restrictions/single_column_restriction.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "types.hh"
 
 namespace cql3 {

cql3/restrictions/statement_restrictions.hh

@@ -42,8 +42,9 @@
 #pragma once
 
 #include <vector>
+#include <list>
 #include "to_string.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "cql3/restrictions/restrictions.hh"
 #include "cql3/restrictions/primary_key_restrictions.hh"
 #include "cql3/restrictions/single_column_restrictions.hh"

cql3/result_set.hh

@@ -45,7 +45,6 @@
 #include <vector>
 #include "enum_set.hh"
 #include "service/pager/paging_state.hh"
-#include "schema.hh"
 
 #include "query-result-reader.hh"
 

cql3/selection/selectable.hh

@@ -42,7 +42,7 @@
 
 #pragma once
 
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include <seastar/core/shared_ptr.hh>
 #include "cql3/selection/selector.hh"
 #include "cql3/cql3_type.hh"

cql3/selection/selection.hh

@@ -42,7 +42,7 @@
 #pragma once
 
 #include "bytes.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "query-result-reader.hh"
 #include "cql3/column_specification.hh"
 #include "exceptions/exceptions.hh"

cql3/selection/selector.hh

@@ -44,7 +44,7 @@
 #include <vector>
 #include "cql3/assignment_testable.hh"
 #include "types.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "counters.hh"
 
 namespace cql3 {

cql3/statements/cf_prop_defs.hh

@@ -43,7 +43,6 @@
 
 #include "cql3/statements/property_definitions.hh"
  
-#include "schema.hh"
 #include "schema_builder.hh"
 #include "compaction_strategy.hh"
 #include "utils/UUID.hh"

cql3/statements/create_table_statement.hh

@@ -48,7 +48,7 @@
 #include "cql3/cql3_type.hh"
 
 #include "service/migration_manager.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 
 #include <seastar/core/shared_ptr.hh>
 

cql3/update_parameters.hh

@@ -43,7 +43,7 @@
 
 #include "gc_clock.hh"
 #include "timestamp.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "atomic_cell.hh"
 #include "tombstone.hh"
 #include "exceptions/exceptions.hh"

database.hh

@@ -54,7 +54,7 @@
 #include "db/commitlog/replay_position.hh"
 #include <limits>
 #include <cstddef>
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "db/schema_features.hh"
 #include "gms/feature.hh"
 #include "timestamp.hh"

db/commitlog/commitlog_entry.hh

@@ -24,7 +24,7 @@
 #include <optional>
 
 #include "frozen_mutation.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 
 class commitlog_entry {
     std::optional<column_mapping> _mapping;

db/data_listeners.hh

@@ -26,7 +26,7 @@
 #include <seastar/core/distributed.hh>
 #include <seastar/core/weak_ptr.hh>
 
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "flat_mutation_reader.hh"
 #include "mutation_reader.hh"
 #include "frozen_mutation.hh"

db/large_data_handler.hh

@@ -22,7 +22,7 @@
 #pragma once
 
 #include <cstdint>
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "system_keyspace.hh"
 
 namespace sstables {

db/schema_tables.hh

@@ -43,7 +43,7 @@
 #include "service/storage_proxy.hh"
 #include "mutation.hh"
 #include "cql3/functions/user_function.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "schema_features.hh"
 #include "hashing.hh"
 #include "schema_mutations.hh"

db/system_distributed_keyspace.hh

@@ -22,7 +22,7 @@
 #pragma once
 
 #include "bytes.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "service/migration_manager.hh"
 #include "utils/UUID.hh"
 

db/system_keyspace.hh

@@ -44,7 +44,7 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "utils/UUID.hh"
 #include "gms/inet_address.hh"
 #include "query-result-set.hh"

db/view/build_progress_virtual_reader.hh

@@ -27,7 +27,7 @@
 #include "mutation_fragment.hh"
 #include "mutation_reader.hh"
 #include "query-request.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "tracing/tracing.hh"
 
 #include <boost/range/iterator_range.hpp>

db/view/row_locking.hh

@@ -39,7 +39,7 @@
 #include <seastar/core/future.hh>
 
 #include "db/timeout_clock.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "dht/i_partitioner.hh"
 #include "query-request.hh"
 #include "utils/estimated_histogram.hh"

db/view/view.hh

@@ -25,7 +25,7 @@
 #include "dht/i_partitioner.hh"
 #include "gc_clock.hh"
 #include "query-request.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "mutation_fragment.hh"
 #include "flat_mutation_reader.hh"
 

db/view/view_updating_consumer.hh

@@ -22,7 +22,7 @@
 #pragma once
 
 #include "dht/i_partitioner.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "mutation_fragment.hh"
 #include "sstables/shared_sstable.hh"
 #include "database.hh"

frozen_schema.hh

@@ -22,7 +22,7 @@
 #pragma once
 
 #include "query-result.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "frozen_mutation.hh"
 
 namespace db {

index/built_indexes_virtual_reader.hh

@@ -19,14 +19,14 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database_fwd.hh"
+#include "database.hh"
 #include "db/system_keyspace.hh"
 #include "db/timeout_clock.hh"
 #include "flat_mutation_reader.hh"
 #include "mutation_fragment.hh"
 #include "mutation_reader.hh"
 #include "query-request.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "secondary_index_manager.hh"
 #include "tracing/tracing.hh"
 #include "view_info.hh"

memtable.hh

@@ -26,7 +26,7 @@
 #include <iosfwd>
 #include "database_fwd.hh"
 #include "dht/i_partitioner.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "encoding_stats.hh"
 #include "mutation_reader.hh"
 #include "db/commitlog/replay_position.hh"

multishard_mutation_query.hh

@@ -22,7 +22,7 @@
 #pragma once
 
 #include "database_fwd.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "mutation_query.hh"
 #include "cache_temperature.hh"
 

mutation.hh

@@ -25,7 +25,7 @@
 
 #include "mutation_partition.hh"
 #include "keys.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "dht/i_partitioner.hh"
 #include "hashing.hh"
 #include "mutation_fragment.hh"

mutation_partition.hh

@@ -32,7 +32,7 @@
 #include <seastar/core/bitset-iter.hh>
 #include <seastar/util/optimized_optional.hh>
 
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "tombstone.hh"
 #include "keys.hh"
 #include "position_in_partition.hh"

mutation_writer/multishard_writer.hh

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "flat_mutation_reader.hh"
 #include "dht/i_partitioner.hh"
 #include "utils/phased_barrier.hh"

partition_slice_builder.hh

@@ -25,7 +25,7 @@
 #include <vector>
 
 #include "query-request.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 
 //
 // Fluent builder for query::partition_slice.

query-result-set.hh

@@ -25,7 +25,7 @@
 #include <seastar/core/shared_ptr.hh>
 #include "query-request.hh"
 #include "query-result.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "mutation.hh"
 
 #include <optional>

read_context.hh

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "query-request.hh"
 #include "mutation_fragment.hh"
 #include "partition_version.hh"

redis/options.hh

@@ -26,7 +26,7 @@
 #include "db/consistency_level_type.hh"
 #include "seastar/core/sstring.hh"
 #include "seastar/net/socket_defs.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "service/client_state.hh"
 #include "auth/service.hh"
 

schema_mutations.hh

@@ -23,7 +23,7 @@
 
 #include <vector>
 #include "mutation.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "canonical_mutation.hh"
 
 // Commutative representation of table schema

schema_registry.hh

@@ -25,7 +25,7 @@
 #include <seastar/core/shared_ptr.hh>
 #include <seastar/core/timer.hh>
 #include <seastar/core/shared_future.hh>
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "frozen_schema.hh"
 
 namespace db {

service/pager/query_pagers.hh

@@ -44,7 +44,7 @@
 #include <vector>
 #include <seastar/core/shared_ptr.hh>
 
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "query-result.hh"
 #include "query-request.hh"
 #include "service/query_state.hh"

sstables/column_name_helper.hh

@@ -40,7 +40,7 @@
 #pragma once
 
 #include <seastar/core/sstring.hh>
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "compound_compat.hh"
 #include <cmath>
 #include <algorithm>

sstables/column_translation.hh

@@ -22,10 +22,10 @@
 #pragma once
 
 #include <vector>
-
+#include <boost/range/algorithm/stable_partition.hpp>
 #include <seastar/core/shared_ptr.hh>
 
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "sstables/types.hh"
 #include "utils/UUID.hh"
 #include "db/marshal/type_parser.hh"

sstables/key.hh

@@ -21,7 +21,7 @@
 
 #pragma once
 #include "bytes.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include <seastar/core/future.hh>
 #include "database_fwd.hh"
 #include "keys.hh"

sstables/mp_row_consumer.hh

@@ -28,7 +28,7 @@
 #include "timestamp.hh"
 #include "gc_clock.hh"
 #include "mutation_fragment.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "row.hh"
 #include "clustering_ranges_walker.hh"
 #include "utils/data_input.hh"

sstables/sstables.hh

@@ -39,7 +39,7 @@
 #include <seastar/core/enum.hh>
 #include "compress.hh"
 #include "dht/i_partitioner.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "mutation.hh"
 #include "utils/i_filter.hh"
 #include <seastar/core/stream.hh>

sstables/writer_impl.hh

@@ -22,7 +22,7 @@
 #pragma once
 
 #include "sstables.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 #include "mutation_fragment.hh"
 
 namespace sstables {

validation.hh

@@ -41,9 +41,11 @@
 
 #pragma once
 
-#include "database_fwd.hh"
-#include "schema.hh"
 #include <seastar/core/sstring.hh>
+#include "database_fwd.hh"
+#include "schema_fwd.hh"
+
+using namespace seastar;
 
 namespace validation {
 

view_info.hh

@@ -23,7 +23,7 @@
 
 #include "dht/i_partitioner.hh"
 #include "query-request.hh"
-#include "schema.hh"
+#include "schema_fwd.hh"
 
 namespace cql3::statements {
 class select_statement;