Change a couple of "can't happen" error messages to be a shade more

tglsfdc · tglsfdc · commit 6ea05c16a407 · 2005-08-12T14:34:14.000Z
verbose when they do happen.  The "left link changed unexpectedly"
one in particular has been seen more than once in the field.
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtpage.c,v 1.86 2005/06/06 20:22:57 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/nbtree/nbtpage.c,v 1.87 2005/08/12 14:34:14 tgl Exp $
  *
  *	NOTES
  *	   Postgres btree pages look like ordinary relation pages.	The opaque
@@ -826,7 +826,8 @@ _bt_pagedel(Relation rel, Buffer buf, bool vacuum_full)
 			_bt_relbuf(rel, lbuf);
 			if (leftsib == P_NONE)
 			{
-				elog(LOG, "no left sibling (concurrent deletion?)");
+				elog(LOG, "no left sibling (concurrent deletion?) in \"%s\"",
+					 RelationGetRelationName(rel));
 				return 0;
 			}
 			lbuf = _bt_getbuf(rel, leftsib, BT_WRITE);
@@ -861,7 +862,8 @@ _bt_pagedel(Relation rel, Buffer buf, bool vacuum_full)
 		return 0;
 	}
 	if (opaque->btpo_prev != leftsib)
-		elog(ERROR, "left link changed unexpectedly");
+		elog(ERROR, "left link changed unexpectedly in block %u of \"%s\"",
+			 target, RelationGetRelationName(rel));
 
 	/*
 	 * And next write-lock the (current) right sibling.
@@ -984,8 +986,8 @@ _bt_pagedel(Relation rel, Buffer buf, bool vacuum_full)
 		itemid = PageGetItemId(page, nextoffset);
 		btitem = (BTItem) PageGetItem(page, itemid);
 		if (ItemPointerGetBlockNumber(&(btitem->bti_itup.t_tid)) != rightsib)
-			elog(PANIC, "right sibling is not next child");
-
+			elog(PANIC, "right sibling is not next child in \"%s\"",
+				 RelationGetRelationName(rel));
 		PageIndexTupleDelete(page, nextoffset);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtpage.c,v 1.86 2005/06/06 20:22:57 tgl Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtpage.c,v 1.87 2005/08/12 14:34:14 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`* NOTES`
`15`	`15`	`* Postgres btree pages look like ordinary relation pages. The opaque`
`@@ -826,7 +826,8 @@ _bt_pagedel(Relation rel, Buffer buf, bool vacuum_full)`
`826`	`826`	`_bt_relbuf(rel, lbuf);`
`827`	`827`	`if (leftsib == P_NONE)`
`828`	`828`	`{`
`829`		`- elog(LOG, "no left sibling (concurrent deletion?)");`
	`829`	`+ elog(LOG, "no left sibling (concurrent deletion?) in \"%s\"",`
	`830`	`+ RelationGetRelationName(rel));`
`830`	`831`	`return 0;`
`831`	`832`	`}`
`832`	`833`	`lbuf = _bt_getbuf(rel, leftsib, BT_WRITE);`
`@@ -861,7 +862,8 @@ _bt_pagedel(Relation rel, Buffer buf, bool vacuum_full)`
`861`	`862`	`return 0;`
`862`	`863`	`}`
`863`	`864`	`if (opaque->btpo_prev != leftsib)`
`864`		`- elog(ERROR, "left link changed unexpectedly");`
	`865`	`+ elog(ERROR, "left link changed unexpectedly in block %u of \"%s\"",`
	`866`	`+ target, RelationGetRelationName(rel));`
`865`	`867`
`866`	`868`	`/*`
`867`	`869`	`* And next write-lock the (current) right sibling.`
`@@ -984,8 +986,8 @@ _bt_pagedel(Relation rel, Buffer buf, bool vacuum_full)`
`984`	`986`	`itemid = PageGetItemId(page, nextoffset);`
`985`	`987`	`btitem = (BTItem) PageGetItem(page, itemid);`
`986`	`988`	`if (ItemPointerGetBlockNumber(&(btitem->bti_itup.t_tid)) != rightsib)`
`987`		`- elog(PANIC, "right sibling is not next child");`
`988`		`-`
	`989`	`+ elog(PANIC, "right sibling is not next child in \"%s\"",`
	`990`	`+ RelationGetRelationName(rel));`
`989`	`991`	`PageIndexTupleDelete(page, nextoffset);`
`990`	`992`	`}`
`991`	`993`