Fix longstanding bug found by Atsushi Ogawa: _bt_check_unique would mark

tglsfdc · tglsfdc · commit e952ae1268c2 · 2005-10-12T17:18:03.000Z
the wrong buffer dirty when trying to kill a dead index entry that's on
a page after the one it started on.  No risk of data corruption, just
inefficiency, but still a bug.
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.125 2005/09/24 22:54:35 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.126 2005/10/12 17:18:03 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -261,7 +261,10 @@ _bt_check_unique(Relation rel, BTItem btitem, Relation heapRel,
 												 hbuffer) == HEAPTUPLE_DEAD)
 					{
 						curitemid->lp_flags |= LP_DELETE;
-						SetBufferCommitInfoNeedsSave(buf);
+						if (nbuf != InvalidBuffer)
+							SetBufferCommitInfoNeedsSave(nbuf);
+						else
+							SetBufferCommitInfoNeedsSave(buf);
 					}
 					LockBuffer(hbuffer, BUFFER_LOCK_UNLOCK);
 				}

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/nbtree/nbtinsert.c,v 1.125 2005/09/24 22:54:35 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.126 2005/10/12 17:18:03 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -261,7 +261,10 @@ _bt_check_unique(Relation rel, BTItem btitem, Relation heapRel,`
`261`	`261`	`hbuffer) == HEAPTUPLE_DEAD)`
`262`	`262`	`{`
`263`	`263`	`curitemid->lp_flags \|= LP_DELETE;`
`264`		`- SetBufferCommitInfoNeedsSave(buf);`
	`264`	`+ if (nbuf != InvalidBuffer)`
	`265`	`+ SetBufferCommitInfoNeedsSave(nbuf);`
	`266`	`+ else`
	`267`	`+ SetBufferCommitInfoNeedsSave(buf);`
`265`	`268`	`}`
`266`	`269`	`LockBuffer(hbuffer, BUFFER_LOCK_UNLOCK);`
`267`	`270`	`}`