Merge branch 'release/1.2.1'

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "scyllapy"
-version = "1.2.0"
+version = "1.2.1"
 edition = "2021"
 
 [lib]
@@ -22,8 +22,9 @@ pyo3 = { version = "0.19.2", features = [
 ] }
 pyo3-asyncio = { version = "0.19.0", features = ["tokio-runtime"] }
 pyo3-log = "0.8.3"
-scylla = { version = "0.9.0", features = ["ssl"] }
-scylla-cql = "0.0.8"
+rustc-hash = "1.1.0"
+scylla = { version = "0.10.1", features = ["ssl"] }
+scylla-cql = "0.0.9"
 thiserror = "1.0.48"
 tokio = { version = "1.32.0", features = ["bytes"] }
 uuid = { version = "1.4.1", features = ["v4"] }

python/scyllapy/_internal/__init__.pyi

@@ -255,6 +255,8 @@ class Consistency:
     LOCAL_QUORUM: Consistency
     EACH_QUORUM: Consistency
     LOCAL_ONE: Consistency
+    SERIAL: Consistency
+    LOCAL_SERIAL: Consistency
 
 class SerialConsistency:
     """Serial consistency for query."""

src/consistencies.rs

@@ -18,6 +18,8 @@ pub enum ScyllaPyConsistency {
     LOCAL_QUORUM,
     EACH_QUORUM,
     LOCAL_ONE,
+    SERIAL,
+    LOCAL_SERIAL,
 }
 
 #[pyclass(name = "SerialConsistency")]
@@ -42,6 +44,8 @@ impl From<ScyllaPyConsistency> for Consistency {
             ScyllaPyConsistency::LOCAL_QUORUM => Self::LocalQuorum,
             ScyllaPyConsistency::EACH_QUORUM => Self::EachQuorum,
             ScyllaPyConsistency::LOCAL_ONE => Self::LocalOne,
+            ScyllaPyConsistency::SERIAL => Self::Serial,
+            ScyllaPyConsistency::LOCAL_SERIAL => Self::LocalSerial,
         }
     }
 }

src/load_balancing.rs

@@ -46,11 +46,12 @@ impl ScyllaPyLoadBalancingPolicy {
             if let Some(token) = token_aware {
                 policy_builer = policy_builer.token_aware(token);
             }
-            if let Some(rack) = prefer_rack {
-                policy_builer = policy_builer.prefer_rack(rack);
-            }
             if let Some(dc) = prefer_datacenter {
-                policy_builer = policy_builer.prefer_datacenter(dc);
+                if let Some(rack) = prefer_rack {
+                    policy_builer = policy_builer.prefer_datacenter_and_rack(dc, rack);
+                } else {
+                    policy_builer = policy_builer.prefer_datacenter(dc);
+                }
             }
             if let Some(shufle) = shuffling_replicas {
                 policy_builer = policy_builer.enable_shuffling_replicas(shufle);

src/query_results.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, sync::Arc};
+use std::{collections::HashMap, hash::BuildHasherDefault, sync::Arc};
 
 use futures::StreamExt;
 use pyo3::{
@@ -40,14 +40,17 @@ impl ScyllaPyQueryResult {
         &'a self,
         py: Python<'a>,
         limit: Option<usize>,
-    ) -> ScyllaPyResult<Option<Vec<HashMap<&'a str, &'a PyAny>>>> {
+    ) -> ScyllaPyResult<Option<Vec<rustc_hash::FxHashMap<&'a str, &'a PyAny>>>> {
         let Some(rows) = &self.inner.rows else {
             return Ok(None);
         };
         let specs = &self.inner.col_specs;
         let mut dumped_rows = Vec::new();
         for (row_index, row) in rows.iter().enumerate() {
-            let mut map = HashMap::new();
+            let mut map = HashMap::with_capacity_and_hasher(
+                specs.len(),
+                BuildHasherDefault::<rustc_hash::FxHasher>::default(),
+            );
             for (col_index, column) in row.columns.iter().enumerate() {
                 map.insert(
                     specs[col_index].name.as_str(),

src/utils.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, future::Future, str::FromStr};
+use std::{collections::HashMap, future::Future, hash::BuildHasherDefault, str::FromStr};
 
 use chrono::Duration;
 use pyo3::{
@@ -119,7 +119,7 @@ impl Value for ScyllaPyCQLDTO {
             ScyllaPyCQLDTO::Map(map) => map
                 .iter()
                 .cloned()
-                .collect::<HashMap<_, _>>()
+                .collect::<HashMap<_, _, BuildHasherDefault<rustc_hash::FxHasher>>>()
                 .serialize(buf),
             ScyllaPyCQLDTO::Timestamp(timestamp) => {
                 scylla::frame::value::Timestamp(*timestamp).serialize(buf)
@@ -502,7 +502,8 @@ pub fn parse_python_query_params(
         return Ok(values);
     } else if params.is_instance_of::<PyDict>() {
         if allow_dicts {
-            let dict = params.extract::<HashMap<&str, &PyAny>>()?;
+            let dict = params
+                .extract::<HashMap<&str, &PyAny, BuildHasherDefault<rustc_hash::FxHasher>>>()?;
             for (name, value) in dict {
                 values.add_named_value(name.to_lowercase().as_str(), &py_to_value(value)?)?;
             }