mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved cache files to db

Browse Source 
As requested in #22097, moved the files
and fixed other includes and build system.

Fixes: #22097
Signed-off-by: Ran Regev <ran.regev@scylladb.com>

Closes scylladb/scylladb#22495
This commit is contained in:
Ran Regev
2025-01-26 13:33:28 +02:00
committed by Pavel Emelyanov
parent e47c7d5255
commit edd56a2c1c
26 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

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

46
configure.py
View File

@@ -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',

3
db/CMakeLists.txt
View File

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

0
cache_mutation_reader.hh → db/cache_mutation_reader.hh
View File

2
partition_snapshot_row_cursor.hh → db/partition_snapshot_row_cursor.hh
View File

@@ -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 <fmt/core.h>

2
read_context.hh → db/read_context.hh
View File

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

2
row_cache.cc → db/row_cache.cc
View File

@@ -6,7 +6,7 @@
* SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
*/
#include "row_cache.hh"
#include "db/row_cache.hh"
#include <fmt/ranges.h>
#include <seastar/core/memory.hh>
#include <seastar/core/future-util.hh>

0
row_cache.hh → db/row_cache.hh
View File

2
mutation/mutation_partition.cc
View File

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

2
mutation/mutation_partition_v2.cc
View File

@@ -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 <seastar/core/execution_stage.hh>
#include "compaction/compaction_garbage_collector.hh"
#include "mutation_partition_view.hh"

4
mutation/partition_version.cc
View File

@@ -9,8 +9,8 @@
#include <boost/range/algorithm/heap_algorithm.hpp>
#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"

2
partition_snapshot_reader.hh
View File

@@ -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 <any>
extern seastar::logger mplog;

2
real_dirty_memory_accounter.hh
View File

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

2
replica/database.hh
View File

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

2
test/boost/cache_mutation_reader_test.cc
View File

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

2
test/boost/mutation_reader_another_test.cc
View File

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

2
test/boost/mvcc_test.cc
View File

@@ -14,7 +14,7 @@
#include <seastar/util/defer.hh>
#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"

2
test/boost/row_cache_test.cc
View File

@@ -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 <seastar/core/thread.hh>
#include "replica/memtable.hh"
#include "partition_slice_builder.hh"

2
test/boost/sstable_conforms_to_mutation_source_test.cc
View File

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

2
test/lib/test_services.hh
View File

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

2
test/manual/sstable_scan_footprint_test.cc
View File

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

2
test/perf/memory_footprint_test.cc
View File

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

2
test/perf/perf_row_cache_reads.cc
View File

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

2
test/perf/perf_row_cache_update.cc
View File

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

2
test/unit/row_cache_alloc_stress_test.cc
View File

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

2
test/unit/row_cache_stress_test.cc
View File

@@ -12,7 +12,7 @@
#include "test/lib/log.hh"
#include <seastar/core/app-template.hh>
#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"