Commitbad1a5c

committed

Use postgres-wide macros BITS_PER_BYTE instead self-definenig macros, also use it for calculating bit length of TPQTGist

1 parent34b934f commitbad1a5cCopy full SHA for bad1a5c

File tree

-8

lines changed

-8

lines changed

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,10 @@`
`9`	`9`	`* signature defines`
`10`	`10`	`*/`
`11`	`11`
`12`		`-#defineBITBYTE 8`
`13`	`12`	`#defineSIGLENINT 63/* >121 => key will toast, so it will not work`
`14`	`13`	`* !!! */`
`15`	`14`	`#defineSIGLEN( sizeof(int4) * SIGLENINT )`
`16`		`-#defineSIGLENBIT (SIGLEN *BITBYTE)`
	`15`	`+#defineSIGLENBIT (SIGLEN *BITS_PER_BYTE)`
`17`	`16`
`18`	`17`	`typedefcharBITVEC[SIGLEN];`
`19`	`18`	`typedefchar*BITVECP;`
`@@ -27,11 +26,11 @@ typedef char *BITVECP;`
`27`	`26`	`a;\`
`28`	`27`	`}`
`29`	`28`
`30`		`-#defineGETBYTE(x,i) ( *( (BITVECP)(x) + (int)( (i) /BITBYTE ) ) )`
	`29`	`+#defineGETBYTE(x,i) ( *( (BITVECP)(x) + (int)( (i) /BITS_PER_BYTE ) ) )`
`31`	`30`	`#defineGETBITBYTE(x,i) ( ((char)(x)) >> (i) & 0x01 )`
`32`		`-#defineCLRBIT(x,i) GETBYTE(x,i) &= ~( 0x01 << ( (i) %BITBYTE ) )`
`33`		`-#defineSETBIT(x,i) GETBYTE(x,i) \|= ( 0x01 << ( (i) %BITBYTE ) )`
`34`		`-#defineGETBIT(x,i) ( (GETBYTE(x,i) >> ( (i) %BITBYTE )) & 0x01 )`
	`31`	`+#defineCLRBIT(x,i) GETBYTE(x,i) &= ~( 0x01 << ( (i) %BITS_PER_BYTE ) )`
	`32`	`+#defineSETBIT(x,i) GETBYTE(x,i) \|= ( 0x01 << ( (i) %BITS_PER_BYTE ) )`
	`33`	`+#defineGETBIT(x,i) ( (GETBYTE(x,i) >> ( (i) %BITS_PER_BYTE )) & 0x01 )`
`35`	`34`
`36`	`35`	`#defineHASHVAL(val) (((unsigned int)(val)) % SIGLENBIT)`
`37`	`36`	`#defineHASH(sign,val) SETBIT((sign), HASHVAL(val))`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`	`#include"query.h"`
`8`	`8`
`9`	`9`	`typedefuint64TPQTGist;`
	`10`	`+#defineSIGLEN(sizeof(TPQTGist)*BITS_PER_BYTE)`
	`11`	`+`
`10`	`12`
`11`	`13`	`#defineGETENTRY(vec,pos) ((TPQTGist *) DatumGetPointer((vec)->vector[(pos)].key))`
`12`	`14`
`@@ -24,7 +26,7 @@ makesign(QUERYTYPE* a) {`
`24`	`26`
`25`	`27`	`for (i=0;i<a->size;i++) {`
`26`	`28`	`if (ptr->type==VAL )`
`27`		`-sign \|=1 << (ptr->val %64);`
	`29`	`+sign \|=1 << (ptr->val %SIGLEN);`
`28`	`30`	`ptr++;`
`29`	`31`	`}`
`30`	`32`
`@@ -198,7 +200,7 @@ static int`
`198`	`200`	`sizebitvec(TPQTGistsign) {`
`199`	`201`	`intsize=0,i;`
`200`	`202`
`201`		`-for(i=0;i<64;i++)`
	`203`	`+for(i=0;i<SIGLEN;i++)`
`202`	`204`	`size+=0x01& (sign>>i);`
`203`	`205`
`204`	`206`	`returnsize;`

Comments

(0)