Merge pull request #690 from wprzytula/execution_profiles_ext

Execution profiles API extensions

Author: piodul

scylla/src/lib.rs

@@ -134,6 +134,7 @@ pub use transport::session_builder::SessionBuilder;
 #[cfg(feature = "cloud")]
 pub use transport::session_builder::CloudSessionBuilder;
 
+pub use transport::execution_profile;
 pub use transport::host_filter;
 pub use transport::load_balancing;
 pub use transport::retry_policy;

scylla/src/transport/execution_profile.rs

@@ -226,6 +226,7 @@ pub(crate) mod defaults {
 /// # Ok(())
 /// # }
 /// ```
+#[derive(Clone, Debug)]
 pub struct ExecutionProfileBuilder {
     request_timeout: Option<Option<Duration>>,
     consistency: Option<Consistency>,
@@ -378,6 +379,12 @@ impl ExecutionProfileBuilder {
     }
 }
 
+impl Default for ExecutionProfileBuilder {
+    fn default() -> Self {
+        ExecutionProfile::builder()
+    }
+}
+
 /// A profile that groups configurable options regarding query execution.
 ///
 /// Execution profile is immutable as such, but the driver implements double indirection of form:
@@ -399,6 +406,20 @@ pub(crate) struct ExecutionProfileInner {
     pub(crate) speculative_execution_policy: Option<Arc<dyn SpeculativeExecutionPolicy>>,
 }
 
+impl ExecutionProfileInner {
+    /// Creates a builder having all options set to the same as set in this ExecutionProfileInner.
+    pub(crate) fn to_builder(&self) -> ExecutionProfileBuilder {
+        ExecutionProfileBuilder {
+            request_timeout: Some(self.request_timeout),
+            consistency: Some(self.consistency),
+            serial_consistency: Some(self.serial_consistency),
+            load_balancing_policy: Some(self.load_balancing_policy.clone()),
+            retry_policy: Some(self.retry_policy.clone()),
+            speculative_execution_policy: Some(self.speculative_execution_policy.clone()),
+        }
+    }
+}
+
 impl ExecutionProfile {
     pub(crate) fn new_from_inner(inner: ExecutionProfileInner) -> Self {
         Self(Arc::new(inner))
@@ -418,14 +439,7 @@ impl ExecutionProfile {
 
     /// Creates a builder having all options set to the same as set in this ExecutionProfile.
     pub fn to_builder(&self) -> ExecutionProfileBuilder {
-        ExecutionProfileBuilder {
-            request_timeout: Some(self.0.request_timeout),
-            consistency: Some(self.0.consistency),
-            serial_consistency: Some(self.0.serial_consistency),
-            load_balancing_policy: Some(self.0.load_balancing_policy.clone()),
-            retry_policy: Some(self.0.retry_policy.clone()),
-            speculative_execution_policy: Some(self.0.speculative_execution_policy.clone()),
-        }
+        self.0.to_builder()
     }
 
     /// Returns a new handle to this ExecutionProfile.
@@ -461,6 +475,11 @@ impl ExecutionProfileHandle {
         self.0 .0.load_full()
     }
 
+    /// Creates a builder having all options set to the same as set in the ExecutionProfile pointed by this handle.
+    pub fn pointee_to_builder(&self) -> ExecutionProfileBuilder {
+        self.0 .0.load().to_builder()
+    }
+
     /// Makes the handle point to a new execution profile.
     /// All entities (queries/Session) holding this handle will reflect the change.
     pub fn map_to_another_profile(&mut self, profile: ExecutionProfile) {

scylla/src/transport/session.rs

@@ -1815,7 +1815,9 @@ impl Session {
         }
     }
 
-    fn get_default_execution_profile_handle(&self) -> &ExecutionProfileHandle {
+    /// Retrieves the handle to execution profile that is used by this session
+    /// by default, i.e. when an executed statement does not define its own handle.
+    pub fn get_default_execution_profile_handle(&self) -> &ExecutionProfileHandle {
         &self.default_execution_profile_handle
     }
 }