diff options
Diffstat (limited to 'src/backend/access/gist/gistget.c')
| -rw-r--r-- | src/backend/access/gist/gistget.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c index 8f3b5dd475..d6fac6f4e2 100644 --- a/src/backend/access/gist/gistget.c +++ b/src/backend/access/gist/gistget.c @@ -241,16 +241,16 @@ gistindex_keytest(IndexTuple tuple, 1, tupdesc, &isNull); - gistdentryinit(giststate, &de, (char *) datum, r, p, offset, - IndexTupleSize(tuple) - sizeof(IndexTupleData), - FALSE); - - if (isNull) + if (isNull || IndexTupleSize(tuple) == sizeof(IndexTupleData) ) { /* XXX eventually should check if SK_ISNULL */ return false; } + gistdentryinit(giststate, &de, (char *) datum, r, p, offset, + IndexTupleSize(tuple) - sizeof(IndexTupleData), + FALSE); + if (key[0].sk_flags & SK_COMMUTE) { test = FunctionCall3(&key[0].sk_func, @@ -266,6 +266,9 @@ gistindex_keytest(IndexTuple tuple, ObjectIdGetDatum(key[0].sk_procedure)); } + if ( (char*)de.pred != (char*)datum ) + if ( de.pred ) pfree( de.pred ); + if (DatumGetBool(test) == !!(key[0].sk_flags & SK_NEGATE)) return false; |