From 96c97ad1db17c8e77a0804ffc9da674d2c106695 Mon Sep 17 00:00:00 2001 From: Piotr Jastrzebski Date: Mon, 22 Jan 2018 15:04:39 +0100 Subject: [PATCH] Rename streamed_mutation* files to mutation_fragment* Signed-off-by: Piotr Jastrzebski --- cache_flat_mutation_reader.hh | 2 +- cell_locking.hh | 2 +- clustering_ranges_walker.hh | 2 +- configure.py | 4 ++-- db/size_estimates_virtual_reader.hh | 2 +- db/view/view.hh | 2 +- flat_mutation_reader.hh | 2 +- frozen_mutation.hh | 2 +- mutation.hh | 2 +- mutation_compactor.hh | 2 +- streamed_mutation.cc => mutation_fragment.cc | 2 +- streamed_mutation.hh => mutation_fragment.hh | 0 mutation_partition.cc | 2 +- mutation_partition_serializer.hh | 2 +- partition_version.hh | 2 +- range_tombstone.cc | 2 +- read_context.hh | 2 +- schema_upgrader.hh | 2 +- tests/flat_mutation_reader_test.cc | 2 +- .../{streamed_mutation_test.cc => mutation_fragment_test.cc} | 2 +- tests/simple_schema.hh | 3 +-- 21 files changed, 21 insertions(+), 22 deletions(-) rename streamed_mutation.cc => mutation_fragment.cc (99%) rename streamed_mutation.hh => mutation_fragment.hh (100%) rename tests/{streamed_mutation_test.cc => mutation_fragment_test.cc} (99%) diff --git a/cache_flat_mutation_reader.hh b/cache_flat_mutation_reader.hh index ca43e2481c..c630d8fadc 100644 --- a/cache_flat_mutation_reader.hh +++ b/cache_flat_mutation_reader.hh @@ -24,7 +24,7 @@ #include #include "row_cache.hh" #include "mutation_reader.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" #include "partition_version.hh" #include "utils/logalloc.hh" #include "query-request.hh" diff --git a/cell_locking.hh b/cell_locking.hh index f867505365..bc6ce9e86f 100644 --- a/cell_locking.hh +++ b/cell_locking.hh @@ -39,7 +39,7 @@ using small_vector = std::vector; #endif #include "fnv1a_hasher.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" #include "mutation_partition.hh" #include "db/timeout_clock.hh" diff --git a/clustering_ranges_walker.hh b/clustering_ranges_walker.hh index db74ec5e98..3682ccdfc9 100644 --- a/clustering_ranges_walker.hh +++ b/clustering_ranges_walker.hh @@ -25,7 +25,7 @@ #include "schema.hh" #include "query-request.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" // Utility for in-order checking of overlap with position ranges. class clustering_ranges_walker { diff --git a/configure.py b/configure.py index 2bd0f2e76e..fe26d6b4e8 100755 --- a/configure.py +++ b/configure.py @@ -200,7 +200,7 @@ modes = { scylla_tests = [ 'tests/mutation_test', 'tests/mvcc_test', - 'tests/streamed_mutation_test', + 'tests/mutation_fragment_test', 'tests/flat_mutation_reader_test', 'tests/schema_registry_test', 'tests/canonical_mutation_test', @@ -363,7 +363,7 @@ scylla_core = (['database.cc', 'schema_registry.cc', 'bytes.cc', 'mutation.cc', - 'streamed_mutation.cc', + 'mutation_fragment.cc', 'partition_version.cc', 'row_cache.cc', 'canonical_mutation.cc', diff --git a/db/size_estimates_virtual_reader.hh b/db/size_estimates_virtual_reader.hh index 686b79d668..95bdb3fa14 100644 --- a/db/size_estimates_virtual_reader.hh +++ b/db/size_estimates_virtual_reader.hh @@ -35,7 +35,7 @@ #include "range.hh" #include "service/storage_service.hh" #include "stdx.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" #include "sstables/sstables.hh" #include "db/timeout_clock.hh" diff --git a/db/view/view.hh b/db/view/view.hh index b1778bb568..3f21fb21cb 100644 --- a/db/view/view.hh +++ b/db/view/view.hh @@ -25,7 +25,7 @@ #include "gc_clock.hh" #include "query-request.hh" #include "schema.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" #include "flat_mutation_reader.hh" #include "stdx.hh" diff --git a/flat_mutation_reader.hh b/flat_mutation_reader.hh index 54339123db..5c93d91bc3 100644 --- a/flat_mutation_reader.hh +++ b/flat_mutation_reader.hh @@ -26,7 +26,7 @@ #include "dht/i_partitioner.hh" #include "position_in_partition.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" #include "tracing/trace_state.hh" #include diff --git a/frozen_mutation.hh b/frozen_mutation.hh index eb48d6fc36..1af0760182 100644 --- a/frozen_mutation.hh +++ b/frozen_mutation.hh @@ -25,7 +25,7 @@ #include "atomic_cell.hh" #include "database_fwd.hh" #include "mutation_partition_view.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" #include "flat_mutation_reader.hh" class mutation; diff --git a/mutation.hh b/mutation.hh index 7d42abd1e7..d4a087109f 100644 --- a/mutation.hh +++ b/mutation.hh @@ -28,7 +28,7 @@ #include "schema.hh" #include "dht/i_partitioner.hh" #include "hashing.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" #include diff --git a/mutation_compactor.hh b/mutation_compactor.hh index 068050a664..b40b8a63b0 100644 --- a/mutation_compactor.hh +++ b/mutation_compactor.hh @@ -21,7 +21,7 @@ #pragma once -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" static inline bool has_ck_selector(const query::clustering_row_ranges& ranges) { // Like PK range, an empty row range, should be considered an "exclude all" restriction diff --git a/streamed_mutation.cc b/mutation_fragment.cc similarity index 99% rename from streamed_mutation.cc rename to mutation_fragment.cc index 995d30e4c4..6bb759d7a5 100644 --- a/streamed_mutation.cc +++ b/mutation_fragment.cc @@ -24,7 +24,7 @@ #include #include "mutation.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" std::ostream& operator<<(std::ostream& os, const clustering_row& row) { diff --git a/streamed_mutation.hh b/mutation_fragment.hh similarity index 100% rename from streamed_mutation.hh rename to mutation_fragment.hh diff --git a/mutation_partition.cc b/mutation_partition.cc index d0edb48b47..a9b9169c68 100644 --- a/mutation_partition.cc +++ b/mutation_partition.cc @@ -28,7 +28,7 @@ #include "query-result-writer.hh" #include "atomic_cell_hash.hh" #include "reversibly_mergeable.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" #include "mutation_query.hh" #include "service/priority_manager.hh" #include "mutation_compactor.hh" diff --git a/mutation_partition_serializer.hh b/mutation_partition_serializer.hh index f1dae36569..be5b0f98cb 100644 --- a/mutation_partition_serializer.hh +++ b/mutation_partition_serializer.hh @@ -26,7 +26,7 @@ #include "database_fwd.hh" #include "mutation_partition_view.hh" #include "bytes_ostream.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" namespace ser { template diff --git a/partition_version.hh b/partition_version.hh index b1dc1fd65a..df460241e0 100644 --- a/partition_version.hh +++ b/partition_version.hh @@ -22,7 +22,7 @@ #pragma once #include "mutation_partition.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" #include "utils/anchorless_list.hh" #include "utils/logalloc.hh" diff --git a/range_tombstone.cc b/range_tombstone.cc index 9aaa74c450..cc3b2def86 100644 --- a/range_tombstone.cc +++ b/range_tombstone.cc @@ -20,7 +20,7 @@ */ #include "range_tombstone.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" std::ostream& operator<<(std::ostream& out, const range_tombstone& rt) { if (rt) { diff --git a/read_context.hh b/read_context.hh index 72c8bb5b8e..3c8b31eb70 100644 --- a/read_context.hh +++ b/read_context.hh @@ -23,7 +23,7 @@ #include "schema.hh" #include "query-request.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" #include "partition_version.hh" #include "tracing/tracing.hh" #include "row_cache.hh" diff --git a/schema_upgrader.hh b/schema_upgrader.hh index 97d788e934..69e601b3c7 100644 --- a/schema_upgrader.hh +++ b/schema_upgrader.hh @@ -21,7 +21,7 @@ #pragma once -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" #include "converting_mutation_partition_applier.hh" // A StreamedMutationTransformer which transforms the stream to a different schema diff --git a/tests/flat_mutation_reader_test.cc b/tests/flat_mutation_reader_test.cc index a82f8eee43..2a6b040bc5 100644 --- a/tests/flat_mutation_reader_test.cc +++ b/tests/flat_mutation_reader_test.cc @@ -24,7 +24,7 @@ #include #include "mutation.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" #include "mutation_source_test.hh" #include "flat_mutation_reader.hh" #include "mutation_reader.hh" diff --git a/tests/streamed_mutation_test.cc b/tests/mutation_fragment_test.cc similarity index 99% rename from tests/streamed_mutation_test.cc rename to tests/mutation_fragment_test.cc index f434090ecc..48d693c940 100644 --- a/tests/streamed_mutation_test.cc +++ b/tests/mutation_fragment_test.cc @@ -24,7 +24,7 @@ #include #include "mutation_source_test.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" #include "frozen_mutation.hh" #include "tests/test_services.hh" #include "schema_builder.hh" diff --git a/tests/simple_schema.hh b/tests/simple_schema.hh index 150f06c3cc..70d6d7688c 100644 --- a/tests/simple_schema.hh +++ b/tests/simple_schema.hh @@ -26,10 +26,9 @@ #include "make_random_string.hh" #include "schema.hh" #include "keys.hh" -#include "streamed_mutation.hh" +#include "mutation_fragment.hh" #include "mutation.hh" #include "schema_builder.hh" -#include "streamed_mutation.hh" #include "sstable_utils.hh" // Helper for working with the following table: