mirror/lnd
1
0 Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

paymentsdb: rename functions and variables

Browse Source 
We take inspiration from the graph sql implementation and name
the variables accordingly.
This commit is contained in:
ziggie committed 2026-02-25 08:02:16 +01:00
1 parent 218a30d16e
commit b02531cc85
1 file changed
+36 -30
Download Patch File Download Diff File Expand all files Collapse all files
payments/db/sql_store.go
+36 -30
View File
@@ -154,7 +154,7 @@ func fetchPaymentWithCompleteData(ctx context.Context,
payment := dbPayment.GetPayment() payment := dbPayment.GetPayment()
// Load batch data for this single payment. // Load batch data for this single payment.
batchData, err := loadPaymentsBatchData( batchData, err := batchLoadPaymentDetailsData(
ctx, cfg, db, []int64{payment.ID}, ctx, cfg, db, []int64{payment.ID},
) )
if err != nil { if err != nil {
@@ -187,10 +187,10 @@ type paymentsDetailsData struct {
routeCustomRecords map[int64][]sqlc.PaymentAttemptFirstHopCustomRecord routeCustomRecords map[int64][]sqlc.PaymentAttemptFirstHopCustomRecord
} }
// loadPaymentCustomRecords loads payment-level custom records for a given // batchLoadPaymentCustomRecords loads payment-level custom records for a given
// set of payment IDs. It uses a batch query to fetch all custom records for // set of payment IDs. It uses a batch query to fetch all custom records for
// the given payment IDs. // the given payment IDs.
func loadPaymentCustomRecords(ctx context.Context, func batchLoadPaymentCustomRecords(ctx context.Context,
cfg *sqldb.QueryConfig, db SQLQueries, paymentIDs []int64, cfg *sqldb.QueryConfig, db SQLQueries, paymentIDs []int64,
batchData *paymentsDetailsData) error { batchData *paymentsDetailsData) error {
@@ -221,10 +221,10 @@ func loadPaymentCustomRecords(ctx context.Context,
) )
} }
// loadHtlcAttempts loads HTLC attempts for all payments and returns all // batchLoadHtlcAttempts loads HTLC attempts for all payments and returns all
// attempt indices. It uses a batch query to fetch all attempts for the given // attempt indices. It uses a batch query to fetch all attempts for the given
// payment IDs. // payment IDs.
func loadHtlcAttempts(ctx context.Context, cfg *sqldb.QueryConfig, func batchLoadHtlcAttempts(ctx context.Context, cfg *sqldb.QueryConfig,
db SQLQueries, paymentIDs []int64, db SQLQueries, paymentIDs []int64,
batchData *paymentsDetailsData) ([]int64, error) { batchData *paymentsDetailsData) ([]int64, error) {
@@ -255,9 +255,9 @@ func loadHtlcAttempts(ctx context.Context, cfg *sqldb.QueryConfig,
return allAttemptIndices, err return allAttemptIndices, err
} }
// loadHopsForAttempts loads hops for all attempts and returns all hop IDs. // batchLoadHopsForAttempts loads hops for all attempts and returns all hop IDs.
// It uses a batch query to fetch all hops for the given attempt indices. // It uses a batch query to fetch all hops for the given attempt indices.
func loadHopsForAttempts(ctx context.Context, cfg *sqldb.QueryConfig, func batchLoadHopsForAttempts(ctx context.Context, cfg *sqldb.QueryConfig,
db SQLQueries, attemptIndices []int64, db SQLQueries, attemptIndices []int64,
batchData *paymentsDetailsData) ([]int64, error) { batchData *paymentsDetailsData) ([]int64, error) {
@@ -289,9 +289,9 @@ func loadHopsForAttempts(ctx context.Context, cfg *sqldb.QueryConfig,
return hopIDs, err return hopIDs, err
} }
// loadHopCustomRecords loads hop-level custom records for all hops. It uses // batchLoadHopCustomRecords loads hop-level custom records for all hops. It
// a batch query to fetch all custom records for the given hop IDs. // uses a batch query to fetch all custom records for the given hop IDs.
func loadHopCustomRecords(ctx context.Context, cfg *sqldb.QueryConfig, func batchLoadHopCustomRecords(ctx context.Context, cfg *sqldb.QueryConfig,
db SQLQueries, hopIDs []int64, batchData *paymentsDetailsData) error { db SQLQueries, hopIDs []int64, batchData *paymentsDetailsData) error {
return sqldb.ExecuteBatchQuery( return sqldb.ExecuteBatchQuery(
@@ -322,10 +322,10 @@ func loadHopCustomRecords(ctx context.Context, cfg *sqldb.QueryConfig,
) )
} }
// loadRouteCustomRecords loads route-level first hop custom records for all // batchLoadRouteCustomRecords loads route-level first hop custom records for
// attempts. It uses a batch query to fetch all custom records for the given // all attempts. It uses a batch query to fetch all custom records for the given
// attempt indices. // attempt indices.
func loadRouteCustomRecords(ctx context.Context, cfg *sqldb.QueryConfig, func batchLoadRouteCustomRecords(ctx context.Context, cfg *sqldb.QueryConfig,
db SQLQueries, attemptIndices []int64, db SQLQueries, attemptIndices []int64,
batchData *paymentsDetailsData) error { batchData *paymentsDetailsData) error {
@@ -362,8 +362,8 @@ type paymentStatusData struct {
} }
// batchLoadPaymentResolutions loads only HTLC resolution types for multiple // batchLoadPaymentResolutions loads only HTLC resolution types for multiple
// payments. This is a lightweight alternative to loadPaymentsBatchData that's // payments. This is a lightweight alternative to batchLoadPaymentsRelatedData
// optimized for operations that only need to determine payment status. // that's optimized for operations that only need to determine payment status.
func batchLoadPaymentResolutions(ctx context.Context, db SQLQueries, func batchLoadPaymentResolutions(ctx context.Context, db SQLQueries,
paymentIDs []int64) (*paymentStatusData, error) { paymentIDs []int64) (*paymentStatusData, error) {
@@ -396,8 +396,8 @@ func batchLoadPaymentResolutions(ctx context.Context, db SQLQueries,
} }
// loadPaymentResolutions is a single-payment wrapper around // loadPaymentResolutions is a single-payment wrapper around
// batchLoadPaymentResolutions for convenience and to prevent duplicate // batchLoadPaymentResolutions for convenience and to prevent duplicate queries
// queries. // so we reuse the same batch query for all payments.
func loadPaymentResolutions(ctx context.Context, db SQLQueries, func loadPaymentResolutions(ctx context.Context, db SQLQueries,
paymentID int64) ([]sql.NullInt32, error) { paymentID int64) ([]sql.NullInt32, error) {
@@ -455,9 +455,9 @@ func computePaymentStatusFromResolutions(resolutionTypes []sql.NullInt32,
return decidePaymentStatus(htlcs, failureReason) return decidePaymentStatus(htlcs, failureReason)
} }
// loadPaymentsBatchData loads all related data for multiple payments in batch. // batchLoadPaymentDetailsData loads all related data for multiple payments in
// It uses a batch queries to fetch all data for the given payment IDs. // batch. It uses a batch queries to fetch all data for the given payment IDs.
func loadPaymentsBatchData(ctx context.Context, cfg *sqldb.QueryConfig, func batchLoadPaymentDetailsData(ctx context.Context, cfg *sqldb.QueryConfig,
db SQLQueries, paymentIDs []int64) (*paymentsDetailsData, error) { db SQLQueries, paymentIDs []int64) (*paymentsDetailsData, error) {
batchData := &paymentsDetailsData{ batchData := &paymentsDetailsData{
@@ -483,14 +483,16 @@ func loadPaymentsBatchData(ctx context.Context, cfg *sqldb.QueryConfig,
} }
// Load payment-level custom records. // Load payment-level custom records.
err := loadPaymentCustomRecords(ctx, cfg, db, paymentIDs, batchData) err := batchLoadPaymentCustomRecords(
ctx, cfg, db, paymentIDs, batchData,
)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to fetch payment custom "+ return nil, fmt.Errorf("failed to fetch payment custom "+
"records: %w", err) "records: %w", err)
} }
// Load HTLC attempts and collect attempt indices. // Load HTLC attempts and collect attempt indices.
allAttemptIndices, err := loadHtlcAttempts( allAttemptIndices, err := batchLoadHtlcAttempts(
ctx, cfg, db, paymentIDs, batchData, ctx, cfg, db, paymentIDs, batchData,
) )
if err != nil { if err != nil {
@@ -504,7 +506,7 @@ func loadPaymentsBatchData(ctx context.Context, cfg *sqldb.QueryConfig,
} }
// Load hops for all attempts and collect hop IDs. // Load hops for all attempts and collect hop IDs.
hopIDs, err := loadHopsForAttempts( hopIDs, err := batchLoadHopsForAttempts(
ctx, cfg, db, allAttemptIndices, batchData, ctx, cfg, db, allAttemptIndices, batchData,
) )
if err != nil { if err != nil {
@@ -514,7 +516,7 @@ func loadPaymentsBatchData(ctx context.Context, cfg *sqldb.QueryConfig,
// Load hop-level custom records if there are any hops. // Load hop-level custom records if there are any hops.
if len(hopIDs) > 0 { if len(hopIDs) > 0 {
err = loadHopCustomRecords(ctx, cfg, db, hopIDs, batchData) err = batchLoadHopCustomRecords(ctx, cfg, db, hopIDs, batchData)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to fetch hop custom "+ return nil, fmt.Errorf("failed to fetch hop custom "+
"records: %w", err) "records: %w", err)
@@ -522,7 +524,9 @@ func loadPaymentsBatchData(ctx context.Context, cfg *sqldb.QueryConfig,
} }
// Load route-level first hop custom records. // Load route-level first hop custom records.
err = loadRouteCustomRecords(ctx, cfg, db, allAttemptIndices, batchData) err = batchLoadRouteCustomRecords(
ctx, cfg, db, allAttemptIndices, batchData,
)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to fetch route custom "+ return nil, fmt.Errorf("failed to fetch route custom "+
"records: %w", err) "records: %w", err)
@@ -670,7 +674,7 @@ func (s *SQLStore) QueryPayments(ctx context.Context, query Query) (Response,
batchDataFunc := func(ctx context.Context, paymentIDs []int64) ( batchDataFunc := func(ctx context.Context, paymentIDs []int64) (
*paymentsDetailsData, error) { *paymentsDetailsData, error) {
return loadPaymentsBatchData( return batchLoadPaymentDetailsData(
ctx, s.cfg.QueryCfg, db, paymentIDs, ctx, s.cfg.QueryCfg, db, paymentIDs,
) )
} }
@@ -925,13 +929,15 @@ func (s *SQLStore) DeleteFailedAttempts(paymentHash lntypes.Hash) error {
// data from the database. This is a lightweight query optimized for SQL that // data from the database. This is a lightweight query optimized for SQL that
// doesn't load route data, making it significantly more efficient than // doesn't load route data, making it significantly more efficient than
// FetchPayment when only the status is needed. // FetchPayment when only the status is needed.
func computePaymentStatusFromDB(ctx context.Context, func computePaymentStatusFromDB(ctx context.Context, db SQLQueries,
db SQLQueries, dbPayment sqlc.PaymentAndIntent) (PaymentStatus, error) { dbPayment sqlc.PaymentAndIntent) (PaymentStatus, error) {
payment := dbPayment.GetPayment() payment := dbPayment.GetPayment()
// Use the batch-optimized wrapper to fetch resolution types. // Load the resolution types for the payment.
resolutionTypes, err := loadPaymentResolutions(ctx, db, payment.ID) resolutionTypes, err := loadPaymentResolutions(
ctx, db, payment.ID,
)
if err != nil { if err != nil {
return 0, fmt.Errorf("failed to load payment resolutions: %w", return 0, fmt.Errorf("failed to load payment resolutions: %w",
err) err)