Removed unused code.

Author: horned-sphere

api/swimos_api/src/persistence.rs

@@ -153,3 +153,17 @@ impl PlanePersistence for StoreDisabled {
         ready(Ok(StoreDisabled)).boxed()
     }
 }
+
+pub trait ServerPersistence {
+    type PlaneStore: PlanePersistence + Clone + Send + Sync + 'static;
+
+    fn open_plane(&self, name: &str) -> Result<Self::PlaneStore, StoreError>;
+}
+
+impl ServerPersistence for StoreDisabled {
+    type PlaneStore = StoreDisabled;
+
+    fn open_plane(&self, _name: &str) -> Result<Self::PlaneStore, StoreError> {
+        Ok(Self)
+    }
+}

server/swimos_server_app/src/server/builder/mod.rs

@@ -21,7 +21,11 @@ use ratchet::{
     deflate::{DeflateConfig, DeflateExtProvider},
     NoExtProvider, WebSocketStream,
 };
-use swimos_api::{agent::Agent, error::StoreError, persistence::StoreDisabled};
+use swimos_api::{
+    agent::Agent,
+    error::StoreError,
+    persistence::{ServerPersistence, StoreDisabled},
+};
 use swimos_remote::net::plain::TokioPlainTextNetworking;
 use swimos_remote::net::{dns::Resolver, ExternalConnections};
 use swimos_tls::{
@@ -39,7 +43,7 @@ use crate::{
 use super::{
     http::HyperWebsockets,
     runtime::{SwimServer, Transport},
-    store::{in_memory::InMemoryPersistence, ServerPersistence},
+    store::in_memory::InMemoryPersistence,
     BoxServer,
 };
 
@@ -213,7 +217,7 @@ where
     match store_config {
         #[cfg(feature = "rocks_store")]
         StoreConfig::RockStore { path, options } => {
-            let store = super::store::rocks::create_rocks_store(path, options)?;
+            let store = swimos_rocks_store::create_rocks_store(path, options)?;
             Ok(with_websockets(bind_to, routes, networking, config, store))
         }
         StoreConfig::InMemory => Ok(with_websockets(

server/swimos_server_app/src/server/runtime/mod.rs

@@ -29,6 +29,7 @@ use swimos_api::agent::{Agent, BoxAgent, HttpLaneRequest};
 use swimos_api::error::{
     AgentRuntimeError, DownlinkFailureReason, DownlinkRuntimeError, IntrospectionStopped,
 };
+use swimos_api::persistence::ServerPersistence;
 use swimos_api::{address::RelativeAddress, persistence::PlanePersistence};
 use swimos_introspection::route::{lane_pattern, mesh_pattern, node_pattern};
 use swimos_introspection::{init_introspection, IntrospectionResolver};
@@ -66,7 +67,6 @@ use self::downlinks::{DownlinkConnectionTask, ServerConnector};
 use self::ids::{IdIssuer, IdKind};
 
 use super::error::UnresolvableRoute;
-use super::store::ServerPersistence;
 use super::{Server, ServerError};
 
 mod downlinks;

server/swimos_server_app/src/server/store/mod.rs

@@ -12,33 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use swimos_api::{
-    error::StoreError,
-    persistence::{PlanePersistence, StoreDisabled},
-};
-
-pub trait ServerPersistence {
-    type PlaneStore: PlanePersistence + Clone + Send + Sync + 'static;
-
-    fn open_plane(&self, name: &str) -> Result<Self::PlaneStore, StoreError>;
-}
-
-impl ServerPersistence for StoreDisabled {
-    type PlaneStore = StoreDisabled;
-
-    fn open_plane(&self, _name: &str) -> Result<Self::PlaneStore, StoreError> {
-        Ok(Self)
-    }
-}
-
 pub mod in_memory {
     use std::collections::{hash_map::Entry, HashMap};
 
     use parking_lot::Mutex;
+    use swimos_api::persistence::ServerPersistence;
     use swimos_store::in_memory::InMemoryPlanePersistence;
 
-    use super::ServerPersistence;
-
     #[derive(Debug, Default)]
     /// A store implementation that mains agent state transiently in memory. State will persist across
     /// an agent restarting but will be lost if the process stops.
@@ -62,47 +42,3 @@ pub mod in_memory {
         }
     }
 }
-
-#[cfg(feature = "rocks_store")]
-pub mod rocks {
-    use std::path::PathBuf;
-
-    use swimos_api::error::StoreError;
-    use swimos_rocks_store::{
-        default_keyspaces, RocksEngine, RocksOpts, ServerStore, StoreWrapper, SwimPlaneStore,
-        SwimStore,
-    };
-
-    use super::ServerPersistence;
-
-    struct RocksServerPersistence {
-        inner: ServerStore<RocksOpts>,
-    }
-
-    const PREFIX: &str = "swimos_store";
-
-    impl ServerPersistence for RocksServerPersistence {
-        type PlaneStore = StoreWrapper<SwimPlaneStore<RocksEngine>>;
-
-        fn open_plane(&self, name: &str) -> Result<Self::PlaneStore, StoreError> {
-            let RocksServerPersistence { inner } = self;
-            let store = inner.plane_store(name)?;
-            Ok(StoreWrapper(store))
-        }
-    }
-
-    pub fn create_rocks_store(
-        path: Option<PathBuf>,
-        options: RocksOpts,
-    ) -> Result<impl ServerPersistence + Send + Sync + 'static, StoreError> {
-        let keyspaces = default_keyspaces();
-
-        let server_store = match path {
-            Some(base_path) => ServerStore::new(options, keyspaces, base_path),
-            _ => ServerStore::transient(options, keyspaces, PREFIX),
-        }?;
-        Ok(RocksServerPersistence {
-            inner: server_store,
-        })
-    }
-}

swimos_rocks_store/src/agent/mock/mod.rs

@@ -16,7 +16,7 @@ use crate::agent::{NodeStore, SwimNodeStore};
 use crate::plane::mock::MockPlaneStore;
 use crate::server::{StoreEngine, StoreKey};
 use swimos_store::nostore::NoRange;
-use swimos_store::{EngineInfo, StoreError};
+use swimos_store::StoreError;
 
 #[derive(Clone, Debug)]
 pub struct MockNodeStore {
@@ -44,28 +44,10 @@ impl NodeStore for MockNodeStore {
         Ok(NoRange)
     }
 
-    fn engine_info(&self) -> EngineInfo {
-        EngineInfo {
-            path: "".to_string(),
-            kind: "Mock".to_string(),
-        }
-    }
-
     fn lane_id_of(&self, _lane: &str) -> Result<u64, StoreError> {
         Ok(0)
     }
 
-    fn load_ranged_snapshot<F, K, V>(
-        &self,
-        _prefix: StoreKey,
-        _map_fn: F,
-    ) -> Result<Option<Vec<(K, V)>>, StoreError>
-    where
-        F: for<'i> Fn(&'i [u8], &'i [u8]) -> Result<(K, V), StoreError>,
-    {
-        Ok(None)
-    }
-
     fn delete_map(&self, _lane_id: u64) -> Result<(), StoreError> {
         Ok(())
     }

swimos_rocks_store/src/agent/mod.rs

@@ -26,7 +26,7 @@ use swimos_model::Text;
 use crate::plane::PlaneStore;
 use crate::server::{StoreEngine, StoreKey};
 
-use swimos_store::{EngineInfo, RangeConsumer, StoreError};
+use swimos_store::{RangeConsumer, StoreError};
 
 /// A trait for defining store engines which open stores for nodes.
 ///
@@ -52,24 +52,8 @@ pub trait NodeStore: StoreEngine + Send + Sync + Clone + Debug + 'static {
     /// * `prefix` - Common prefix for the records to read.
     fn ranged_snapshot_consumer(&self, prefix: StoreKey) -> Result<Self::RangeCon<'_>, StoreError>;
 
-    /// Returns information about the delegate store
-    fn engine_info(&self) -> EngineInfo;
-
     fn lane_id_of(&self, lane: &str) -> Result<u64, StoreError>;
 
-    /// Executes a ranged snapshot read prefixed by a lane key and deserialize each key-value pair
-    /// using `map_fn`.
-    ///
-    /// Returns an optional snapshot iterator if entries were found that will yield deserialized
-    /// key-value pairs.
-    fn load_ranged_snapshot<F, K, V>(
-        &self,
-        prefix: StoreKey,
-        map_fn: F,
-    ) -> Result<Option<Vec<(K, V)>>, StoreError>
-    where
-        F: for<'i> Fn(&'i [u8], &'i [u8]) -> Result<(K, V), StoreError>;
-
     /// Delete all values for a map lane.
     fn delete_map(&self, lane_id: u64) -> Result<(), StoreError>;
 }
@@ -136,26 +120,11 @@ impl<D: PlaneStore> NodeStore for SwimNodeStore<D> {
         self.delegate.ranged_snapshot_consumer(prefix)
     }
 
-    fn engine_info(&self) -> EngineInfo {
-        self.delegate.engine_info()
-    }
-
     fn lane_id_of(&self, lane: &str) -> Result<u64, StoreError> {
         let node_id = format!("{}/{}", self.node_uri, lane);
         self.delegate.node_id_of(node_id)
     }
 
-    fn load_ranged_snapshot<F, K, V>(
-        &self,
-        prefix: StoreKey,
-        map_fn: F,
-    ) -> Result<Option<Vec<(K, V)>>, StoreError>
-    where
-        F: for<'i> Fn(&'i [u8], &'i [u8]) -> Result<(K, V), StoreError>,
-    {
-        self.delegate.get_prefix_range(prefix, map_fn)
-    }
-
     fn delete_map(&self, lane_id: u64) -> Result<(), StoreError> {
         self.delegate.delete_map(lane_id)
     }

swimos_rocks_store/src/engine/tests.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{RocksEngine, RocksOpts};
+use crate::engine::{RocksEngine, RocksOpts};
 use integer_encoding::VarInt;
 use rocksdb::{MergeOperands, Options, SliceTransform};
 use std::collections::HashMap;

swimos_rocks_store/src/lib.rs

@@ -13,17 +13,12 @@
 // limitations under the License.
 
 mod agent;
-pub(crate) mod engine;
+mod engine;
 mod plane;
 mod server;
 
-pub use agent::StoreWrapper;
-pub use engine::*;
-pub use plane::SwimPlaneStore;
-pub use server::{
-    rocks::{default_db_opts, default_keyspaces},
-    ServerStore, SwimStore,
-};
+pub use engine::RocksOpts;
+pub use server::{create_rocks_store, default_db_opts};
 
 /// An enumeration over the keyspaces that exist in a store.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]

swimos_rocks_store/src/plane/mock.rs

@@ -18,7 +18,7 @@ use crate::plane::PlaneStore;
 use crate::server::{StoreEngine, StoreKey};
 use swimos_model::Text;
 use swimos_store::nostore::NoRange;
-use swimos_store::{EngineInfo, Keyspace, KeyspaceResolver, StoreError};
+use swimos_store::{Keyspace, KeyspaceResolver, StoreError};
 
 #[derive(Clone, Debug)]
 pub struct MockPlaneStore;
@@ -43,24 +43,6 @@ impl PlaneStore for MockPlaneStore {
         MockNodeStore::mock()
     }
 
-    fn get_prefix_range<F, K, V>(
-        &self,
-        _prefix: StoreKey,
-        _map_fn: F,
-    ) -> Result<Option<Vec<(K, V)>>, StoreError>
-    where
-        F: for<'i> Fn(&'i [u8], &'i [u8]) -> Result<(K, V), StoreError>,
-    {
-        Ok(None)
-    }
-
-    fn engine_info(&self) -> EngineInfo {
-        EngineInfo {
-            path: "".to_string(),
-            kind: "Mock".to_string(),
-        }
-    }
-
     fn node_id_of<I>(&self, _lane: I) -> Result<u64, StoreError>
     where
         I: Into<String>,

swimos_rocks_store/src/plane/mod.rs

@@ -19,7 +19,7 @@ use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
 use swimos_model::Text;
-use swimos_store::{EngineInfo, KeyValue, KeyspaceByteEngine, RangeConsumer, Store, StoreError};
+use swimos_store::{KeyValue, KeyspaceByteEngine, RangeConsumer, Store, StoreError};
 
 use crate::agent::{NodeStore, SwimNodeStore};
 use crate::server::keystore::KeyStore;
@@ -65,25 +65,9 @@ pub trait PlaneStore: StoreEngine + Sized + Debug + Send + Sync + Clone + 'stati
     where
         I: Into<Text>;
 
-    /// Executes a ranged snapshot read prefixed by a lane key and deserialize each key-value pair
-    /// using `map_fn`.
-    ///
-    /// Returns an optional snapshot iterator if entries were found that will yield deserialized
-    /// key-value pairs.
-    fn get_prefix_range<F, K, V>(
-        &self,
-        prefix: StoreKey,
-        map_fn: F,
-    ) -> Result<Option<Vec<(K, V)>>, StoreError>
-    where
-        F: for<'i> Fn(&'i [u8], &'i [u8]) -> Result<(K, V), StoreError>;
-
     /// Delete all values for a map lane.
     fn delete_map(&self, lane_id: u64) -> Result<(), StoreError>;
 
-    /// Returns information about the delegate store
-    fn engine_info(&self) -> EngineInfo;
-
     fn node_id_of<I>(&self, node: I) -> Result<u64, StoreError>
     where
         I: Into<String>;
@@ -173,27 +157,6 @@ where
         SwimNodeStore::new(self.clone(), node)
     }
 
-    fn get_prefix_range<F, K, V>(
-        &self,
-        prefix: StoreKey,
-        map_fn: F,
-    ) -> Result<Option<Vec<(K, V)>>, StoreError>
-    where
-        F: for<'i> Fn(&'i [u8], &'i [u8]) -> Result<(K, V), StoreError>,
-    {
-        let namespace = match &prefix {
-            StoreKey::Map { .. } => KeyspaceName::Map,
-            StoreKey::Value { .. } => KeyspaceName::Value,
-        };
-
-        self.delegate
-            .get_prefix_range(namespace, prefix.serialize_as_bytes().as_slice(), map_fn)
-    }
-
-    fn engine_info(&self) -> EngineInfo {
-        self.delegate.engine_info()
-    }
-
     fn node_id_of<I>(&self, lane: I) -> Result<u64, StoreError>
     where
         I: Into<String>,