From 2b7334d4877ba445003f96b0bb7eed4e7078a39b Mon Sep 17 00:00:00 2001
From: Neil Conway <neilc@samurai.com>
Date: Sat, 20 Jan 2007 18:43:35 +0000
Subject: Refactor the index AM API slightly: move currentItemData and
 currentMarkData from IndexScanDesc to the opaque structs for the AMs that
 need this information (currently gist and hash).

Patch from Heikki Linnakangas, fixes by Neil Conway.
---
 src/backend/access/gist/gistscan.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/backend/access/gist/gistscan.c')

diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index 08ca73357c0..a275bb257ce 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/gist/gistscan.c,v 1.66 2007/01/05 22:19:22 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/gist/gistscan.c,v 1.67 2007/01/20 18:43:35 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,12 +42,6 @@ gistrescan(PG_FUNCTION_ARGS)
 	GISTScanOpaque so;
 	int			i;
 
-	/*
-	 * Clear all the pointers.
-	 */
-	ItemPointerSetInvalid(&scan->currentItemData);
-	ItemPointerSetInvalid(&scan->currentMarkData);
-
 	so = (GISTScanOpaque) scan->opaque;
 	if (so != NULL)
 	{
@@ -82,6 +76,12 @@ gistrescan(PG_FUNCTION_ARGS)
 		scan->opaque = so;
 	}
 
+	/*
+	 * Clear all the pointers.
+	 */
+	ItemPointerSetInvalid(&so->curpos);
+	ItemPointerSetInvalid(&so->markpos);
+
 	/* Update scan key, if a new one is given */
 	if (key && scan->numberOfKeys > 0)
 	{
@@ -111,8 +111,8 @@ gistmarkpos(PG_FUNCTION_ARGS)
 			   *n,
 			   *tmp;
 
-	scan->currentMarkData = scan->currentItemData;
 	so = (GISTScanOpaque) scan->opaque;
+	so->markpos = so->curpos;
 	if (so->flags & GS_CURBEFORE)
 		so->flags |= GS_MRKBEFORE;
 	else
@@ -160,8 +160,8 @@ gistrestrpos(PG_FUNCTION_ARGS)
 			   *n,
 			   *tmp;
 
-	scan->currentItemData = scan->currentMarkData;
 	so = (GISTScanOpaque) scan->opaque;
+	so->curpos = so->markpos;
 	if (so->flags & GS_MRKBEFORE)
 		so->flags |= GS_CURBEFORE;
 	else
-- 
cgit v1.2.3