comments addressing

Author: Shubham8287

crates/core/src/host/instance_env.rs

@@ -9,7 +9,7 @@ use core::mem;
 use parking_lot::{Mutex, MutexGuard};
 use smallvec::SmallVec;
 use spacetimedb_datastore::locking_tx_datastore::state_view::StateView;
-use spacetimedb_datastore::locking_tx_datastore::{MutTxId, UniqueView};
+use spacetimedb_datastore::locking_tx_datastore::{MutTxId, ViewCall};
 use spacetimedb_lib::{ConnectionId, Identity, Timestamp};
 use spacetimedb_primitives::{ColId, ColList, IndexId, TableId};
 use spacetimedb_sats::{
@@ -31,7 +31,7 @@ pub struct InstanceEnv {
     pub tx: TxSlot,
     /// The timestamp the current reducer began running.
     pub start_time: Timestamp,
-    pub view: Option<UniqueView>,
+    pub view: Option<ViewCall>,
 }
 
 #[derive(Clone, Default)]
@@ -189,7 +189,7 @@ impl InstanceEnv {
     }
 
     /// Signal to this `InstanceEnv` that a view is starting.
-    pub fn start_view(&mut self, ts: Timestamp, view: UniqueView) {
+    pub fn start_view(&mut self, ts: Timestamp, view: ViewCall) {
         self.start_time = ts;
         self.view = Some(view);
     }

crates/core/src/host/mod.rs

@@ -69,7 +69,7 @@ impl FunctionArgs {
 
 #[derive(Debug, Clone)]
 pub struct ArgsTuple {
-    pub tuple: ProductValue,
+    tuple: ProductValue,
     bsatn: OnceCell<Bytes>,
     json: OnceCell<ByteString>,
 }

crates/core/src/host/wasmtime/wasm_instance_env.rs

@@ -9,7 +9,7 @@ use crate::host::wasm_common::{err_to_errno_and_log, RowIterIdx, RowIters, Timin
 use crate::host::AbiCall;
 use anyhow::Context as _;
 use spacetimedb_data_structures::map::IntMap;
-use spacetimedb_datastore::locking_tx_datastore::UniqueView;
+use spacetimedb_datastore::locking_tx_datastore::ViewCall;
 use spacetimedb_lib::{ConnectionId, Timestamp};
 use spacetimedb_primitives::{errno, ColId};
 use std::future::Future;
@@ -130,7 +130,7 @@ type RtResult<T> = anyhow::Result<T>;
 pub enum FuncCallType {
     Reducer,
     Procedure,
-    View(UniqueView),
+    View(ViewCall),
 }
 
 /// Wraps an `InstanceEnv` with the magic necessary to push
@@ -257,7 +257,6 @@ impl WasmInstanceEnv {
                 self.instance_env.start_view(ts, view);
             }
         }
-        self.instance_env.start_funcall(ts);
 
         (args, errors)
     }

crates/core/src/host/wasmtime/wasmtime_module.rs

@@ -10,7 +10,7 @@ use crate::host::wasm_common::*;
 use crate::host::wasmtime::wasm_instance_env::FuncCallType;
 use crate::util::string_from_utf8_lossy_owned;
 use futures_util::FutureExt;
-use spacetimedb_datastore::locking_tx_datastore::UniqueView;
+use spacetimedb_datastore::locking_tx_datastore::ViewCall;
 use spacetimedb_lib::{ConnectionId, Identity};
 use spacetimedb_primitives::errno::HOST_CALL_FAILURE;
 use wasmtime::{
@@ -393,7 +393,7 @@ impl module_host_actor::WasmInstance for WasmtimeInstance {
         let store = &mut self.store;
         prepare_store_for_call(store, budget);
 
-        let view = UniqueView::with_identity(*op.caller_identity, op.id, op.args.get_bsatn().clone());
+        let view = ViewCall::with_identity(*op.caller_identity, op.id, op.args.get_bsatn().clone());
 
         // Prepare sender identity and connection ID, as LITTLE-ENDIAN byte arrays.
         let [sender_0, sender_1, sender_2, sender_3] = prepare_identity_for_call(*op.caller_identity);
@@ -419,8 +419,8 @@ impl module_host_actor::WasmInstance for WasmtimeInstance {
             ),
         );
 
-        // Signal that this reducer call is finished. This gets us the timings
-        // associated to our reducer call, and clears all of the instance state
+        // Signal that this view call is finished. This gets us the timings
+        // associated to our view call, and clears all of the instance state
         // associated to the call.
         let (timings, result_bytes) = store.data_mut().finish_funcall();
 
@@ -450,7 +450,7 @@ impl module_host_actor::WasmInstance for WasmtimeInstance {
         let store = &mut self.store;
         prepare_store_for_call(store, budget);
 
-        let view = UniqueView::anonymous(op.id, op.args.get_bsatn().clone());
+        let view = ViewCall::anonymous(op.id, op.args.get_bsatn().clone());
         // Prepare arguments to the reducer + the error sink & start timings.
         let args_bytes = op.args.get_bsatn().clone();
 
@@ -462,8 +462,8 @@ impl module_host_actor::WasmInstance for WasmtimeInstance {
         let call_result =
             call_sync_typed_func(&self.call_view_anon, &mut *store, (op.id.0, args_source.0, errors_sink));
 
-        // Signal that this reducer call is finished. This gets us the timings
-        // associated to our reducer call, and clears all of the instance state
+        // Signal that this view call is finished. This gets us the timings
+        // associated to our view call, and clears all of the instance state
         // associated to the call.
         let (timings, result_bytes) = store.data_mut().finish_funcall();
 

crates/datastore/src/locking_tx_datastore/committed_state.rs

@@ -11,7 +11,7 @@ use crate::{
     error::{DatastoreError, IndexError, TableError},
     execution_context::ExecutionContext,
     locking_tx_datastore::{
-        mut_tx::{UniqueView, ViewReadSets},
+        mut_tx::{ViewCall, ViewReadSets},
         state_view::iter_st_column_for_table,
     },
     system_tables::{
@@ -53,12 +53,12 @@ use std::collections::BTreeMap;
 use std::sync::Arc;
 use thin_vec::ThinVec;
 
-type IndexKeyReadSet = HashMap<AlgebraicValue, HashSet<UniqueView>>;
+type IndexKeyReadSet = HashMap<AlgebraicValue, HashSet<ViewCall>>;
 type IndexColReadSet = HashMap<ColList, IndexKeyReadSet>;
 
 #[derive(Default)]
 struct CommittedReadSets {
-    tables: IntMap<TableId, HashSet<UniqueView>>,
+    tables: IntMap<TableId, HashSet<ViewCall>>,
     index_keys: IntMap<TableId, IndexColReadSet>,
 }
 
@@ -72,12 +72,12 @@ impl MemoryUsage for CommittedReadSets {
 
 impl CommittedReadSets {
     /// Record in the [`CommittedState`] that this view scans this table
-    fn view_scans_table(&mut self, view: UniqueView, table_id: TableId) {
+    fn view_scans_table(&mut self, view: ViewCall, table_id: TableId) {
         self.tables.entry(table_id).or_default().insert(view);
     }
 
     /// Record in the [`CommittedState`] that this view reads this index `key` for these table `cols`
-    fn view_reads_index_key(&mut self, view: UniqueView, table_id: TableId, cols: ColList, key: &AlgebraicValue) {
+    fn view_reads_index_key(&mut self, view: ViewCall, table_id: TableId, cols: ColList, key: &AlgebraicValue) {
         self.index_keys
             .entry(table_id)
             .or_default()
@@ -98,7 +98,7 @@ impl CommittedReadSets {
 
     /// Returns true if the given view exists in any read set.
     /// This is used to determine whether a view needs to be re-evaluated.
-    fn is_materialized(&self, view: &UniqueView) -> bool {
+    fn is_materialized(&self, view: &ViewCall) -> bool {
         self.tables.values().any(|views| views.contains(view))
             || self.index_keys.values().any(|col_map| {
                 col_map
@@ -724,7 +724,7 @@ impl CommittedState {
         tx_data
     }
 
-    fn merge_read_set(&mut self, view: UniqueView, read_set: ReadSet) {
+    fn merge_read_set(&mut self, view: ViewCall, read_set: ReadSet) {
         for table_id in read_set.tables_scanned() {
             self.read_sets.view_scans_table(view.clone(), *table_id);
         }
@@ -1061,7 +1061,7 @@ impl CommittedState {
             .set(self.blob_store.bytes_used_by_blobs() as _);
     }
 
-    pub(super) fn is_materialized(&self, view: &UniqueView) -> bool {
+    pub(super) fn is_materialized(&self, view: &ViewCall) -> bool {
         self.read_sets.is_materialized(view)
     }
 }

crates/datastore/src/locking_tx_datastore/mod.rs

@@ -3,7 +3,7 @@
 pub mod committed_state;
 pub mod datastore;
 mod mut_tx;
-pub use mut_tx::{MutTxId, UniqueView};
+pub use mut_tx::{MutTxId, ViewCall};
 mod sequence;
 pub mod state_view;
 pub use state_view::{IterByColEqTx, IterByColRangeTx};

crates/datastore/src/locking_tx_datastore/mut_tx.rs

@@ -123,14 +123,14 @@ impl ReadSet {
 }
 
 #[derive(Clone, Debug, Eq, PartialEq, Hash)]
-pub struct UniqueView {
+pub struct ViewCall {
     identity: Option<Identity>,
     view_id: ViewId,
     //TODO: use arg_id from [`ST_VIEW_ARGS`]
     args: Bytes,
 }
 
-impl UniqueView {
+impl ViewCall {
     pub fn anonymous(view_id: ViewId, args: Bytes) -> Self {
         Self {
             identity: None,
@@ -152,7 +152,7 @@ impl UniqueView {
     }
 }
 
-pub type ViewReadSets = HashMap<UniqueView, ReadSet>;
+pub type ViewReadSets = HashMap<ViewCall, ReadSet>;
 
 /// Represents a Mutable transaction. Holds locks for its duration
 ///
@@ -176,7 +176,7 @@ static_assert_size!(MutTxId, 448);
 
 impl MutTxId {
     /// Record that a view performs a table scan in this transaction's read set
-    pub fn record_table_scan(&mut self, view: Option<UniqueView>, table_id: TableId) {
+    pub fn record_table_scan(&mut self, view: Option<ViewCall>, table_id: TableId) {
         if let Some(view) = view {
             self.read_sets.entry(view).or_default().insert_table_scan(table_id)
         }
@@ -185,7 +185,7 @@ impl MutTxId {
     /// Record that a view performs an index scan in this transaction's read set
     pub fn record_index_scan(
         &mut self,
-        view: Option<UniqueView>,
+        view: Option<ViewCall>,
         table_id: TableId,
         index_id: IndexId,
         lower: Bound<AlgebraicValue>,
@@ -754,9 +754,9 @@ impl MutTxId {
             .ok_or_else(|| anyhow::anyhow!("view `{view_name}` not found"))?;
 
         let unique_view = if is_anonymous {
-            UniqueView::anonymous(view_id, args)
+            ViewCall::anonymous(view_id, args)
         } else {
-            UniqueView::with_identity(sender, view_id, args)
+            ViewCall::with_identity(sender, view_id, args)
         };
 
         let is_materialized =