GlcoinCore/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2026-08-13 12:32:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge pull request #10859 from lightningnetwork/backport-10851-to-v0.21.x-branch

Browse source 
[v0.21.x-branch] Backport #10851: sqldb: avoid materializing non-terminal payments
This commit is contained in:
ziggieXXX 2026-05-28 11:26:27 -03:00 • committed by GitHub
commit 78cec3d5c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 48 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

48
sqldb/sqlc/payments.sql.go
View file

@ -392,27 +392,6 @@ func (q *Queries) FetchHtlcAttemptsForPayments(ctx context.Context, paymentIds [
}
const fetchNonTerminalPayments = `-- name: FetchNonTerminalPayments :many
WITH non_terminal_ids AS (
SELECT p.id
FROM payments p
WHERE p.fail_reason IS NULL
AND NOT EXISTS (
SELECT 1 FROM payment_htlc_attempt_resolutions hr
JOIN payment_htlc_attempts ha
ON ha.attempt_index = hr.attempt_index
WHERE ha.payment_id = p.id
AND hr.resolution_type = 1
)
UNION
SELECT DISTINCT ha.payment_id AS id
FROM payment_htlc_attempts ha
WHERE NOT EXISTS (
SELECT 1 FROM payment_htlc_attempt_resolutions hr
WHERE hr.attempt_index = ha.attempt_index
)
)
SELECT
p.id,
p.amount_msat,
@ -421,12 +400,33 @@ SELECT
p.fail_reason,
pi.intent_type,
pi.intent_payload
FROM non_terminal_ids n
JOIN payments p
ON p.id = n.id
FROM payments p
LEFT JOIN payment_intents pi
ON pi.payment_id = p.id
WHERE p.id > $1
AND (
(
p.fail_reason IS NULL
AND NOT EXISTS (
SELECT 1
FROM payment_htlc_attempts ha
JOIN payment_htlc_attempt_resolutions hr
ON hr.attempt_index = ha.attempt_index
WHERE ha.payment_id = p.id
AND hr.resolution_type = 1
)
)
OR EXISTS (
SELECT 1
FROM payment_htlc_attempts ha
WHERE ha.payment_id = p.id
AND NOT EXISTS (
SELECT 1
FROM payment_htlc_attempt_resolutions hr
WHERE hr.attempt_index = ha.attempt_index
)
)
)
ORDER BY p.id ASC
LIMIT $2
`

48
sqldb/sqlc/queries/payments.sql
View file

@ -129,27 +129,6 @@ ORDER BY p.id ASC;
-- Fetch all non-terminal payments using pagination. A payment is
-- non-terminal if it has an unresolved attempt, or if it has not been
-- permanently failed and has no settled attempt yet.
WITH non_terminal_ids AS (
SELECT p.id
FROM payments p
WHERE p.fail_reason IS NULL
AND NOT EXISTS (
SELECT 1 FROM payment_htlc_attempt_resolutions hr
JOIN payment_htlc_attempts ha
ON ha.attempt_index = hr.attempt_index
WHERE ha.payment_id = p.id
AND hr.resolution_type = 1
)
UNION
SELECT DISTINCT ha.payment_id AS id
FROM payment_htlc_attempts ha
WHERE NOT EXISTS (
SELECT 1 FROM payment_htlc_attempt_resolutions hr
WHERE hr.attempt_index = ha.attempt_index
)
)
SELECT
p.id,
p.amount_msat,
@ -158,12 +137,33 @@ SELECT
p.fail_reason,
pi.intent_type,
pi.intent_payload
FROM non_terminal_ids n
JOIN payments p
ON p.id = n.id
FROM payments p
LEFT JOIN payment_intents pi
ON pi.payment_id = p.id
WHERE p.id > $1
AND (
(
p.fail_reason IS NULL
AND NOT EXISTS (
SELECT 1
FROM payment_htlc_attempts ha
JOIN payment_htlc_attempt_resolutions hr
ON hr.attempt_index = ha.attempt_index
WHERE ha.payment_id = p.id
AND hr.resolution_type = 1
)
)
OR EXISTS (
SELECT 1
FROM payment_htlc_attempts ha
WHERE ha.payment_id = p.id
AND NOT EXISTS (
SELECT 1
FROM payment_htlc_attempt_resolutions hr
WHERE hr.attempt_index = ha.attempt_index
)
)
)
ORDER BY p.id ASC
LIMIT $2;