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.

Author: tglsfdc

contrib/dblink/dblink.c

@@ -1357,8 +1357,10 @@ get_pkey_attnames(Oid relid, int16 *numatts)
 
 	/* use relid to get all related indexes */
 	indexRelation = heap_openr(IndexRelationName, AccessShareLock);
-	ScanKeyEntryInitialize(&entry, 0, Anum_pg_index_indrelid,
-						   F_OIDEQ, ObjectIdGetDatum(relid));
+	ScanKeyEntryInitialize(&entry, 0,
+						   Anum_pg_index_indrelid,
+						   BTEqualStrategyNumber, F_OIDEQ,
+						   ObjectIdGetDatum(relid), OIDOID);
 	scan = heap_beginscan(indexRelation, SnapshotNow, 1, &entry);
 
 	while ((indexTuple = heap_getnext(scan, ForwardScanDirection)) != NULL)

contrib/miscutil/misc_utils.c

@@ -21,6 +21,7 @@
 #include "access/tupdesc.h"
 #include "catalog/catname.h"
 #include "catalog/pg_listener.h"
+#include "catalog/pg_type.h"
 #include "commands/async.h"
 #include "fmgr.h"
 #include "storage/lmgr.h"
@@ -88,8 +89,8 @@ active_listeners(text *relname)
 		memcpy(listen_name, VARDATA(relname), len);
 		ScanKeyEntryInitialize(&key, 0,
 							   Anum_pg_listener_relname,
-							   F_NAMEEQ,
-							   PointerGetDatum(listen_name));
+							   BTEqualStrategyNumber, F_NAMEEQ,
+							   PointerGetDatum(listen_name), NAMEOID);
 		sRel = heap_beginscan(lRel, SnapshotNow, 1, &key);
 	}
 	else

src/backend/access/common/indexvalid.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.29 2003/08/04 02:39:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.30 2003/11/09 21:30:35 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,12 +57,9 @@ index_keytest(IndexTuple tuple,
 		if (key->sk_flags & SK_ISNULL)
 			return false;
 
-		if (key->sk_flags & SK_COMMUTE)
-			test = FunctionCall2(&key->sk_func, key->sk_argument, datum);
-		else
-			test = FunctionCall2(&key->sk_func, datum, key->sk_argument);
+		test = FunctionCall2(&key->sk_func, datum, key->sk_argument);
 
-		if (DatumGetBool(test) == !!(key->sk_flags & SK_NEGATE))
+		if (!DatumGetBool(test))
 			return false;
 
 		key++;

src/backend/access/common/scankey.c

@@ -1,99 +1,70 @@
 /*-------------------------------------------------------------------------
  *
- * scan.c
- *	  scan direction and key code
+ * scankey.c
+ *	  scan key support code
  *
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.22 2003/08/04 02:39:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.23 2003/11/09 21:30:35 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
-
 #include "postgres.h"
 
 #include "access/skey.h"
 
-/*
- * ScanKeyEntryIsLegal
- *		True iff the scan key entry is legal.
- */
-#define ScanKeyEntryIsLegal(entry) \
-( \
-	AssertMacro(PointerIsValid(entry)), \
-	AttributeNumberIsValid((entry)->sk_attno) \
-)
-
-/*
- * ScanKeyEntrySetIllegal
- *		Marks a scan key entry as illegal.
- */
-void
-ScanKeyEntrySetIllegal(ScanKey entry)
-{
-
-	Assert(PointerIsValid(entry));
-
-	entry->sk_flags = 0;		/* just in case... */
-	entry->sk_attno = InvalidAttrNumber;
-	entry->sk_procedure = 0;	/* should be InvalidRegProcedure */
-	entry->sk_func.fn_oid = InvalidOid;
-	entry->sk_argument = (Datum) 0;
-}
 
 /*
  * ScanKeyEntryInitialize
- *		Initializes a scan key entry.
+ *		Initializes a scan key entry given all the field values.
+ *		The target procedure is specified by OID.
  *
- * Note:
- *		Assumes the scan key entry is valid.
- *		Assumes the intialized scan key entry will be legal.
+ * Note: CurrentMemoryContext at call should be as long-lived as the ScanKey
+ * itself, because that's what will be used for any subsidiary info attached
+ * to the ScanKey's FmgrInfo record.
  */
 void
 ScanKeyEntryInitialize(ScanKey entry,
-					   bits16 flags,
+					   int flags,
 					   AttrNumber attributeNumber,
+					   StrategyNumber strategy,
 					   RegProcedure procedure,
-					   Datum argument)
+					   Datum argument,
+					   Oid argtype)
 {
-	Assert(PointerIsValid(entry));
-
 	entry->sk_flags = flags;
 	entry->sk_attno = attributeNumber;
-	entry->sk_procedure = procedure;
+	entry->sk_strategy = strategy;
 	entry->sk_argument = argument;
+	entry->sk_argtype = argtype;
 	fmgr_info(procedure, &entry->sk_func);
-
-	Assert(ScanKeyEntryIsLegal(entry));
 }
 
 /*
  * ScanKeyEntryInitializeWithInfo
  *		Initializes a scan key entry using an already-completed FmgrInfo
  *		function lookup record.
  *
- * mcxt is the memory context holding the scan key; it'll be used for
- * any subsidiary info attached to the scankey's FmgrInfo record.
+ * Note: CurrentMemoryContext at call should be as long-lived as the ScanKey
+ * itself, because that's what will be used for any subsidiary info attached
+ * to the ScanKey's FmgrInfo record.
  */
 void
 ScanKeyEntryInitializeWithInfo(ScanKey entry,
-							   bits16 flags,
+							   int flags,
 							   AttrNumber attributeNumber,
+							   StrategyNumber strategy,
 							   FmgrInfo *finfo,
-							   MemoryContext mcxt,
-							   Datum argument)
+							   Datum argument,
+							   Oid argtype)
 {
-	Assert(PointerIsValid(entry));
-	Assert(RegProcedureIsValid(finfo->fn_oid));
-
 	entry->sk_flags = flags;
 	entry->sk_attno = attributeNumber;
-	entry->sk_procedure = finfo->fn_oid;
+	entry->sk_strategy = strategy;
 	entry->sk_argument = argument;
-	fmgr_info_copy(&entry->sk_func, finfo, mcxt);
-
-	Assert(ScanKeyEntryIsLegal(entry));
+	entry->sk_argtype = argtype;
+	fmgr_info_copy(&entry->sk_func, finfo, CurrentMemoryContext);
 }

src/backend/access/gist/Makefile

@@ -4,15 +4,15 @@
 #    Makefile for access/gist
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.10 2000/08/31 16:09:31 petere Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.11 2003/11/09 21:30:35 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/backend/access/gist
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = gist.o gistget.o gistscan.o giststrat.o
+OBJS = gist.o gistget.o gistscan.o
 
 all: SUBSYS.o
 

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--;

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];
 		}
 	}