Commit280acf0

committed

hash.h's use of BSHIFT conflicts with <sys/param.h> on my

system. Finally got tired of looking at the compiler warning messages.BSHIFT isn't all that useful, so I just took out the macro.

1 parent3512284 commit280acf0Copy full SHA for 280acf0

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.17 1998/09/01 03:20:57 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.18 1998/10/0420:19:08 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* Overflow pages look like ordinary relation pages.`
`@@ -121,11 +121,11 @@ _hash_getovfladdr(Relation rel, Buffer *metabufp)`
`121`	`121`	`splitnum=metap->OVFL_POINT;`
`122`	`122`	`max_free=metap->SPARES[splitnum];`
`123`	`123`
`124`		`-free_page= (max_free-1) >> (metap->BSHIFT+BYTE_TO_BIT);`
	`124`	`+free_page= (max_free-1) >> (metap->hashm_bshift+BYTE_TO_BIT);`
`125`	`125`	`free_bit= (max_free-1)& (BMPGSZ_BIT(metap)-1);`
`126`	`126`
`127`	`127`	`/* Look through all the free maps to find the first free block */`
`128`		`-first_page=metap->LAST_FREED >> (metap->BSHIFT+BYTE_TO_BIT);`
	`128`	`+first_page=metap->LAST_FREED >> (metap->hashm_bshift+BYTE_TO_BIT);`
`129`	`129`	`for (i=first_page;i <=free_page;i++)`
`130`	`130`	`{`
`131`	`131`	`Pagemappage;`
`@@ -369,7 +369,7 @@ _hash_freeovflpage(Relation rel, Buffer ovflbuf)`
`369`	`369`	`if (ovflpgno<metap->LAST_FREED)`
`370`	`370`	`metap->LAST_FREED=ovflpgno;`
`371`	`371`
`372`		`-bitmappage= (ovflpgno >> (metap->BSHIFT+BYTE_TO_BIT));`
	`372`	`+bitmappage= (ovflpgno >> (metap->hashm_bshift+BYTE_TO_BIT));`
`373`	`373`	`bitmapbit=ovflpgno& (BMPGSZ_BIT(metap)-1);`
`374`	`374`
`375`	`375`	`blkno=metap->hashm_mapp[bitmappage];`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: hash.h,v 1.19 1998/09/01 04:34:11 momjian Exp $`
	`9`	`+ * $Id: hash.h,v 1.20 1998/10/04 20:19:06 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`* NOTES`
`12`	`12`	`*modeled after Margo Seltzer's hash implementation for unix.`
`@@ -165,7 +165,6 @@ typedef struct HashMetaPageData`
`165`	`165`	`typedefHashMetaPageData*HashMetaPage;`
`166`	`166`
`167`	`167`	`/* Short hands for accessing structure */`
`168`		`-#defineBSHIFThashm_bshift`
`169`	`168`	`#defineOVFL_POINThashm_ovflpoint`
`170`	`169`	`#defineLAST_FREEDhashm_lastfreed`
`171`	`170`	`#defineMAX_BUCKEThashm_maxbucket`

Comments

(0)