spacetimedb_table: nix spacetimedb-core dep (#767)

Readd `BTreeIndex::name` to report unique constraint violations on sys tables.
Add a unique_violation_test

crates/core/Cargo.toml

@@ -19,11 +19,12 @@ harness = false
 
 [dependencies]
 spacetimedb-lib = { path = "../lib", version = "0.8.1" }
-spacetimedb-sats = { path = "../sats", version = "0.8.1" }
-spacetimedb-vm = { path = "../vm", version = "0.8.1" }
 spacetimedb-client-api-messages = { path = "../client-api-messages", version = "0.8.1" }
-spacetimedb-primitives = { path = "../primitives", version = "0.8.1" }
 spacetimedb-metrics = { path = "../metrics", version = "0.8.1" }
+spacetimedb-primitives = { path = "../primitives", version = "0.8.1" }
+spacetimedb-sats = { path = "../sats", version = "0.8.1" }
+spacetimedb-table = { path = "../table", version = "0.8.1" }
+spacetimedb-vm = { path = "../vm", version = "0.8.1" }
 
 anyhow.workspace = true
 async-trait.workspace = true

crates/core/src/db/datastore/locking_tx_datastore/mod.rs

@@ -669,6 +669,7 @@ mod tests {
     use spacetimedb_primitives::Constraints;
     use spacetimedb_sats::db::auth::{StAccess, StTableType};
     use spacetimedb_sats::product;
+    use spacetimedb_table::table::UniqueConstraintViolation;
 
     /// Utility to query the system tables and return their concrete table row
     pub struct SystemTableQuery<'a> {
@@ -1327,12 +1328,12 @@ mod tests {
         datastore.insert_mut_tx(&mut tx, table_id, row.clone())?;
         let result = datastore.insert_mut_tx(&mut tx, table_id, row);
         match result {
-            Err(DBError::Index(IndexError::UniqueConstraintViolation {
+            Err(DBError::Index(IndexError::UniqueConstraintViolation(UniqueConstraintViolation {
                 constraint_name: _,
                 table_name: _,
                 cols: _,
                 value: _,
-            })) => (),
+            }))) => (),
             _ => panic!("Expected an unique constraint violation error."),
         }
         #[rustfmt::skip]
@@ -1349,12 +1350,12 @@ mod tests {
         let mut tx = datastore.begin_mut_tx();
         let result = datastore.insert_mut_tx(&mut tx, table_id, row);
         match result {
-            Err(DBError::Index(IndexError::UniqueConstraintViolation {
+            Err(DBError::Index(IndexError::UniqueConstraintViolation(UniqueConstraintViolation {
                 constraint_name: _,
                 table_name: _,
                 cols: _,
                 value: _,
-            })) => (),
+            }))) => (),
             _ => panic!("Expected an unique constraint violation error."),
         }
         #[rustfmt::skip]
@@ -1407,12 +1408,12 @@ mod tests {
         let row = u32_str_u32(0, "Bar", 18); // 0 will be ignored.
         let result = datastore.insert_mut_tx(&mut tx, table_id, row);
         match result {
-            Err(DBError::Index(IndexError::UniqueConstraintViolation {
+            Err(DBError::Index(IndexError::UniqueConstraintViolation(UniqueConstraintViolation {
                 constraint_name: _,
                 table_name: _,
                 cols: _,
                 value: _,
-            })) => (),
+            }))) => (),
             _ => panic!("Expected an unique constraint violation error."),
         }
         #[rustfmt::skip]
@@ -1450,12 +1451,12 @@ mod tests {
         let row = u32_str_u32(0, "Bar", 18); // 0 will be ignored.
         let result = datastore.insert_mut_tx(&mut tx, table_id, row);
         match result {
-            Err(DBError::Index(IndexError::UniqueConstraintViolation {
+            Err(DBError::Index(IndexError::UniqueConstraintViolation(UniqueConstraintViolation {
                 constraint_name: _,
                 table_name: _,
                 cols: _,
                 value: _,
-            })) => (),
+            }))) => (),
             _ => panic!("Expected an unique constraint violation error."),
         }
         #[rustfmt::skip]

crates/core/src/db/datastore/locking_tx_datastore/mut_tx.rs

@@ -29,6 +29,7 @@ use spacetimedb_sats::data_key::{DataKey, ToDataKey};
 use spacetimedb_sats::db::def::*;
 use spacetimedb_sats::db::error::SchemaErrors;
 use spacetimedb_sats::{AlgebraicValue, ProductType, ProductValue};
+use spacetimedb_table::table::UniqueConstraintViolation;
 use std::borrow::Cow;
 use std::collections::BTreeMap;
 use std::sync::Arc;
@@ -983,7 +984,7 @@ impl MutTxId {
     }
 
     fn build_error_unique(index: &BTreeIndex, table: &Table, value: AlgebraicValue) -> IndexError {
-        IndexError::UniqueConstraintViolation {
+        IndexError::UniqueConstraintViolation(UniqueConstraintViolation {
             constraint_name: index.name.clone(),
             table_name: table.schema.table_name.clone(),
             cols: index
@@ -992,7 +993,7 @@ impl MutTxId {
                 .map(|x| table.schema.columns()[usize::from(x)].col_name.clone())
                 .collect(),
             value,
-        }
+        })
     }
 
     pub(crate) fn get<'a>(&'a self, table_id: &TableId, row_id: &'a RowId) -> Result<Option<DataRef<'a>>> {

crates/core/src/error.rs

@@ -4,6 +4,7 @@ use std::path::PathBuf;
 use std::sync::{MutexGuard, PoisonError};
 
 use hex::FromHexError;
+use spacetimedb_table::table::UniqueConstraintViolation;
 use thiserror::Error;
 
 use crate::client::ClientActorId;
@@ -17,7 +18,6 @@ use spacetimedb_sats::hash::Hash;
 use spacetimedb_sats::product_value::InvalidFieldError;
 use spacetimedb_sats::relation::FieldName;
 use spacetimedb_sats::satn::Satn;
-use spacetimedb_sats::AlgebraicValue;
 use spacetimedb_vm::errors::{ErrorKind, ErrorLang, ErrorVm};
 use spacetimedb_vm::expr::Crud;
 
@@ -68,13 +68,8 @@ pub enum IndexError {
     IndexAlreadyExists(IndexDef, String),
     #[error("Column not found: {0:?}")]
     ColumnNotFound(IndexDef),
-    #[error("Unique constraint violation '{}' in table '{}': column(s): '{:?}' value: {}", constraint_name, table_name, cols, value.to_satn())]
-    UniqueConstraintViolation {
-        constraint_name: String,
-        table_name: String,
-        cols: Vec<String>,
-        value: AlgebraicValue,
-    },
+    #[error(transparent)]
+    UniqueConstraintViolation(UniqueConstraintViolation),
     #[error("Attempt to define a index with more than 1 auto_inc column: Table: {0:?}, Columns: {1:?}")]
     OneAutoInc(TableId, Vec<String>),
 }

crates/core/src/host/instance_env.rs

@@ -1,5 +1,6 @@
 use parking_lot::{Mutex, MutexGuard};
 use smallvec::SmallVec;
+use spacetimedb_table::table::UniqueConstraintViolation;
 use std::ops::DerefMut;
 use std::sync::Arc;
 
@@ -120,12 +121,12 @@ impl InstanceEnv {
         let ret = stdb
             .insert_bytes_as_row(tx, table_id, buffer)
             .inspect_err_(|e| match e {
-                crate::error::DBError::Index(IndexError::UniqueConstraintViolation {
+                crate::error::DBError::Index(IndexError::UniqueConstraintViolation(UniqueConstraintViolation {
                     constraint_name: _,
                     table_name: _,
                     cols: _,
                     value: _,
-                }) => {}
+                })) => {}
                 _ => {
                     let res = stdb.table_name_from_id(ctx, tx, table_id);
                     if let Ok(Some(table_name)) = res {

crates/core/src/host/wasm_common.rs

@@ -7,6 +7,7 @@ use std::time::Instant;
 use super::AbiCall;
 use crate::error::{DBError, IndexError, NodesError};
 use spacetimedb_sats::typespace::TypeRefError;
+use spacetimedb_table::table::UniqueConstraintViolation;
 
 pub const CALL_REDUCER_DUNDER: &str = "__call_reducer__";
 
@@ -353,12 +354,12 @@ pub fn err_to_errno(err: &NodesError) -> Option<u16> {
         }
         NodesError::AlreadyExists(_) => Some(errnos::UNIQUE_ALREADY_EXISTS),
         NodesError::Internal(internal) => match **internal {
-            DBError::Index(IndexError::UniqueConstraintViolation {
+            DBError::Index(IndexError::UniqueConstraintViolation(UniqueConstraintViolation {
                 constraint_name: _,
                 table_name: _,
                 cols: _,
                 value: _,
-            }) => Some(errnos::UNIQUE_ALREADY_EXISTS),
+            })) => Some(errnos::UNIQUE_ALREADY_EXISTS),
             _ => None,
         },
         _ => None,

crates/table/Cargo.toml

@@ -29,7 +29,6 @@ proptest = ["dep:proptest", "dep:proptest-derive"]
 blake3_pure = ["blake3/pure"]
 
 [dependencies]
-spacetimedb-core = { path = "../core" }
 spacetimedb-primitives = { path = "../primitives" }
 spacetimedb-sats = { path = "../sats" }
 

crates/table/src/btree_index.rs

@@ -3,9 +3,8 @@ use super::table::RowRef;
 use crate::static_assert_size;
 use core::ops::RangeBounds;
 use multimap::{MultiMap, MultiMapRangeIter};
-use spacetimedb::error::DBError;
 use spacetimedb_primitives::{ColList, IndexId};
-use spacetimedb_sats::{AlgebraicValue, ProductValue};
+use spacetimedb_sats::{product_value::InvalidFieldError, AlgebraicValue, ProductValue};
 
 mod multimap;
 
@@ -70,30 +69,33 @@ pub struct BTreeIndex {
     pub(crate) is_unique: bool,
     /// The actual index.
     idx: MultiMap<IndexKey, RowPointer>,
+    /// The index name, used for reporting unique constraint violations.
+    pub(crate) name: Box<str>,
 }
 
-static_assert_size!(BTreeIndex, 32);
+static_assert_size!(BTreeIndex, 48);
 
 impl BTreeIndex {
     /// Returns a new possibly unique index, with `index_id` for a set of columns.
-    pub fn new(index_id: IndexId, is_unique: bool) -> Self {
+    pub fn new(index_id: IndexId, is_unique: bool, name: impl Into<Box<str>>) -> Self {
         Self {
             index_id,
             is_unique,
             idx: MultiMap::new(),
+            name: name.into(),
         }
     }
 
     /// Extracts from `row` the relevant column values according to what columns are indexed.
-    pub fn get_fields(&self, cols: &ColList, row: &ProductValue) -> Result<AlgebraicValue, DBError> {
-        row.project_not_empty(cols).map_err(Into::into)
+    pub fn get_fields(&self, cols: &ColList, row: &ProductValue) -> Result<AlgebraicValue, InvalidFieldError> {
+        row.project_not_empty(cols)
     }
 
     /// Inserts `ptr` with the value `row` to this index.
     /// This index will extract the necessary values from `row` based on `self.cols`.
     ///
     /// Return false if `ptr` was already indexed prior to this call.
-    pub fn insert(&mut self, cols: &ColList, row: &ProductValue, ptr: RowPointer) -> Result<bool, DBError> {
+    pub fn insert(&mut self, cols: &ColList, row: &ProductValue, ptr: RowPointer) -> Result<bool, InvalidFieldError> {
         let col_value = self.get_fields(cols, row)?;
         Ok(self.idx.insert(col_value, ptr))
     }
@@ -144,7 +146,7 @@ impl BTreeIndex {
         &mut self,
         cols: &ColList,
         rows: impl IntoIterator<Item = RowRef<'table>>,
-    ) -> Result<bool, DBError> {
+    ) -> Result<bool, InvalidFieldError> {
         let mut all_inserted = true;
         for row_ref in rows {
             let row = row_ref.to_product_value();
@@ -190,7 +192,7 @@ mod test {
     }
 
     fn new_index(is_unique: bool) -> BTreeIndex {
-        BTreeIndex::new(0.into(), is_unique)
+        BTreeIndex::new(0.into(), is_unique, "test_index")
     }
 
     proptest! {