Merge branch 'master' into phoebe/remove-memtable-from-plans

Author: gefjon

crates/bench/benches/subscription.rs

@@ -7,7 +7,7 @@ use spacetimedb::subscription::query::compile_read_only_query;
 use spacetimedb::subscription::subscription::ExecutionSet;
 use spacetimedb_lib::identity::AuthCtx;
 use spacetimedb_primitives::TableId;
-use spacetimedb_sats::{product, AlgebraicType, AlgebraicValue, ProductValue, ToDataKey};
+use spacetimedb_sats::{product, AlgebraicType, AlgebraicValue, ProductValue};
 use tempdir::TempDir;
 
 fn create_table_location(db: &RelationalDB) -> Result<TableId, DBError> {
@@ -39,15 +39,10 @@ fn create_table_footprint(db: &RelationalDB) -> Result<TableId, DBError> {
 }
 
 fn insert_op(table_id: TableId, table_name: &str, row: ProductValue) -> DatabaseTableUpdate {
-    let row_pk = row.to_data_key().to_bytes();
     DatabaseTableUpdate {
         table_id,
         table_name: table_name.to_string(),
-        ops: vec![TableOp {
-            op_type: 1,
-            row,
-            row_pk,
-        }],
+        ops: vec![TableOp::insert(row)],
     }
 }
 

crates/bindings/src/impls.rs

@@ -1,65 +1,13 @@
-use spacetimedb_lib::{Address, Identity};
-
-use super::PrimaryKey;
-use crate::sats::data_key::DataKey;
 use crate::sats::hash::Hash;
-use crate::{FilterableValue, UniqueValue};
+use crate::FilterableValue;
+use spacetimedb_lib::{Address, Identity};
 
 macro_rules! impl_primitives {
-    (uniq { $($t:ty => $x:ident,)*}) => {
+    ($($t:ty),*) => {
         $(
             impl FilterableValue for $t {}
-            impl UniqueValue for $t {
-                fn into_primarykey(self) -> PrimaryKey {
-                    todo!() // idk what this is
-                }
-            }
         )*
     };
 }
 
-impl FilterableValue for u8 {}
-impl UniqueValue for u8 {
-    fn into_primarykey(self) -> PrimaryKey {
-        todo!() // idk what this is
-    }
-}
-
-impl_primitives! {
-    uniq {
-        i8 => I8,
-        u16 => U16,
-        i16 => I16,
-        u32 => U32,
-        i32 => I32,
-        u64 => U64,
-        i64 => I64,
-        u128 => U128,
-        i128 => I128,
-        bool => Bool,
-        String => String,
-    }
-}
-
-impl FilterableValue for Hash {}
-impl UniqueValue for Hash {
-    fn into_primarykey(self) -> PrimaryKey {
-        PrimaryKey {
-            data_key: DataKey::Hash(self),
-        }
-    }
-}
-
-impl FilterableValue for Identity {}
-impl UniqueValue for Identity {
-    fn into_primarykey(self) -> PrimaryKey {
-        todo!() // idk what this is
-    }
-}
-
-impl FilterableValue for Address {}
-impl UniqueValue for Address {
-    fn into_primarykey(self) -> PrimaryKey {
-        todo!()
-    }
-}
+impl_primitives![u8, i8, u16, i16, u32, i32, u64, i64, u128, i128, bool, String, Hash, Identity, Address];

crates/bindings/src/lib.rs

@@ -10,17 +10,17 @@ pub mod rt;
 pub mod time_span;
 mod timestamp;
 
+use crate::sats::db::attr::ColumnAttribute;
 use crate::sats::db::def::IndexType;
 use spacetimedb_lib::buffer::{BufReader, BufWriter, Cursor, DecodeError};
 use spacetimedb_lib::sats::{impl_deserialize, impl_serialize, impl_st};
-use spacetimedb_lib::{bsatn, PrimaryKey, ProductType, ProductValue};
+use spacetimedb_lib::{bsatn, ProductType, ProductValue};
 use std::cell::RefCell;
 use std::marker::PhantomData;
 use std::slice::from_ref;
 use std::{fmt, panic};
 use sys::{Buffer, BufferIter};
 
-use crate::sats::db::attr::ColumnAttribute;
 pub use log;
 pub use sats::SpacetimeType;
 pub use spacetimedb_bindings_macro::{duration, query, spacetimedb, TableType};
@@ -440,11 +440,6 @@ impl<T: TableType> sealed::InsertResult for T {
 /// then so are the values in their serialized representation.
 pub trait FilterableValue: Serialize + Eq {}
 
-/// A trait for types that can be converted into primary keys.
-pub trait UniqueValue: FilterableValue {
-    fn into_primarykey(self) -> PrimaryKey;
-}
-
 #[doc(hidden)]
 pub mod query {
     use super::*;
@@ -470,7 +465,7 @@ pub mod query {
     #[doc(hidden)]
     pub fn filter_by_unique_field<
         Table: TableType + FieldAccess<COL_IDX, Field = T>,
-        T: UniqueValue,
+        T: FilterableValue,
         const COL_IDX: u8,
     >(
         val: &T,
@@ -531,7 +526,7 @@ pub mod query {
     /// **NOTE:** Do not use directly.
     /// This is exposed as `delete_by_{$field_name}` on types with `#[spacetimedb(table)]`
     /// where the field has a unique constraint.
-    pub fn delete_by_unique_field<Table: TableType, T: UniqueValue, const COL_IDX: u8>(val: &T) -> bool {
+    pub fn delete_by_unique_field<Table: TableType, T: FilterableValue, const COL_IDX: u8>(val: &T) -> bool {
         let count = delete_by_field::<Table, T, COL_IDX>(val);
         debug_assert!(count <= 1);
         count > 0
@@ -545,7 +540,7 @@ pub mod query {
     /// **NOTE:** Do not use directly.
     /// This is exposed as `update_by_{$field_name}` on types with `#[spacetimedb(table)]`.
     #[doc(hidden)]
-    pub fn update_by_field<Table: TableType, T: UniqueValue, const COL_IDX: u8>(old: &T, new: Table) -> bool {
+    pub fn update_by_field<Table: TableType, T: FilterableValue, const COL_IDX: u8>(old: &T, new: Table) -> bool {
         // Delete the existing row, if any.
         delete_by_field::<Table, T, COL_IDX>(old);
 

crates/core/src/db/relational_db.rs

@@ -19,9 +19,7 @@ use crate::execution_context::ExecutionContext;
 use crate::hash::Hash;
 use fs2::FileExt;
 use itertools::Itertools;
-use spacetimedb_lib::PrimaryKey;
 use spacetimedb_primitives::*;
-use spacetimedb_sats::data_key::ToDataKey;
 use spacetimedb_sats::db::auth::{StAccess, StTableType};
 use spacetimedb_sats::db::def::{ColumnDef, IndexDef, SequenceDef, TableDef, TableSchema};
 use spacetimedb_sats::{AlgebraicType, AlgebraicValue, ProductType, ProductValue};
@@ -185,12 +183,6 @@ impl RelationalDB {
             .map_or(Ok(0), |commit_log| commit_log.object_db_size_on_disk())
     }
 
-    pub fn pk_for_row(row: &ProductValue) -> PrimaryKey {
-        PrimaryKey {
-            data_key: row.to_data_key(),
-        }
-    }
-
     #[tracing::instrument(skip_all)]
     pub fn encode_row(row: &ProductValue, bytes: &mut Vec<u8>) {
         // TODO: large file storage of the row elements
@@ -589,7 +581,6 @@ impl RelationalDB {
     /// where the column data identified by `cols` matches `value`.
     ///
     /// Matching is defined by `Ord for AlgebraicValue`.
-    #[tracing::instrument(skip_all)]
     pub fn iter_by_col_eq_mut<'a>(
         &'a self,
         ctx: &'a ExecutionContext,
@@ -601,7 +592,6 @@ impl RelationalDB {
         self.inner.iter_by_col_eq_mut_tx(ctx, tx, table_id.into(), cols, value)
     }
 
-    #[tracing::instrument(skip_all)]
     pub fn iter_by_col_eq<'a>(
         &'a self,
         ctx: &'a ExecutionContext,

crates/core/src/error.rs

@@ -12,7 +12,7 @@ use thiserror::Error;
 use crate::client::ClientActorId;
 use crate::db::datastore::system_tables::SystemTable;
 use spacetimedb_lib::buffer::DecodeError;
-use spacetimedb_lib::{PrimaryKey, ProductValue};
+use spacetimedb_lib::ProductValue;
 use spacetimedb_primitives::*;
 use spacetimedb_sats::db::def::IndexDef;
 use spacetimedb_sats::db::error::{LibError, RelationError, SchemaErrors};
@@ -313,8 +313,6 @@ pub enum NodesError {
     DecodeFilter(#[source] DecodeError),
     #[error("table with provided name or id doesn't exist")]
     TableNotFound,
-    #[error("Primary key {0:?} not found")]
-    PrimaryKeyNotFound(PrimaryKey),
     #[error("row with column of given value not found")]
     ColumnValueNotFound,
     #[error("range of rows not found")]