diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/bloom/blinsert.c | 10 | ||||
| -rw-r--r-- | contrib/bloom/blutils.c | 9 | ||||
| -rw-r--r-- | contrib/bloom/blvacuum.c | 4 |
3 files changed, 12 insertions, 11 deletions
diff --git a/contrib/bloom/blinsert.c b/contrib/bloom/blinsert.c index 330d7fd7692..4e3fe2feb2e 100644 --- a/contrib/bloom/blinsert.c +++ b/contrib/bloom/blinsert.c @@ -49,7 +49,7 @@ flushCachedPage(Relation index, BloomBuildState *buildstate) GenericXLogState *state; state = GenericXLogStart(index); - page = GenericXLogRegister(state, buffer, true); + page = GenericXLogRegisterBuffer(state, buffer, GENERIC_XLOG_FULL_IMAGE); memcpy(page, buildstate->data, BLCKSZ); GenericXLogFinish(state); UnlockReleaseBuffer(buffer); @@ -221,7 +221,7 @@ blinsert(Relation index, Datum *values, bool *isnull, LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE); state = GenericXLogStart(index); - page = GenericXLogRegister(state, buffer, false); + page = GenericXLogRegisterBuffer(state, buffer, 0); if (BloomPageAddItem(&blstate, page, itup)) { @@ -268,7 +268,7 @@ blinsert(Relation index, Datum *values, bool *isnull, state = GenericXLogStart(index); /* get modifiable copy of metapage */ - metaPage = GenericXLogRegister(state, metaBuffer, false); + metaPage = GenericXLogRegisterBuffer(state, metaBuffer, 0); metaData = BloomPageGetMeta(metaPage); if (nStart >= metaData->nEnd) @@ -279,7 +279,7 @@ blinsert(Relation index, Datum *values, bool *isnull, buffer = ReadBuffer(index, blkno); LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE); - page = GenericXLogRegister(state, buffer, false); + page = GenericXLogRegisterBuffer(state, buffer, 0); if (BloomPageAddItem(&blstate, page, itup)) { @@ -305,7 +305,7 @@ blinsert(Relation index, Datum *values, bool *isnull, */ buffer = BloomNewBuffer(index); - page = GenericXLogRegister(state, buffer, true); + page = GenericXLogRegisterBuffer(state, buffer, GENERIC_XLOG_FULL_IMAGE); BloomInitPage(page, 0); if (!BloomPageAddItem(&blstate, page, itup)) diff --git a/contrib/bloom/blutils.c b/contrib/bloom/blutils.c index edfdfb934f6..5e506eaee40 100644 --- a/contrib/bloom/blutils.c +++ b/contrib/bloom/blutils.c @@ -39,7 +39,7 @@ PG_FUNCTION_INFO_V1(blhandler); /* Kind of relation optioms for bloom index */ static relopt_kind bl_relopt_kind; -static int32 myRand(); +static int32 myRand(void); static void mySrand(uint32 seed); /* @@ -173,15 +173,16 @@ initBloomState(BloomState *state, Relation index) static int32 next; static int32 -myRand() +myRand(void) { - /* + /*---------- * Compute x = (7^5 * x) mod (2^31 - 1) * without overflowing 31 bits: * (2^31 - 1) = 127773 * (7^5) + 2836 * From "Random number generators: good ones are hard to find", * Park and Miller, Communications of the ACM, vol. 31, no. 10, * October 1988, p. 1195. + *---------- */ int32 hi, lo, x; @@ -418,7 +419,7 @@ BloomInitMetapage(Relation index) /* Initialize contents of meta page */ state = GenericXLogStart(index); - metaPage = GenericXLogRegister(state, metaBuffer, true); + metaPage = GenericXLogRegisterBuffer(state, metaBuffer, GENERIC_XLOG_FULL_IMAGE); BloomInitPage(metaPage, BLOOM_META); metadata = BloomPageGetMeta(metaPage); diff --git a/contrib/bloom/blvacuum.c b/contrib/bloom/blvacuum.c index ee40ebbd973..7467afb7b92 100644 --- a/contrib/bloom/blvacuum.c +++ b/contrib/bloom/blvacuum.c @@ -65,7 +65,7 @@ blbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats, LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE); gxlogState = GenericXLogStart(index); - page = GenericXLogRegister(gxlogState, buffer, false); + page = GenericXLogRegisterBuffer(gxlogState, buffer, 0); if (BloomPageIsDeleted(page)) { @@ -145,7 +145,7 @@ blbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats, LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE); gxlogState = GenericXLogStart(index); - page = GenericXLogRegister(gxlogState, buffer, false); + page = GenericXLogRegisterBuffer(gxlogState, buffer, 0); metaData = BloomPageGetMeta(page); memcpy(metaData->notFullPage, notFullPage, sizeof(BlockNumber) * countPage); |