From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Tue, 9 Nov 2010 15:40:09 +0000 (+0200)
Subject: In rewriteheap.c (used by VACUUM FULL and CLUSTER), calculate the tuple
X-Git-Tag: REL9_0_2~32
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=39a67533975c8cbadf3d755216cea3ec2c3ce64c;p=pg-rex%2Fsyncrep.git

In rewriteheap.c (used by VACUUM FULL and CLUSTER), calculate the tuple
length stored in the line pointer the same way it's calculated in the normal
heap_insert() codepath. As noted by Jeff Davis, the length stored by
raw_heap_insert() included padding but the one stored by the normal codepath
did not. While the mismatch seems to be harmless, inconsistency isn't good,
and the normal codepath has received a lot more testing over the years.

Backpatch to 8.3 where the heap rewrite code was introduced.
---

diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c
index e35fbeb9b1..378b0ad620 100644
--- a/src/backend/access/heap/rewriteheap.c
+++ b/src/backend/access/heap/rewriteheap.c
@@ -636,7 +636,7 @@ raw_heap_insert(RewriteState state, HeapTuple tup)
 	}
 
 	/* And now we can insert the tuple into the page */
-	newoff = PageAddItem(page, (Item) heaptup->t_data, len,
+	newoff = PageAddItem(page, (Item) heaptup->t_data, heaptup->t_len,
 						 InvalidOffsetNumber, false, true);
 	if (newoff == InvalidOffsetNumber)
 		elog(ERROR, "failed to add tuple");