Merge host component key value implementations into new factor crates

Signed-off-by: Caleb Schoepp <[email protected]>
fermyon · Sep 3, 2024 · 1c1f8b0 · 1c1f8b0
1 parent 8fda052
commit 1c1f8b0
Show file tree

Hide file tree

Showing 29 changed files with 508 additions and 748 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/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" }

diff --git a/crates/factor-key-value-azure/Cargo.toml b/crates/factor-key-value-azure/Cargo.toml
diff --git a/crates/factor-key-value-azure/src/lib.rs b/crates/factor-key-value-azure/src/lib.rs
diff --git a/crates/factor-key-value-redis/Cargo.toml b/crates/factor-key-value-redis/Cargo.toml
diff --git a/crates/factor-key-value-redis/src/lib.rs b/crates/factor-key-value-redis/src/lib.rs
diff --git a/crates/factor-key-value-spin/Cargo.toml b/crates/factor-key-value-spin/Cargo.toml
diff --git a/crates/factor-key-value/Cargo.toml b/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"] }

diff --git a/crates/key-value/src/lib.rs → crates/factor-key-value/src/host.rs b/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;