make partial collections of multi datasets idempotent

paradigmxyz · Jan 22, 2024 · 0a36dac · 0a36dac
1 parent 21503ed
commit 0a36dac
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/crates/freeze/src/multi_datasets/state_reads.rs b/crates/freeze/src/multi_datasets/state_reads.rs
@@ -49,10 +49,10 @@ impl CollectByBlock for StateReads {
             query.schemas.get(&Datatype::NonceReads),
             query.schemas.get(&Datatype::StorageReads),
         ) {
-            (Some(schema), _, _, _)
-            | (_, Some(schema), _, _)
-            | (_, _, Some(schema), _)
-            | (_, _, _, Some(schema)) => schema.has_column("transaction_hash"),
+            (Some(schema), _, _, _) |
+            (_, Some(schema), _, _) |
+            (_, _, Some(schema), _) |
+            (_, _, _, Some(schema)) => schema.has_column("transaction_hash"),
             _ => false,
         };
         source.geth_debug_trace_block_prestate(request.block_number()? as u32, include_txs).await
@@ -74,10 +74,10 @@ impl CollectByTransaction for StateReads {
             query.schemas.get(&Datatype::NonceReads),
             query.schemas.get(&Datatype::StorageReads),
         ) {
-            (Some(schema), _, _, _)
-            | (_, Some(schema), _, _)
-            | (_, _, Some(schema), _)
-            | (_, _, _, Some(schema)) => schema.has_column("block_number"),
+            (Some(schema), _, _, _) |
+            (_, Some(schema), _, _) |
+            (_, _, Some(schema), _) |
+            (_, _, _, Some(schema)) => schema.has_column("block_number"),
             _ => false,
         };
         let tx = request.transaction_hash()?;

diff --git a/crates/freeze/src/types/files.rs b/crates/freeze/src/types/files.rs
@@ -51,7 +51,9 @@ impl FileOutput {
         };
         for meta_datatype in meta_datatypes.iter() {
             for datatype in meta_datatype.datatypes().into_iter() {
-                paths.insert(datatype, self.get_path(query, partition, datatype)?);
+                if query.schemas.get(&datatype).is_some() {
+                    paths.insert(datatype, self.get_path(query, partition, datatype)?);
+                }
             }
         }
         Ok(paths)

diff --git a/crates/freeze/src/types/summaries.rs b/crates/freeze/src/types/summaries.rs
@@ -5,9 +5,8 @@ use colored::Colorize;
 use thousands::Separable;
 
 use crate::{
-    chunks::chunk_ops::ValueToString, ChunkData, ChunkStats, CollectError, ColumnType,
-    Datatype, Dim, ExecutionEnv, FileOutput, MetaDatatype, MultiDatatype, Partition, Query, Source,
-    Table,
+    chunks::chunk_ops::ValueToString, ChunkData, ChunkStats, CollectError, ColumnType, Datatype,
+    Dim, ExecutionEnv, FileOutput, MetaDatatype, MultiDatatype, Partition, Query, Source, Table,
 };
 use std::path::PathBuf;