Merge pull request #896 from gobitfly/BEDS-519/fix-rewards-query

(BEDS-519) DA: more efficient rewards query

Author: remoterami

backend/pkg/api/data_access/vdb_rewards.go

@@ -106,12 +106,13 @@ func (d *DataAccessService) GetValidatorDashboardRewards(ctx context.Context, da
 		LeftJoin(goqu.L("blocks b"), goqu.On(goqu.L("v.validator_index = b.proposer AND b.status = '1'"))).
 		LeftJoin(goqu.L("execution_payloads ep"), goqu.On(goqu.L("ep.block_hash = b.exec_block_hash"))).
 		LeftJoin(
-			goqu.Dialect("postgres").
+			goqu.Lateral(goqu.Dialect("postgres").
 				From("relays_blocks").
 				Select(
 					goqu.L("exec_block_hash"),
 					goqu.MAX("value").As("value")).
-				GroupBy("exec_block_hash").As("rb"),
+				Where(goqu.L("relays_blocks.exec_block_hash = b.exec_block_hash")).
+				GroupBy("exec_block_hash")).As("rb"),
 			goqu.On(goqu.L("rb.exec_block_hash = b.exec_block_hash")),
 		)
 
@@ -561,12 +562,13 @@ func (d *DataAccessService) GetValidatorDashboardGroupRewards(ctx context.Contex
 		LeftJoin(goqu.L("blocks b"), goqu.On(goqu.L("v.validator_index = b.proposer AND b.status = '1'"))).
 		LeftJoin(goqu.L("execution_payloads ep"), goqu.On(goqu.L("ep.block_hash = b.exec_block_hash"))).
 		LeftJoin(
-			goqu.Dialect("postgres").
+			goqu.Lateral(goqu.Dialect("postgres").
 				From("relays_blocks").
 				Select(
 					goqu.L("exec_block_hash"),
 					goqu.MAX("value").As("value")).
-				GroupBy("exec_block_hash").As("rb"),
+				Where(goqu.L("relays_blocks.exec_block_hash = b.exec_block_hash")).
+				GroupBy("exec_block_hash")).As("rb"),
 			goqu.On(goqu.L("rb.exec_block_hash = b.exec_block_hash")),
 		).
 		Where(goqu.L("b.epoch = ?", epoch))
@@ -736,12 +738,13 @@ func (d *DataAccessService) GetValidatorDashboardRewardsChart(ctx context.Contex
 		LeftJoin(goqu.L("blocks b"), goqu.On(goqu.L("v.validator_index = b.proposer AND b.status = '1'"))).
 		LeftJoin(goqu.L("execution_payloads ep"), goqu.On(goqu.L("ep.block_hash = b.exec_block_hash"))).
 		LeftJoin(
-			goqu.Dialect("postgres").
+			goqu.Lateral(goqu.Dialect("postgres").
 				From("relays_blocks").
 				Select(
 					goqu.L("exec_block_hash"),
 					goqu.MAX("value").As("value")).
-				GroupBy("exec_block_hash").As("rb"),
+				Where(goqu.L("relays_blocks.exec_block_hash = b.exec_block_hash")).
+				GroupBy("exec_block_hash")).As("rb"),
 			goqu.On(goqu.L("rb.exec_block_hash = b.exec_block_hash")),
 		).
 		Where(goqu.L("b.epoch >= ?", startEpoch))
@@ -987,12 +990,13 @@ func (d *DataAccessService) GetValidatorDashboardDuties(ctx context.Context, das
 		From(goqu.L("blocks b")).
 		LeftJoin(goqu.L("execution_payloads ep"), goqu.On(goqu.L("ep.block_hash = b.exec_block_hash"))).
 		LeftJoin(
-			goqu.Dialect("postgres").
+			goqu.Lateral(goqu.Dialect("postgres").
 				From("relays_blocks").
 				Select(
 					goqu.L("exec_block_hash"),
 					goqu.MAX("value").As("value")).
-				GroupBy("exec_block_hash").As("rb"),
+				Where(goqu.L("relays_blocks.exec_block_hash = b.exec_block_hash")).
+				GroupBy("exec_block_hash")).As("rb"),
 			goqu.On(goqu.L("rb.exec_block_hash = b.exec_block_hash")),
 		).
 		Where(goqu.L("b.epoch = ?", epoch)).

backend/pkg/api/data_access/vdb_summary.go

@@ -191,12 +191,13 @@ func (d *DataAccessService) GetValidatorDashboardSummary(ctx context.Context, da
 		From(goqu.L("blocks b")).
 		LeftJoin(goqu.L("execution_payloads ep"), goqu.On(goqu.L("ep.block_hash = b.exec_block_hash"))).
 		LeftJoin(
-			goqu.Dialect("postgres").
+			goqu.Lateral(goqu.Dialect("postgres").
 				From("relays_blocks").
 				Select(
 					goqu.L("exec_block_hash"),
 					goqu.MAX("value").As("value")).
-				GroupBy("exec_block_hash").As("rb"),
+				Where(goqu.L("relays_blocks.exec_block_hash = b.exec_block_hash")).
+				GroupBy("exec_block_hash")).As("rb"),
 			goqu.On(goqu.L("rb.exec_block_hash = b.exec_block_hash")),
 		).
 		Where(goqu.L("b.epoch >= ? AND b.epoch <= ? AND b.status = '1'", epochMin, epochMax)).
@@ -829,12 +830,13 @@ func (d *DataAccessService) internal_getElClAPR(ctx context.Context, dashboardId
 		From(goqu.L("blocks AS b")).
 		LeftJoin(goqu.L("execution_payloads AS ep"), goqu.On(goqu.L("b.exec_block_hash = ep.block_hash"))).
 		LeftJoin(
-			goqu.Dialect("postgres").
+			goqu.Lateral(goqu.Dialect("postgres").
 				From("relays_blocks").
 				Select(
 					goqu.L("exec_block_hash"),
 					goqu.MAX("value").As("value")).
-				GroupBy("exec_block_hash").As("rb"),
+				Where(goqu.L("relays_blocks.exec_block_hash = b.exec_block_hash")).
+				GroupBy("exec_block_hash")).As("rb"),
 			goqu.On(goqu.L("rb.exec_block_hash = b.exec_block_hash")),
 		).
 		Where(goqu.L("b.status = '1'"))