diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b955991c8..5a8bb8cfcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -202,7 +202,6 @@ target_sources(scylla-main tombstone_gc.cc reader_concurrency_semaphore.cc reader_concurrency_semaphore_group.cc - row_cache.cc schema_mutations.cc serializer.cc sstables_loader.cc diff --git a/configure.py b/configure.py index 4259b7da54..45978d8955 100755 --- a/configure.py +++ b/configure.py @@ -795,7 +795,6 @@ scylla_core = (['message/messaging_service.cc', 'frozen_schema.cc', 'bytes.cc', 'timeout_config.cc', - 'row_cache.cc', 'schema_mutations.cc', 'generic_server.cc', 'utils/alien_worker.cc', @@ -975,43 +974,44 @@ scylla_core = (['message/messaging_service.cc', 'cql3/restrictions/statement_restrictions.cc', 'cql3/result_set.cc', 'cql3/prepare_context.cc', - 'db/consistency_level.cc', - 'db/system_keyspace.cc', - 'db/virtual_table.cc', - 'db/virtual_tables.cc', - 'db/system_distributed_keyspace.cc', - 'db/size_estimates_virtual_reader.cc', - 'db/schema_applier.cc', - 'db/schema_tables.cc', - 'db/cql_type_parser.cc', - 'db/legacy_schema_migrator.cc', + 'db/batchlog_manager.cc', 'db/commitlog/commitlog.cc', - 'db/commitlog/commitlog_replayer.cc', 'db/commitlog/commitlog_entry.cc', + 'db/commitlog/commitlog_replayer.cc', + 'db/config.cc', + 'db/consistency_level.cc', + 'db/cql_type_parser.cc', 'db/data_listeners.cc', + 'db/extensions.cc', 'db/functions/function.cc', + 'db/heat_load_balance.cc', + 'db/hints/host_filter.cc', 'db/hints/internal/hint_endpoint_manager.cc', 'db/hints/internal/hint_sender.cc', 'db/hints/internal/hint_storage.cc', 'db/hints/manager.cc', 'db/hints/resource_manager.cc', - 'db/hints/host_filter.cc', 'db/hints/sync_point.cc', - 'db/config.cc', - 'db/extensions.cc', - 'db/heat_load_balance.cc', 'db/large_data_handler.cc', + 'db/legacy_schema_migrator.cc', 'db/marshal/type_parser.cc', - 'db/batchlog_manager.cc', + 'db/per_partition_rate_limit_options.cc', + 'db/rate_limiter.cc', + 'db/row_cache.cc', + 'db/schema_applier.cc', + 'db/schema_tables.cc', + 'db/size_estimates_virtual_reader.cc', + 'db/snapshot-ctl.cc', + 'db/snapshot/backup_task.cc', + 'db/sstables-format-selector.cc', + 'db/system_distributed_keyspace.cc', + 'db/system_keyspace.cc', 'db/tags/utils.cc', + 'db/view/row_locking.cc', 'db/view/view.cc', 'db/view/view_update_generator.cc', - 'db/view/row_locking.cc', - 'db/sstables-format-selector.cc', - 'db/snapshot-ctl.cc', - 'db/rate_limiter.cc', - 'db/per_partition_rate_limit_options.cc', - 'db/snapshot/backup_task.cc', + 'db/virtual_table.cc', + 'db/virtual_tables.cc', 'index/secondary_index_manager.cc', 'index/secondary_index.cc', 'utils/UUID_gen.cc', diff --git a/db/CMakeLists.txt b/db/CMakeLists.txt index 4c1f28ddb2..ddf2e8aa41 100644 --- a/db/CMakeLists.txt +++ b/db/CMakeLists.txt @@ -37,7 +37,8 @@ target_sources(db snapshot-ctl.cc snapshot/backup_task.cc rate_limiter.cc - per_partition_rate_limit_options.cc) + per_partition_rate_limit_options.cc + row_cache.cc) target_include_directories(db PUBLIC ${CMAKE_SOURCE_DIR}) diff --git a/cache_mutation_reader.hh b/db/cache_mutation_reader.hh similarity index 100% rename from cache_mutation_reader.hh rename to db/cache_mutation_reader.hh diff --git a/partition_snapshot_row_cursor.hh b/db/partition_snapshot_row_cursor.hh similarity index 99% rename from partition_snapshot_row_cursor.hh rename to db/partition_snapshot_row_cursor.hh index e64ac51b5e..c6df54590c 100644 --- a/partition_snapshot_row_cursor.hh +++ b/db/partition_snapshot_row_cursor.hh @@ -9,7 +9,7 @@ #pragma once #include "mutation/partition_version.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" #include "utils/assert.hh" #include "utils/small_vector.hh" #include diff --git a/read_context.hh b/db/read_context.hh similarity index 99% rename from read_context.hh rename to db/read_context.hh index d7910f8f96..084f916686 100644 --- a/read_context.hh +++ b/db/read_context.hh @@ -14,7 +14,7 @@ #include "mutation/mutation_fragment.hh" #include "mutation/partition_version.hh" #include "tracing/tracing.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" namespace cache { diff --git a/row_cache.cc b/db/row_cache.cc similarity index 99% rename from row_cache.cc rename to db/row_cache.cc index 9d31a6d1c6..fb00186a7a 100644 --- a/row_cache.cc +++ b/db/row_cache.cc @@ -6,7 +6,7 @@ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0 */ -#include "row_cache.hh" +#include "db/row_cache.hh" #include #include #include diff --git a/row_cache.hh b/db/row_cache.hh similarity index 100% rename from row_cache.hh rename to db/row_cache.hh diff --git a/mutation/mutation_partition.cc b/mutation/mutation_partition.cc index 22f6d3ae16..9c891f7664 100644 --- a/mutation/mutation_partition.cc +++ b/mutation/mutation_partition.cc @@ -19,7 +19,7 @@ #include "mutation_query.hh" #include "mutation_compactor.hh" #include "counters.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" #include "timestamp.hh" #include "view_info.hh" #include "mutation_cleaner.hh" diff --git a/mutation/mutation_partition_v2.cc b/mutation/mutation_partition_v2.cc index e49debcaf3..d3105f493a 100644 --- a/mutation/mutation_partition_v2.cc +++ b/mutation/mutation_partition_v2.cc @@ -15,7 +15,7 @@ #include "partition_builder.hh" #include "query-result-writer.hh" #include "counters.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" #include #include "compaction/compaction_garbage_collector.hh" #include "mutation_partition_view.hh" diff --git a/mutation/partition_version.cc b/mutation/partition_version.cc index 846488ab16..799d6c5805 100644 --- a/mutation/partition_version.cc +++ b/mutation/partition_version.cc @@ -9,8 +9,8 @@ #include #include "partition_version.hh" -#include "row_cache.hh" -#include "partition_snapshot_row_cursor.hh" +#include "db/row_cache.hh" +#include "db/partition_snapshot_row_cursor.hh" #include "utils/assert.hh" #include "utils/coroutine.hh" #include "real_dirty_memory_accounter.hh" diff --git a/partition_snapshot_reader.hh b/partition_snapshot_reader.hh index 077b4c3940..d89f7df8ff 100644 --- a/partition_snapshot_reader.hh +++ b/partition_snapshot_reader.hh @@ -14,7 +14,7 @@ #include "readers/range_tombstone_change_merger.hh" #include "clustering_key_filter.hh" #include "query-request.hh" -#include "partition_snapshot_row_cursor.hh" +#include "db/partition_snapshot_row_cursor.hh" #include extern seastar::logger mplog; diff --git a/real_dirty_memory_accounter.hh b/real_dirty_memory_accounter.hh index afea98f844..f1a9b5cb3b 100644 --- a/real_dirty_memory_accounter.hh +++ b/real_dirty_memory_accounter.hh @@ -9,7 +9,7 @@ #pragma once #include "replica/memtable.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" #include "replica/dirty_memory_manager.hh" // # Flush control overview diff --git a/replica/database.hh b/replica/database.hh index 7444c0dbcb..1d2bebb5b2 100644 --- a/replica/database.hh +++ b/replica/database.hh @@ -37,7 +37,7 @@ #include "db/view/view.hh" #include "db/snapshot-ctl.hh" #include "memtable.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" #include "query-result.hh" #include "compaction/compaction_strategy.hh" #include "utils/estimated_histogram.hh" diff --git a/test/boost/cache_mutation_reader_test.cc b/test/boost/cache_mutation_reader_test.cc index a7e2bfe3e5..ea929bc47a 100644 --- a/test/boost/cache_mutation_reader_test.cc +++ b/test/boost/cache_mutation_reader_test.cc @@ -19,7 +19,7 @@ #include "mutation/partition_version.hh" #include "mutation/mutation.hh" #include "replica/memtable.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" #include "test/lib/memtable_snapshot_source.hh" #include "test/lib/mutation_reader_assertions.hh" diff --git a/test/boost/mutation_reader_another_test.cc b/test/boost/mutation_reader_another_test.cc index 1baf80c5f6..1f11ec834d 100644 --- a/test/boost/mutation_reader_another_test.cc +++ b/test/boost/mutation_reader_another_test.cc @@ -22,7 +22,7 @@ #include "readers/delegating_v2.hh" #include "readers/multi_range.hh" #include "replica/memtable.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" #include "mutation/mutation_rebuilder.hh" #include "utils/assert.hh" #include "utils/to_string.hh" diff --git a/test/boost/mvcc_test.cc b/test/boost/mvcc_test.cc index 6378204d0d..f28157eeb2 100644 --- a/test/boost/mvcc_test.cc +++ b/test/boost/mvcc_test.cc @@ -14,7 +14,7 @@ #include #include "mutation/partition_version.hh" -#include "partition_snapshot_row_cursor.hh" +#include "db/partition_snapshot_row_cursor.hh" #include "partition_snapshot_reader.hh" #include "clustering_interval_set.hh" diff --git a/test/boost/row_cache_test.cc b/test/boost/row_cache_test.cc index 4a5ef39067..a436cecba8 100644 --- a/test/boost/row_cache_test.cc +++ b/test/boost/row_cache_test.cc @@ -22,7 +22,7 @@ #include "schema/schema_builder.hh" #include "test/lib/simple_schema.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" #include #include "replica/memtable.hh" #include "partition_slice_builder.hh" diff --git a/test/boost/sstable_conforms_to_mutation_source_test.cc b/test/boost/sstable_conforms_to_mutation_source_test.cc index 15e746d6bd..da19acb908 100644 --- a/test/boost/sstable_conforms_to_mutation_source_test.cc +++ b/test/boost/sstable_conforms_to_mutation_source_test.cc @@ -15,7 +15,7 @@ #include "sstables/sstables.hh" #include "test/lib/mutation_source_test.hh" #include "test/lib/sstable_utils.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" #include "test/lib/simple_schema.hh" #include "partition_slice_builder.hh" #include "test/lib/mutation_reader_assertions.hh" diff --git a/test/lib/test_services.hh b/test/lib/test_services.hh index af6387205f..114a66dcb0 100644 --- a/test/lib/test_services.hh +++ b/test/lib/test_services.hh @@ -27,7 +27,7 @@ #include "schema/schema.hh" #include "schema/schema_builder.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" #include "replica/database.hh" #include "cell_locking.hh" #include "compaction/compaction_manager.hh" diff --git a/test/manual/sstable_scan_footprint_test.cc b/test/manual/sstable_scan_footprint_test.cc index 8851901dbc..b57b0a2ade 100644 --- a/test/manual/sstable_scan_footprint_test.cc +++ b/test/manual/sstable_scan_footprint_test.cc @@ -11,7 +11,7 @@ #include "test/lib/random_utils.hh" #include "test/lib/log.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" #include "replica/database.hh" #include "db/config.hh" #include "db/commitlog/commitlog.hh" diff --git a/test/perf/memory_footprint_test.cc b/test/perf/memory_footprint_test.cc index 680964b6b6..8fd7127fb4 100644 --- a/test/perf/memory_footprint_test.cc +++ b/test/perf/memory_footprint_test.cc @@ -16,7 +16,7 @@ #include "partition_slice_builder.hh" #include "schema/schema_builder.hh" #include "replica/memtable.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" #include "mutation/frozen_mutation.hh" #include "test/lib/tmpdir.hh" #include "sstables/sstables.hh" diff --git a/test/perf/perf_row_cache_reads.cc b/test/perf/perf_row_cache_reads.cc index 0b006101fc..3efecc89a1 100644 --- a/test/perf/perf_row_cache_reads.cc +++ b/test/perf/perf_row_cache_reads.cc @@ -15,7 +15,7 @@ #include "utils/managed_bytes.hh" #include "utils/logalloc.hh" #include "utils/UUID_gen.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" #include "partition_slice_builder.hh" #include "schema/schema_builder.hh" #include "replica/memtable.hh" diff --git a/test/perf/perf_row_cache_update.cc b/test/perf/perf_row_cache_update.cc index 3c775c1621..05e940b488 100644 --- a/test/perf/perf_row_cache_update.cc +++ b/test/perf/perf_row_cache_update.cc @@ -15,7 +15,7 @@ #include "utils/managed_bytes.hh" #include "utils/logalloc.hh" #include "utils/UUID_gen.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" #include "utils/log.hh" #include "schema/schema_builder.hh" #include "readers/combined.hh" diff --git a/test/unit/row_cache_alloc_stress_test.cc b/test/unit/row_cache_alloc_stress_test.cc index 6531e5e7ed..23a33c264c 100644 --- a/test/unit/row_cache_alloc_stress_test.cc +++ b/test/unit/row_cache_alloc_stress_test.cc @@ -14,7 +14,7 @@ #include "utils/assert.hh" #include "utils/logalloc.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" #include "utils/log.hh" #include "schema/schema_builder.hh" #include "replica/memtable.hh" diff --git a/test/unit/row_cache_stress_test.cc b/test/unit/row_cache_stress_test.cc index 6d9eb10dbc..86819b9de2 100644 --- a/test/unit/row_cache_stress_test.cc +++ b/test/unit/row_cache_stress_test.cc @@ -12,7 +12,7 @@ #include "test/lib/log.hh" #include #include "replica/memtable.hh" -#include "row_cache.hh" +#include "db/row_cache.hh" #include "partition_slice_builder.hh" #include "utils/assert.hh" #include "utils/int_range.hh"