invoices: batch-load ancillary data for paginated invoice fetches

config_builder.go

@@ -1246,6 +1246,7 @@ func (d *DefaultDatabaseBuilder) BuildDatabase(
 		)
 
 		sqlInvoiceDB := invoices.NewSQLStore(
+			&invoices.SQLStoreConfig{QueryCfg: queryCfg},
 			invoiceExecutor, clock.NewDefaultClock(),
 		)
 

docs/release-notes/release-notes-0.21.0.md

@@ -211,6 +211,26 @@
   is fully populated. This new behaviour can be opted out of via the new
   `--db.sync-graph-cache-load` option.
 
+* [Invoice pagination queries no longer use
+  `OFFSET`](https://github.com/lightningnetwork/lnd/pull/10700). The five
+  invoice filter queries previously used `LIMIT+OFFSET` for internal batching,
+  which requires the database to scan and discard all preceding rows on every
+  page. All pagination is now cursor-based (`WHERE id >= cursor`), making every
+  page an efficient primary-key range scan regardless of how deep into the
+  result set the query is.
+
+* [Eliminate N+1 per-invoice queries in the SQL invoice
+  store](https://github.com/lightningnetwork/lnd/pull/10701). The four
+  paginated list methods (`FetchPendingInvoices`, `InvoicesSettledSince`,
+  `InvoicesAddedSince`, `QueryInvoices`) previously issued multiple separate
+  DB round-trips per invoice row (features, HTLCs, HTLC custom records, AMP
+  sub-invoices, AMP sub-invoice HTLCs). Each method now collects all invoice
+  IDs for a page and loads the ancillary data in a small set of `WHERE id IN
+  (…)` batch queries, reducing the total round-trips per page from `O(n)` to
+  `O(1)`.
+  The single-invoice lookup path (`LookupInvoice`, `UpdateInvoice`) is
+  unchanged.
+
 * [Replace the catch-all `FilterInvoices` SQL query with five focused,
   index-friendly queries](https://github.com/lightningnetwork/lnd/pull/10601)
   (`FetchPendingInvoices`, `FilterInvoicesBySettleIndex`,

invoices/invoiceregistry_test.go

@@ -155,7 +155,15 @@ func TestInvoiceRegistry(t *testing.T) {
 
 		testClock := clock.NewTestClock(testTime)
 
-		return invpkg.NewSQLStore(executor, testClock), testClock
+		queryCfg := sqldb.DefaultSQLiteConfig()
+		if !sqlite {
+			queryCfg = sqldb.DefaultPostgresConfig()
+		}
+
+		return invpkg.NewSQLStore(
+			&invpkg.SQLStoreConfig{QueryCfg: queryCfg},
+			executor, testClock,
+		), testClock
 	}
 
 	for _, test := range testList {

invoices/invoices_test.go

@@ -254,9 +254,14 @@ func TestInvoices(t *testing.T) {
 		// that we also cover query pagination.
 		const testPaginationLimit = 3
 
+		queryCfg := &sqldb.QueryConfig{
+			MaxPageSize:  testPaginationLimit,
+			MaxBatchSize: testPaginationLimit,
+		}
+
 		return invpkg.NewSQLStore(
+			&invpkg.SQLStoreConfig{QueryCfg: queryCfg},
 			executor, testClock,
-			invpkg.WithPaginationLimit(testPaginationLimit),
 		)
 	}
 

invoices/kv_sql_migration_test.go

@@ -58,8 +58,15 @@ func TestMigrationWithChannelDB(t *testing.T) {
 
 		testClock := clock.NewTestClock(time.Unix(1, 0))
 
-		return invpkg.NewSQLStore(invoiceExecutor, testClock),
-			genericExecutor
+		queryCfg := sqldb.DefaultSQLiteConfig()
+		if !sqlite {
+			queryCfg = sqldb.DefaultPostgresConfig()
+		}
+
+		return invpkg.NewSQLStore(
+			&invpkg.SQLStoreConfig{QueryCfg: queryCfg},
+			invoiceExecutor, testClock,
+		), genericExecutor
 	}
 
 	migrationTest := func(t *testing.T, kvStore *channeldb.DB,

invoices/sql_migration_test.go

@@ -283,7 +283,15 @@ func TestMigrateSingleInvoiceRapid(t *testing.T) {
 
 		testClock := clock.NewTestClock(time.Unix(1, 0))
 
-		return NewSQLStore(executor, testClock)
+		queryCfg := sqldb.DefaultSQLiteConfig()
+		if !sqlite {
+			queryCfg = sqldb.DefaultPostgresConfig()
+		}
+
+		return NewSQLStore(
+			&SQLStoreConfig{QueryCfg: queryCfg},
+			executor, testClock,
+		)
 	}
 
 	// Define property-based test using rapid.