Centril/flatten sats

Cargo.toml

@@ -71,6 +71,7 @@ arrayvec = "0.7.2"
 backtrace = "0.3.66"
 base64 = "0.21.2"
 bitflags = "2.3.3"
+bit-set = "0.5.3"
 byte-unit = "4.0.18"
 bytes = "1.2.1"
 bytestring = { version = "1.2.0", features = ["serde"] }
@@ -115,7 +116,6 @@ jsonwebtoken = { version = "8.1.0" }
 lazy_static = "1.4.0"
 log = "0.4.17"
 mimalloc = "0.1.39"
-nonempty = "0.8.1"
 once_cell = "1.16"
 parking_lot = { version = "0.12.1", features = ["send_guard", "arc_lock"] }
 paste = "1.0"

crates/bench/src/schemas.rs

@@ -1,4 +1,4 @@
-use spacetimedb_lib::sats;
+use spacetimedb_lib::sats::{self, product, SatsString};
 use std::fmt::Debug;
 use std::hash::Hash;
 
@@ -60,7 +60,7 @@ impl BenchTable for Person {
         .into()
     }
     fn into_product_value(self) -> sats::ProductValue {
-        sats::product![self.id, self.name, self.age]
+        sats::product![self.id, SatsString::from_string(self.name), self.age]
     }
 
     type SqliteParams = (u32, String, u64);
@@ -86,7 +86,7 @@ impl BenchTable for Location {
         .into()
     }
     fn into_product_value(self) -> sats::ProductValue {
-        sats::product![self.id, self.x, self.y]
+        product![self.id, self.x, self.y]
     }
 
     type SqliteParams = (u32, u64, u64);

crates/bench/src/spacetime_module.rs

@@ -117,7 +117,7 @@ impl BenchDatabase for SpacetimeModule {
 
         let count = runtime.block_on(async move {
             let name = format!("count_{}", table_id.snake_case);
-            module.call_reducer_binary(&name, ProductValue::new(&[])).await?;
+            module.call_reducer_binary(&name, ProductValue::new([].into())).await?;
             let logs = module.read_log(Some(1)).await;
             let message = serde_json::from_str::<LoggerRecord>(&logs)?;
             if !message.message.starts_with("COUNT: ") {
@@ -135,7 +135,9 @@ impl BenchDatabase for SpacetimeModule {
         let module = module.as_mut().unwrap();
 
         runtime.block_on(async move {
-            module.call_reducer_binary("empty", ProductValue::new(&[])).await?;
+            module
+                .call_reducer_binary("empty", ProductValue::new([].into()))
+                .await?;
             Ok(())
         })
     }
@@ -154,7 +156,12 @@ impl BenchDatabase for SpacetimeModule {
     }
 
     fn insert_bulk<T: BenchTable>(&mut self, table_id: &Self::TableId, rows: Vec<T>) -> ResultBench<()> {
-        let rows = rows.into_iter().map(|row| row.into_product_value()).collect();
+        let rows = rows
+            .into_iter()
+            .map(|row| row.into_product_value())
+            .collect::<Box<[_]>>()
+            .try_into()
+            .unwrap();
         let args = product![ArrayValue::Product(rows)];
         let SpacetimeModule { runtime, module } = self;
         let module = module.as_mut().unwrap();
@@ -173,7 +180,7 @@ impl BenchDatabase for SpacetimeModule {
 
         runtime.block_on(async move {
             module
-                .call_reducer_binary(&reducer_name, ProductValue::new(&[]))
+                .call_reducer_binary(&reducer_name, ProductValue::new([].into()))
                 .await?;
             Ok(())
         })
@@ -194,7 +201,12 @@ impl BenchDatabase for SpacetimeModule {
 
         runtime.block_on(async move {
             module
-                .call_reducer_binary(&reducer_name, ProductValue { elements: vec![value] })
+                .call_reducer_binary(
+                    &reducer_name,
+                    ProductValue {
+                        elements: [value].into(),
+                    },
+                )
                 .await?;
             Ok(())
         })

crates/bench/src/spacetime_raw.rs

@@ -6,8 +6,9 @@ use crate::{
 use spacetimedb::db::relational_db::{open_db, RelationalDB};
 use spacetimedb::execution_context::ExecutionContext;
 use spacetimedb_lib::sats::db::def::{IndexDef, TableDef};
-use spacetimedb_lib::sats::AlgebraicValue;
+use spacetimedb_lib::sats::{AlgebraicValue, SatsString};
 use spacetimedb_primitives::{ColId, TableId};
+use spacetimedb_sats::nstr;
 use std::hint::black_box;
 use tempdir::TempDir;
 
@@ -38,15 +39,15 @@ impl BenchDatabase for SpacetimeRaw {
     }
 
     fn create_table<T: BenchTable>(&mut self, index_strategy: IndexStrategy) -> ResultBench<Self::TableId> {
-        let name = table_name::<T>(index_strategy);
+        let name = SatsString::from_string(table_name::<T>(index_strategy));
         self.db.with_auto_commit(&ExecutionContext::default(), |tx| {
             let table_def = TableDef::from(T::product_type());
             let table_id = self.db.create_table(tx, table_def)?;
-            self.db.rename_table(tx, table_id, &name)?;
+            self.db.rename_table(tx, table_id, name)?;
             match index_strategy {
                 IndexStrategy::Unique => {
                     self.db
-                        .create_index(tx, IndexDef::new("id".to_string(), table_id, 0.into(), true))?;
+                        .create_index(tx, IndexDef::new(nstr!("id"), table_id, 0.into(), true))?;
                 }
                 IndexStrategy::NonUnique => (),
                 IndexStrategy::MultiIndex => {

crates/bench/src/sqlite.rs

@@ -6,7 +6,7 @@ use crate::{
 use ahash::AHashMap;
 use lazy_static::lazy_static;
 use rusqlite::Connection;
-use spacetimedb_lib::sats::{AlgebraicType, AlgebraicValue, ProductType};
+use spacetimedb_lib::sats::{AlgebraicType, AlgebraicValue, ProductType, SatsString};
 use std::{
     fmt::Write,
     hint::black_box,
@@ -26,6 +26,8 @@ impl BenchDatabase for SQLite {
         "sqlite"
     }
 
+    type TableId = SatsString;
+
     fn build(in_memory: bool, fsync: bool) -> ResultBench<Self>
     where
         Self: Sized,
@@ -50,8 +52,6 @@ impl BenchDatabase for SQLite {
         })
     }
 
-    type TableId = String;
-
     /// We derive the SQLite schema from the AlgebraicType of the table.
     fn create_table<T: BenchTable>(
         &mut self,
@@ -91,7 +91,7 @@ impl BenchDatabase for SQLite {
         log::info!("SQLITE: `{statement}`");
         self.db.execute_batch(&statement)?;
 
-        Ok(table_name)
+        Ok(SatsString::from_string(table_name))
     }
 
     fn clear_table(&mut self, table_id: &Self::TableId) -> ResultBench<()> {
@@ -172,8 +172,7 @@ impl BenchDatabase for SQLite {
         value: AlgebraicValue,
     ) -> ResultBench<()> {
         let statement = memo_query(BenchName::Filter, table_id, || {
-            let column = T::product_type()
-                .elements
+            let column = Vec::from(T::product_type().elements)
                 .swap_remove(column_index as usize)
                 .name
                 .unwrap();

crates/bindings-macro/src/module.rs

@@ -171,7 +171,10 @@ pub(crate) fn derive_satstype(ty: &SatsType<'_>, gen_type_alias: bool) -> TokenS
 
     let (impl_generics, ty_generics, where_clause) = ty.generics.split_for_impl();
     let ty_name = if gen_type_alias {
-        quote!(Some(#ty_name))
+        quote!(Some({
+            const NAME: &spacetimedb::sats::SatsStr<'_> = &spacetimedb::sats::from_str(#ty_name);
+            NAME
+        }))
     } else {
         quote!(None)
     };
@@ -283,10 +286,10 @@ pub(crate) fn derive_deserialize(ty: &SatsType<'_>) -> TokenStream {
                             names.extend::<&[&str]>(&[#(#field_strings),*])
                         }
 
-                        fn visit<__E: #spacetimedb_lib::de::Error>(self, name: &str) -> Result<Self::Output, __E> {
-                            match name {
+                        fn visit<__E: #spacetimedb_lib::de::Error>(self, name: #spacetimedb_lib::SatsStr<'_>) -> Result<Self::Output, __E> {
+                            match &*name {
                                 #(#field_strings => Ok(__ProductFieldIdent::#field_names),)*
-                                _ => Err(#spacetimedb_lib::de::Error::unknown_field_name(name, &self)),
+                                name => Err(#spacetimedb_lib::de::Error::unknown_field_name(name, &self)),
                             }
                         }
                     }
@@ -366,9 +369,9 @@ pub(crate) fn derive_deserialize(ty: &SatsType<'_>) -> TokenStream {
                             }
                         }
                         fn visit_name<E: #spacetimedb_lib::de::Error>(self, __name: &str) -> Result<Self::Output, E> {
-                            match __name {
+                            match &*__name {
                                 #(#variant_names => Ok(__Variant::#variant_idents),)*
-                                _ => Err(#spacetimedb_lib::de::Error::unknown_variant_name(__name, &self)),
+                                __name => Err(#spacetimedb_lib::de::Error::unknown_variant_name(__name, &self)),
                             }
                         }
                     }
@@ -390,7 +393,7 @@ pub(crate) fn derive_serialize(ty: &SatsType) -> TokenStream {
             let nfields = fields.len();
             quote! {
                 let mut __prod = __serializer.serialize_named_product(#nfields)?;
-                #(#spacetimedb_lib::ser::SerializeNamedProduct::serialize_element::<#tys>(&mut __prod, Some(#fieldnamestrings), &self.#fieldnames)?;)*
+                #(#spacetimedb_lib::ser::SerializeNamedProduct::serialize_element::<#tys>(&mut __prod, Some(#spacetimedb_lib::from_str(#fieldnamestrings)), &self.#fieldnames)?;)*
                 #spacetimedb_lib::ser::SerializeNamedProduct::end(__prod)
             }
         }

crates/bindings/Cargo.toml

@@ -16,14 +16,15 @@ bench = false
 getrandom = ["spacetimedb-bindings-sys/getrandom"]
 
 [dependencies]
+spacetimedb-bindings-macro = { path = "../bindings-macro", version = "0.7.3"}
 spacetimedb-bindings-sys = { path = "../bindings-sys", version = "0.7.3" }
+spacetimedb-data-structures = { path = "../data-structures", version = "0.7.3" }
 spacetimedb-lib = { path = "../lib", default-features = false, version = "0.7.3"}
-spacetimedb-bindings-macro = { path = "../bindings-macro", version = "0.7.3"}
 spacetimedb-primitives = { path = "../primitives", version = "0.7.3" }
+spacetimedb-sats = { path = "../sats", version = "0.7.3" }
 
 derive_more.workspace = true
 log.workspace = true
-nonempty.workspace = true
 once_cell.workspace = true
 scoped-tls.workspace = true