diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-11-09 21:30:38 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-11-09 21:30:38 +0000 |
| commit | c1d62bfd00f4d1ea0647e12947ca1de9fea39b33 (patch) | |
| tree | 1afdccb5267627182cab94b347730657107ad6eb /src/backend/access/gist/gistget.c | |
| parent | 723825afebb6de7212fa18882bcc78212d5c1743 (diff) | |
| download | postgresql-c1d62bfd00f4d1ea0647e12947ca1de9fea39b33.tar.gz | |
Add operator strategy and comparison-value datatype fields to ScanKey.
Remove the 'strategy map' code, which was a large amount of mechanism
that no longer had any use except reverse-mapping from procedure OID to
strategy number. Passing the strategy number to the index AM in the
first place is simpler and faster.
This is a preliminary step in planned support for cross-datatype index
operations. I'm committing it now since the ScanKeyEntryInitialize()
API change touches quite a lot of files, and I want to commit those
changes before the tree drifts under me.
Diffstat (limited to 'src/backend/access/gist/gistget.c')
| -rw-r--r-- | src/backend/access/gist/gistget.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c index bfa557bb9c..24168c9926 100644 --- a/src/backend/access/gist/gistget.c +++ b/src/backend/access/gist/gistget.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/gist/gistget.c,v 1.36 2003/08/04 02:39:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/gist/gistget.c,v 1.37 2003/11/09 21:30:35 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -249,26 +249,16 @@ gistindex_keytest(IndexTuple tuple, IndexTupleSize(tuple) - sizeof(IndexTupleData), FALSE, isNull); - if (key[0].sk_flags & SK_COMMUTE) - { - test = FunctionCall3(&key[0].sk_func, - key[0].sk_argument, - PointerGetDatum(&de), - ObjectIdGetDatum(key[0].sk_procedure)); - } - else - { - test = FunctionCall3(&key[0].sk_func, - PointerGetDatum(&de), - key[0].sk_argument, - ObjectIdGetDatum(key[0].sk_procedure)); - } + test = FunctionCall3(&key[0].sk_func, + PointerGetDatum(&de), + key[0].sk_argument, + Int32GetDatum(key[0].sk_strategy)); if (de.key != datum && !isAttByVal(giststate, key[0].sk_attno - 1)) if (DatumGetPointer(de.key) != NULL) pfree(DatumGetPointer(de.key)); - if (DatumGetBool(test) == !!(key[0].sk_flags & SK_NEGATE)) + if (!DatumGetBool(test)) return false; scanKeySize--; |