partitioner: calculate_token_for_partition_key accepts PartitionerName

As `PartitionerName` is now public and retrievable from
`PreparedStatement` using `get_partitioner_name()`, it makes sense to
accept it in `calculate_token_for_partition_key` instead of an
`impl Partitioner` generic parameter.

Author: wprzytula

scylla/benches/benchmark.rs

@@ -1,7 +1,7 @@
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use bytes::BytesMut;
-use scylla::routing::partitioner::{calculate_token_for_partition_key, Murmur3Partitioner};
+use scylla::routing::partitioner::{calculate_token_for_partition_key, PartitionerName};
 use scylla_cql::frame::response::result::{ColumnType, NativeType};
 use scylla_cql::frame::types;
 use scylla_cql::serialize::row::SerializedValues;
@@ -84,7 +84,9 @@ fn calculate_token_bench(c: &mut Criterion) {
         .unwrap();
 
     c.bench_function("calculate_token_from_partition_key simple pk", |b| {
-        b.iter(|| calculate_token_for_partition_key(&serialized_simple_pk, &Murmur3Partitioner))
+        b.iter(|| {
+            calculate_token_for_partition_key(&serialized_simple_pk, &PartitionerName::Murmur3)
+        })
     });
 
     c.bench_function(
@@ -93,14 +95,16 @@ fn calculate_token_bench(c: &mut Criterion) {
             b.iter(|| {
                 calculate_token_for_partition_key(
                     &serialized_simple_pk_long_column,
-                    &Murmur3Partitioner,
+                    &PartitionerName::Murmur3,
                 )
             })
         },
     );
 
     c.bench_function("calculate_token_from_partition_key complex pk", |b| {
-        b.iter(|| calculate_token_for_partition_key(&serialized_complex_pk, &Murmur3Partitioner))
+        b.iter(|| {
+            calculate_token_for_partition_key(&serialized_complex_pk, &PartitionerName::Murmur3)
+        })
     });
 
     c.bench_function(
@@ -109,7 +113,7 @@ fn calculate_token_bench(c: &mut Criterion) {
             b.iter(|| {
                 calculate_token_for_partition_key(
                     &serialized_values_long_column,
-                    &Murmur3Partitioner,
+                    &PartitionerName::Murmur3,
                 )
             })
         },

scylla/src/client/session_test.rs

@@ -3044,7 +3044,7 @@ async fn test_manual_primary_key_computation() {
 
         let token_by_hand = calculate_token_for_partition_key(
             serialized_pk_values_in_pk_order,
-            &Murmur3Partitioner,
+            &PartitionerName::Murmur3,
         )
         .unwrap();
         println!(

scylla/src/routing/partitioner.rs

@@ -348,9 +348,9 @@ impl PartitionerHasher for CDCPartitionerHasher {
 ///
 /// NOTE: the provided values must completely constitute partition key
 /// and be in the order defined in CREATE TABLE statement.
-pub fn calculate_token_for_partition_key<P: Partitioner>(
+pub fn calculate_token_for_partition_key(
     serialized_partition_key_values: &SerializedValues,
-    partitioner: &P,
+    partitioner: &PartitionerName,
 ) -> Result<Token, TokenCalculationError> {
     let mut partitioner_hasher = partitioner.build_hasher();