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.

1 files changed, 5 insertions, 9 deletions

diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index 790048aef38..960d1c2f25b 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/gist/gistscan.c,v 1.47 2003/08/04 02:39:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/gist/gistscan.c,v 1.48 2003/11/09 21:30:35 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -106,17 +106,13 @@ gistrescan(PG_FUNCTION_ARGS)
 				s->numberOfKeys * sizeof(ScanKeyData));
 
 		/*
-		 * Play games here with the scan key to use the Consistent
-		 * function for all comparisons: 1) the sk_procedure field will
-		 * now be used to hold the strategy number 2) the sk_func field
-		 * will point to the Consistent function
+		 * Modify the scan key so that the Consistent function is called
+		 * for all comparisons.  The original operator is passed to the
+		 * Consistent function in the form of its strategy number, which
+		 * is available from the sk_strategy field.
 		 */
 		for (i = 0; i < s->numberOfKeys; i++)
 		{
-			s->keyData[i].sk_procedure =
-				RelationGetGISTStrategy(s->indexRelation,
-										s->keyData[i].sk_attno,
-										s->keyData[i].sk_procedure);
 			s->keyData[i].sk_func = p->giststate->consistentFn[s->keyData[i].sk_attno - 1];
 		}
 	}