types: move types.{cc,hh} into types

they are part of the CQL type system, and are "closer" to types.
let's move them into "types" directory.

the building systems are updated accordingly.

the source files referencing `types.hh` were updated using following
command:

```
find . -name "*.{cc,hh}" -exec sed -i 's/\"types.hh\"/\"types\/types.hh\"/' {} +
```

the source files under sstables include "types.hh", which is
indeed the one located under "sstables", so include "sstables/types.hh"
instea, so it's more explicit.

Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>

Closes #12926

CMakeLists.txt

@@ -302,7 +302,6 @@ set(scylla_sources
     transport/event_notifier.cc
     transport/messages/result_message.cc
     transport/server.cc
-    types.cc
     unimplemented.cc
     validation.cc
     vint-serialization.cc
@@ -317,11 +316,12 @@ add_subdirectory(alternator)
 add_subdirectory(auth)
 add_subdirectory(cql3)
 add_subdirectory(idl)
+add_subdirectory(rust)
 add_subdirectory(schema)
 add_subdirectory(sstables)
 add_subdirectory(test)
+add_subdirectory(types)
 add_subdirectory(utils)
-add_subdirectory(rust)
 
 add_executable(scylla
     ${scylla_sources}
@@ -336,6 +336,7 @@ target_link_libraries(scylla PRIVATE
     schema
     sstables
     test-perf
+    types
     utils
     wasmtime_bindings)
 target_link_libraries(Boost::regex

alternator/serialization.hh

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

alternator/ttl.cc

@@ -34,7 +34,7 @@
 #include "gms/feature_service.hh"
 #include "sstables/types.hh"
 #include "mutation/mutation.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "types/map.hh"
 #include "utils/rjson.hh"
 #include "utils/big_decimal.hh"

cdc/log.cc

@@ -37,7 +37,7 @@
 #include "utils/UUID_gen.hh"
 #include "utils/managed_bytes.hh"
 #include "utils/fragment_range.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "concrete_types.hh"
 #include "types/listlike_partial_deserializing_iterator.hh"
 #include "tracing/trace_state.hh"

compound.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "types/types.hh"
 #include <iosfwd>
 #include <algorithm>
 #include <vector>

concrete_types.hh

@@ -10,7 +10,7 @@
 
 #include <seastar/net/inet_address.hh>
 
-#include "types.hh"
+#include "types/types.hh"
 #include "types/list.hh"
 #include "types/map.hh"
 #include "types/set.hh"

configure.py

@@ -830,7 +830,7 @@ scylla_core = (['message/messaging_service.cc',
                 'utils/murmur_hash.cc',
                 'utils/uuid.cc',
                 'utils/big_decimal.cc',
-                'types.cc',
+                'types/types.cc',
                 'validation.cc',
                 'service/priority_manager.cc',
                 'service/migration_manager.cc',

counters.hh

@@ -13,7 +13,7 @@
 #include <boost/range/numeric.hpp>
 
 #include "mutation/atomic_cell.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "locator/host_id.hh"
 
 class mutation;

cql3/CMakeLists.txt

@@ -106,7 +106,6 @@ target_sources(cql3
     restrictions/statement_restrictions.cc
     result_set.cc
     prepare_context.cc
-    ${CMAKE_SOURCE_DIR}/types.cc
     ${cql_grammar_srcs})
 target_include_directories(cql3
   PUBLIC

cql3/column_specification.hh

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "types/types.hh"
 
 namespace cql3 {
 

cql3/cql3_type.hh

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "types/types.hh"
 #include "data_dictionary/data_dictionary.hh"
 #include "exceptions/exceptions.hh"
 #include <iosfwd>

cql3/error_collector.hh

@@ -12,7 +12,7 @@
 
 #include "cql3/error_listener.hh"
 #include "exceptions/exceptions.hh"
-#include "types.hh"
+#include "types/types.hh"
 
 namespace cql3 {
 

cql3/functions/abstract_function.hh

@@ -11,7 +11,7 @@
 #pragma once
 
 #include "function.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "cql3/cql3_type.hh"
 #include <vector>
 #include <iosfwd>

cql3/functions/aggregate_fcts.cc

@@ -9,7 +9,7 @@
  */
 
 #include "bytes.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "types/tuple.hh"
 #include "cql3/functions/scalar_function.hh"
 #include "cql3/util.hh"

cql3/functions/as_json_function.hh

@@ -17,7 +17,7 @@
 #include "cql3/type_json.hh"
 
 #include "bytes_ostream.hh"
-#include "types.hh"
+#include "types/types.hh"
 
 #include <boost/algorithm/cxx11/any_of.hpp>
 

cql3/functions/native_aggregate_function.hh

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "types/types.hh"
 #include "native_function.hh"
 #include "aggregate_function.hh"
 #include <seastar/core/shared_ptr.hh>

cql3/functions/token_fct.hh

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "types/types.hh"
 #include "native_scalar_function.hh"
 #include "dht/i_partitioner.hh"
 #include "utils/UUID.hh"

cql3/functions/uuid_fcts.hh

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "types/types.hh"
 #include "native_scalar_function.hh"
 #include "utils/UUID.hh"
 

cql3/selection/field_selector.hh

@@ -11,7 +11,7 @@
 #pragma once
 
 #include "selector.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "types/user.hh"
 
 namespace cql3 {

cql3/selection/selector.hh

@@ -13,7 +13,7 @@
 #include <vector>
 #include "cql3/assignment_testable.hh"
 #include "query-request.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "schema/schema_fwd.hh"
 #include "counters.hh"
 

cql3/statements/describe_statement.cc

@@ -21,7 +21,7 @@
 #include "seastar/core/on_internal_error.hh"
 #include "seastar/coroutine/maybe_yield.hh"
 #include "service/client_state.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "cql3/query_processor.hh"
 #include "cql3/cql_statement.hh"
 #include "cql3/statements/raw/describe_statement.hh"

cql3/type_json.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "types/types.hh"
 #include "utils/rjson.hh"
 
 bytes from_json_object(const abstract_type &t, const rjson::value& value);

cql3/untyped_result_set.hh

@@ -11,7 +11,7 @@
 #include <optional>
 #include <seastar/core/sharded.hh>
 #include "bytes.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "types/map.hh"
 #include "types/list.hh"
 #include "types/set.hh"

cql3/values.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "types/types.hh"
 #include "types/collection.hh"
 #include "bytes.hh"
 

db/cql_type_parser.cc

@@ -14,7 +14,7 @@
 #include "cql3/CqlParser.hpp"
 #include "cql3/util.hh"
 #include "cql_type_parser.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "data_dictionary/user_types_metadata.hh"
 
 static ::shared_ptr<cql3::cql3_type::raw> parse_raw(const sstring& str) {

db/cql_type_parser.hh

@@ -13,7 +13,7 @@
 #include <seastar/core/sstring.hh>
 #include <seastar/core/shared_ptr.hh>
 
-#include "types.hh"
+#include "types/types.hh"
 
 #include "seastarx.hh"
 

db/functions/function.hh

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "types/types.hh"
 #include <vector>
 #include <optional>
 

db/marshal/type_parser.hh

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "types/types.hh"
 
 #include <seastar/core/sstring.hh>
 

db/schema_tables.cc

@@ -75,7 +75,7 @@
 #include "cql3/expr/expression.hh"
 #include "cql3/column_identifier.hh"
 #include "cql3/column_specification.hh"
-#include "types.hh"
+#include "types/types.hh"
 
 using namespace db;
 using namespace std::chrono_literals;

db/system_distributed_keyspace.cc

@@ -14,7 +14,7 @@
 #include "db/system_keyspace.hh"
 #include "schema/schema_builder.hh"
 #include "timeout_config.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "types/tuple.hh"
 #include "types/set.hh"
 #include "cdc/generation.hh"

db/system_keyspace.cc

@@ -18,7 +18,7 @@
 #include <seastar/core/reactor.hh>
 #include <seastar/json/json_elements.hh>
 #include "system_keyspace.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "service/storage_proxy.hh"
 #include "service/client_state.hh"
 #include "service/query_state.hh"

dht/i_partitioner.cc

@@ -13,7 +13,7 @@
 #include "dht/token-sharding.hh"
 #include "dht/partition_filter.hh"
 #include "utils/class_registrator.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "utils/murmur_hash.hh"
 #include "utils/div_ceil.hh"
 #include <deque>

dht/i_partitioner.hh

@@ -12,7 +12,7 @@
 #include <seastar/core/shared_ptr.hh>
 #include <seastar/core/sstring.hh>
 #include <seastar/util/optimized_optional.hh>
-#include "types.hh"
+#include "types/types.hh"
 #include "keys.hh"
 #include "utils/managed_bytes.hh"
 #include <memory>

dht/token.hh

@@ -10,7 +10,7 @@
 
 #include "bytes.hh"
 #include "utils/managed_bytes.hh"
-#include "types.hh"
+#include "types/types.hh"
 
 #include <seastar/net/byteorder.hh>
 #include <fmt/format.h>

keys.hh

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "bytes.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "compound_compat.hh"
 #include "utils/managed_bytes.hh"
 #include "utils/hashing.hh"

lang/lua.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "types/types.hh"
 #include "utils/updateable_value.hh"
 #include <seastar/core/future.hh>
 

lang/lua_scylla_types.hh

@@ -7,7 +7,7 @@
  */
 
 #include <lua.hpp>
-#include "types.hh"
+#include "types/types.hh"
 
 namespace lua {
 

lang/wasm.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "types/types.hh"
 #include <seastar/core/future.hh>
 #include "db/functions/function_name.hh"
 #include "rust/wasmtime_bindings.hh"

mutation/atomic_cell.cc

@@ -9,7 +9,7 @@
 #include "atomic_cell.hh"
 #include "atomic_cell_or_collection.hh"
 #include "counters.hh"
-#include "types.hh"
+#include "types/types.hh"
 
 atomic_cell atomic_cell::make_dead(api::timestamp_type timestamp, gc_clock::time_point deletion_time) {
     return atomic_cell_type::make_dead(timestamp, deletion_time);

mutation/atomic_cell_hash.hh

@@ -10,7 +10,7 @@
 
 // Not part of atomic_cell.hh to avoid cyclic dependency between types.hh and atomic_cell.hh
 
-#include "types.hh"
+#include "types/types.hh"
 #include "types/collection.hh"
 #include "atomic_cell.hh"
 #include "atomic_cell_or_collection.hh"

mutation/position_in_partition.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "types/types.hh"
 #include "keys.hh"
 #include "clustering_bounds_comparator.hh"
 #include "query-request.hh"

query-result-set.hh

@@ -10,7 +10,7 @@
 
 
 #include <seastar/core/shared_ptr.hh>
-#include "types.hh"
+#include "types/types.hh"
 #include "schema/schema.hh"
 
 #include <optional>

query-result-writer.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "types/types.hh"
 #include "mutation/atomic_cell.hh"
 #include "query-request.hh"
 #include "query-result.hh"

redis/commands.cc

@@ -10,7 +10,7 @@
 #include <seastar/core/shared_ptr.hh>
 #include "redis/request.hh"
 #include "redis/reply.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "service_permit.hh"
 #include "service/client_state.hh"
 #include "redis/options.hh"

redis/keyspace_utils.cc

@@ -10,7 +10,7 @@
 #include <seastar/coroutine/parallel_for_each.hh>
 #include "redis/keyspace_utils.hh"
 #include "schema/schema_builder.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "exceptions/exceptions.hh"
 #include "cql3/statements/ks_prop_defs.hh"
 #include <seastar/core/future.hh>

redis/lolwut.hh

@@ -7,7 +7,7 @@
  */
 
 #pragma once
-#include "types.hh"
+#include "types/types.hh"
 
 namespace redis {
 

redis/mutation_utils.cc

@@ -7,7 +7,7 @@
  */
 
 #include "redis/mutation_utils.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "service/storage_proxy.hh"
 #include "schema/schema.hh"
 #include <seastar/core/print.hh>

redis/mutation_utils.hh

@@ -7,7 +7,7 @@
  */
 
 #pragma once
-#include "types.hh"
+#include "types/types.hh"
 
 class service_permit;
 

redis/options.cc

@@ -7,7 +7,7 @@
  */
 
 #include "redis/options.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "service/storage_proxy.hh"
 #include "data_dictionary/data_dictionary.hh"
 #include "schema/schema.hh"

redis/version.hh

@@ -7,7 +7,7 @@
  */
 
 #pragma once
-#include "types.hh"
+#include "types/types.hh"
 
 namespace redis {
 

replica/database.hh

@@ -27,7 +27,7 @@
 #include <boost/range/algorithm/find.hpp>
 #include <optional>
 #include <string.h>
-#include "types.hh"
+#include "types/types.hh"
 #include <seastar/core/future.hh>
 #include <seastar/core/gate.hh>
 #include "db/commitlog/replay_position.hh"

schema/schema.hh

@@ -20,7 +20,7 @@
 #include <seastar/core/shared_ptr.hh>
 #include <seastar/util/backtrace.hh>
 #include "seastar/core/sstring.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "compound.hh"
 #include "gc_clock.hh"
 #include "compress.hh"

sstables/compress.hh

@@ -42,7 +42,7 @@
 #include <seastar/core/shared_ptr.hh>
 #include <seastar/core/fstream.hh>
 
-#include "types.hh"
+#include "types/types.hh"
 #include "sstables/types.hh"
 #include "checksum_utils.hh"
 #include "../compress.hh"

sstables/metadata_collector.hh

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "sstables/types.hh"
 #include "utils/extremum_tracking.hh"
 #include "utils/murmur_hash.hh"
 #include "hyperloglog.hh"

sstables/promoted_index_blocks_reader.hh

@@ -9,7 +9,6 @@
 #pragma once
 
 #include "consumer.hh"
-#include "types.hh"
 #include "column_translation.hh"
 #include "m_format_read_helpers.hh"
 #include "sstables/mx/parsers.hh"

sstables/sstable_mutation_reader.hh

@@ -6,7 +6,6 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 #include "mutation/mutation.hh"
-#include "types.hh"
 #include <seastar/core/future-util.hh>
 #include <seastar/core/coroutine.hh>
 #include "key.hh"

sstables/sstable_version.hh

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "sstables/types.hh"
 #include "version.hh"
 #include "component_type.hh"
 

sstables/sstable_version_k_l.hh

@@ -10,7 +10,6 @@
 #pragma once
 
 #include "sstable_version.hh"
-#include "types.hh"
 
 namespace sstables {
 

sstables/sstable_version_m.hh

@@ -10,7 +10,6 @@
 #pragma once
 
 #include "sstable_version.hh"
-#include "types.hh"
 
 namespace sstables {
 

sstables/sstables.cc

@@ -33,7 +33,6 @@
 #include <seastar/coroutine/as_future.hh>
 
 #include "dht/sharder.hh"
-#include "types.hh"
 #include "writer.hh"
 #include "m_format_read_helpers.hh"
 #include "open_info.hh"

sstables/sstables.hh

@@ -20,7 +20,6 @@
 #include <unordered_set>
 #include <unordered_map>
 #include <variant>
-#include "types.hh"
 #include "schema/schema_fwd.hh"
 #include <seastar/core/stream.hh>
 #include "encoding_stats.hh"

sstables/writer.hh

@@ -10,7 +10,7 @@
 
 #include <seastar/core/iostream.hh>
 #include <seastar/core/fstream.hh>
-#include "types.hh"
+#include "sstables/types.hh"
 #include "checksum_utils.hh"
 #include "progress_monitor.hh"
 #include "vint-serialization.hh"

streaming/stream_summary.cc

@@ -9,7 +9,7 @@
  */
 
 #include "streaming/stream_summary.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "utils/serialization.hh"
 
 namespace streaming {

test/boost/UUID_test.cc

@@ -11,7 +11,7 @@
 #include <boost/test/unit_test.hpp>
 #include <utility>
 #include "utils/UUID_gen.hh"
-#include "types.hh"
+#include "types/types.hh"
 
 BOOST_AUTO_TEST_CASE(test_generation_of_name_based_UUID) {
     auto uuid = utils::UUID_gen::get_name_UUID("systembatchlog");

test/boost/cdc_test.cc

@@ -21,7 +21,7 @@
 #include "test/lib/log.hh"
 #include "transport/messages/result_message.hh"
 
-#include "types.hh"
+#include "types/types.hh"
 #include "types/tuple.hh"
 #include "types/map.hh"
 #include "types/list.hh"

test/boost/expr_test.cc

@@ -1,7 +1,7 @@
 #include "cql3/column_identifier.hh"
 #include "cql3/util.hh"
 #include "seastar/core/shared_ptr.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "types/list.hh"
 #include "types/map.hh"
 #include <boost/test/tools/old/interface.hpp>

test/boost/keys_test.cc

@@ -13,7 +13,7 @@
 #include "keys.hh"
 #include "schema/schema.hh"
 #include "schema/schema_builder.hh"
-#include "types.hh"
+#include "types/types.hh"
 
 #include "idl/keys.dist.hh"
 #include "serializer_impl.hh"

test/boost/large_paging_state_test.cc

@@ -12,7 +12,7 @@
 
 #include "test/lib/cql_test_env.hh"
 #include "transport/messages/result_message.hh"
-#include "types.hh"
+#include "types/types.hh"
 
 static lw_shared_ptr<service::pager::paging_state> extract_paging_state(::shared_ptr<cql_transport::messages::result_message> res) {
     auto rows = dynamic_pointer_cast<cql_transport::messages::result_message::rows>(res);

test/boost/partitioner_test.cc

@@ -14,7 +14,7 @@
 #include "dht/sharder.hh"
 #include "dht/murmur3_partitioner.hh"
 #include "schema/schema.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "schema/schema_builder.hh"
 #include "utils/div_ceil.hh"
 

test/boost/serialization_test.cc

@@ -13,7 +13,7 @@
 #include <initializer_list>
 
 #include "utils/serialization.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "gms/inet_address.hh"
 #include "gms/inet_address_serializer.hh"
 #include "serializer_impl.hh"

test/boost/sstable_3_x_test.cc

@@ -32,7 +32,7 @@
 #include "test/lib/random_utils.hh"
 #include "sstables/types.hh"
 #include "keys.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "types/user.hh"
 #include "partition_slice_builder.hh"
 #include "schema/schema.hh"

test/boost/types_test.cc

@@ -13,7 +13,7 @@
 #include <boost/asio/ip/address_v4.hpp>
 #include <seastar/net/ip.hh>
 #include <boost/multiprecision/cpp_int.hpp>
-#include "types.hh"
+#include "types/types.hh"
 #include "types/tuple.hh"
 #include "compound.hh"
 #include "db/marshal/type_parser.hh"

test/manual/partition_data_test.cc

@@ -17,7 +17,7 @@
 #include "test/lib/random_utils.hh"
 #include "utils/disk-error-handler.hh"
 #include "mutation/atomic_cell.hh"
-#include "types.hh"
+#include "types/types.hh"
 
 BOOST_AUTO_TEST_CASE(test_atomic_cell) {
     struct test_case {

test/perf/perf_row_cache_reads.cc

@@ -25,7 +25,7 @@
 #include "test/lib/random_utils.hh"
 #include "test/lib/simple_schema.hh"
 #include "querier.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "reader_concurrency_semaphore.hh"
 
 /// Tests read scenarios from cache.

tracing/trace_keyspace_helper.cc

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: (AGPL-3.0-or-later and Apache-2.0)
  */
 #include <seastar/core/metrics.hh>
-#include "types.hh"
+#include "types/types.hh"
 #include "tracing/trace_keyspace_helper.hh"
 #include "cql3/statements/batch_statement.hh"
 #include "cql3/statements/modification_statement.hh"

tracing/trace_state.hh

@@ -18,7 +18,7 @@
 #include "gms/inet_address.hh"
 #include "auth/authenticated_user.hh"
 #include "db/consistency_level_type.hh"
-#include "types.hh"
+#include "types/types.hh"
 #include "timestamp.hh"
 #include "inet_address_vectors.hh"
 

types/CMakeLists.txt

@@ -0,0 +1,12 @@
+add_library(types STATIC)
+target_sources(types
+  PRIVATE
+    types.cc)
+target_include_directories(types
+  PUBLIC
+    ${CMAKE_SOURCE_DIR})
+target_link_libraries(types
+    cql3
+    idl
+    Seastar::seastar
+    xxHash::xxhash)

types/collection.hh

@@ -11,7 +11,7 @@
 #include <seastar/core/shared_ptr.hh>
 #include <seastar/core/sstring.hh>
 #include <vector>
-#include "types.hh"
+#include "types/types.hh"
 #include "collection_mutation.hh"
 #include "utils/chunked_vector.hh"
 #include "schema/schema_fwd.hh"

types/list.hh

@@ -12,7 +12,7 @@
 #include <seastar/core/sstring.hh>
 #include <vector>
 
-#include "types.hh"
+#include "types/types.hh"
 #include "types/collection.hh"
 
 class user_type_impl;

types/listlike_partial_deserializing_iterator.hh

@@ -13,7 +13,7 @@
 #include "utils/fragment_range.hh"
 #include "utils/managed_bytes.hh"
 #include "exceptions/exceptions.hh"
-#include "types.hh"
+#include "types/types.hh"
 
 int read_collection_size(bytes_view& in);
 bytes_view read_collection_key(bytes_view& in);

types/map.hh

@@ -13,7 +13,7 @@
 #include <vector>
 #include <utility>
 
-#include "types.hh"
+#include "types/types.hh"
 #include "types/collection.hh"
 
 class user_type_impl;

types/set.hh

@@ -12,7 +12,7 @@
 #include <seastar/core/sstring.hh>
 #include <vector>
 
-#include "types.hh"
+#include "types/types.hh"
 #include "types/collection.hh"
 
 class user_type_impl;

types/tuple.hh

@@ -16,7 +16,7 @@
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/algorithm/for_each.hpp>
 
-#include "types.hh"
+#include "types/types.hh"
 
 struct tuple_deserializing_iterator {
 public:

types/types.cc

@@ -16,7 +16,7 @@
 #include "cql3/util.hh"
 #include "concrete_types.hh"
 #include <seastar/core/print.hh>
-#include "types.hh"
+#include "types/types.hh"
 #include "utils/exceptions.hh"
 #include "utils/serialization.hh"
 #include "vint-serialization.hh"

types/user.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "types.hh"
+#include "types/types.hh"
 #include "types/tuple.hh"
 #include "data_dictionary/keyspace_element.hh"