Merge pull request #2794 from calebschoepp/merge-kv-impls

Merge host component key value implementations into new factor crates

Cargo.toml

@@ -49,8 +49,6 @@ spin-common = { path = "crates/common" }
 spin-doctor = { path = "crates/doctor" }
 spin-expressions = { path = "crates/expressions" }
 spin-http = { path = "crates/http" }
-spin-key-value = { path = "crates/key-value" }
-spin-key-value-sqlite = { path = "crates/key-value-sqlite" }
 spin-loader = { path = "crates/loader" }
 spin-locked-app = { path = "crates/locked-app" }
 spin-manifest = { path = "crates/manifest" }

crates/factor-key-value/Cargo.toml

@@ -6,16 +6,20 @@ edition = { workspace = true }
 
 [dependencies]
 anyhow = "1.0"
+lru = "0.9.0"
 serde = { version = "1.0", features = ["rc"] }
+spin-core = { path = "../core" }
 spin-factors = { path = "../factors" }
-# TODO: merge with this crate
-spin-key-value = { path = "../key-value" }
+spin-locked-app = { path = "../locked-app" }
 spin-world = { path = "../world" }
+table = { path = "../table" }
+tokio = { version = "1", features = ["macros", "sync", "rt"] }
 toml = "0.8"
+tracing = { workspace = true }
 
 [dev-dependencies]
-spin-factor-key-value-redis = { path = "../factor-key-value-redis" }
-spin-factor-key-value-spin = { path = "../factor-key-value-spin" }
+spin-key-value-redis = { path = "../key-value-redis" }
+spin-key-value-spin = { path = "../key-value-spin" }
 spin-factors-test = { path = "../factors-test" }
 tempfile = "3.12.0"
 tokio = { version = "1", features = ["macros", "rt"] }

crates/key-value/src/lib.rs → crates/factor-key-value/src/host.rs

@@ -1,18 +1,11 @@
+use crate::util::EmptyStoreManager;
 use anyhow::{Context, Result};
-use spin_app::MetadataKey;
 use spin_core::{async_trait, wasmtime::component::Resource};
+use spin_locked_app::MetadataKey;
 use spin_world::v2::key_value;
 use std::{collections::HashSet, sync::Arc};
 use table::Table;
 
-// TODO(factors): Code left for reference; remove after migration to factors
-// mod host_component;
-mod util;
-
-pub use util::{
-    CachingStoreManager, DefaultManagerGetter, DelegatingStoreManager, EmptyStoreManager,
-};
-
 pub const KEY_VALUE_STORES_KEY: MetadataKey<Vec<String>> = MetadataKey::new("key_value_stores");
 
 const DEFAULT_STORE_TABLE_CAPACITY: u32 = 256;

crates/factor-key-value/src/lib.rs

@@ -1,30 +1,32 @@
+mod host;
 pub mod runtime_config;
+mod util;
 
 use std::{
     collections::{HashMap, HashSet},
     sync::Arc,
 };
 
 use anyhow::ensure;
+use host::KEY_VALUE_STORES_KEY;
 use spin_factors::{
     ConfigureAppContext, Factor, FactorInstanceBuilder, InitContext, InstanceBuilders,
     PrepareContext, RuntimeFactors,
 };
-use spin_key_value::{
-    CachingStoreManager, DefaultManagerGetter, DelegatingStoreManager, KeyValueDispatch,
-    StoreManager, KEY_VALUE_STORES_KEY,
-};
+use util::{CachingStoreManager, DefaultManagerGetter};
 
+pub use host::{log_error, Error, KeyValueDispatch, Store, StoreManager};
 pub use runtime_config::RuntimeConfig;
+pub use util::DelegatingStoreManager;
 
 /// A factor that provides key-value storage.
 pub struct KeyValueFactor {
     default_label_resolver: Arc<dyn DefaultLabelResolver>,
 }
 
 impl KeyValueFactor {
-    /// Create a new KeyValueFactor.  
-    ///  
+    /// Create a new KeyValueFactor.
+    ///
     /// The `default_label_resolver` is used to resolve store managers for labels that
     /// are not defined in the runtime configuration.
     pub fn new(default_label_resolver: impl DefaultLabelResolver + 'static) -> Self {

crates/factor-key-value/src/runtime_config.rs

@@ -2,7 +2,7 @@ pub mod spin;
 
 use std::{collections::HashMap, sync::Arc};
 
-use spin_key_value::StoreManager;
+use crate::StoreManager;
 
 /// Runtime configuration for all key value stores.
 #[derive(Default, Clone)]