Merge pull request MaterializeInc#11674 from aljoscha/persist-usability-fixes

persist: fix assortment of usability issues

Author: aljoscha

src/persist-client/src/lib.rs

@@ -84,16 +84,25 @@ pub(crate) mod r#impl {
 /// processes. This location can contain any number of persist shards.
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct Location {
-    blob_uri: String,
-    consensus_uri: String,
+    /// Uri string that identifies the blob store.
+    pub blob_uri: String,
+
+    /// Uri string that identifies the consensus system.
+    pub consensus_uri: String,
 }
 
 impl Location {
     /// Opens the associated implementations of [BlobMulti] and [Consensus].
     pub async fn open(
         &self,
         timeout: Duration,
-    ) -> Result<(Arc<dyn BlobMulti>, Arc<dyn Consensus>), ExternalError> {
+    ) -> Result<
+        (
+            Arc<dyn BlobMulti + Send + Sync>,
+            Arc<dyn Consensus + Send + Sync>,
+        ),
+        ExternalError,
+    > {
         let deadline = Instant::now() + timeout;
         debug!(
             "Location::open timeout={:?} blob={} consensus={}",

src/persist/src/cfg.rs

@@ -32,14 +32,17 @@ pub enum BlobMultiConfig {
 
 impl BlobMultiConfig {
     /// Opens the associated implementation of [BlobMulti].
-    pub async fn open(self, deadline: Instant) -> Result<Arc<dyn BlobMulti>, ExternalError> {
+    pub async fn open(
+        self,
+        deadline: Instant,
+    ) -> Result<Arc<dyn BlobMulti + Send + Sync>, ExternalError> {
         match self {
             BlobMultiConfig::File(config) => FileBlobMulti::open(deadline, config)
                 .await
-                .map(|x| Arc::new(x) as Arc<dyn BlobMulti>),
+                .map(|x| Arc::new(x) as Arc<dyn BlobMulti + Send + Sync>),
             BlobMultiConfig::S3(config) => S3BlobMulti::open(deadline, config)
                 .await
-                .map(|x| Arc::new(x) as Arc<dyn BlobMulti>),
+                .map(|x| Arc::new(x) as Arc<dyn BlobMulti + Send + Sync>),
         }
     }
 
@@ -100,11 +103,13 @@ pub enum ConsensusConfig {
 
 impl ConsensusConfig {
     /// Opens the associated implementation of [Consensus].
-    pub async fn open(self, _deadline: Instant) -> Result<Arc<dyn Consensus>, ExternalError> {
+    pub async fn open(
+        self,
+        _deadline: Instant,
+    ) -> Result<Arc<dyn Consensus + Send + Sync>, ExternalError> {
         match self {
-            ConsensusConfig::Sqlite(config) => {
-                SqliteConsensus::open(config).map(|x| Arc::new(x) as Arc<dyn Consensus>)
-            }
+            ConsensusConfig::Sqlite(config) => SqliteConsensus::open(config)
+                .map(|x| Arc::new(x) as Arc<dyn Consensus + Send + Sync>),
         }
     }