diff options
Diffstat (limited to 'src/backend/storage/buffer')
| -rw-r--r-- | src/backend/storage/buffer/buf_table.c | 6 | ||||
| -rw-r--r-- | src/backend/storage/buffer/bufmgr.c | 17 | ||||
| -rw-r--r-- | src/backend/storage/buffer/localbuf.c | 15 |
3 files changed, 13 insertions, 25 deletions
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c index e61546a5ff6..2b96639a5a5 100644 --- a/src/backend/storage/buffer/buf_table.c +++ b/src/backend/storage/buffer/buf_table.c @@ -94,7 +94,7 @@ BufTableLookup(BufferTag *tagPtr, uint32 hashcode) result = (BufferLookupEnt *) hash_search_with_hash_value(SharedBufHash, - (void *) tagPtr, + tagPtr, hashcode, HASH_FIND, NULL); @@ -126,7 +126,7 @@ BufTableInsert(BufferTag *tagPtr, uint32 hashcode, int buf_id) result = (BufferLookupEnt *) hash_search_with_hash_value(SharedBufHash, - (void *) tagPtr, + tagPtr, hashcode, HASH_ENTER, &found); @@ -152,7 +152,7 @@ BufTableDelete(BufferTag *tagPtr, uint32 hashcode) result = (BufferLookupEnt *) hash_search_with_hash_value(SharedBufHash, - (void *) tagPtr, + tagPtr, hashcode, HASH_REMOVE, NULL); diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 800a4248c95..1bc8d6555b9 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -262,7 +262,7 @@ ReservePrivateRefCountEntry(void) /* enter victim array entry into hashtable */ hashent = hash_search(PrivateRefCountHash, - (void *) &(ReservedRefCountEntry->buffer), + &(ReservedRefCountEntry->buffer), HASH_ENTER, &found); Assert(!found); @@ -336,10 +336,7 @@ GetPrivateRefCountEntry(Buffer buffer, bool do_move) if (PrivateRefCountOverflowed == 0) return NULL; - res = hash_search(PrivateRefCountHash, - (void *) &buffer, - HASH_FIND, - NULL); + res = hash_search(PrivateRefCountHash, &buffer, HASH_FIND, NULL); if (res == NULL) return NULL; @@ -368,10 +365,7 @@ GetPrivateRefCountEntry(Buffer buffer, bool do_move) free->refcount = res->refcount; /* delete from hashtable */ - hash_search(PrivateRefCountHash, - (void *) &buffer, - HASH_REMOVE, - &found); + hash_search(PrivateRefCountHash, &buffer, HASH_REMOVE, &found); Assert(found); Assert(PrivateRefCountOverflowed > 0); PrivateRefCountOverflowed--; @@ -430,10 +424,7 @@ ForgetPrivateRefCountEntry(PrivateRefCountEntry *ref) bool found; Buffer buffer = ref->buffer; - hash_search(PrivateRefCountHash, - (void *) &buffer, - HASH_REMOVE, - &found); + hash_search(PrivateRefCountHash, &buffer, HASH_REMOVE, &found); Assert(found); Assert(PrivateRefCountOverflowed > 0); PrivateRefCountOverflowed--; diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c index 8372acc383d..71e2a5fecd5 100644 --- a/src/backend/storage/buffer/localbuf.c +++ b/src/backend/storage/buffer/localbuf.c @@ -76,7 +76,7 @@ PrefetchLocalBuffer(SMgrRelation smgr, ForkNumber forkNum, /* See if the desired buffer already exists */ hresult = (LocalBufferLookupEnt *) - hash_search(LocalBufHash, (void *) &newTag, HASH_FIND, NULL); + hash_search(LocalBufHash, &newTag, HASH_FIND, NULL); if (hresult) { @@ -125,7 +125,7 @@ LocalBufferAlloc(SMgrRelation smgr, ForkNumber forkNum, BlockNumber blockNum, /* See if the desired buffer already exists */ hresult = (LocalBufferLookupEnt *) - hash_search(LocalBufHash, (void *) &newTag, HASH_FIND, NULL); + hash_search(LocalBufHash, &newTag, HASH_FIND, NULL); if (hresult) { @@ -248,8 +248,7 @@ LocalBufferAlloc(SMgrRelation smgr, ForkNumber forkNum, BlockNumber blockNum, if (buf_state & BM_TAG_VALID) { hresult = (LocalBufferLookupEnt *) - hash_search(LocalBufHash, (void *) &bufHdr->tag, - HASH_REMOVE, NULL); + hash_search(LocalBufHash, &bufHdr->tag, HASH_REMOVE, NULL); if (!hresult) /* shouldn't happen */ elog(ERROR, "local buffer hash table corrupted"); /* mark buffer invalid just in case hash insert fails */ @@ -259,7 +258,7 @@ LocalBufferAlloc(SMgrRelation smgr, ForkNumber forkNum, BlockNumber blockNum, } hresult = (LocalBufferLookupEnt *) - hash_search(LocalBufHash, (void *) &newTag, HASH_ENTER, &found); + hash_search(LocalBufHash, &newTag, HASH_ENTER, &found); if (found) /* shouldn't happen */ elog(ERROR, "local buffer hash table corrupted"); hresult->id = b; @@ -351,8 +350,7 @@ DropRelationLocalBuffers(RelFileLocator rlocator, ForkNumber forkNum, /* Remove entry from hashtable */ hresult = (LocalBufferLookupEnt *) - hash_search(LocalBufHash, (void *) &bufHdr->tag, - HASH_REMOVE, NULL); + hash_search(LocalBufHash, &bufHdr->tag, HASH_REMOVE, NULL); if (!hresult) /* shouldn't happen */ elog(ERROR, "local buffer hash table corrupted"); /* Mark buffer invalid */ @@ -396,8 +394,7 @@ DropRelationAllLocalBuffers(RelFileLocator rlocator) LocalRefCount[i]); /* Remove entry from hashtable */ hresult = (LocalBufferLookupEnt *) - hash_search(LocalBufHash, (void *) &bufHdr->tag, - HASH_REMOVE, NULL); + hash_search(LocalBufHash, &bufHdr->tag, HASH_REMOVE, NULL); if (!hresult) /* shouldn't happen */ elog(ERROR, "local buffer hash table corrupted"); /* Mark buffer invalid */ |