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/nodes | |
| parent | 723825afebb6de7212fa18882bcc78212d5c1743 (diff) | |
| download | postgresql-c1d62bfd00f4d1ea0647e12947ca1de9fea39b33.tar.gz postgresql-c1d62bfd00f4d1ea0647e12947ca1de9fea39b33.zip | |
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/nodes')
| -rw-r--r-- | src/backend/nodes/copyfuncs.c | 13 | ||||
| -rw-r--r-- | src/backend/nodes/outfuncs.c | 12 |
2 files changed, 23 insertions, 2 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 17b32cd4ab8..c02270fa2e7 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -15,7 +15,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.265 2003/08/17 23:43:25 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.266 2003/11/09 21:30:36 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -262,6 +262,17 @@ _copyIndexScan(IndexScan *from) COPY_OIDLIST_FIELD(indxid); COPY_NODE_FIELD(indxqual); COPY_NODE_FIELD(indxqualorig); + /* this can become COPY_NODE_FIELD when intlists are normal objects: */ + { + List *newstrat = NIL; + List *tmp; + + foreach(tmp, from->indxstrategy) + { + newstrat = lappend(newstrat, listCopy(lfirst(tmp))); + } + newnode->indxstrategy = newstrat; + } COPY_SCALAR_FIELD(indxorderdir); return newnode; diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index 97d9aed2407..b2fa96bd5d2 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.218 2003/08/17 23:43:26 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.219 2003/11/09 21:30:36 tgl Exp $ * * NOTES * Every node type that can appear in stored rules' parsetrees *must* @@ -336,6 +336,16 @@ _outIndexScan(StringInfo str, IndexScan *node) WRITE_OIDLIST_FIELD(indxid); WRITE_NODE_FIELD(indxqual); WRITE_NODE_FIELD(indxqualorig); + /* this can become WRITE_NODE_FIELD when intlists are normal objects: */ + { + List *tmp; + + appendStringInfo(str, " :indxstrategy "); + foreach(tmp, node->indxstrategy) + { + _outIntList(str, lfirst(tmp)); + } + } WRITE_ENUM_FIELD(indxorderdir, ScanDirection); } |