Adjust overstrong nbtree skip array assertion.

petergeoghegan · petergeoghegan · commit 9d924dbb3710 · 2025-04-30T23:15:51.000-04:00
Make an nbtree array preprocessing assertion account for scans that add fewer skip arrays than initially expected due to preprocessing finding an unsatisfiable array qual. Oversight in commit 92fe23d. Author: Peter Geoghegan <pg@bowt.ie> Reported-By: Mark Dilger <mark.dilger@enterprisedb.com> Discussion: https://postgr.es/m/CAHgHdKtQMhHy5qcB3KqCcGiW-Rp8P7KzUFRa9ZMKUiv6zen7LQ@mail.gmail.com
diff --git a/src/backend/access/nbtree/nbtpreprocesskeys.c b/src/backend/access/nbtree/nbtpreprocesskeys.c
@@ -1856,7 +1856,7 @@ _bt_preprocess_array_keys(IndexScanDesc scan, int *new_numberOfKeys)
 		numArrayKeyData++;		/* keep this scan key/array */
 	}
 
-	Assert(numSkipArrayKeys == 0);
+	Assert(numSkipArrayKeys == 0 || !so->qual_ok);
 
 	/* Set final number of equality-type array keys */
 	so->numArrayKeys = numArrayKeys;

Original file line number	Diff line number	Diff line change
`@@ -1856,7 +1856,7 @@ _bt_preprocess_array_keys(IndexScanDesc scan, int *new_numberOfKeys)`
`1856`	`1856`	`numArrayKeyData++; /* keep this scan key/array */`
`1857`	`1857`	`}`
`1858`	`1858`
`1859`		`- Assert(numSkipArrayKeys == 0);`
	`1859`	`+ Assert(numSkipArrayKeys == 0 \|\| !so->qual_ok);`
`1860`	`1860`
`1861`	`1861`	`/* Set final number of equality-type array keys */`
`1862`	`1862`	`so->numArrayKeys = numArrayKeys;`