diff options
| -rw-r--r-- | src/backend/access/nbtree/nbtree.c | 19 | ||||
| -rw-r--r-- | src/backend/access/nbtree/nbtsearch.c | 2 |
2 files changed, 1 insertions, 20 deletions
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index cf4a6dc7c47..cd2d4a6c54e 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -592,25 +592,6 @@ btrestrpos(PG_FUNCTION_ARGS) */ so->currPos.itemIndex = so->markItemIndex; } - else if (so->currPos.currPage == so->markPos.currPage) - { - /* - * so->markItemIndex < 0 but mark and current positions are on the - * same page. This would be an unusual case, where the scan moved to - * a new index page after the mark, restored, and later restored again - * without moving off the marked page. It is not clear that this code - * can currently be reached, but it seems better to make this function - * robust for this case than to Assert() or elog() that it can't - * happen. - * - * We neither want to set so->markItemIndex >= 0 (because that could - * cause a later move to a new page to redo the memcpy() executions) - * nor re-execute the memcpy() functions for a restore within the same - * page. The previous restore to this page already set everything - * except markPos as it should be. - */ - so->currPos.itemIndex = so->markPos.itemIndex; - } else { /* diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index 101a7d80a95..3bdbe757aeb 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -1000,7 +1000,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir) so->currPos.moreRight = false; } so->numKilled = 0; /* just paranoia */ - so->markItemIndex = -1; /* ditto */ + Assert(so->markItemIndex == -1); /* position to the precise item on the page */ offnum = _bt_binsrch(rel, buf, keysCount, scankeys, nextkey); |