more verbose error handling & get rid of bit masking task id

dojoengine · Jan 15, 2025 · 2ad2772 · 2ad2772
1 parent 312befa
commit 2ad2772
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 17 deletions.
diff --git a/crates/torii/indexer/src/engine.rs b/crates/torii/indexer/src/engine.rs
@@ -890,14 +890,14 @@ impl<P: Provider + Send + Sync + std::fmt::Debug + 'static> Engine<P> {
             "ModelRegistered" | "EventRegistered" => {
                 let mut hasher = DefaultHasher::new();
                 event.keys.iter().for_each(|k| k.hash(&mut hasher));
-                let hash = hasher.finish() & 0x00FFFFFFFFFFFFFF;
+                let hash = hasher.finish();
                 (0usize, hash) // Priority 0 (highest) for model/event registration
             }
             "StoreSetRecord" | "StoreUpdateRecord" | "StoreUpdateMember" | "StoreDelRecord" => {
                 let mut hasher = DefaultHasher::new();
                 event.keys[1].hash(&mut hasher);
                 event.keys[2].hash(&mut hasher);
-                let hash = hasher.finish() & 0x00FFFFFFFFFFFFFF;
+                let hash = hasher.finish();
                 (2usize, hash) // Priority 2 (lower) for store operations
             }
             _ => (0, 0) // No parallelization for other events

diff --git a/crates/torii/indexer/src/processors/store_del_record.rs b/crates/torii/indexer/src/processors/store_del_record.rs
@@ -35,7 +35,7 @@ where
         block_timestamp: u64,
         event_id: &str,
         event: &Event,
-        _config: &EventProcessorConfig,
+        config: &EventProcessorConfig,
     ) -> Result<(), Error> {
         // Torii version is coupled to the world version, so we can expect the event to be well
         // formed.
@@ -55,15 +55,21 @@ where
         // This can happen if only specific namespaces are indexed.
         let model = match db.model(event.selector).await {
             Ok(m) => m,
-            Err(e) if e.to_string().contains("no rows") => {
+            Err(e) if e.to_string().contains("no rows") && !config.namespaces.is_empty() => {
                 debug!(
                     target: LOG_TARGET,
                     selector = %event.selector,
                     "Model does not exist, skipping."
                 );
                 return Ok(());
             }
-            Err(e) => return Err(e),
+            Err(e) => {
+                return Err(anyhow::anyhow!(
+                    "Failed to retrieve model with selector {:#x}: {}",
+                    event.selector,
+                    e
+                ))
+            }
         };
 
         info!(

diff --git a/crates/torii/indexer/src/processors/store_set_record.rs b/crates/torii/indexer/src/processors/store_set_record.rs
@@ -36,7 +36,7 @@ where
         block_timestamp: u64,
         event_id: &str,
         event: &Event,
-        _config: &EventProcessorConfig,
+        config: &EventProcessorConfig,
     ) -> Result<(), Error> {
         // Torii version is coupled to the world version, so we can expect the event to be well
         // formed.
@@ -56,15 +56,21 @@ where
         // This can happen if only specific namespaces are indexed.
         let model = match db.model(event.selector).await {
             Ok(m) => m,
-            Err(e) if e.to_string().contains("no rows") => {
+            Err(e) if e.to_string().contains("no rows") && !config.namespaces.is_empty() => {
                 debug!(
                     target: LOG_TARGET,
                     selector = %event.selector,
                     "Model does not exist, skipping."
                 );
                 return Ok(());
             }
-            Err(e) => return Err(e),
+            Err(e) => {
+                return Err(anyhow::anyhow!(
+                    "Failed to retrieve model with selector {:#x}: {}",
+                    event.selector,
+                    e
+                ))
+            }
         };
 
         info!(

diff --git a/crates/torii/indexer/src/processors/store_update_member.rs b/crates/torii/indexer/src/processors/store_update_member.rs
@@ -7,7 +7,7 @@ use starknet::core::types::Event;
 use starknet::core::utils::get_selector_from_name;
 use starknet::providers::Provider;
 use torii_sqlite::Sql;
-use tracing::info;
+use tracing::{debug, info};
 
 use super::{EventProcessor, EventProcessorConfig};
 
@@ -37,7 +37,7 @@ where
         block_timestamp: u64,
         event_id: &str,
         event: &Event,
-        _config: &EventProcessorConfig,
+        config: &EventProcessorConfig,
     ) -> Result<(), Error> {
         // Torii version is coupled to the world version, so we can expect the event to be well
         // formed.
@@ -61,11 +61,20 @@ where
         // This can happen if only specific namespaces are indexed.
         let model = match db.model(model_selector).await {
             Ok(m) => m,
+            Err(e) if e.to_string().contains("no rows") && !config.namespaces.is_empty() => {
+                debug!(
+                    target: LOG_TARGET,
+                    selector = %model_selector,
+                    "Model does not exist, skipping."
+                );
+                return Ok(());
+            }
             Err(e) => {
-                if e.to_string().contains("no rows") {
-                    return Ok(());
-                }
-                return Err(e);
+                return Err(anyhow::anyhow!(
+                    "Failed to retrieve model with selector {:#x}: {}",
+                    event.selector,
+                    e
+                ))
             }
         };
 

diff --git a/crates/torii/indexer/src/processors/store_update_record.rs b/crates/torii/indexer/src/processors/store_update_record.rs
@@ -36,7 +36,7 @@ where
         block_timestamp: u64,
         event_id: &str,
         event: &Event,
-        _config: &EventProcessorConfig,
+        config: &EventProcessorConfig,
     ) -> Result<(), Error> {
         // Torii version is coupled to the world version, so we can expect the event to be well
         // formed.
@@ -59,15 +59,21 @@ where
         // This can happen if only specific namespaces are indexed.
         let model = match db.model(event.selector).await {
             Ok(m) => m,
-            Err(e) if e.to_string().contains("no rows") => {
+            Err(e) if e.to_string().contains("no rows") && !config.namespaces.is_empty() => {
                 debug!(
                     target: LOG_TARGET,
                     selector = %event.selector,
                     "Model does not exist, skipping."
                 );
                 return Ok(());
             }
-            Err(e) => return Err(e),
+            Err(e) => {
+                return Err(anyhow::anyhow!(
+                    "Failed to retrieve model with selector {:#x}: {}",
+                    event.selector,
+                    e
+                ))
+            }
         };
 
         info!(