perf: update queries to load up v2

Signed-off-by: Gustavo Inacio <[email protected]>
graphprotocol · Feb 12, 2025 · 50b7dc4 · 50b7dc4
1 parent d70e7e2
commit 50b7dc4
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 53 deletions.
diff --git a/.sqlx/query-386e6b18da62b478ccdba5439490817f582abaec68e1ba01d55daee1e1edcbbd.json b/.sqlx/query-386e6b18da62b478ccdba5439490817f582abaec68e1ba01d55daee1e1edcbbd.json
diff --git a/.sqlx/query-7124365390787371768fdb52259f8a9fd7f1a549ddd6410fa4359cacbea2ce6e.json b/.sqlx/query-7124365390787371768fdb52259f8a9fd7f1a549ddd6410fa4359cacbea2ce6e.json
diff --git a/...3a328bea75b556032bfea57eb61b30e51f95.json → ...5b4ace9acc032be502cd1d9fc72c5b9ed50a.json b/...3a328bea75b556032bfea57eb61b30e51f95.json → ...5b4ace9acc032be502cd1d9fc72c5b9ed50a.json
diff --git a/crates/tap-agent/src/agent/sender_accounts_manager.rs b/crates/tap-agent/src/agent/sender_accounts_manager.rs
@@ -622,17 +622,11 @@ impl State {
                     FROM tap_horizon_receipts
                     GROUP BY signer_address, allocation_id
                 )
-                SELECT DISTINCT
+                SELECT 
                     signer_address,
-                    (
-                        SELECT ARRAY
-                        (
-                            SELECT DISTINCT allocation_id
-                            FROM grouped
-                            WHERE signer_address = top.signer_address
-                        )
-                    ) AS allocation_ids
-                FROM grouped AS top
+                    ARRAY_AGG(allocation_id) AS allocation_ids
+                FROM grouped
+                GROUP BY signer_address
             "#
         )
         .fetch_all(&self.pgpool)
@@ -668,18 +662,11 @@ impl State {
 
         let nonfinal_ravs_sender_allocations_in_db = sqlx::query!(
             r#"
-                SELECT DISTINCT
-                    sender_address,
-                    (
-                        SELECT ARRAY
-                        (
-                            SELECT DISTINCT allocation_id
-                            FROM tap_horizon_ravs
-                            WHERE sender_address = top.sender_address
-                            AND NOT last
-                        )
-                    ) AS allocation_id
-                FROM scalar_tap_ravs AS top
+                SELECT
+                    payer,
+                    ARRAY_AGG(DISTINCT allocation_id) FILTER (WHERE NOT last) AS allocation_ids
+                FROM tap_horizon_ravs
+                GROUP BY payer
             "#
         )
         .fetch_all(&self.pgpool)
@@ -688,7 +675,7 @@ impl State {
 
         for row in nonfinal_ravs_sender_allocations_in_db {
             let allocation_ids = row
-                .allocation_id
+                .allocation_ids
                 .expect("all RAVs should have an allocation_id")
                 .iter()
                 .map(|allocation_id| {
@@ -698,8 +685,8 @@ impl State {
                     )
                 })
                 .collect::<HashSet<_>>();
-            let sender_id = Address::from_str(&row.sender_address)
-                .expect("sender_address should be a valid address");
+            let sender_id =
+                Address::from_str(&row.payer).expect("sender_address should be a valid address");
 
             // Accumulate allocations for the sender
             unfinalized_sender_allocations_map