bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kefu Chai
2023-02-19 11:24:44 +08:00
committed by Avi Kivity
parent f97a23a9e3
commit df63e2ba27
86 changed files with 91 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

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

2
alternator/serialization.hh
View File

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

2
alternator/ttl.cc
View File

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

2
cdc/log.cc
View File

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

2
compound.hh
View File

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

2
concrete_types.hh
View File

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

2
configure.py
View File

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

2
counters.hh
View File

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

1
cql3/CMakeLists.txt
View File

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

2
cql3/column_specification.hh
View File

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

2
cql3/cql3_type.hh
View File

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

2
cql3/error_collector.hh
View File

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

2
cql3/functions/abstract_function.hh
View File

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

2
cql3/functions/aggregate_fcts.cc
View File

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

2
cql3/functions/as_json_function.hh
View File

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

2
cql3/functions/native_aggregate_function.hh
View File

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

2
cql3/functions/token_fct.hh
View File

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

2
cql3/functions/uuid_fcts.hh
View File

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

2
cql3/selection/field_selector.hh
View File

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

2
cql3/selection/selector.hh
View File

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

2
cql3/statements/describe_statement.cc
View File

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

2
cql3/type_json.hh
View File

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

2
cql3/untyped_result_set.hh
View File

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

2
cql3/values.hh
View File

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

2
db/cql_type_parser.cc
View File

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

2
db/cql_type_parser.hh
View File

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

2
db/functions/function.hh
View File

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

2
db/marshal/type_parser.hh
View File

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

2
db/schema_tables.cc
View File

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

2
db/system_distributed_keyspace.cc
View File

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

2
db/system_keyspace.cc
View File

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

2
dht/i_partitioner.cc
View File

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

2
dht/i_partitioner.hh
View File

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

2
dht/token.hh
View File

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

2
keys.hh
View File

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

2
lang/lua.hh
View File

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

2
lang/lua_scylla_types.hh
View File

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

2
lang/wasm.hh
View File

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

2
mutation/atomic_cell.cc
View File

@@ -9,7 +9,7 @@
#include "atomic_cell.hh" #include "atomic_cell.hh"
#include "atomic_cell_or_collection.hh" #include "atomic_cell_or_collection.hh"
#include "counters.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) { 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); return atomic_cell_type::make_dead(timestamp, deletion_time);

2
mutation/atomic_cell_hash.hh
View File

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

2
mutation/position_in_partition.hh
View File

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

2
query-result-set.hh
View File

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

2
query-result-writer.hh
View File

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

2
redis/commands.cc
View File

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

2
redis/keyspace_utils.cc
View File

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

2
redis/lolwut.hh
View File

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

2
redis/mutation_utils.cc
View File

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

2
redis/mutation_utils.hh
View File

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

2
redis/options.cc
View File

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

2
redis/version.hh
View File

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

2
replica/database.hh
View File

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

2
schema/schema.hh
View File

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

2
sstables/compress.hh
View File

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

2
sstables/metadata_collector.hh
View File

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

1
sstables/promoted_index_blocks_reader.hh
View File

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

1
sstables/sstable_mutation_reader.hh
View File

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

2
sstables/sstable_version.hh
View File

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

1
sstables/sstable_version_k_l.hh
View File

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

1
sstables/sstable_version_m.hh
View File

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

1
sstables/sstables.cc
View File

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

1
sstables/sstables.hh
View File

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

2
sstables/writer.hh
View File

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

2
streaming/stream_summary.cc
View File

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

2
test/boost/UUID_test.cc
View File

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

2
test/boost/cdc_test.cc
View File

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

2
test/boost/expr_test.cc
View File

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

2
test/boost/keys_test.cc
View File

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

2
test/boost/large_paging_state_test.cc
View File

@@ -12,7 +12,7 @@
#include "test/lib/cql_test_env.hh" #include "test/lib/cql_test_env.hh"
#include "transport/messages/result_message.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) { 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); auto rows = dynamic_pointer_cast<cql_transport::messages::result_message::rows>(res);

2
test/boost/partitioner_test.cc
View File

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

2
test/boost/serialization_test.cc
View File

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

2
test/boost/sstable_3_x_test.cc
View File

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

2
test/boost/types_test.cc
View File

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

2
test/manual/partition_data_test.cc
View File

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

2
test/perf/perf_row_cache_reads.cc
View File

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

2
tracing/trace_keyspace_helper.cc
View File

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

2
tracing/trace_state.hh
View File

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

12
types/CMakeLists.txt Normal file
View File

@@ -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)

2
types/collection.hh
View File

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

2
types/list.hh
View File

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

2
types/listlike_partial_deserializing_iterator.hh
View File

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

2
types/map.hh
View File

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

2
types/set.hh
View File

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

2
types/tuple.hh
View File

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

2
types.cc → types/types.cc
View File

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

0
types.hh → types/types.hh
View File

2
types/user.hh
View File

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