Skip to content

P
Postgres FD Implementation
Commit 5f0bf6cb authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Run pgindent on remaining files now that LOOPBYTE is a usable macro.

parent 0c2c061e
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 44 deletions
contrib/hstore/hstore_gist.c
View file @ 5f0bf6cb
...@@ -146,8 +146,8 @@ ghstore_compress(PG_FUNCTION_ARGS) ...@@ -146,8 +146,8 @@ ghstore_compress(PG_FUNCTION_ARGS)
LOOPBYTE LOOPBYTE
{ {
if ((sign[i] & 0xff) != 0xff) if ((sign[i] & 0xff) != 0xff)
PG_RETURN_POINTER(retval); PG_RETURN_POINTER(retval);
} }
res = (GISTTYPE *) palloc(CALCGTSIZE(ALLISTRUE)); res = (GISTTYPE *) palloc(CALCGTSIZE(ALLISTRUE));
...@@ -169,7 +169,7 @@ ghstore_decompress(PG_FUNCTION_ARGS) ...@@ -169,7 +169,7 @@ ghstore_decompress(PG_FUNCTION_ARGS)
{ {
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0); GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
GISTENTRY *retval; GISTENTRY *retval;
HStore *key; HStore *key;
key = (HStore *) PG_DETOAST_DATUM(entry->key); key = (HStore *) PG_DETOAST_DATUM(entry->key);
...@@ -273,7 +273,7 @@ unionkey(BITVECP sbase, GISTTYPE * add) ...@@ -273,7 +273,7 @@ unionkey(BITVECP sbase, GISTTYPE * add)
if (ISALLTRUE(add)) if (ISALLTRUE(add))
return 1; return 1;
LOOPBYTE LOOPBYTE
sbase[i] |= sadd[i]; sbase[i] |= sadd[i];
return 0; return 0;
} }
...@@ -328,7 +328,7 @@ typedef struct ...@@ -328,7 +328,7 @@ typedef struct
{ {
OffsetNumber pos; OffsetNumber pos;
int4 cost; int4 cost;
} SPLITCOST; } SPLITCOST;
static int static int
comparecost(const void *a, const void *b) comparecost(const void *a, const void *b)
...@@ -470,7 +470,7 @@ ghstore_picksplit(PG_FUNCTION_ARGS) ...@@ -470,7 +470,7 @@ ghstore_picksplit(PG_FUNCTION_ARGS)
{ {
ptr = GETSIGN(_j); ptr = GETSIGN(_j);
LOOPBYTE LOOPBYTE
union_l[i] |= ptr[i]; union_l[i] |= ptr[i];
} }
*left++ = j; *left++ = j;
v->spl_nleft++; v->spl_nleft++;
...@@ -486,7 +486,7 @@ ghstore_picksplit(PG_FUNCTION_ARGS) ...@@ -486,7 +486,7 @@ ghstore_picksplit(PG_FUNCTION_ARGS)
{ {
ptr = GETSIGN(_j); ptr = GETSIGN(_j);
LOOPBYTE LOOPBYTE
union_r[i] |= ptr[i]; union_r[i] |= ptr[i];
} }
*right++ = j; *right++ = j;
v->spl_nright++; v->spl_nright++;
...@@ -516,7 +516,7 @@ ghstore_consistent(PG_FUNCTION_ARGS) ...@@ -516,7 +516,7 @@ ghstore_consistent(PG_FUNCTION_ARGS)
sign = GETSIGN(entry); sign = GETSIGN(entry);
if ( strategy == HStoreContainsStrategyNumber || strategy == 13 /* hack for old strats */ ) if (strategy == HStoreContainsStrategyNumber || strategy == 13 /* hack for old strats */ )
{ {
HStore *query = PG_GETARG_HS(1); HStore *query = PG_GETARG_HS(1);
HEntry *qe = ARRPTR(query); HEntry *qe = ARRPTR(query);
...@@ -540,10 +540,10 @@ ghstore_consistent(PG_FUNCTION_ARGS) ...@@ -540,10 +540,10 @@ ghstore_consistent(PG_FUNCTION_ARGS)
qe++; qe++;
} }
} }
else if ( strategy == HStoreExistsStrategyNumber ) else if (strategy == HStoreExistsStrategyNumber)
{ {
text *query = PG_GETARG_TEXT_P(1); text *query = PG_GETARG_TEXT_P(1);
int crc = crc32_sz( VARDATA(query), VARSIZE(query)-VARHDRSZ ); int crc = crc32_sz(VARDATA(query), VARSIZE(query) - VARHDRSZ);
res = (GETBIT(sign, HASHVAL(crc))) ? true : false; res = (GETBIT(sign, HASHVAL(crc))) ? true : false;
} }
......
contrib/intarray/_intbig_gist.c
View file @ 5f0bf6cb
...@@ -319,7 +319,7 @@ typedef struct ...@@ -319,7 +319,7 @@ typedef struct
{ {
OffsetNumber pos; OffsetNumber pos;
int4 cost; int4 cost;
} SPLITCOST; } SPLITCOST;
static int static int
comparecost(const void *a, const void *b) comparecost(const void *a, const void *b)
......
contrib/ltree/_ltree_gist.c
View file @ 5f0bf6cb
...@@ -272,7 +272,7 @@ typedef struct ...@@ -272,7 +272,7 @@ typedef struct
{ {
OffsetNumber pos; OffsetNumber pos;
int4 cost; int4 cost;
} SPLITCOST; } SPLITCOST;
static int static int
comparecost(const void *a, const void *b) comparecost(const void *a, const void *b)
......
contrib/ltree/ltree_gist.c
View file @ 5f0bf6cb
/* /*
* GiST support for ltree * GiST support for ltree
* Teodor Sigaev <teodor@stack.net> * Teodor Sigaev <teodor@stack.net>
* $PostgreSQL: pgsql/contrib/ltree/ltree_gist.c,v 1.21 2007/11/16 00:13:02 momjian Exp $ * $PostgreSQL: pgsql/contrib/ltree/ltree_gist.c,v 1.22 2007/11/16 01:12:24 momjian Exp $
*/ */
#include "ltree.h" #include "ltree.h"
...@@ -136,8 +136,8 @@ ltree_same(PG_FUNCTION_ARGS) ...@@ -136,8 +136,8 @@ ltree_same(PG_FUNCTION_ARGS)
{ {
LOOPBYTE LOOPBYTE
{ {
if (sa[i] != sb[i]) if (sa[i] != sb[i])
{ {
*result = false; *result = false;
break; break;
} }
...@@ -202,7 +202,7 @@ ltree_union(PG_FUNCTION_ARGS) ...@@ -202,7 +202,7 @@ ltree_union(PG_FUNCTION_ARGS)
BITVECP sc = LTG_SIGN(cur); BITVECP sc = LTG_SIGN(cur);
LOOPBYTE LOOPBYTE
((unsigned char *) base)[i] |= sc[i]; ((unsigned char *) base)[i] |= sc[i];
} }
curtree = LTG_LNODE(cur); curtree = LTG_LNODE(cur);
...@@ -347,7 +347,7 @@ ltree_picksplit(PG_FUNCTION_ARGS) ...@@ -347,7 +347,7 @@ ltree_picksplit(PG_FUNCTION_ARGS)
BITVECP sc = LTG_SIGN(lu); BITVECP sc = LTG_SIGN(lu);
LOOPBYTE LOOPBYTE
((unsigned char *) ls)[i] |= sc[i]; ((unsigned char *) ls)[i] |= sc[i];
} }
} }
} }
...@@ -368,7 +368,7 @@ ltree_picksplit(PG_FUNCTION_ARGS) ...@@ -368,7 +368,7 @@ ltree_picksplit(PG_FUNCTION_ARGS)
BITVECP sc = LTG_SIGN(lu); BITVECP sc = LTG_SIGN(lu);
LOOPBYTE LOOPBYTE
((unsigned char *) rs)[i] |= sc[i]; ((unsigned char *) rs)[i] |= sc[i];
} }
} }
} }
......
contrib/pg_trgm/trgm_gist.c
View file @ 5f0bf6cb
...@@ -115,8 +115,8 @@ gtrgm_compress(PG_FUNCTION_ARGS) ...@@ -115,8 +115,8 @@ gtrgm_compress(PG_FUNCTION_ARGS)
LOOPBYTE LOOPBYTE
{ {
if ((sign[i] & 0xff) != 0xff) if ((sign[i] & 0xff) != 0xff)
PG_RETURN_POINTER(retval); PG_RETURN_POINTER(retval);
} }
len = CALCGTSIZE(SIGNKEY | ALLISTRUE, 0); len = CALCGTSIZE(SIGNKEY | ALLISTRUE, 0);
...@@ -137,7 +137,7 @@ gtrgm_decompress(PG_FUNCTION_ARGS) ...@@ -137,7 +137,7 @@ gtrgm_decompress(PG_FUNCTION_ARGS)
{ {
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0); GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
GISTENTRY *retval; GISTENTRY *retval;
text *key; text *key;
key = DatumGetTextP(entry->key); key = DatumGetTextP(entry->key);
...@@ -212,7 +212,7 @@ unionkey(BITVECP sbase, TRGM * add) ...@@ -212,7 +212,7 @@ unionkey(BITVECP sbase, TRGM * add)
return 1; return 1;
LOOPBYTE LOOPBYTE
sbase[i] |= sadd[i]; sbase[i] |= sadd[i];
} }
else else
{ {
...@@ -327,7 +327,7 @@ sizebitvec(BITVECP sign) ...@@ -327,7 +327,7 @@ sizebitvec(BITVECP sign)
i; i;
LOOPBYTE LOOPBYTE
size += number_of_ones[(unsigned char) sign[i]]; size += number_of_ones[(unsigned char) sign[i]];
return size; return size;
} }
...@@ -394,10 +394,10 @@ typedef struct ...@@ -394,10 +394,10 @@ typedef struct
{ {
bool allistrue; bool allistrue;
BITVEC sign; BITVEC sign;
} CACHESIGN; } CACHESIGN;
static void static void
fillcache(CACHESIGN * item, TRGM * key) fillcache(CACHESIGN *item, TRGM * key)
{ {
item->allistrue = false; item->allistrue = false;
if (ISARRKEY(key)) if (ISARRKEY(key))
...@@ -413,7 +413,7 @@ typedef struct ...@@ -413,7 +413,7 @@ typedef struct
{ {
OffsetNumber pos; OffsetNumber pos;
int4 cost; int4 cost;
} SPLITCOST; } SPLITCOST;
static int static int
comparecost(const void *a, const void *b) comparecost(const void *a, const void *b)
...@@ -426,7 +426,7 @@ comparecost(const void *a, const void *b) ...@@ -426,7 +426,7 @@ comparecost(const void *a, const void *b)
static int static int
hemdistcache(CACHESIGN * a, CACHESIGN * b) hemdistcache(CACHESIGN *a, CACHESIGN *b)
{ {
if (a->allistrue) if (a->allistrue)
{ {
......
src/backend/utils/adt/tsgistidx.c
View file @ 5f0bf6cb
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/tsgistidx.c,v 1.5 2007/11/16 00:13:02 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/tsgistidx.c,v 1.6 2007/11/16 01:12:24 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -50,7 +50,7 @@ typedef char *BITVECP; ...@@ -50,7 +50,7 @@ typedef char *BITVECP;
typedef struct typedef struct
{ {
int32 vl_len_; /* varlena header (do not touch directly!) */ int32 vl_len_; /* varlena header (do not touch directly!) */
int4 flag; int4 flag;
char data[1]; char data[1];
} SignTSVector; } SignTSVector;
...@@ -133,8 +133,8 @@ gtsvectorout(PG_FUNCTION_ARGS) ...@@ -133,8 +133,8 @@ gtsvectorout(PG_FUNCTION_ARGS)
static int static int
compareint(const void *va, const void *vb) compareint(const void *va, const void *vb)
{ {
int4 a = *((int4 *) va); int4 a = *((int4 *) va);
int4 b = *((int4 *) vb); int4 b = *((int4 *) vb);
if (a == b) if (a == b)
return 0; return 0;
...@@ -167,7 +167,7 @@ uniqueint(int4 *a, int4 l) ...@@ -167,7 +167,7 @@ uniqueint(int4 *a, int4 l)
} }
static void static void
makesign(BITVECP sign, SignTSVector * a) makesign(BITVECP sign, SignTSVector *a)
{ {
int4 k, int4 k,
len = ARRNELEM(a); len = ARRNELEM(a);
...@@ -252,8 +252,8 @@ gtsvector_compress(PG_FUNCTION_ARGS) ...@@ -252,8 +252,8 @@ gtsvector_compress(PG_FUNCTION_ARGS)
LOOPBYTE LOOPBYTE
{ {
if ((sign[i] & 0xff) != 0xff) if ((sign[i] & 0xff) != 0xff)
PG_RETURN_POINTER(retval); PG_RETURN_POINTER(retval);
} }
len = CALCGTSIZE(SIGNKEY | ALLISTRUE, 0); len = CALCGTSIZE(SIGNKEY | ALLISTRUE, 0);
...@@ -299,7 +299,7 @@ typedef struct ...@@ -299,7 +299,7 @@ typedef struct
* is there value 'val' in array or not ? * is there value 'val' in array or not ?
*/ */
static bool static bool
checkcondition_arr(void *checkval, QueryOperand * val) checkcondition_arr(void *checkval, QueryOperand *val)
{ {
int4 *StopLow = ((CHKVAL *) checkval)->arrb; int4 *StopLow = ((CHKVAL *) checkval)->arrb;
int4 *StopHigh = ((CHKVAL *) checkval)->arre; int4 *StopHigh = ((CHKVAL *) checkval)->arre;
...@@ -322,7 +322,7 @@ checkcondition_arr(void *checkval, QueryOperand * val) ...@@ -322,7 +322,7 @@ checkcondition_arr(void *checkval, QueryOperand * val)
} }
static bool static bool
checkcondition_bit(void *checkval, QueryOperand * val) checkcondition_bit(void *checkval, QueryOperand *val)
{ {
return GETBIT(checkval, HASHVAL(val->valcrc)); return GETBIT(checkval, HASHVAL(val->valcrc));
} }
...@@ -364,7 +364,7 @@ gtsvector_consistent(PG_FUNCTION_ARGS) ...@@ -364,7 +364,7 @@ gtsvector_consistent(PG_FUNCTION_ARGS)
} }
static int4 static int4
unionkey(BITVECP sbase, SignTSVector * add) unionkey(BITVECP sbase, SignTSVector *add)
{ {
int4 i; int4 i;
...@@ -487,7 +487,7 @@ sizebitvec(BITVECP sign) ...@@ -487,7 +487,7 @@ sizebitvec(BITVECP sign)
i; i;
LOOPBYTE LOOPBYTE
size += number_of_ones[(unsigned char) sign[i]]; size += number_of_ones[(unsigned char) sign[i]];
return size; return size;
} }
...@@ -507,7 +507,7 @@ hemdistsign(BITVECP a, BITVECP b) ...@@ -507,7 +507,7 @@ hemdistsign(BITVECP a, BITVECP b)
} }
static int static int
hemdist(SignTSVector * a, SignTSVector * b) hemdist(SignTSVector *a, SignTSVector *b)
{ {
if (ISALLTRUE(a)) if (ISALLTRUE(a))
{ {
...@@ -557,7 +557,7 @@ typedef struct ...@@ -557,7 +557,7 @@ typedef struct
} CACHESIGN; } CACHESIGN;
static void static void
fillcache(CACHESIGN * item, SignTSVector * key) fillcache(CACHESIGN *item, SignTSVector *key)
{ {
item->allistrue = false; item->allistrue = false;
if (ISARRKEY(key)) if (ISARRKEY(key))
...@@ -578,8 +578,8 @@ typedef struct ...@@ -578,8 +578,8 @@ typedef struct
static int static int
comparecost(const void *va, const void *vb) comparecost(const void *va, const void *vb)
{ {
SPLITCOST *a = (SPLITCOST *) va; SPLITCOST *a = (SPLITCOST *) va;
SPLITCOST *b = (SPLITCOST *) vb; SPLITCOST *b = (SPLITCOST *) vb;
if (a->cost == b->cost) if (a->cost == b->cost)
return 0; return 0;
...@@ -589,7 +589,7 @@ comparecost(const void *va, const void *vb) ...@@ -589,7 +589,7 @@ comparecost(const void *va, const void *vb)
static int static int
hemdistcache(CACHESIGN * a, CACHESIGN * b) hemdistcache(CACHESIGN *a, CACHESIGN *b)
{ {
if (a->allistrue) if (a->allistrue)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment