mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove no-longer-needed compatibility code for hash indexes.

Browse Source 
Because commit ea69a0dead5128c421140dc53fac165ba4af8520 bumped the
HASH_VERSION, we don't need to worry about PostgreSQL 10 seeing
bucket pages from earlier versions.

Amit Kapila

Discussion: http://postgr.es/m/CAA4eK1LAo4DGwh+mi-G3U8Pj1WkBBeFL38xdCnUHJv1z4bZFkQ@mail.gmail.com
This commit is contained in:
Robert Haas 2017-05-09 23:44:21 -04:00
parent df1a4eba94
commit a5775991bb
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/access/hash/hash.c
View File

@ -624,13 +624,9 @@ loop_top:
* now that the primary page of the target bucket has been locked
* (and thus can't be further split), check whether we need to
* update our cached metapage data.
*
* NB: The check for InvalidBlockNumber is only needed for
* on-disk compatibility with indexes created before we started
* storing hashm_maxbucket in the primary page's hasho_prevblkno.
*/
if (bucket_opaque->hasho_prevblkno != InvalidBlockNumber &&
bucket_opaque->hasho_prevblkno > cachedmetap->hashm_maxbucket)
Assert(bucket_opaque->hasho_prevblkno != InvalidBlockNumber);
if (bucket_opaque->hasho_prevblkno > cachedmetap->hashm_maxbucket)
{
cachedmetap = _hash_getcachedmetap(rel, &metabuf, true);
Assert(cachedmetap != NULL);

8
src/backend/access/hash/hashpage.c
View File

@ -1564,16 +1564,12 @@ _hash_getbucketbuf_from_hashkey(Relation rel, uint32 hashkey, int access,
page = BufferGetPage(buf);
opaque = (HashPageOpaque) PageGetSpecialPointer(page);
Assert(opaque->hasho_bucket == bucket);
Assert(opaque->hasho_prevblkno != InvalidBlockNumber);
/*
* If this bucket hasn't been split, we're done.
*
* NB: The check for InvalidBlockNumber is only needed for on-disk
* compatibility with indexes created before we started storing
* hashm_maxbucket in the primary page's hasho_prevblkno.
*/
if (opaque->hasho_prevblkno == InvalidBlockNumber ||
opaque->hasho_prevblkno <= metap->hashm_maxbucket)
if (opaque->hasho_prevblkno <= metap->hashm_maxbucket)
break;
/* Drop lock on this buffer, update cached metapage, and retry. */