Merge pull request #149 from LimarDeWills/PGPRO-11557-fix-orderby-loop

sokolcati · web-flow · commit 6c954ab6ebe6 · 2025-05-30T14:37:11.000+03:00
[PGPRO-11557] Fix infinite loop with multiple ORDER BY in RUM scan
diff --git a/src/rumget.c b/src/rumget.c
@@ -1741,7 +1741,11 @@ entryFindItem(RumState * rumstate, RumScanEntry entry, RumItem * item, Snapshot
 	{
 		if (compareRumItemScanDirection(rumstate, entry->attnumOrig,
 							entry->scanDirection,
-							&entry->curItem, item) >= 0)
+							&entry->curItem, item) >= 0 &&
+							entry->offset >= 0 &&
+							entry->offset < entry->nlist &&
+							rumCompareItemPointers(&entry->curItem.iptr,
+												   &entry->list[entry->offset].iptr) == 0)
 			return;
 		while (entry->offset >= 0 && entry->offset < entry->nlist)
 		{

Original file line number	Diff line number	Diff line change
`@@ -1741,7 +1741,11 @@ entryFindItem(RumState * rumstate, RumScanEntry entry, RumItem * item, Snapshot`
`1741`	`1741`	`{`
`1742`	`1742`	`if (compareRumItemScanDirection(rumstate, entry->attnumOrig,`
`1743`	`1743`	`entry->scanDirection,`
`1744`		`- &entry->curItem, item) >= 0)`
	`1744`	`+ &entry->curItem, item) >= 0 &&`
	`1745`	`+ entry->offset >= 0 &&`
	`1746`	`+ entry->offset < entry->nlist &&`
	`1747`	`+ rumCompareItemPointers(&entry->curItem.iptr,`
	`1748`	`+ &entry->list[entry->offset].iptr) == 0)`
`1745`	`1749`	`return;`
`1746`	`1750`	`while (entry->offset >= 0 && entry->offset < entry->nlist)`
`1747`	`1751`	`{`