diff --git a/graph/db/sql_store.go b/graph/db/sql_store.go index d6ca33bcd..cdbeeab89 100644 --- a/graph/db/sql_store.go +++ b/graph/db/sql_store.go @@ -73,7 +73,7 @@ type SQLQueries interface { DeleteExtraNodeType(ctx context.Context, arg sqlc.DeleteExtraNodeTypeParams) error InsertNodeAddress(ctx context.Context, arg sqlc.InsertNodeAddressParams) error - GetNodeAddressesByPubKey(ctx context.Context, arg sqlc.GetNodeAddressesByPubKeyParams) ([]sqlc.GetNodeAddressesByPubKeyRow, error) + GetNodeAddresses(ctx context.Context, nodeID int64) ([]sqlc.GetNodeAddressesRow, error) DeleteNodeAddresses(ctx context.Context, nodeID int64) error InsertNodeFeature(ctx context.Context, arg sqlc.InsertNodeFeatureParams) error @@ -321,10 +321,21 @@ func (s *SQLStore) AddrsForNode(ctx context.Context, known bool ) err := s.db.ExecTx(ctx, sqldb.ReadTxOpt(), func(db SQLQueries) error { - var err error - known, addresses, err = getNodeAddresses( - ctx, db, nodePub.SerializeCompressed(), + // First, check if the node exists and get its DB ID if it + // does. + dbID, err := db.GetNodeIDByPubKey( + ctx, sqlc.GetNodeIDByPubKeyParams{ + Version: int16(ProtocolV1), + PubKey: nodePub.SerializeCompressed(), + }, ) + if errors.Is(err, sql.ErrNoRows) { + return nil + } + + known = true + + addresses, err = getNodeAddresses(ctx, db, dbID) if err != nil { return fmt.Errorf("unable to fetch node addresses: %w", err) @@ -3381,7 +3392,7 @@ func buildNode(ctx context.Context, db SQLQueries, dbNode *sqlc.GraphNode) ( } // Fetch the node's addresses. - _, node.Addresses, err = getNodeAddresses(ctx, db, pub[:]) + node.Addresses, err = getNodeAddresses(ctx, db, dbNode.ID) if err != nil { return nil, fmt.Errorf("unable to fetch node(%d) "+ "addresses: %w", dbNode.ID, err) @@ -3685,42 +3696,26 @@ func upsertNodeAddresses(ctx context.Context, db SQLQueries, nodeID int64, return nil } -// getNodeAddresses fetches the addresses for a node with the given public key. -func getNodeAddresses(ctx context.Context, db SQLQueries, nodePub []byte) (bool, - []net.Addr, error) { +// getNodeAddresses fetches the addresses for a node with the given DB ID. +func getNodeAddresses(ctx context.Context, db SQLQueries, id int64) ([]net.Addr, + error) { - // GetNodeAddressesByPubKey ensures that the addresses for a given type - // are returned in the same order as they were inserted. - rows, err := db.GetNodeAddressesByPubKey( - ctx, sqlc.GetNodeAddressesByPubKeyParams{ - Version: int16(ProtocolV1), - PubKey: nodePub, - }, - ) + // GetNodeAddresses ensures that the addresses for a given type are + // returned in the same order as they were inserted. + rows, err := db.GetNodeAddresses(ctx, id) if err != nil { - return false, nil, err - } - - // GetNodeAddressesByPubKey uses a left join so there should always be - // at least one row returned if the node exists even if it has no - // addresses. - if len(rows) == 0 { - return false, nil, nil + return nil, err } addresses := make([]net.Addr, 0, len(rows)) - for _, addr := range rows { - if !(addr.Type.Valid && addr.Address.Valid) { - continue - } + for _, row := range rows { + address := row.Address - address := addr.Address.String - - switch dbAddressType(addr.Type.Int16) { + switch dbAddressType(row.Type) { case addressTypeIPv4: tcp, err := net.ResolveTCPAddr("tcp4", address) if err != nil { - return false, nil, nil + return nil, err } tcp.IP = tcp.IP.To4() @@ -3729,21 +3724,20 @@ func getNodeAddresses(ctx context.Context, db SQLQueries, nodePub []byte) (bool, case addressTypeIPv6: tcp, err := net.ResolveTCPAddr("tcp6", address) if err != nil { - return false, nil, nil + return nil, err } addresses = append(addresses, tcp) case addressTypeTorV3, addressTypeTorV2: service, portStr, err := net.SplitHostPort(address) if err != nil { - return false, nil, fmt.Errorf("unable to "+ - "split tor v3 address: %v", - addr.Address) + return nil, fmt.Errorf("unable to "+ + "split tor v3 address: %v", address) } port, err := strconv.Atoi(portStr) if err != nil { - return false, nil, err + return nil, err } addresses = append(addresses, &tor.OnionAddr{ @@ -3754,8 +3748,8 @@ func getNodeAddresses(ctx context.Context, db SQLQueries, nodePub []byte) (bool, case addressTypeOpaque: opaque, err := hex.DecodeString(address) if err != nil { - return false, nil, fmt.Errorf("unable to "+ - "decode opaque address: %v", addr) + return nil, fmt.Errorf("unable to "+ + "decode opaque address: %v", address) } addresses = append(addresses, &lnwire.OpaqueAddrs{ @@ -3763,8 +3757,8 @@ func getNodeAddresses(ctx context.Context, db SQLQueries, nodePub []byte) (bool, }) default: - return false, nil, fmt.Errorf("unknown address "+ - "type: %v", addr.Type) + return nil, fmt.Errorf("unknown address type: %v", + row.Type) } } @@ -3774,7 +3768,7 @@ func getNodeAddresses(ctx context.Context, db SQLQueries, nodePub []byte) (bool, addresses = nil } - return true, addresses, nil + return addresses, nil } // upsertNodeExtraSignedFields updates the node's extra signed fields in the diff --git a/sqldb/sqlc/graph.sql.go b/sqldb/sqlc/graph.sql.go index 98b120ec0..4dbdb9aa8 100644 --- a/sqldb/sqlc/graph.sql.go +++ b/sqldb/sqlc/graph.sql.go @@ -1438,33 +1438,27 @@ func (q *Queries) GetExtraNodeTypes(ctx context.Context, nodeID int64) ([]GraphN return items, nil } -const getNodeAddressesByPubKey = `-- name: GetNodeAddressesByPubKey :many -SELECT a.type, a.address -FROM graph_nodes n -LEFT JOIN graph_node_addresses a ON a.node_id = n.id -WHERE n.pub_key = $1 AND n.version = $2 -ORDER BY a.type ASC, a.position ASC +const getNodeAddresses = `-- name: GetNodeAddresses :many +SELECT type, address +FROM graph_node_addresses +WHERE node_id = $1 +ORDER BY type ASC, position ASC ` -type GetNodeAddressesByPubKeyParams struct { - PubKey []byte - Version int16 +type GetNodeAddressesRow struct { + Type int16 + Address string } -type GetNodeAddressesByPubKeyRow struct { - Type sql.NullInt16 - Address sql.NullString -} - -func (q *Queries) GetNodeAddressesByPubKey(ctx context.Context, arg GetNodeAddressesByPubKeyParams) ([]GetNodeAddressesByPubKeyRow, error) { - rows, err := q.db.QueryContext(ctx, getNodeAddressesByPubKey, arg.PubKey, arg.Version) +func (q *Queries) GetNodeAddresses(ctx context.Context, nodeID int64) ([]GetNodeAddressesRow, error) { + rows, err := q.db.QueryContext(ctx, getNodeAddresses, nodeID) if err != nil { return nil, err } defer rows.Close() - var items []GetNodeAddressesByPubKeyRow + var items []GetNodeAddressesRow for rows.Next() { - var i GetNodeAddressesByPubKeyRow + var i GetNodeAddressesRow if err := rows.Scan(&i.Type, &i.Address); err != nil { return nil, err } diff --git a/sqldb/sqlc/querier.go b/sqldb/sqlc/querier.go index 3cfb8924e..84b9f6cac 100644 --- a/sqldb/sqlc/querier.go +++ b/sqldb/sqlc/querier.go @@ -59,7 +59,7 @@ type Querier interface { GetInvoiceHTLCs(ctx context.Context, invoiceID int64) ([]InvoiceHtlc, error) GetKVInvoicePaymentHashByAddIndex(ctx context.Context, addIndex int64) ([]byte, error) GetMigration(ctx context.Context, version int32) (time.Time, error) - GetNodeAddressesByPubKey(ctx context.Context, arg GetNodeAddressesByPubKeyParams) ([]GetNodeAddressesByPubKeyRow, error) + GetNodeAddresses(ctx context.Context, nodeID int64) ([]GetNodeAddressesRow, error) GetNodeByPubKey(ctx context.Context, arg GetNodeByPubKeyParams) (GraphNode, error) GetNodeFeatures(ctx context.Context, nodeID int64) ([]GraphNodeFeature, error) GetNodeFeaturesByPubKey(ctx context.Context, arg GetNodeFeaturesByPubKeyParams) ([]int32, error) diff --git a/sqldb/sqlc/queries/graph.sql b/sqldb/sqlc/queries/graph.sql index 509a9434e..542fd6004 100644 --- a/sqldb/sqlc/queries/graph.sql +++ b/sqldb/sqlc/queries/graph.sql @@ -134,12 +134,11 @@ INSERT INTO graph_node_addresses ( $1, $2, $3, $4 ); --- name: GetNodeAddressesByPubKey :many -SELECT a.type, a.address -FROM graph_nodes n -LEFT JOIN graph_node_addresses a ON a.node_id = n.id -WHERE n.pub_key = $1 AND n.version = $2 -ORDER BY a.type ASC, a.position ASC; +-- name: GetNodeAddresses :many +SELECT type, address +FROM graph_node_addresses +WHERE node_id = $1 +ORDER BY type ASC, position ASC; -- name: GetNodesByLastUpdateRange :many SELECT *