Commita577599

committed

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

Because commitea69a0d bumped theHASH_VERSION, we don't need to worry about PostgreSQL 10 seeingbucket pages from earlier versions.Amit KapilaDiscussion:http://postgr.es/m/CAA4eK1LAo4DGwh+mi-G3U8Pj1WkBBeFL38xdCnUHJv1z4bZFkQ@mail.gmail.com

1 parentdf1a4eb commita577599Copy full SHA for a577599

File tree

-12

lines changed

-12

lines changed

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -624,13 +624,9 @@ hashbulkdelete(IndexVacuumInfo info, IndexBulkDeleteResult stats,`
`624`	`624`	`* now that the primary page of the target bucket has been locked`
`625`	`625`	`* (and thus can't be further split), check whether we need to`
`626`	`626`	`* update our cached metapage data.`
`627`		`- *`
`628`		`- * NB: The check for InvalidBlockNumber is only needed for`
`629`		`- * on-disk compatibility with indexes created before we started`
`630`		`- * storing hashm_maxbucket in the primary page's hasho_prevblkno.`
`631`	`627`	`*/`
`632`		`-if(bucket_opaque->hasho_prevblkno!=InvalidBlockNumber&&`
`633`		`-bucket_opaque->hasho_prevblkno>cachedmetap->hashm_maxbucket)`
	`628`	`+Assert(bucket_opaque->hasho_prevblkno!=InvalidBlockNumber);`
	`629`	`+if (bucket_opaque->hasho_prevblkno>cachedmetap->hashm_maxbucket)`
`634`	`630`	`{`
`635`	`631`	`cachedmetap=_hash_getcachedmetap(rel,&metabuf, true);`
`636`	`632`	`Assert(cachedmetap!=NULL);`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1564,16 +1564,12 @@ _hash_getbucketbuf_from_hashkey(Relation rel, uint32 hashkey, int access,`
`1564`	`1564`	`page=BufferGetPage(buf);`
`1565`	`1565`	`opaque= (HashPageOpaque)PageGetSpecialPointer(page);`
`1566`	`1566`	`Assert(opaque->hasho_bucket==bucket);`
	`1567`	`+Assert(opaque->hasho_prevblkno!=InvalidBlockNumber);`
`1567`	`1568`
`1568`	`1569`	`/*`
`1569`	`1570`	`* If this bucket hasn't been split, we're done.`
`1570`		`- *`
`1571`		`- * NB: The check for InvalidBlockNumber is only needed for on-disk`
`1572`		`- * compatibility with indexes created before we started storing`
`1573`		`- * hashm_maxbucket in the primary page's hasho_prevblkno.`
`1574`	`1571`	`*/`
`1575`		`-if (opaque->hasho_prevblkno==InvalidBlockNumber\|\|`
`1576`		`-opaque->hasho_prevblkno <=metap->hashm_maxbucket)`
	`1572`	`+if (opaque->hasho_prevblkno <=metap->hashm_maxbucket)`
`1577`	`1573`	`break;`
`1578`	`1574`
`1579`	`1575`	`/* Drop lock on this buffer, update cached metapage, and retry. */`

Comments

(0)