Keep rs_startblock the same during heap_rescan, so that a rescan of a SeqScan

tglsfdc · tglsfdc · commit 61dd4185ffb0 · 2009-06-10T18:54:16.000Z
node starts from the same place as the first scan did.  This avoids surprising
behavior of scrollable and WITH HOLD cursors, as seen in Mark Kirkwood's bug
report of yesterday.

It's not entirely clear whether a rescan should be forced to drop out of the
syncscan mode, but for the moment I left the code behaving the same on that
point.  Any change there would only be a performance and not a correctness
issue, anyway.

Back-patch to 8.3, since the unstable behavior was created by the syncscan
patch.
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.275 2009/05/12 16:43:32 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.276 2009/06/10 18:54:16 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -93,7 +93,7 @@ static bool HeapSatisfiesHOTUpdate(Relation relation, Bitmapset *hot_attrs,
  * ----------------
  */
 static void
-initscan(HeapScanDesc scan, ScanKey key)
+initscan(HeapScanDesc scan, ScanKey key, bool is_rescan)
 {
 	bool		allow_strat;
 	bool		allow_sync;
@@ -143,7 +143,16 @@ initscan(HeapScanDesc scan, ScanKey key)
 		scan->rs_strategy = NULL;
 	}
 
-	if (allow_sync && synchronize_seqscans)
+	if (is_rescan)
+	{
+		/*
+		 * If rescan, keep the previous startblock setting so that rewinding
+		 * a cursor doesn't generate surprising results.  Reset the syncscan
+		 * setting, though.
+		 */
+		scan->rs_syncscan = (allow_sync && synchronize_seqscans);
+	}
+	else if (allow_sync && synchronize_seqscans)
 	{
 		scan->rs_syncscan = true;
 		scan->rs_startblock = ss_get_location(scan->rs_rd, scan->rs_nblocks);
@@ -1218,7 +1227,7 @@ heap_beginscan_internal(Relation relation, Snapshot snapshot,
 	else
 		scan->rs_key = NULL;
 
-	initscan(scan, key);
+	initscan(scan, key, false);
 
 	return scan;
 }
@@ -1240,7 +1249,7 @@ heap_rescan(HeapScanDesc scan,
 	/*
 	 * reinitialize scan descriptor
 	 */
-	initscan(scan, key);
+	initscan(scan, key, true);
 }
 
 /* ----------------

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.275 2009/05/12 16:43:32 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.276 2009/06/10 18:54:16 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* INTERFACE ROUTINES`
`@@ -93,7 +93,7 @@ static bool HeapSatisfiesHOTUpdate(Relation relation, Bitmapset *hot_attrs,`
`93`	`93`	`* ----------------`
`94`	`94`	`*/`
`95`	`95`	`static void`
`96`		`-initscan(HeapScanDesc scan, ScanKey key)`
	`96`	`+initscan(HeapScanDesc scan, ScanKey key, bool is_rescan)`
`97`	`97`	`{`
`98`	`98`	`bool allow_strat;`
`99`	`99`	`bool allow_sync;`
`@@ -143,7 +143,16 @@ initscan(HeapScanDesc scan, ScanKey key)`
`143`	`143`	`scan->rs_strategy = NULL;`
`144`	`144`	`}`
`145`	`145`
`146`		`- if (allow_sync && synchronize_seqscans)`
	`146`	`+ if (is_rescan)`
	`147`	`+ {`
	`148`	`+ /*`
	`149`	`+ * If rescan, keep the previous startblock setting so that rewinding`
	`150`	`+ * a cursor doesn't generate surprising results. Reset the syncscan`
	`151`	`+ * setting, though.`
	`152`	`+ */`
	`153`	`+ scan->rs_syncscan = (allow_sync && synchronize_seqscans);`
	`154`	`+ }`
	`155`	`+ else if (allow_sync && synchronize_seqscans)`
`147`	`156`	`{`
`148`	`157`	`scan->rs_syncscan = true;`
`149`	`158`	`scan->rs_startblock = ss_get_location(scan->rs_rd, scan->rs_nblocks);`
`@@ -1218,7 +1227,7 @@ heap_beginscan_internal(Relation relation, Snapshot snapshot,`
`1218`	`1227`	`else`
`1219`	`1228`	`scan->rs_key = NULL;`
`1220`	`1229`
`1221`		`- initscan(scan, key);`
	`1230`	`+ initscan(scan, key, false);`
`1222`	`1231`
`1223`	`1232`	`return scan;`
`1224`	`1233`	`}`
`@@ -1240,7 +1249,7 @@ heap_rescan(HeapScanDesc scan,`
`1240`	`1249`	`/*`
`1241`	`1250`	`* reinitialize scan descriptor`
`1242`	`1251`	`*/`
`1243`		`- initscan(scan, key);`
	`1252`	`+ initscan(scan, key, true);`
`1244`	`1253`	`}`
`1245`	`1254`
`1246`	`1255`	`/* ----------------`