Rename table crate to spin-resource-table

rylev · rylev · commit 7b5578078bd9 · 2024-09-25T18:06:54.000+02:00
Signed-off-by: Ryan Levick &lt;ryan.levick@fermyon.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/factor-key-value/Cargo.toml b/crates/factor-key-value/Cargo.toml
@@ -11,8 +11,8 @@ serde = { workspace = true }
 spin-core = { path = "../core" }
 spin-factors = { path = "../factors" }
 spin-locked-app = { path = "../locked-app" }
+spin-resource-table = { path = "../table" }
 spin-world = { path = "../world" }
-table = { path = "../table" }
 tokio = { workspace = true, features = ["macros", "sync", "rt"] }
 toml = { workspace = true }
 tracing = { workspace = true }
diff --git a/crates/factor-key-value/src/host.rs b/crates/factor-key-value/src/host.rs
@@ -1,8 +1,8 @@
 use anyhow::{Context, Result};
 use spin_core::{async_trait, wasmtime::component::Resource};
+use spin_resource_table::Table;
 use spin_world::v2::key_value;
 use std::{collections::HashSet, sync::Arc};
-use table::Table;
 use tracing::{instrument, Level};
 
 const DEFAULT_STORE_TABLE_CAPACITY: u32 = 256;
diff --git a/crates/factor-outbound-mqtt/Cargo.toml b/crates/factor-outbound-mqtt/Cargo.toml
@@ -10,8 +10,8 @@ rumqttc = { version = "0.24", features = ["url"] }
 spin-core = { path = "../core" }
 spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
 spin-factors = { path = "../factors" }
+spin-resource-table = { path = "../table" }
 spin-world = { path = "../world" }
-table = { path = "../table" }
 tokio = { workspace = true, features = ["sync"] }
 tracing = { workspace = true }
 
diff --git a/crates/factor-outbound-mqtt/src/host.rs b/crates/factor-outbound-mqtt/src/host.rs
@@ -10,7 +10,7 @@ use crate::ClientCreator;
 
 pub struct InstanceState {
     allowed_hosts: OutboundAllowedHosts,
-    connections: table::Table<Arc<dyn MqttClient>>,
+    connections: spin_resource_table::Table<Arc<dyn MqttClient>>,
     create_client: Arc<dyn ClientCreator>,
 }
 
@@ -19,7 +19,7 @@ impl InstanceState {
         Self {
             allowed_hosts,
             create_client,
-            connections: table::Table::new(1024),
+            connections: spin_resource_table::Table::new(1024),
         }
     }
 }
diff --git a/crates/factor-outbound-mysql/Cargo.toml b/crates/factor-outbound-mysql/Cargo.toml
@@ -21,8 +21,8 @@ spin-core = { path = "../core" }
 spin-expressions = { path = "../expressions" }
 spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
 spin-factors = { path = "../factors" }
+spin-resource-table = { path = "../table" }
 spin-world = { path = "../world" }
-table = { path = "../table" }
 tokio = { workspace = true, features = ["rt-multi-thread"] }
 tracing = { workspace = true }
 url = { workspace = true }
diff --git a/crates/factor-outbound-mysql/src/lib.rs b/crates/factor-outbound-mysql/src/lib.rs
@@ -60,7 +60,7 @@ impl<C> OutboundMysqlFactor<C> {
 
 pub struct InstanceState<C> {
     allowed_hosts: OutboundAllowedHosts,
-    connections: table::Table<C>,
+    connections: spin_resource_table::Table<C>,
 }
 
 impl<C: Send + 'static> SelfInstanceBuilder for InstanceState<C> {}
diff --git a/crates/factor-outbound-pg/Cargo.toml b/crates/factor-outbound-pg/Cargo.toml
@@ -11,8 +11,8 @@ postgres-native-tls = "0.5"
 spin-core = { path = "../core" }
 spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
 spin-factors = { path = "../factors" }
+spin-resource-table = { path = "../table" }
 spin-world = { path = "../world" }
-table = { path = "../table" }
 tokio = { workspace = true, features = ["rt-multi-thread"] }
 tokio-postgres = "0.7"
 tracing = { workspace = true }
diff --git a/crates/factor-outbound-pg/src/lib.rs b/crates/factor-outbound-pg/src/lib.rs
@@ -63,7 +63,7 @@ impl<C> OutboundPgFactor<C> {
 
 pub struct InstanceState<C> {
     allowed_hosts: OutboundAllowedHosts,
-    connections: table::Table<C>,
+    connections: spin_resource_table::Table<C>,
 }
 
 impl<C: Send + 'static> SelfInstanceBuilder for InstanceState<C> {}
diff --git a/crates/factor-outbound-redis/Cargo.toml b/crates/factor-outbound-redis/Cargo.toml
@@ -10,8 +10,8 @@ redis = { version = "0.25", features = ["tokio-comp", "tokio-native-tls-comp", "
 spin-core = { path = "../core" }
 spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
 spin-factors = { path = "../factors" }
+spin-resource-table = { path = "../table" }
 spin-world = { path = "../world" }
-table = { path = "../table" }
 tracing = { workspace = true }
 
 [dev-dependencies]
diff --git a/crates/factor-outbound-redis/src/host.rs b/crates/factor-outbound-redis/src/host.rs
@@ -10,7 +10,7 @@ use tracing::{instrument, Level};
 
 pub struct InstanceState {
     pub allowed_hosts: OutboundAllowedHosts,
-    pub connections: table::Table<MultiplexedConnection>,
+    pub connections: spin_resource_table::Table<MultiplexedConnection>,
 }
 
 impl InstanceState {
diff --git a/crates/factor-outbound-redis/src/lib.rs b/crates/factor-outbound-redis/src/lib.rs
@@ -48,7 +48,7 @@ impl Factor for OutboundRedisFactor {
             .allowed_hosts();
         Ok(InstanceState {
             allowed_hosts,
-            connections: table::Table::new(1024),
+            connections: spin_resource_table::Table::new(1024),
         })
     }
 }
diff --git a/crates/factor-sqlite/Cargo.toml b/crates/factor-sqlite/Cargo.toml
@@ -13,8 +13,8 @@ async-trait = { workspace = true }
 serde = { workspace = true }
 spin-factors = { path = "../factors" }
 spin-locked-app = { path = "../locked-app" }
+spin-resource-table = { path = "../table" }
 spin-world = { path = "../world" }
-table = { path = "../table" }
 tokio = { workspace = true }
 toml = { workspace = true }
 tracing = { workspace = true }
diff --git a/crates/factor-sqlite/src/host.rs b/crates/factor-sqlite/src/host.rs
@@ -15,7 +15,7 @@ use crate::{Connection, ConnectionCreator};
 pub struct InstanceState {
     allowed_databases: Arc<HashSet<String>>,
     /// A resource table of connections.
-    connections: table::Table<Box<dyn Connection>>,
+    connections: spin_resource_table::Table<Box<dyn Connection>>,
     /// A map from database label to connection creators.
     connection_creators: HashMap<String, Arc<dyn ConnectionCreator>>,
 }
@@ -30,7 +30,7 @@ impl InstanceState {
     ) -> Self {
         Self {
             allowed_databases,
-            connections: table::Table::new(256),
+            connections: spin_resource_table::Table::new(256),
             connection_creators,
         }
     }
diff --git a/crates/llm-local/src/bert.rs b/crates/llm-local/src/bert.rs
@@ -485,7 +485,7 @@ struct BertEncoder {
 impl BertEncoder {
     fn load(vb: VarBuilder, config: &Config) -> Result<Self> {
         let layers = (0..config.num_hidden_layers)
-            .map(|index| BertLayer::load(vb.pp(&format!("layer.{index}")), config))
+            .map(|index| BertLayer::load(vb.pp(format!("layer.{index}")), config))
             .collect::<Result<Vec<_>>>()?;
         let span = tracing::span!(tracing::Level::TRACE, "encoder");
         Ok(BertEncoder { layers, span })
@@ -519,8 +519,8 @@ impl BertModel {
             (Err(err), _) | (_, Err(err)) => {
                 if let Some(model_type) = &config.model_type {
                     if let (Ok(embeddings), Ok(encoder)) = (
-                        BertEmbeddings::load(vb.pp(&format!("{model_type}.embeddings")), config),
-                        BertEncoder::load(vb.pp(&format!("{model_type}.encoder")), config),
+                        BertEmbeddings::load(vb.pp(format!("{model_type}.embeddings")), config),
+                        BertEncoder::load(vb.pp(format!("{model_type}.encoder")), config),
                     ) {
                         (embeddings, encoder)
                     } else {
diff --git a/crates/sqlite/Cargo.toml b/crates/sqlite/Cargo.toml
@@ -10,9 +10,9 @@ serde = { workspace = true }
 spin-factor-sqlite = { path = "../factor-sqlite" }
 spin-factors = { path = "../factors" }
 spin-locked-app = { path = "../locked-app" }
+spin-resource-table = { path = "../table" }
 spin-sqlite-inproc = { path = "../sqlite-inproc" }
 spin-sqlite-libsql = { path = "../sqlite-libsql" }
 spin-world = { path = "../world" }
-table = { path = "../table" }
 tokio = { workspace = true }
 toml = { workspace = true }
diff --git a/crates/table/Cargo.toml b/crates/table/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "table"
+name = "spin-resource-table"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ use crate::ClientCreator;`
`10`	`10`
`11`	`11`	`pub struct InstanceState {`
`12`	`12`	`allowed_hosts: OutboundAllowedHosts,`
`13`		`- connections: table::Table<Arc<dyn MqttClient>>,`
	`13`	`+ connections: spin_resource_table::Table<Arc<dyn MqttClient>>,`
`14`	`14`	`create_client: Arc<dyn ClientCreator>,`
`15`	`15`	`}`
`16`	`16`
`@@ -19,7 +19,7 @@ impl InstanceState {`
`19`	`19`	`Self {`
`20`	`20`	`allowed_hosts,`
`21`	`21`	`create_client,`
`22`		`- connections: table::Table::new(1024),`
	`22`	`+ connections: spin_resource_table::Table::new(1024),`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ impl<C> OutboundMysqlFactor<C> {`
`60`	`60`
`61`	`61`	`pub struct InstanceState<C> {`
`62`	`62`	`allowed_hosts: OutboundAllowedHosts,`
`63`		`- connections: table::Table<C>,`
	`63`	`+ connections: spin_resource_table::Table<C>,`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`impl<C: Send + 'static> SelfInstanceBuilder for InstanceState<C> {}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ impl<C> OutboundPgFactor<C> {`
`63`	`63`
`64`	`64`	`pub struct InstanceState<C> {`
`65`	`65`	`allowed_hosts: OutboundAllowedHosts,`
`66`		`- connections: table::Table<C>,`
	`66`	`+ connections: spin_resource_table::Table<C>,`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`impl<C: Send + 'static> SelfInstanceBuilder for InstanceState<C> {}`