More informative NOTICEs in tuple checks.

vadim4o · vadim4o · commit 3055eeff9379 · 1997-04-30T03:05:43.000Z
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.30 1997/04/23 06:25:43 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.31 1997/04/30 03:05:43 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -733,8 +733,8 @@ vc_scanheap (VRelStats *vacrelstats, Relation onerel,
 		    tupgone = true;
 		}
 		else {
-		    elog (MESSAGE_LEVEL, "Rel %.*s: InsertTransactionInProgress %u for TID %u/%u",
-			NAMEDATALEN, relname, htup->t_xmin, blkno, offnum);
+		    elog (MESSAGE_LEVEL, "Rel %.*s: TID %u/%u: InsertTransactionInProgress %u",
+			NAMEDATALEN, relname, blkno, offnum, htup->t_xmin);
 		}
 	    }
 
@@ -765,8 +765,9 @@ vc_scanheap (VRelStats *vacrelstats, Relation onerel,
 	     */
 	    if ( !TransactionIdIsValid((TransactionId)htup->t_xmin) )
 	    {
-		elog (NOTICE, "TID %u/%u: INSERT_TRANSACTION_ID IS INVALID. \
+		elog (NOTICE, "Rel %.*s: TID %u/%u: INSERT_TRANSACTION_ID IS INVALID. \
 DELETE_TRANSACTION_ID_VALID %d, TUPGONE %d.", 
+			NAMEDATALEN, relname, blkno, offnum, 
 			TransactionIdIsValid((TransactionId)htup->t_xmax),
 			tupgone);
 	    }
@@ -779,23 +780,25 @@ DELETE_TRANSACTION_ID_VALID %d, TUPGONE %d.",
 	    if ( !ItemPointerIsValid (itemptr) || 
 	    		BlockIdGetBlockNumber(&(itemptr->ip_blkid)) != blkno )
 	    {
-	    	elog (NOTICE, "ITEM POINTER IS INVALID: %u/%u FOR %u/%u. TUPGONE %d.", 
+	    	elog (NOTICE, "Rel %.*s: TID %u/%u: TID IN TUPLEHEADER %u/%u IS NOT THE SAME. TUPGONE %d.", 
+	    		NAMEDATALEN, relname, blkno, offnum,
 	    		BlockIdGetBlockNumber(&(itemptr->ip_blkid)), 
-	    		itemptr->ip_posid, blkno, offnum, tupgone);
+	    		itemptr->ip_posid, tupgone);
 	    }
 
 	    /*
 	     * Other checks...
 	     */
 	    if ( htup->t_len != itemid->lp_len )
 	    {
-	    	elog (NOTICE, "PAGEHEADER' LEN %u IS NOT THE SAME AS HTUP' %u FOR %u/%u.TUPGONE %d.", 
-	    		itemid->lp_len, htup->t_len, blkno, offnum, tupgone);
+	    	elog (NOTICE, "Rel %.*s: TID %u/%u: TUPLE_LEN IN PAGEHEADER %u IS NOT THE SAME AS IN TUPLEHEADER %u. TUPGONE %d.", 
+	    		NAMEDATALEN, relname, blkno, offnum, 
+	    		itemid->lp_len, htup->t_len, tupgone);
 	    }
 	    if ( !OidIsValid(htup->t_oid) )
 	    {
-	    	elog (NOTICE, "OID IS INVALID FOR %u/%u.TUPGONE %d.", 
-	    		blkno, offnum, tupgone);
+	    	elog (NOTICE, "Rel %.*s: TID %u/%u: OID IS INVALID. TUPGONE %d.", 
+	    		NAMEDATALEN, relname, blkno, offnum, tupgone);
 	    }
 	    
 	    if (tupgone) {

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/commands/vacuum.c,v 1.30 1997/04/23 06:25:43 vadim Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.31 1997/04/30 03:05:43 vadim Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -733,8 +733,8 @@ vc_scanheap (VRelStats *vacrelstats, Relation onerel,`
`733`	`733`	`tupgone = true;`
`734`	`734`	`}`
`735`	`735`	`else {`
`736`		`- elog (MESSAGE_LEVEL, "Rel %.*s: InsertTransactionInProgress %u for TID %u/%u",`
`737`		`- NAMEDATALEN, relname, htup->t_xmin, blkno, offnum);`
	`736`	`+ elog (MESSAGE_LEVEL, "Rel %.*s: TID %u/%u: InsertTransactionInProgress %u",`
	`737`	`+ NAMEDATALEN, relname, blkno, offnum, htup->t_xmin);`
`738`	`738`	`}`
`739`	`739`	`}`
`740`	`740`
`@@ -765,8 +765,9 @@ vc_scanheap (VRelStats *vacrelstats, Relation onerel,`
`765`	`765`	`*/`
`766`	`766`	`if ( !TransactionIdIsValid((TransactionId)htup->t_xmin) )`
`767`	`767`	`{`
`768`		`- elog (NOTICE, "TID %u/%u: INSERT_TRANSACTION_ID IS INVALID. \`
	`768`	`+ elog (NOTICE, "Rel %.*s: TID %u/%u: INSERT_TRANSACTION_ID IS INVALID. \`
`769`	`769`	`DELETE_TRANSACTION_ID_VALID %d, TUPGONE %d.",`
	`770`	`+ NAMEDATALEN, relname, blkno, offnum,`
`770`	`771`	`TransactionIdIsValid((TransactionId)htup->t_xmax),`
`771`	`772`	`tupgone);`
`772`	`773`	`}`
`@@ -779,23 +780,25 @@ DELETE_TRANSACTION_ID_VALID %d, TUPGONE %d.",`
`779`	`780`	`if ( !ItemPointerIsValid (itemptr) \|\|`
`780`	`781`	`BlockIdGetBlockNumber(&(itemptr->ip_blkid)) != blkno )`
`781`	`782`	`{`
`782`		`- elog (NOTICE, "ITEM POINTER IS INVALID: %u/%u FOR %u/%u. TUPGONE %d.",`
	`783`	`+ elog (NOTICE, "Rel %.*s: TID %u/%u: TID IN TUPLEHEADER %u/%u IS NOT THE SAME. TUPGONE %d.",`
	`784`	`+ NAMEDATALEN, relname, blkno, offnum,`
`783`	`785`	`BlockIdGetBlockNumber(&(itemptr->ip_blkid)),`
`784`		`- itemptr->ip_posid, blkno, offnum, tupgone);`
	`786`	`+ itemptr->ip_posid, tupgone);`
`785`	`787`	`}`
`786`	`788`
`787`	`789`	`/*`
`788`	`790`	`* Other checks...`
`789`	`791`	`*/`
`790`	`792`	`if ( htup->t_len != itemid->lp_len )`
`791`	`793`	`{`
`792`		`- elog (NOTICE, "PAGEHEADER' LEN %u IS NOT THE SAME AS HTUP' %u FOR %u/%u.TUPGONE %d.",`
`793`		`- itemid->lp_len, htup->t_len, blkno, offnum, tupgone);`
	`794`	`+ elog (NOTICE, "Rel %.*s: TID %u/%u: TUPLE_LEN IN PAGEHEADER %u IS NOT THE SAME AS IN TUPLEHEADER %u. TUPGONE %d.",`
	`795`	`+ NAMEDATALEN, relname, blkno, offnum,`
	`796`	`+ itemid->lp_len, htup->t_len, tupgone);`
`794`	`797`	`}`
`795`	`798`	`if ( !OidIsValid(htup->t_oid) )`
`796`	`799`	`{`
`797`		`- elog (NOTICE, "OID IS INVALID FOR %u/%u.TUPGONE %d.",`
`798`		`- blkno, offnum, tupgone);`
	`800`	`+ elog (NOTICE, "Rel %.*s: TID %u/%u: OID IS INVALID. TUPGONE %d.",`
	`801`	`+ NAMEDATALEN, relname, blkno, offnum, tupgone);`
`799`	`802`	`}`
`800`	`803`
`801`	`804`	`if (tupgone) {`