Widen tuple counter variables from long to int64

Mistake in ab0dfc961b6a; 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
index 00a57470a772700533c0d489229a6a0541db4113..293f80fe24cf27e957c46b46931cb19abb7f2226 100644 (file)
--- 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
index 9ac4c1e1c081479fe4b79d08fe29f196a1ad4e93..e662eee236070009f73e9f4452d3789ba48f35ba 100644 (file)
--- 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)
    {