mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2024-11-19 09:53:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8595 from bhandras/sqldb-invoices-reset-on-retry

Browse Source 
sqldb: reset out of scope containers on potential ExecTx retry
This commit is contained in:
András Bánki-Horváth 2024-04-02 09:43:59 +02:00 committed by GitHub
commit 16c8339034
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/release-notes/release-notes-0.18.0.md
View File

@ -415,6 +415,9 @@ bitcoin peers' feefilter values into account](https://github.com/lightningnetwor
start](https://github.com/lightningnetwork/lnd/pull/8568) if native SQL is
enabled but the channeldb already has any KV invoices stored.
* [Fix a bug](https://github.com/lightningnetwork/lnd/pull/8595) when retrying
SQL InvoiceDB transactions due to database errors.
## Code Health
* [Remove database pointers](https://github.com/lightningnetwork/lnd/pull/8117)

6
sqldb/invoices.go
View File

@ -611,10 +611,11 @@ func (i *InvoiceStore) LookupInvoice(ctx context.Context,
func (i *InvoiceStore) FetchPendingInvoices(ctx context.Context) (
map[lntypes.Hash]invpkg.Invoice, error) {
invoices := make(map[lntypes.Hash]invpkg.Invoice)
var invoices map[lntypes.Hash]invpkg.Invoice
readTxOpt := NewInvoiceQueryReadTx()
err := i.db.ExecTx(ctx, &readTxOpt, func(db InvoiceQueries) error {
invoices = make(map[lntypes.Hash]invpkg.Invoice)
limit := queryPaginationLimit
return queryWithLimit(func(offset int) (int, error) {
@ -671,6 +672,7 @@ func (i *InvoiceStore) InvoicesSettledSince(ctx context.Context, idx uint64) (
readTxOpt := NewInvoiceQueryReadTx()
err := i.db.ExecTx(ctx, &readTxOpt, func(db InvoiceQueries) error {
invoices = nil
settleIdx := idx
limit := queryPaginationLimit
@ -784,6 +786,7 @@ func (i *InvoiceStore) InvoicesAddedSince(ctx context.Context, idx uint64) (
readTxOpt := NewInvoiceQueryReadTx()
err := i.db.ExecTx(ctx, &readTxOpt, func(db InvoiceQueries) error {
result = nil
addIdx := idx
limit := queryPaginationLimit
@ -840,6 +843,7 @@ func (i *InvoiceStore) QueryInvoices(ctx context.Context,
readTxOpt := NewInvoiceQueryReadTx()
err := i.db.ExecTx(ctx, &readTxOpt, func(db InvoiceQueries) error {
invoices = nil
limit := queryPaginationLimit
return queryWithLimit(func(offset int) (int, error) {