From df90401556ce77f861d9a2205c90256968939152 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 22 Mar 2018 13:13:58 -0400 Subject: [PATCH] Fix errors in contrib/bloom index build. Count the number of tuples in the index honestly, instead of assuming that it's the same as the number of tuples in the heap. (It might be different if the index is partial.) Fix counting of tuples in current index page, too. This error would have led to failing to write out the final page of the index if it contained exactly one tuple, so that the last tuple of the relation would not get indexed. Back-patch to 9.6 where contrib/bloom was added. Tomas Vondra and Tom Lane Discussion: https://postgr.es/m/3b3d8eac-c709-0d25-088e-b98339a1b28a@2ndquadrant.com --- contrib/bloom/blinsert.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/contrib/bloom/blinsert.c b/contrib/bloom/blinsert.c index a31149f044..946902a61d 100644 --- a/contrib/bloom/blinsert.c +++ b/contrib/bloom/blinsert.c @@ -33,10 +33,11 @@ PG_MODULE_MAGIC; typedef struct { BloomState blstate; /* bloom index state */ + int64 indtuples; /* total number of tuples indexed */ MemoryContext tmpCtx; /* temporary memory context reset after each * tuple */ char data[BLCKSZ]; /* cached page */ - int64 count; /* number of tuples in cached page */ + int count; /* number of tuples in cached page */ } BloomBuildState; /* @@ -102,8 +103,14 @@ bloomBuildCallback(Relation index, HeapTuple htup, Datum *values, /* We shouldn't be here since we're inserting to the empty page */ elog(ERROR, "could not add new bloom tuple to empty page"); } + + /* Next item was added successfully */ + buildstate->count++; } + /* Update total tuple count */ + buildstate->indtuples += 1; + MemoryContextSwitchTo(oldCtx); MemoryContextReset(buildstate->tmpCtx); } @@ -137,17 +144,15 @@ blbuild(Relation heap, Relation index, IndexInfo *indexInfo) reltuples = IndexBuildHeapScan(heap, index, indexInfo, true, bloomBuildCallback, (void *) &buildstate); - /* - * There are could be some items in cached page. Flush this page if - * needed. - */ + /* Flush last page if needed (it will be, unless heap was empty) */ if (buildstate.count > 0) flushCachedPage(index, &buildstate); MemoryContextDelete(buildstate.tmpCtx); result = (IndexBuildResult *) palloc(sizeof(IndexBuildResult)); - result->heap_tuples = result->index_tuples = reltuples; + result->heap_tuples = reltuples; + result->index_tuples = buildstate.indtuples; return result; }