Fix scan adjusting for marked index tuples.

vadim4o · vadim4o · commit 4af1e537d699 · 1998-02-28T13:53:18.000Z
diff --git a/src/backend/access/nbtree/nbtscan.c b/src/backend/access/nbtree/nbtscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.12 1998/01/07 21:01:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.13 1998/02/28 13:53:18 vadim Exp $
  *
  *
  * NOTES
@@ -170,6 +170,9 @@ _bt_scandel(IndexScanDesc scan, int op, BlockNumber blkno, OffsetNumber offno)
 		tmp = *current;
 		*current = scan->currentItemData;
 		scan->currentItemData = tmp;
+		so->btso_curbuf = so->btso_mrkbuf;
+		so->btso_mrkbuf = buf;
+		buf = so->btso_curbuf;
 		switch (op)
 		{
 			case BT_INSERT:
@@ -182,6 +185,7 @@ _bt_scandel(IndexScanDesc scan, int op, BlockNumber blkno, OffsetNumber offno)
 				elog(ERROR, "_bt_scandel: bad operation '%d'", op);
 				/* NOTREACHED */
 		}
+		so->btso_curbuf = so->btso_mrkbuf;
 		so->btso_mrkbuf = buf;
 		tmp = *current;
 		*current = scan->currentItemData;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.12 1998/01/07 21:01:54 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.13 1998/02/28 13:53:18 vadim Exp $`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`@@ -170,6 +170,9 @@ _bt_scandel(IndexScanDesc scan, int op, BlockNumber blkno, OffsetNumber offno)`
`170`	`170`	`tmp = *current;`
`171`	`171`	`*current = scan->currentItemData;`
`172`	`172`	`scan->currentItemData = tmp;`
	`173`	`+ so->btso_curbuf = so->btso_mrkbuf;`
	`174`	`+ so->btso_mrkbuf = buf;`
	`175`	`+ buf = so->btso_curbuf;`
`173`	`176`	`switch (op)`
`174`	`177`	`{`
`175`	`178`	`case BT_INSERT:`
`@@ -182,6 +185,7 @@ _bt_scandel(IndexScanDesc scan, int op, BlockNumber blkno, OffsetNumber offno)`
`182`	`185`	`elog(ERROR, "_bt_scandel: bad operation '%d'", op);`
`183`	`186`	`/* NOTREACHED */`
`184`	`187`	`}`
	`188`	`+ so->btso_curbuf = so->btso_mrkbuf;`
`185`	`189`	`so->btso_mrkbuf = buf;`
`186`	`190`	`tmp = *current;`
`187`	`191`	`*current = scan->currentItemData;`