Fixed misprint in heap update WALoging.

vadim4o · vadim4o · commit c193f19a3938 · 2000-12-30T06:52:34.000Z
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.103 2000/12/28 13:00:06 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.104 2000/12/30 06:52:33 vadim Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -1665,6 +1665,10 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
 		 * without reading log if xact will abort before update is logged.
 		 * In the event of crash prio logging, TQUAL routines will see
 		 * HEAP_XMAX_UNLOGGED flag...
+		 *
+		 * NOTE: this trick is useless currently but saved for future
+		 * when we'll implement UNDO and will re-use transaction IDs
+		 * after postmaster startup.
 		 */
 		_locked_tuple_.node = relation->rd_node;
 		_locked_tuple_.tid = *otid;
@@ -2066,7 +2070,7 @@ log_heap_update(Relation reln, Buffer oldbuf, ItemPointerData from,
 		hsize += (2 * sizeof(TransactionId));
 	}
 	rdata[2].buffer = newbuf;
-	rdata[2].data = (char*)&xlhdr;
+	rdata[2].data = (char*)xlhdr;
 	rdata[2].len = hsize;
 	rdata[2].next = &(rdata[3]);
 
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.46 2000/12/29 21:31:21 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.47 2000/12/30 06:52:34 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2243,9 +2243,24 @@ xlog_desc(char *buf, uint8 xl_info, char* rec)
 static void
 xlog_outrec(char *buf, XLogRecord *record)
 {
-	sprintf(buf + strlen(buf), "prev %u/%u; xprev %u/%u; xid %u: %s",
+	int		bkpb;
+	int		i;
+
+	sprintf(buf + strlen(buf), "prev %u/%u; xprev %u/%u; xid %u",
 		record->xl_prev.xlogid, record->xl_prev.xrecoff,
 		record->xl_xact_prev.xlogid, record->xl_xact_prev.xrecoff,
-		record->xl_xid, 
+		record->xl_xid);
+
+	for (i = 0, bkpb = 0; i < 2; i++)
+	{
+		if (!(record->xl_info & (XLR_SET_BKP_BLOCK(i))))
+			continue;
+		bkpb++;
+	}
+
+	if (bkpb)
+		sprintf(buf + strlen(buf), "; bkpb %d", bkpb);
+
+	sprintf(buf + strlen(buf), ": %s",
 		RmgrTable[record->xl_rmid].rm_name);
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.103 2000/12/28 13:00:06 vadim Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.104 2000/12/30 06:52:33 vadim Exp $`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* INTERFACE ROUTINES`
`@@ -1665,6 +1665,10 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,`
`1665`	`1665`	`* without reading log if xact will abort before update is logged.`
`1666`	`1666`	`* In the event of crash prio logging, TQUAL routines will see`
`1667`	`1667`	`* HEAP_XMAX_UNLOGGED flag...`
	`1668`	`+ *`
	`1669`	`+ * NOTE: this trick is useless currently but saved for future`
	`1670`	`+ * when we'll implement UNDO and will re-use transaction IDs`
	`1671`	`+ * after postmaster startup.`
`1668`	`1672`	`*/`
`1669`	`1673`	`_locked_tuple_.node = relation->rd_node;`
`1670`	`1674`	`_locked_tuple_.tid = *otid;`
`@@ -2066,7 +2070,7 @@ log_heap_update(Relation reln, Buffer oldbuf, ItemPointerData from,`
`2066`	`2070`	`hsize += (2 * sizeof(TransactionId));`
`2067`	`2071`	`}`
`2068`	`2072`	`rdata[2].buffer = newbuf;`
`2069`		`- rdata[2].data = (char*)&xlhdr;`
	`2073`	`+ rdata[2].data = (char*)xlhdr;`
`2070`	`2074`	`rdata[2].len = hsize;`
`2071`	`2075`	`rdata[2].next = &(rdata[3]);`
`2072`	`2076`