README
[hstore.git] / hstore_gist.c
index cb9cfae..21d90e3 100644 (file)
@@ -1,14 +1,20 @@
-#include "hstore.h"
+/*
+ * contrib/hstore/hstore_gist.c
+ */
+#include "postgres.h"
 
 #include "access/gist.h"
-#include "access/itup.h"
-/*#include "access/rtree.h"*/
-#include "crc32.h"
+#include "access/skey.h"
+#include "catalog/pg_type.h"
+#include "utils/builtins.h"
+#include "utils/pg_crc.h"
+
+#include "hstore.h"
 
 /* bigint defines */
 #define BITBYTE 8
-#define SIGLENINT  4              /* >122 => key will toast, so very slow!!! */
-#define SIGLEN  ( sizeof(int)*SIGLENINT )
+#define SIGLENINT  4                   /* >122 => key will toast, so very slow!!! */
+#define SIGLEN ( sizeof(int)*SIGLENINT )
 #define SIGLENBIT (SIGLEN*BITBYTE)
 
 typedef char BITVEC[SIGLEN];
@@ -17,15 +23,11 @@ typedef char *BITVECP;
 #define SIGPTR(x)  ( (BITVECP) ARR_DATA_PTR(x) )
 
 
-#define LOOPBYTE(a) \
-               for(i=0;i<SIGLEN;i++) {\
-                               a;\
-               }
+#define LOOPBYTE \
+                       for(i=0;i<SIGLEN;i++)
 
-#define LOOPBIT(a) \
-               for(i=0;i<SIGLENBIT;i++) {\
-                               a;\
-               }
+#define LOOPBIT \
+                       for(i=0;i<SIGLENBIT;i++)
 
 /* beware of multiple evaluation of arguments to these macros! */
 #define GETBYTE(x,i) ( *( (BITVECP)(x) + (int)( (i) / BITBYTE ) ) )
@@ -36,22 +38,23 @@ typedef char *BITVECP;
 #define HASHVAL(val) (((unsigned int)(val)) % SIGLENBIT)
 #define HASH(sign, val) SETBIT((sign), HASHVAL(val))
 
-typedef struct {
-       int4        len;
-       int4        flag;
-       char        data[1];
-}       GISTTYPE;
+typedef struct
+{
+       int32           vl_len_;                /* varlena header (do not touch directly!) */
+       int32           flag;
+       char            data[1];
+} GISTTYPE;
 
-#define ALLISTRUE       0x04
+#define ALLISTRUE              0x04
 
-#define ISALLTRUE(x)    ( ((GISTTYPE*)x)->flag & ALLISTRUE )
+#define ISALLTRUE(x)   ( ((GISTTYPE*)x)->flag & ALLISTRUE )
 
-#define GTHDRSIZE       ( sizeof(int4)*2  )
+#define GTHDRSIZE              (VARHDRSZ + sizeof(int32))
 #define CALCGTSIZE(flag) ( GTHDRSIZE+(((flag) & ALLISTRUE) ? 0 : SIGLEN) )
-  
-#define GETSIGN(x)      ( (BITVECP)( (char*)x+GTHDRSIZE ) )
 
-#define SUMBIT(val) (       \
+#define GETSIGN(x)             ( (BITVECP)( (char*)x+GTHDRSIZE ) )
+
+#define SUMBIT(val) (          \
        GETBITBYTE((val),0) + \
        GETBITBYTE((val),1) + \
        GETBITBYTE((val),2) + \
@@ -62,29 +65,27 @@ typedef struct {
        GETBITBYTE((val),7)   \
 )
 
-#ifdef GEVHDRSZ
 #define GETENTRY(vec,pos) ((GISTTYPE *) DatumGetPointer((vec)->vector[(pos)].key))
-#else
-#define GETENTRY(vec,pos) ((GISTTYPE *) DatumGetPointer(((GISTENTRY *) VARDATA(vec))[(pos)].key))
-#endif
 
 #define WISH_F(a,b,c) (double)( -(double)(((a)-(b))*((a)-(b))*((a)-(b)))*(c) )
 
 PG_FUNCTION_INFO_V1(ghstore_in);
-Datum     ghstore_in(PG_FUNCTION_ARGS);
+Datum          ghstore_in(PG_FUNCTION_ARGS);
 
 PG_FUNCTION_INFO_V1(ghstore_out);
-Datum     ghstore_out(PG_FUNCTION_ARGS);
-  
+Datum          ghstore_out(PG_FUNCTION_ARGS);
+
 
 Datum
-ghstore_in(PG_FUNCTION_ARGS) {
+ghstore_in(PG_FUNCTION_ARGS)
+{
        elog(ERROR, "Not implemented");
        PG_RETURN_DATUM(0);
 }
 
 Datum
-ghstore_out(PG_FUNCTION_ARGS) {
+ghstore_out(PG_FUNCTION_ARGS)
+{
        elog(ERROR, "Not implemented");
        PG_RETURN_DATUM(0);
 }
@@ -97,88 +98,154 @@ PG_FUNCTION_INFO_V1(ghstore_picksplit);
 PG_FUNCTION_INFO_V1(ghstore_union);
 PG_FUNCTION_INFO_V1(ghstore_same);
 
-Datum     ghstore_consistent(PG_FUNCTION_ARGS);
-Datum     ghstore_compress(PG_FUNCTION_ARGS);
-Datum     ghstore_decompress(PG_FUNCTION_ARGS);
-Datum     ghstore_penalty(PG_FUNCTION_ARGS);
-Datum     ghstore_picksplit(PG_FUNCTION_ARGS);
-Datum     ghstore_union(PG_FUNCTION_ARGS);
-Datum     ghstore_same(PG_FUNCTION_ARGS);
+Datum          ghstore_consistent(PG_FUNCTION_ARGS);
+Datum          ghstore_compress(PG_FUNCTION_ARGS);
+Datum          ghstore_decompress(PG_FUNCTION_ARGS);
+Datum          ghstore_penalty(PG_FUNCTION_ARGS);
+Datum          ghstore_picksplit(PG_FUNCTION_ARGS);
+Datum          ghstore_union(PG_FUNCTION_ARGS);
+Datum          ghstore_same(PG_FUNCTION_ARGS);
+
+static int
+crc32_HStoreValue(HStoreValue *v, uint32 r)
+{
+       int             crc;
+       char    flag = '\0';
+
+       INIT_CRC32(crc);
+
+       switch(r)
+       {
+               case WHS_KEY:
+                       flag = KEYFLAG;
+                       break;
+               case WHS_VALUE:
+                       flag = VALFLAG;
+                       break;
+               case WHS_ELEM:
+                       flag = ELEMFLAG;
+                       break;
+               default:
+                       break;
+       }
+
+       COMP_CRC32(crc, &flag, 1);
+
+       switch(v->type)
+       {
+               case hsvString:
+                       COMP_CRC32(crc, v->string.val, v->string.len);
+                       break;
+               case hsvBool:
+                       flag = (v->boolean) ? 't' : 'f';
+                       COMP_CRC32(crc, &flag, 1);
+                       break;
+               case hsvNumeric:
+                       crc = DatumGetInt32(DirectFunctionCall1(hash_numeric,
+                                                               NumericGetDatum(v->numeric)));
+                       break;
+               default:
+                       elog(PANIC, "impossible value %d", v->type);
+       }
+
+       FIN_CRC32(crc);
+       return crc;
+}
+
+static int
+crc32_Key(char *buf, int sz)
+{
+       int     crc;
+       char    flag = KEYFLAG;
+
+       INIT_CRC32(crc);
+
+       COMP_CRC32(crc, &flag, 1);
+       COMP_CRC32(crc, buf, sz);
+
+       FIN_CRC32(crc);
+       return crc;
+}
 
 Datum
-ghstore_compress(PG_FUNCTION_ARGS) {
+ghstore_compress(PG_FUNCTION_ARGS)
+{
        GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
        GISTENTRY  *retval = entry;
-        
-       if (entry->leafkey) {                                                  
-               GISTTYPE   *res = (GISTTYPE*)palloc(CALCGTSIZE(0));
-               HStore     *toastedval = (HStore *) DatumGetPointer(entry->key);
-               HStore     *val = (HStore *) DatumGetPointer(PG_DETOAST_DATUM(entry->key));
-               HEntry     *ptr = ARRPTR(val);
-               char       *words = STRPTR(val);
-
-               memset(res,0,CALCGTSIZE(0));
-               res->len=CALCGTSIZE(0);
-       
-               while(ptr-ARRPTR(val) < val->size) {
-                       int h;
-                       h = crc32_sz((char*)(words+ptr->pos), ptr->keylen);
-                       HASH( GETSIGN(res), h);
-                       if ( !ptr->valisnull ) {
-                               h = crc32_sz((char *)(words+ptr->pos+ptr->keylen), ptr->vallen);
-                               HASH( GETSIGN(res), h);
+
+       if (entry->leafkey)
+       {
+               GISTTYPE                *res = (GISTTYPE *) palloc0(CALCGTSIZE(0));
+               HStore                  *val = DatumGetHStoreP(entry->key);
+
+               SET_VARSIZE(res, CALCGTSIZE(0));
+
+               if (!HS_ISEMPTY(val))
+               {
+                       int                             r;
+                       HStoreIterator  *it = HStoreIteratorInit(VARDATA(val));
+                       HStoreValue             v;
+
+                       while((r = HStoreIteratorGet(&it, &v, false)) != 0)
+                       {
+                               if ((r == WHS_ELEM || r == WHS_KEY || r == WHS_VALUE) &&
+                                       v.type != hsvNull)
+                               {
+                                       int   h = crc32_HStoreValue(&v, r);
+
+                                       HASH(GETSIGN(res), h);
+                               }
                        }
-                       ptr++;
                }
 
-               if (val != toastedval)
-                       pfree(val);
-
                retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
                gistentryinit(*retval, PointerGetDatum(res),
                                          entry->rel, entry->page,
                                          entry->offset,
-#ifndef PG_MODULE_MAGIC
-                                         res->len,
-#endif
                                          FALSE);
-       } else if ( !ISALLTRUE(DatumGetPointer(entry->key)) ) {
-               int4        i;
+       }
+       else if (!ISALLTRUE(DatumGetPointer(entry->key)))
+       {
+               int32           i;
                GISTTYPE   *res;
-               BITVECP  sign = GETSIGN(DatumGetPointer(entry->key));
-               
-               LOOPBYTE(
+               BITVECP         sign = GETSIGN(DatumGetPointer(entry->key));
+
+               LOOPBYTE
+               {
                        if ((sign[i] & 0xff) != 0xff)
                                PG_RETURN_POINTER(retval);
-               );
+               }
 
                res = (GISTTYPE *) palloc(CALCGTSIZE(ALLISTRUE));
-               res->len = CALCGTSIZE(ALLISTRUE);
+               SET_VARSIZE(res, CALCGTSIZE(ALLISTRUE));
                res->flag = ALLISTRUE;
 
                retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
                gistentryinit(*retval, PointerGetDatum(res),
                                          entry->rel, entry->page,
-                                         entry->offset, 
-#ifndef PG_MODULE_MAGIC
-                                         res->len,
-#endif
+                                         entry->offset,
                                          FALSE);
        }
 
        PG_RETURN_POINTER(retval);
 }
 
+/*
+ * Since type ghstore isn't toastable (and doesn't need to be),
+ * this function can be a no-op.
+ */
 Datum
-ghstore_decompress(PG_FUNCTION_ARGS) {
-       PG_RETURN_DATUM(PG_GETARG_DATUM(0));
+ghstore_decompress(PG_FUNCTION_ARGS)
+{
+       PG_RETURN_POINTER(PG_GETARG_POINTER(0));
 }
 
 Datum
-ghstore_same(PG_FUNCTION_ARGS) {
+ghstore_same(PG_FUNCTION_ARGS)
+{
        GISTTYPE   *a = (GISTTYPE *) PG_GETARG_POINTER(0);
        GISTTYPE   *b = (GISTTYPE *) PG_GETARG_POINTER(1);
-       bool       *result = (bool *) PG_GETARG_POINTER(2);
+       bool       *result = (bool *) PG_GETARG_POINTER(2);
 
        if (ISALLTRUE(a) && ISALLTRUE(b))
                *result = true;
@@ -186,87 +253,99 @@ ghstore_same(PG_FUNCTION_ARGS) {
                *result = false;
        else if (ISALLTRUE(b))
                *result = false;
-       else {
-               int4            i;
-               BITVECP         sa = GETSIGN(a),
-                               sb = GETSIGN(b);
+       else
+       {
+               int32           i;
+               BITVECP         sa = GETSIGN(a),
+                                       sb = GETSIGN(b);
+
                *result = true;
-               LOOPBYTE(
-                       if (sa[i] != sb[i]) {
+               LOOPBYTE
+               {
+                       if (sa[i] != sb[i])
+                       {
                                *result = false;
                                break;
                        }
-               );
+               }
        }
        PG_RETURN_POINTER(result);
 }
 
-static int4
-sizebitvec(BITVECP sign) {
-       int4        size = 0, i;
-       LOOPBYTE(
+static int32
+sizebitvec(BITVECP sign)
+{
+       int32           size = 0,
+                               i;
+
+       LOOPBYTE
+       {
                size += SUMBIT(sign);
                sign = (BITVECP) (((char *) sign) + 1);
-       );
+       }
        return size;
 }
+
 static int
-hemdistsign(BITVECP  a, BITVECP b) {
-       int i,dist=0;
+hemdistsign(BITVECP a, BITVECP b)
+{
+       int                     i,
+                               dist = 0;
 
-       LOOPBIT(
-               if ( GETBIT(a,i) != GETBIT(b,i) )
+       LOOPBIT
+       {
+               if (GETBIT(a, i) != GETBIT(b, i))
                        dist++;
-       );
+       }
        return dist;
 }
 
 static int
-hemdist(GISTTYPE   *a, GISTTYPE   *b) {
-       if ( ISALLTRUE(a) ) {
+hemdist(GISTTYPE *a, GISTTYPE *b)
+{
+       if (ISALLTRUE(a))
+       {
                if (ISALLTRUE(b))
                        return 0;
                else
-                       return SIGLENBIT-sizebitvec(GETSIGN(b));
-       } else if (ISALLTRUE(b))
-               return SIGLENBIT-sizebitvec(GETSIGN(a));
+                       return SIGLENBIT - sizebitvec(GETSIGN(b));
+       }
+       else if (ISALLTRUE(b))
+               return SIGLENBIT - sizebitvec(GETSIGN(a));
 
-       return hemdistsign( GETSIGN(a), GETSIGN(b) );
+       return hemdistsign(GETSIGN(a), GETSIGN(b));
 }
 
-static int4
-unionkey(BITVECP sbase, GISTTYPE * add)
+static int32
+unionkey(BITVECP sbase, GISTTYPE *add)
 {
-       int4        i;
-       BITVECP  sadd = GETSIGN(add);
+       int32           i;
+       BITVECP         sadd = GETSIGN(add);
 
        if (ISALLTRUE(add))
                return 1;
-       LOOPBYTE(
+       LOOPBYTE
                sbase[i] |= sadd[i];
-       );
        return 0;
 }
 
 Datum
-ghstore_union(PG_FUNCTION_ARGS) {
-#ifdef GEVHDRSZ
-       GistEntryVector      *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
-       int4        len = entryvec->n;
-#else
-       bytea      *entryvec = (bytea *) PG_GETARG_POINTER(0);
-       int4        len = (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY);
-#endif
-       int             *size = (int *) PG_GETARG_POINTER(1);
-       BITVEC    base;
-       int4        i;
-       int4        flag = 0;
+ghstore_union(PG_FUNCTION_ARGS)
+{
+       GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
+       int32           len = entryvec->n;
+
+       int                *size = (int *) PG_GETARG_POINTER(1);
+       BITVEC          base;
+       int32           i;
+       int32           flag = 0;
        GISTTYPE   *result;
 
        MemSet((void *) base, 0, sizeof(BITVEC));
-       for (i = 0; i < len; i++) {
-               if (unionkey(base, GETENTRY(entryvec, i))) {
+       for (i = 0; i < len; i++)
+       {
+               if (unionkey(base, GETENTRY(entryvec, i)))
+               {
                        flag = ALLISTRUE;
                        break;
                }
@@ -274,77 +353,82 @@ ghstore_union(PG_FUNCTION_ARGS) {
 
        len = CALCGTSIZE(flag);
        result = (GISTTYPE *) palloc(len);
-       *size = result->len = len;
+       SET_VARSIZE(result, len);
        result->flag = flag;
        if (!ISALLTRUE(result))
                memcpy((void *) GETSIGN(result), (void *) base, sizeof(BITVEC));
+       *size = len;
 
        PG_RETURN_POINTER(result);
 }
 
 Datum
-ghstore_penalty(PG_FUNCTION_ARGS) {
+ghstore_penalty(PG_FUNCTION_ARGS)
+{
        GISTENTRY  *origentry = (GISTENTRY *) PG_GETARG_POINTER(0); /* always ISSIGNKEY */
        GISTENTRY  *newentry = (GISTENTRY *) PG_GETARG_POINTER(1);
-       float      *penalty = (float *) PG_GETARG_POINTER(2);
+       float      *penalty = (float *) PG_GETARG_POINTER(2);
        GISTTYPE   *origval = (GISTTYPE *) DatumGetPointer(origentry->key);
        GISTTYPE   *newval = (GISTTYPE *) DatumGetPointer(newentry->key);
 
-       *penalty=hemdist(origval,newval);
+       *penalty = hemdist(origval, newval);
        PG_RETURN_POINTER(penalty);
 }
 
 
-typedef struct {
+typedef struct
+{
        OffsetNumber pos;
-       int4        cost;
+       int32           cost;
 } SPLITCOST;
 
 static int
-comparecost(const void *a, const void *b) {
-       return ((SPLITCOST *) a)->cost - ((SPLITCOST *) b)->cost;
+comparecost(const void *a, const void *b)
+{
+       return ((const SPLITCOST *) a)->cost - ((const SPLITCOST *) b)->cost;
 }
 
 
 Datum
-ghstore_picksplit(PG_FUNCTION_ARGS) {
-#ifdef GEVHDRSZ
-       GistEntryVector      *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
+ghstore_picksplit(PG_FUNCTION_ARGS)
+{
+       GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
        OffsetNumber maxoff = entryvec->n - 2;
-#else
-       bytea      *entryvec = (bytea *) PG_GETARG_POINTER(0);
-       OffsetNumber maxoff = ((VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY)) - 2;
-#endif
+
        GIST_SPLITVEC *v = (GIST_SPLITVEC *) PG_GETARG_POINTER(1);
        OffsetNumber k,
                                j;
-       GISTTYPE *datum_l,
+       GISTTYPE   *datum_l,
                           *datum_r;
-       BITVECP  union_l,
+       BITVECP         union_l,
                                union_r;
-       int4        size_alpha, size_beta;
-       int4        size_waste,
+       int32           size_alpha,
+                               size_beta;
+       int32           size_waste,
                                waste = -1;
-       int4        nbytes;
+       int32           nbytes;
        OffsetNumber seed_1 = 0,
                                seed_2 = 0;
        OffsetNumber *left,
                           *right;
-       BITVECP  ptr;
-       int                  i;
+       BITVECP         ptr;
+       int                     i;
        SPLITCOST  *costvector;
-       GISTTYPE *_k,
+       GISTTYPE   *_k,
                           *_j;
 
        nbytes = (maxoff + 2) * sizeof(OffsetNumber);
        v->spl_left = (OffsetNumber *) palloc(nbytes);
        v->spl_right = (OffsetNumber *) palloc(nbytes);
 
-       for (k = FirstOffsetNumber; k < maxoff; k = OffsetNumberNext(k)) {
+       for (k = FirstOffsetNumber; k < maxoff; k = OffsetNumberNext(k))
+       {
                _k = GETENTRY(entryvec, k);
-               for (j = OffsetNumberNext(k); j <= maxoff; j = OffsetNumberNext(j)) {
-                       size_waste=hemdist(_k, GETENTRY(entryvec, j));
-                       if (size_waste > waste ) {
+               for (j = OffsetNumberNext(k); j <= maxoff; j = OffsetNumberNext(j))
+               {
+                       size_waste = hemdist(_k, GETENTRY(entryvec, j));
+                       if (size_waste > waste)
+                       {
                                waste = size_waste;
                                seed_1 = k;
                                seed_2 = j;
@@ -364,26 +448,34 @@ ghstore_picksplit(PG_FUNCTION_ARGS) {
        }
 
        /* form initial .. */
-       if (ISALLTRUE(GETENTRY(entryvec, seed_1))) {
+       if (ISALLTRUE(GETENTRY(entryvec, seed_1)))
+       {
                datum_l = (GISTTYPE *) palloc(GTHDRSIZE);
-               datum_l->len = GTHDRSIZE;
+               SET_VARSIZE(datum_l, GTHDRSIZE);
                datum_l->flag = ALLISTRUE;
-       } else {
+       }
+       else
+       {
                datum_l = (GISTTYPE *) palloc(GTHDRSIZE + SIGLEN);
-               datum_l->len = GTHDRSIZE + SIGLEN;
+               SET_VARSIZE(datum_l, GTHDRSIZE + SIGLEN);
                datum_l->flag = 0;
-               memcpy((void *) GETSIGN(datum_l), (void *) GETSIGN(GETENTRY(entryvec, seed_1)), sizeof(BITVEC))
-;
+               memcpy((void *) GETSIGN(datum_l),
+                          (void *) GETSIGN(GETENTRY(entryvec, seed_1)), sizeof(BITVEC))
+                       ;
        }
-       if (ISALLTRUE(GETENTRY(entryvec, seed_2))) {
+       if (ISALLTRUE(GETENTRY(entryvec, seed_2)))
+       {
                datum_r = (GISTTYPE *) palloc(GTHDRSIZE);
-               datum_r->len = GTHDRSIZE;
+               SET_VARSIZE(datum_r, GTHDRSIZE);
                datum_r->flag = ALLISTRUE;
-       } else {
+       }
+       else
+       {
                datum_r = (GISTTYPE *) palloc(GTHDRSIZE + SIGLEN);
-               datum_r->len = GTHDRSIZE + SIGLEN;
+               SET_VARSIZE(datum_r, GTHDRSIZE + SIGLEN);
                datum_r->flag = 0;
-               memcpy((void *) GETSIGN(datum_r), (void *) GETSIGN(GETENTRY(entryvec, seed_2)), sizeof(BITVEC)) ;
+               memcpy((void *) GETSIGN(datum_r),
+                          (void *) GETSIGN(GETENTRY(entryvec, seed_2)), sizeof(BITVEC));
        }
 
        maxoff = OffsetNumberNext(maxoff);
@@ -393,51 +485,62 @@ ghstore_picksplit(PG_FUNCTION_ARGS) {
        {
                costvector[j - 1].pos = j;
                _j = GETENTRY(entryvec, j);
-               size_alpha = hemdist(datum_l,_j);
-               size_beta  = hemdist(datum_r,_j);
+               size_alpha = hemdist(datum_l, _j);
+               size_beta = hemdist(datum_r, _j);
                costvector[j - 1].cost = abs(size_alpha - size_beta);
        }
        qsort((void *) costvector, maxoff, sizeof(SPLITCOST), comparecost);
 
-       union_l=GETSIGN(datum_l);
-       union_r=GETSIGN(datum_r);
+       union_l = GETSIGN(datum_l);
+       union_r = GETSIGN(datum_r);
 
-       for (k = 0; k < maxoff; k++) {
+       for (k = 0; k < maxoff; k++)
+       {
                j = costvector[k].pos;
-               if (j == seed_1) {
+               if (j == seed_1)
+               {
                        *left++ = j;
                        v->spl_nleft++;
                        continue;
-               } else if (j == seed_2) {
+               }
+               else if (j == seed_2)
+               {
                        *right++ = j;
                        v->spl_nright++;
                        continue;
                }
                _j = GETENTRY(entryvec, j);
-               size_alpha = hemdist(datum_l,_j);
-               size_beta  = hemdist(datum_r,_j);
+               size_alpha = hemdist(datum_l, _j);
+               size_beta = hemdist(datum_r, _j);
 
-               if (size_alpha < size_beta  + WISH_F(v->spl_nleft, v->spl_nright, 0.0001)) {
-                       if (ISALLTRUE(datum_l) || ISALLTRUE(_j) ) {
+               if (size_alpha < size_beta + WISH_F(v->spl_nleft, v->spl_nright, 0.0001))
+               {
+                       if (ISALLTRUE(datum_l) || ISALLTRUE(_j))
+                       {
                                if (!ISALLTRUE(datum_l))
                                        MemSet((void *) union_l, 0xff, sizeof(BITVEC));
-                       } else {
-                               ptr=GETSIGN(_j);
-                               LOOPBYTE(
+                       }
+                       else
+                       {
+                               ptr = GETSIGN(_j);
+                               LOOPBYTE
                                        union_l[i] |= ptr[i];
-                               );
                        }
                        *left++ = j;
                        v->spl_nleft++;
-               } else {
-                       if (ISALLTRUE(datum_r) || ISALLTRUE(_j) ) {
+               }
+               else
+               {
+                       if (ISALLTRUE(datum_r) || ISALLTRUE(_j))
+                       {
                                if (!ISALLTRUE(datum_r))
                                        MemSet((void *) union_r, 0xff, sizeof(BITVEC));
-                       } else {
-                               ptr=GETSIGN(_j);
-                               LOOPBYTE(
+                       }
+                       else
+                       {
+                               ptr = GETSIGN(_j);
+                               LOOPBYTE
                                        union_r[i] |= ptr[i];
-                               );
                        }
                        *right++ = j;
                        v->spl_nright++;
@@ -445,7 +548,6 @@ ghstore_picksplit(PG_FUNCTION_ARGS) {
        }
 
        *right = *left = FirstOffsetNumber;
-       pfree(costvector);
 
        v->spl_ldatum = PointerGetDatum(datum_l);
        v->spl_rdatum = PointerGetDatum(datum_r);
@@ -453,37 +555,149 @@ ghstore_picksplit(PG_FUNCTION_ARGS) {
        PG_RETURN_POINTER(v);
 }
 
+Datum
+ghstore_consistent(PG_FUNCTION_ARGS)
+{
+       GISTTYPE   *entry = (GISTTYPE *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
+       StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
+
+       /* Oid          subtype = PG_GETARG_OID(3); */
+       bool       *recheck = (bool *) PG_GETARG_POINTER(4);
+       bool            res = true;
+       BITVECP         sign;
 
-Datum     
-ghstore_consistent(PG_FUNCTION_ARGS) {
-       GISTTYPE  *entry = (GISTTYPE*) DatumGetPointer( ((GISTENTRY *) PG_GETARG_POINTER(0))->key );
-       HStore *query=PG_GETARG_HS(1);
-       bool res=true;
-       HEntry  *qe = ARRPTR(query);
-       char    *qv = STRPTR(query);
-       BITVECP sign;
+       /* All cases served by this function are inexact */
+       *recheck = true;
 
-       if ( ISALLTRUE(entry) ) {
-               PG_FREE_IF_COPY(query,1);
+       if (ISALLTRUE(entry))
                PG_RETURN_BOOL(true);
+
+       sign = GETSIGN(entry);
+
+       if (strategy == HStoreContainsStrategyNumber ||
+               strategy == HStoreOldContainsStrategyNumber)
+       {
+               BITVECP         qe;
+               int                     i;
+
+               qe = fcinfo->flinfo->fn_extra;
+               if (qe == NULL)
+               {
+                       HStore                  *query = PG_GETARG_HS(1);
+
+                       qe = MemoryContextAlloc(fcinfo->flinfo->fn_mcxt, sizeof(BITVEC));
+                       memset(qe, 0, sizeof(BITVEC));
+
+                       if (!HS_ISEMPTY(query))
+                       {
+                               int                             r;
+                               HStoreIterator  *it = HStoreIteratorInit(VARDATA(query));
+                               HStoreValue             v;
+
+                               while((r = HStoreIteratorGet(&it, &v, false)) != 0)
+                               {
+                                       if ((r == WHS_ELEM || r == WHS_KEY || r == WHS_VALUE) && v.type != hsvNull)
+                                       {
+                                               int   crc = crc32_HStoreValue(&v, r);
+
+                                               HASH(qe, crc);
+                                       }
+                               }
+                       }
+
+                       fcinfo->flinfo->fn_extra = qe;
+               }
+
+               LOOPBYTE
+               {
+                       if ((sign[i] & qe[i]) != qe[i])
+                       {
+                               res = false;
+                               break;
+                       }
+               }
+       }
+       else if (strategy == HStoreExistsStrategyNumber)
+       {
+               int     *qval;
+
+               qval = fcinfo->flinfo->fn_extra;
+               if (qval == NULL)
+               {
+                       text       *query = PG_GETARG_TEXT_PP(1);
+                       int                     crc = crc32_Key(VARDATA_ANY(query), VARSIZE_ANY_EXHDR(query));
+
+                       qval = MemoryContextAlloc(fcinfo->flinfo->fn_mcxt, sizeof(*qval));
+                       *qval = HASHVAL(crc);
+
+                       fcinfo->flinfo->fn_extra = qval;
+               }
+
+               res = (GETBIT(sign, *qval)) ? true : false;
        }
+       else if (strategy == HStoreExistsAllStrategyNumber ||
+                        strategy == HStoreExistsAnyStrategyNumber)
+       {
+               BITVECP arrentry;
+               int             i;
+
+               arrentry = fcinfo->flinfo->fn_extra;
+               if (arrentry == NULL)
+               {
+                       ArrayType  *query = PG_GETARG_ARRAYTYPE_P(1);
+                       Datum      *key_datums;
+                       bool       *key_nulls;
+                       int                     key_count;
+
+                       arrentry = MemoryContextAlloc(fcinfo->flinfo->fn_mcxt,
+                                                                                 sizeof(BITVEC));
+                       memset(arrentry, 0, sizeof(BITVEC));
+
+                       deconstruct_array(query,
+                                                         TEXTOID, -1, false, 'i',
+                                                         &key_datums, &key_nulls, &key_count);
+
+                       for (i = 0; i < key_count; ++i)
+                       {
+                               int                     crc;
+
+                               if (key_nulls[i])
+                                       continue;
+                               crc = crc32_Key(VARDATA(key_datums[i]),
+                                                               VARSIZE(key_datums[i]) - VARHDRSZ);
+                               HASH(arrentry, crc);
+                       }
 
-       sign=GETSIGN(entry); 
-       while(res && qe-ARRPTR(query) < query->size) {
-               int crc = crc32_sz((char *)(qv + qe->pos), qe->keylen);
-               if (GETBIT(sign,HASHVAL(crc))) {
-                       if ( !qe->valisnull ) {
-                               crc = crc32_sz((char *)(qv + qe->pos + qe->keylen), qe->vallen);
-                               if ( !GETBIT(sign,HASHVAL(crc)) )
-                                       res=false;
+                       fcinfo->flinfo->fn_extra = arrentry;
+               }
+
+               if (strategy == HStoreExistsAllStrategyNumber)
+               {
+                       LOOPBYTE
+                       {
+                               if ((sign[i] & arrentry[i]) != arrentry[i])
+                               {
+                                       res = false;
+                                       break;
+                               }
+                       }
+               }
+               else /* HStoreExistsAnyStrategyNumber */
+               {
+                       res = false;
+
+                       LOOPBYTE
+                       {
+                               if (sign[i] & arrentry[i])
+                               {
+                                       res = true;
+                                       break;
+                               }
                        }
-               } else
-                       res=false;
-               qe++;
+               }
        }
+       else
+               elog(ERROR, "Unsupported strategy number: %d", strategy);
 
-       PG_FREE_IF_COPY(query,1);
        PG_RETURN_BOOL(res);
 }
-
-