diff options
| author | Teodor Sigaev | 2005-03-01 15:40:04 +0000 |
|---|---|---|
| committer | Teodor Sigaev | 2005-03-01 15:40:04 +0000 |
| commit | e1662cb6b8d398bffe2f9a72df0c6103dadc4be2 (patch) | |
| tree | b6699a20fbd3ba2712d0a838f517a64e273a1e85 /contrib/btree_gist/btree_bit.c | |
| parent | 03b8efa5403ccece65e21496ebde167feeca4f26 (diff) | |
Simplify/clean up code for varlena types
Diffstat (limited to 'contrib/btree_gist/btree_bit.c')
| -rw-r--r-- | contrib/btree_gist/btree_bit.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/contrib/btree_gist/btree_bit.c b/contrib/btree_gist/btree_bit.c index 0b220ae2bb7..459c4d60b0d 100644 --- a/contrib/btree_gist/btree_bit.c +++ b/contrib/btree_gist/btree_bit.c @@ -67,7 +67,7 @@ static bytea * gbt_bit_xfrm(bytea *leaf) { bytea *out = leaf; - int s = VARBITBYTES(leaf) + VARHDRSZ; + int s = INTALIGN(VARBITBYTES(leaf) + VARHDRSZ); out = palloc(s); VARATT_SIZEP(out) = s; @@ -126,8 +126,7 @@ Datum gbt_bit_consistent(PG_FUNCTION_ARGS) { GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0); - GBT_VARKEY *ktst = (GBT_VARKEY *) DatumGetPointer(entry->key); - GBT_VARKEY *key = (GBT_VARKEY *) DatumGetPointer(PG_DETOAST_DATUM(entry->key)); + GBT_VARKEY *key = (GBT_VARKEY *) DatumGetPointer(entry->key); void *qtst = (void *) DatumGetPointer(PG_GETARG_DATUM(1)); void *query = (void *) DatumGetByteaP(PG_GETARG_DATUM(1)); StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2); @@ -144,8 +143,6 @@ gbt_bit_consistent(PG_FUNCTION_ARGS) pfree(q); } - if (ktst != key) - pfree(key); if (qtst != query) pfree(query); PG_RETURN_BOOL(retval); |