Widen tuple counter variables from long to int64

alvherre · alvherre · commit 9a83afecb7ec · 2019-04-30T10:27:38.000-04:00
Mistake in ab0dfc9; progress reporting would have wrapped around for indexes created with more than 2^31 tuples. Reported-by: Peter Geoghegan Discussion: https://postgr.es/m/CAH2-Wz=WbNxc5ob5NJ9yqo2RMJ0q4HXDS30GVCobeCvC9A1L9A@mail.gmail.com
diff --git a/src/backend/access/hash/hashsort.c b/src/backend/access/hash/hashsort.c
@@ -118,7 +118,7 @@ void
 _h_indexbuild(HSpool *hspool, Relation heapRel)
 {
 	IndexTuple	itup;
-	long		tups_done = 0;
+	int64		tups_done = 0;
 #ifdef USE_ASSERT_CHECKING
 	uint32		hashkey = 0;
 #endif
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
@@ -1130,7 +1130,7 @@ _bt_load(BTWriteState *wstate, BTSpool *btspool, BTSpool *btspool2)
 	int			i,
 				keysz = IndexRelationGetNumberOfKeyAttributes(wstate->index);
 	SortSupport sortKeys;
-	long		tuples_done = 0;
+	int64		tuples_done = 0;
 
 	if (merge)
 	{

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ void`
`118`	`118`	`_h_indexbuild(HSpool *hspool, Relation heapRel)`
`119`	`119`	`{`
`120`	`120`	`IndexTuple itup;`
`121`		`- long tups_done = 0;`
	`121`	`+ int64 tups_done = 0;`
`122`	`122`	`#ifdef USE_ASSERT_CHECKING`
`123`	`123`	`uint32 hashkey = 0;`
`124`	`124`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -1130,7 +1130,7 @@ _bt_load(BTWriteState wstate, BTSpool btspool, BTSpool *btspool2)`
`1130`	`1130`	`int i,`
`1131`	`1131`	`keysz = IndexRelationGetNumberOfKeyAttributes(wstate->index);`
`1132`	`1132`	`SortSupport sortKeys;`
`1133`		`- long tuples_done = 0;`
	`1133`	`+ int64 tuples_done = 0;`
`1134`	`1134`
`1135`	`1135`	`if (merge)`
`1136`	`1136`	`{`