ArgId

Author: joshua-spacetime

crates/datastore/src/locking_tx_datastore/mut_tx.rs

@@ -39,7 +39,7 @@ use spacetimedb_lib::{
     ConnectionId, Identity,
 };
 use spacetimedb_primitives::{
-    col_list, ColId, ColList, ColSet, ConstraintId, IndexId, ScheduleId, SequenceId, TableId, ViewId,
+    col_list, ArgId, ColId, ColList, ColSet, ConstraintId, IndexId, ScheduleId, SequenceId, TableId, ViewId,
 };
 use spacetimedb_sats::{
     bsatn::{self, to_writer, DecodeError, Deserializer},
@@ -1796,7 +1796,7 @@ impl MutTxId {
     }
 
     /// Is anyone is subscribed to the view arguments identified by `arg_id`?
-    fn is_identity_subscribed_to_view_args(&self, view_id: ViewId, arg_id: u64, sender: Identity) -> Result<bool> {
+    fn is_identity_subscribed_to_view_args(&self, view_id: ViewId, arg_id: ArgId, sender: Identity) -> Result<bool> {
         Ok(self
             .iter_by_col_eq(
                 ST_VIEW_CLIENT_ID,
@@ -1828,7 +1828,7 @@ impl MutTxId {
     }
 
     /// Deletes the rows of a view subscribed to by `sender`.
-    fn delete_view_rows_for_identity(&mut self, view_id: ViewId, arg_id: u64, sender: Identity) -> Result<()> {
+    fn delete_view_rows_for_identity(&mut self, view_id: ViewId, arg_id: ArgId, sender: Identity) -> Result<()> {
         if let Some((table_id, is_anonymous)) = self.get_table_id_for_view(view_id)? {
             let value = if is_anonymous {
                 let none_sender = AlgebraicValue::OptionNone();

crates/datastore/src/system_tables.rs

@@ -932,7 +932,7 @@ pub struct StViewParamRow {
 #[sats(crate = spacetimedb_lib)]
 pub struct StViewClientRow {
     pub view_id: ViewId,
-    pub arg_id: u64,
+    pub arg_id: ArgId,
     pub identity: IdentityViaU256,
     pub connection_id: ConnectionIdViaU128,
 }

crates/primitives/src/ids.rs

@@ -84,6 +84,12 @@ system_id! {
 }
 auto_inc_system_id!(ViewId);
 
+system_id! {
+    /// An identifier for a list of arguments passed to a view.
+    pub struct ArgId(pub u64);
+}
+auto_inc_system_id!(ArgId);
+
 system_id! {
     /// An identifier for a sequence, unique within a database.
     pub struct SequenceId(pub u32);

crates/primitives/src/lib.rs

@@ -8,7 +8,7 @@ mod ids;
 pub use attr::{AttributeKind, ColumnAttribute, ConstraintKind, Constraints};
 pub use col_list::{ColList, ColOrCols, ColSet};
 pub use ids::{
-    ColId, ConstraintId, FunctionId, IndexId, ProcedureId, ReducerId, ScheduleId, SequenceId, TableId, ViewId,
+    ArgId, ColId, ConstraintId, FunctionId, IndexId, ProcedureId, ReducerId, ScheduleId, SequenceId, TableId, ViewId,
 };
 
 /// The minimum size of a chunk yielded by a wasm abi RowIter.

crates/sats/src/convert.rs

@@ -1,7 +1,7 @@
 use crate::sum_value::SumTag;
 use crate::{i256, u256};
 use crate::{AlgebraicType, AlgebraicValue, ProductType, ProductValue};
-use spacetimedb_primitives::{ColId, ConstraintId, IndexId, ScheduleId, SequenceId, TableId, ViewId};
+use spacetimedb_primitives::{ArgId, ColId, ConstraintId, IndexId, ScheduleId, SequenceId, TableId, ViewId};
 
 impl crate::Value for AlgebraicValue {
     type Type = AlgebraicType;
@@ -63,6 +63,7 @@ macro_rules! system_id {
         }
     };
 }
+system_id!(ArgId);
 system_id!(TableId);
 system_id!(ViewId);
 system_id!(ColId);

crates/sats/src/de/impls.rs

@@ -741,6 +741,7 @@ impl FieldNameVisitor<'_> for TupleNameVisitor<'_> {
     }
 }
 
+impl_deserialize!([] spacetimedb_primitives::ArgId, de => u64::deserialize(de).map(Self));
 impl_deserialize!([] spacetimedb_primitives::TableId, de => u32::deserialize(de).map(Self));
 impl_deserialize!([] spacetimedb_primitives::ViewId, de => u32::deserialize(de).map(Self));
 impl_deserialize!([] spacetimedb_primitives::SequenceId, de => u32::deserialize(de).map(Self));

crates/sats/src/ser/impls.rs

@@ -257,6 +257,7 @@ impl_serialize!([] ValueWithType<'_, ArrayValue>, (self, ser) => {
     }
 });
 
+impl_serialize!([] spacetimedb_primitives::ArgId, (self, ser) => ser.serialize_u64(self.0));
 impl_serialize!([] spacetimedb_primitives::TableId, (self, ser) => ser.serialize_u32(self.0));
 impl_serialize!([] spacetimedb_primitives::ViewId, (self, ser) => ser.serialize_u32(self.0));
 impl_serialize!([] spacetimedb_primitives::SequenceId, (self, ser) => ser.serialize_u32(self.0));

crates/sats/src/typespace.rs

@@ -410,6 +410,7 @@ impl_st!([T] Vec<T>, ts => <[T]>::make_type(ts));
 impl_st!([T, const N: usize] SmallVec<[T; N]>, ts => <[T]>::make_type(ts));
 impl_st!([T] Option<T>, ts => AlgebraicType::option(T::make_type(ts)));
 
+impl_st!([] spacetimedb_primitives::ArgId, AlgebraicType::U64);
 impl_st!([] spacetimedb_primitives::ColId, AlgebraicType::U16);
 impl_st!([] spacetimedb_primitives::TableId, AlgebraicType::U32);
 impl_st!([] spacetimedb_primitives::ViewId, AlgebraicType::U32);

crates/table/src/read_column.rs

@@ -325,6 +325,7 @@ macro_rules! impl_read_column_via_from {
 }
 
 impl_read_column_via_from! {
+    u64 => spacetimedb_primitives::ArgId;
     u16 => spacetimedb_primitives::ColId;
     u32 => spacetimedb_primitives::ViewId;
     u32 => spacetimedb_primitives::TableId;