Merge pull request #10129 from ellemouton/graphPerf9

[8] graph/db: use batch loading for various graph SQL methods

Author: ellemouton

graph/db/benchmark_test.go

@@ -736,6 +736,15 @@ func BenchmarkGraphReadMethods(b *testing.B) {
 				require.NoError(b, err)
 			},
 		},
+		{
+			name: "ChanUpdatesInHorizon",
+			fn: func(b testing.TB, store V1Store) {
+				_, err := store.ChanUpdatesInHorizon(
+					time.Unix(0, 0), time.Now(),
+				)
+				require.NoError(b, err)
+			},
+		},
 	}
 
 	for _, test := range tests {

graph/db/kv_store.go

@@ -2789,7 +2789,8 @@ func (c *KVStore) delChannelEdgeUnsafe(edges, edgeIndex, chanIndex,
 		}
 
 		nodeKey1, nodeKey2 = makeZombiePubkeys(
-			&edgeInfo, e1UpdateTime, e2UpdateTime,
+			edgeInfo.NodeKey1Bytes, edgeInfo.NodeKey2Bytes,
+			e1UpdateTime, e2UpdateTime,
 		)
 	}
 
@@ -2814,27 +2815,27 @@ func (c *KVStore) delChannelEdgeUnsafe(edges, edgeIndex, chanIndex,
 // the channel. If the channel were to be marked zombie again, it would be
 // marked with the correct lagging channel since we received an update from only
 // one side.
-func makeZombiePubkeys(info *models.ChannelEdgeInfo,
-	e1, e2 *time.Time) ([33]byte, [33]byte) {
+func makeZombiePubkeys(node1, node2 [33]byte, e1, e2 *time.Time) ([33]byte,
+	[33]byte) {
 
 	switch {
 	// If we don't have either edge policy, we'll return both pubkeys so
 	// that the channel can be resurrected by either party.
 	case e1 == nil && e2 == nil:
-		return info.NodeKey1Bytes, info.NodeKey2Bytes
+		return node1, node2
 
 	// If we're missing edge1, or if both edges are present but edge1 is
 	// older, we'll return edge1's pubkey and a blank pubkey for edge2. This
 	// means that only an update from edge1 will be able to resurrect the
 	// channel.
 	case e1 == nil || (e2 != nil && e1.Before(*e2)):
-		return info.NodeKey1Bytes, [33]byte{}
+		return node1, [33]byte{}
 
 	// Otherwise, we're missing edge2 or edge2 is the older side, so we
 	// return a blank pubkey for edge1. In this case, only an update from
 	// edge2 can resurect the channel.
 	default:
-		return [33]byte{}, info.NodeKey2Bytes
+		return [33]byte{}, node1
 	}
 }
 

graph/db/sql_migration.go

@@ -192,7 +192,7 @@ func migrateNodes(ctx context.Context, kvBackend kvdb.Backend,
 				pub, id, dbNode.ID)
 		}
 
-		migratedNode, err := buildNode(ctx, sqlDB, &dbNode)
+		migratedNode, err := buildNode(ctx, sqlDB, dbNode)
 		if err != nil {
 			return fmt.Errorf("could not build migrated node "+
 				"from dbNode(db id: %d, node pub: %x): %w",
@@ -410,6 +410,8 @@ func migrateChannelsAndPolicies(ctx context.Context, kvBackend kvdb.Backend,
 		}
 
 		channelCount++
+		chunk++
+
 		err = migrateSingleChannel(
 			ctx, sqlDB, channel, policy1, policy2, migChanPolicy,
 		)