remove cross join

Author: serichoi65

pkg/rewards/2_goldStakerRewardAmounts.go

@@ -18,13 +18,12 @@ latest_operator_avs_snapshots AS (
     ap.reward_hash,
     ap.snapshot as reward_snapshot,
     ap.avs,
-    MAX(oar.snapshot) as latest_operator_snapshot
+    (SELECT MAX(oar.snapshot) 
+     FROM operator_avs_registration_snapshots oar 
+     WHERE oar.avs = ap.avs 
+       AND oar.snapshot <= ap.snapshot) as latest_operator_snapshot
   FROM {{.activeRewardsTable}} ap
-  CROSS JOIN (SELECT DISTINCT snapshot, avs FROM operator_avs_registration_snapshots) oar
   WHERE ap.reward_type = 'avs'
-    AND oar.avs = ap.avs
-    AND oar.snapshot <= ap.snapshot
-  GROUP BY ap.reward_hash, ap.snapshot, ap.avs
 ),
 reward_snapshot_operators as (
   SELECT

pkg/rewards/9_goldStakerODRewardAmounts.go

@@ -55,12 +55,11 @@ latest_staker_delegation_snapshots AS (
         ors.reward_hash,
         ors.snapshot as reward_snapshot,
         ors.operator,
-        MAX(sds.snapshot) as latest_delegation_snapshot
+        (SELECT MAX(sds.snapshot) 
+         FROM staker_delegation_snapshots sds 
+         WHERE sds.operator = ors.operator 
+           AND sds.snapshot <= ors.snapshot) as latest_delegation_snapshot
     FROM staker_splits ors
-    CROSS JOIN (SELECT DISTINCT snapshot, operator FROM staker_delegation_snapshots) sds
-    WHERE sds.operator = ors.operator
-      AND sds.snapshot <= ors.snapshot
-    GROUP BY ors.reward_hash, ors.snapshot, ors.operator
 ),
 -- Get the stakers that were delegated to the operator for the snapshot
 staker_delegated_operators AS (