utils: move hashing related files to utils/ module

Closes #12884

CMakeLists.txt

@@ -221,7 +221,6 @@ set(scylla_sources
     gms/inet_address.cc
     gms/versioned_value.cc
     gms/version_generator.cc
-    hashers.cc
     index/secondary_index.cc
     index/secondary_index_manager.cc
     init.cc
@@ -398,6 +397,7 @@ set(scylla_sources
     utils/generation-number.cc
     utils/gz/crc_combine.cc
     utils/gz/crc_combine_table.cc
+    utils/hashers.cc
     utils/human_readable.cc
     utils/i_filter.cc
     utils/large_bitset.cc

alternator/auth.cc

@@ -11,7 +11,7 @@
 #include <string>
 #include <string_view>
 #include <gnutls/crypto.h>
-#include "hashers.hh"
+#include "utils/hashers.hh"
 #include "bytes.hh"
 #include "alternator/auth.hh"
 #include <fmt/format.h>

bytes.hh

@@ -10,7 +10,7 @@
 
 #include "seastarx.hh"
 #include <seastar/core/sstring.hh>
-#include "hashing.hh"
+#include "utils/hashing.hh"
 #include <optional>
 #include <iosfwd>
 #include <functional>

bytes_ostream.hh

@@ -12,7 +12,7 @@
 
 #include "bytes.hh"
 #include "utils/managed_bytes.hh"
-#include "hashing.hh"
+#include "utils/hashing.hh"
 #include <seastar/core/simple-stream.hh>
 #include <seastar/core/loop.hh>
 #include <bit>

cell_locking.hh

@@ -12,7 +12,7 @@
 
 #include "utils/small_vector.hh"
 #include "mutation/mutation_partition.hh"
-#include "xx_hasher.hh"
+#include "utils/xx_hasher.hh"
 
 #include "db/timeout_clock.hh"
 

configure.py

@@ -676,7 +676,6 @@ scylla_core = (['message/messaging_service.cc',
                 'collection_mutation.cc',
                 'client_data.cc',
                 'debug.cc',
-                'hashers.cc',
                 'schema/caching_options.cc',
                 'schema/schema.cc',
                 'schema/schema_registry.cc',
@@ -995,6 +994,7 @@ scylla_core = (['message/messaging_service.cc',
                 'tombstone_gc_options.cc',
                 'tombstone_gc.cc',
                 'utils/disk-error-handler.cc',
+                'utils/hashers.cc',
                 'duration.cc',
                 'vint-serialization.cc',
                 'utils/arch/powerpc/crc32-vpmsum/crc32_wrapper.cc',
@@ -1281,7 +1281,7 @@ deps['test/boost/bytes_ostream_test'] = [
     "test/lib/log.cc",
 ]
 deps['test/boost/input_stream_test'] = ['test/boost/input_stream_test.cc']
-deps['test/boost/UUID_test'] = ['utils/UUID_gen.cc', 'test/boost/UUID_test.cc', 'utils/uuid.cc', 'utils/dynamic_bitset.cc', 'hashers.cc']
+deps['test/boost/UUID_test'] = ['utils/UUID_gen.cc', 'test/boost/UUID_test.cc', 'utils/uuid.cc', 'utils/dynamic_bitset.cc', 'utils/hashers.cc']
 deps['test/boost/murmur_hash_test'] = ['bytes.cc', 'utils/murmur_hash.cc', 'test/boost/murmur_hash_test.cc']
 deps['test/boost/allocation_strategy_test'] = ['test/boost/allocation_strategy_test.cc', 'utils/logalloc.cc', 'utils/dynamic_bitset.cc']
 deps['test/boost/log_heap_test'] = ['test/boost/log_heap_test.cc']

cql3/query_processor.cc

@@ -21,7 +21,7 @@
 #include "cql3/untyped_result_set.hh"
 #include "db/config.hh"
 #include "data_dictionary/data_dictionary.hh"
-#include "hashers.hh"
+#include "utils/hashers.hh"
 #include "utils/error_injection.hh"
 
 namespace cql3 {

db/schema_tables.cc

@@ -39,7 +39,7 @@
 #include "db/marshal/type_parser.hh"
 #include "db/config.hh"
 #include "db/extensions.hh"
-#include "hashers.hh"
+#include "utils/hashers.hh"
 
 #include <seastar/util/noncopyable_function.hh>
 #include <seastar/rpc/rpc_types.hh>

db/schema_tables.hh

@@ -13,7 +13,7 @@
 #include "db/commitlog/replay_position.hh"
 #include "schema/schema_fwd.hh"
 #include "schema_features.hh"
-#include "hashing.hh"
+#include "utils/hashing.hh"
 #include "schema_mutations.hh"
 #include "types/map.hh"
 #include "query-result-set.hh"

db/system_keyspace.cc

@@ -37,7 +37,7 @@
 #include "gms/feature_service.hh"
 #include "system_keyspace_view_types.hh"
 #include "schema/schema_builder.hh"
-#include "hashers.hh"
+#include "utils/hashers.hh"
 #include "release.hh"
 #include "log.hh"
 #include <seastar/core/enum.hh>

gc_clock.hh

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "clocks-impl.hh"
-#include "hashing.hh"
+#include "utils/hashing.hh"
 
 #include <seastar/core/lowres_clock.hh>
 

hashing_partition_visitor.hh

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "mutation/mutation_partition_visitor.hh"
-#include "hashing.hh"
+#include "utils/hashing.hh"
 #include "schema/schema.hh"
 #include "mutation/atomic_cell_hash.hh"
 #include "keys.hh"

keys.hh

@@ -12,7 +12,7 @@
 #include "types.hh"
 #include "compound_compat.hh"
 #include "utils/managed_bytes.hh"
-#include "hashing.hh"
+#include "utils/hashing.hh"
 #include "replica/database_fwd.hh"
 #include "schema/schema_fwd.hh"
 #include <compare>

message/messaging_service.cc

@@ -29,13 +29,13 @@
 #include "range.hh"
 #include "frozen_schema.hh"
 #include "repair/repair.hh"
-#include "digest_algorithm.hh"
+#include "utils/digest_algorithm.hh"
 #include "service/paxos/proposal.hh"
 #include "service/paxos/prepare_response.hh"
 #include "query-request.hh"
 #include "mutation_query.hh"
 #include "repair/repair.hh"
-#include "digest_algorithm.hh"
+#include "utils/digest_algorithm.hh"
 #include "streaming/stream_reason.hh"
 #include "streaming/stream_mutation_fragments_cmd.hh"
 #include "cache_temperature.hh"

mutation/atomic_cell_hash.hh

@@ -14,7 +14,7 @@
 #include "types/collection.hh"
 #include "atomic_cell.hh"
 #include "atomic_cell_or_collection.hh"
-#include "hashing.hh"
+#include "utils/hashing.hh"
 #include "counters.hh"
 
 template<>

mutation/mutation.hh

@@ -14,7 +14,7 @@
 #include "keys.hh"
 #include "schema/schema_fwd.hh"
 #include "dht/i_partitioner.hh"
-#include "hashing.hh"
+#include "utils/hashing.hh"
 #include "mutation_fragment_v2.hh"
 #include "mutation_consumer.hh"
 #include "range_tombstone_change_generator.hh"

mutation/mutation_fragment.cc

@@ -13,8 +13,8 @@
 #include "mutation_fragment.hh"
 #include "mutation_fragment_v2.hh"
 #include "clustering_interval_set.hh"
-#include "hashing.hh"
+#include "utils/hashing.hh"
-#include "xx_hasher.hh"
+#include "utils/xx_hasher.hh"
 
 std::ostream&
 operator<<(std::ostream& os, const clustering_row::printer& p) {

mutation/range_tombstone.hh

@@ -10,7 +10,7 @@
 
 #include <boost/intrusive/set.hpp>
 #include <optional>
-#include "hashing.hh"
+#include "utils/hashing.hh"
 #include "keys.hh"
 #include "mutation/tombstone.hh"
 #include "clustering_bounds_comparator.hh"

mutation/tombstone.hh

@@ -13,7 +13,7 @@
 
 #include "timestamp.hh"
 #include "gc_clock.hh"
-#include "hashing.hh"
+#include "utils/hashing.hh"
 
 /**
  * Represents deletion operation. Can be commuted with other tombstones via apply() method.

query-result-reader.hh

@@ -12,7 +12,7 @@
 #include <boost/range/numeric.hpp>
 
 #include "query-result.hh"
-#include "digest_algorithm.hh"
+#include "utils/digest_algorithm.hh"
 #include "full_position.hh"
 
 #include "idl/query.dist.hh"

query-result-writer.hh

@@ -12,8 +12,8 @@
 #include "mutation/atomic_cell.hh"
 #include "query-request.hh"
 #include "query-result.hh"
-#include "digest_algorithm.hh"
+#include "utils/digest_algorithm.hh"
-#include "digester.hh"
+#include "utils/digester.hh"
 #include "full_position.hh"
 #include "idl/query.dist.hh"
 #include "idl/query.dist.impl.hh"

query-result.hh

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "bytes_ostream.hh"
-#include "digest_algorithm.hh"
+#include "utils/digest_algorithm.hh"
 #include "query-request.hh"
 #include "full_position.hh"
 #include <optional>

repair/decorated_key_with_hash.hh

@@ -7,7 +7,7 @@
  */
 
 #pragma once
-#include "xx_hasher.hh"
+#include "utils/xx_hasher.hh"
 #include "repair/hash.hh"
 #include "dht/i_partitioner.hh"
 

repair/repair.cc

@@ -20,7 +20,7 @@
 #include "sstables/sstables.hh"
 #include "replica/database.hh"
 #include "db/config.hh"
-#include "hashers.hh"
+#include "utils/hashers.hh"
 #include "locator/network_topology_strategy.hh"
 #include "service/migration_manager.hh"
 #include "partition_range_compat.hh"

repair/row_level.cc

@@ -17,7 +17,7 @@
 #include "dht/i_partitioner.hh"
 #include "dht/sharder.hh"
 #include "to_string.hh"
-#include "xx_hasher.hh"
+#include "utils/xx_hasher.hh"
 #include "utils/UUID.hh"
 #include "utils/hash.hh"
 #include "service/priority_manager.hh"
@@ -55,7 +55,7 @@
 #include "repair/decorated_key_with_hash.hh"
 #include "repair/row.hh"
 #include "repair/writer.hh"
-#include "xx_hasher.hh"
+#include "utils/xx_hasher.hh"
 
 extern logging::logger rlogger;
 

schema_mutations.cc

@@ -9,7 +9,7 @@
 #include "schema_mutations.hh"
 #include "mutation/canonical_mutation.hh"
 #include "db/schema_tables.hh"
-#include "hashers.hh"
+#include "utils/hashers.hh"
 #include "utils/UUID_gen.hh"
 
 schema_mutations::schema_mutations(canonical_mutation columnfamilies,

service/paxos/paxos_state.hh

@@ -9,7 +9,7 @@
 #pragma once
 #include "service/paxos/proposal.hh"
 #include "log.hh"
-#include "digest_algorithm.hh"
+#include "utils/digest_algorithm.hh"
 #include "db/timeout_clock.hh"
 #include <unordered_map>
 #include "utils/UUID_gen.hh"

test/boost/hashers_test.cc

@@ -11,8 +11,8 @@
 #include <seastar/util/closeable.hh>
 #include "test/lib/scylla_test_case.hh"
 #include <seastar/testing/thread_test_case.hh>
-#include "hashers.hh"
+#include "utils/hashers.hh"
-#include "xx_hasher.hh"
+#include "utils/xx_hasher.hh"
 #include "gc_clock.hh"
 #include "test/lib/simple_schema.hh"
 #include "reader_concurrency_semaphore.hh"

test/boost/mutation_test.cc

@@ -13,8 +13,8 @@
 #include <boost/range/algorithm_ext/push_back.hpp>
 #include <boost/range/combine.hpp>
 #include "mutation_query.hh"
-#include "hashers.hh"
+#include "utils/hashers.hh"
-#include "xx_hasher.hh"
+#include "utils/xx_hasher.hh"
 
 #include <seastar/core/sstring.hh>
 #include <seastar/core/do_with.hh>

test/raft/replication.hh

@@ -26,7 +26,7 @@
 #include "raft/server.hh"
 #include "serializer.hh"
 #include "serializer_impl.hh"
-#include "xx_hasher.hh"
+#include "utils/xx_hasher.hh"
 #include "test/raft/helpers.hh"
 #include "test/lib/eventually.hh"
 #include "test/lib/random_utils.hh"

types.hh

@@ -27,7 +27,7 @@
 #include <seastar/net/ipv6_address.hh>
 #include <seastar/net/inet_address.hh>
 #include <seastar/util/backtrace.hh>
-#include "hashing.hh"
+#include "utils/hashing.hh"
 #include "utils/fragmented_temporary_buffer.hh"
 #include "utils/exceptions.hh"
 #include "utils/managed_bytes.hh"

utils/UUID.hh

@@ -20,7 +20,7 @@
 #include <seastar/core/print.hh>
 #include <seastar/net/byteorder.hh>
 #include "bytes.hh"
-#include "hashing.hh"
+#include "utils/hashing.hh"
 #include "utils/serialization.hh"
 
 namespace utils {

utils/UUID_gen.cc

@@ -16,7 +16,7 @@
 #endif // __linux__
 
 #include <stdlib.h>
-#include "hashers.hh"
+#include "utils/hashers.hh"
 
 namespace utils {
 

utils/digester.hh

@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "digest_algorithm.hh"
+#include "utils/digest_algorithm.hh"
-#include "hashers.hh"
+#include "utils/hashers.hh"
-#include "xx_hasher.hh"
+#include "utils/xx_hasher.hh"
 
 #include <type_traits>
 #include <variant>

utils/hashers.cc

@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-#include "hashers.hh"
+#include "utils/hashers.hh"
 
 #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
 #include <cryptopp/md5.h>

utils/hashers.hh

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "bytes.hh"
-#include "hashing.hh"
+#include "utils/hashing.hh"
 
 class md5_hasher;