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, 0 insertions, 138 deletions

diff --git a/src/backend/access/nbtree/nbtstrat.c b/src/backend/access/nbtree/nbtstrat.c
deleted file mode 100644
index 15544d47572..00000000000
--- a/src/backend/access/nbtree/nbtstrat.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * nbtstrat.c
- *	  Strategy map entries for the btree indexed access method
- *
- * 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/nbtree/Attic/nbtstrat.c,v 1.18 2003/08/04 02:39:57 momjian Exp $
- *
- *-------------------------------------------------------------------------
- */
-
-#include "postgres.h"
-
-#include "access/istrat.h"
-#include "access/nbtree.h"
-
-/*
- * Note:
- *		StrategyNegate, StrategyCommute, and StrategyNegateCommute
- *		assume <, <=, ==, >=, > ordering.
- */
-static StrategyNumber BTNegate[BTMaxStrategyNumber] = {
-	BTGreaterEqualStrategyNumber,
-	BTGreaterStrategyNumber,
-	InvalidStrategy,
-	BTLessStrategyNumber,
-	BTLessEqualStrategyNumber
-};
-
-static StrategyNumber BTCommute[BTMaxStrategyNumber] = {
-	BTGreaterStrategyNumber,
-	BTGreaterEqualStrategyNumber,
-	InvalidStrategy,
-	BTLessEqualStrategyNumber,
-	BTLessStrategyNumber
-};
-
-static StrategyNumber BTNegateCommute[BTMaxStrategyNumber] = {
-	BTLessEqualStrategyNumber,
-	BTLessStrategyNumber,
-	InvalidStrategy,
-	BTGreaterStrategyNumber,
-	BTGreaterEqualStrategyNumber
-};
-
-static uint16 BTLessTermData[] = {		/* XXX type clash */
-	2,
-	BTLessStrategyNumber,
-	SK_NEGATE,
-	BTLessStrategyNumber,
-	SK_NEGATE | SK_COMMUTE
-};
-
-static uint16 BTLessEqualTermData[] = { /* XXX type clash */
-	2,
-	BTLessEqualStrategyNumber,
-	0x0,
-	BTLessEqualStrategyNumber,
-	SK_COMMUTE
-};
-
-static uint16 BTGreaterEqualTermData[] = {		/* XXX type clash */
-	2,
-	BTGreaterEqualStrategyNumber,
-	0x0,
-	BTGreaterEqualStrategyNumber,
-	SK_COMMUTE
-};
-
-static uint16 BTGreaterTermData[] = {	/* XXX type clash */
-	2,
-	BTGreaterStrategyNumber,
-	SK_NEGATE,
-	BTGreaterStrategyNumber,
-	SK_NEGATE | SK_COMMUTE
-};
-
-static StrategyTerm BTEqualExpressionData[] = {
-	(StrategyTerm) BTLessTermData,		/* XXX */
-	(StrategyTerm) BTLessEqualTermData, /* XXX */
-	(StrategyTerm) BTGreaterEqualTermData,		/* XXX */
-	(StrategyTerm) BTGreaterTermData,	/* XXX */
-	NULL
-};
-
-static StrategyExpression BTEvaluationExpressions[BTMaxStrategyNumber] = {
-	NULL,
-	NULL,
-	(StrategyExpression) BTEqualExpressionData,
-	NULL,
-	NULL
-};
-
-static StrategyEvaluationData BTEvaluationData = {
-	BTMaxStrategyNumber,
-	(StrategyTransformMap) BTNegate,
-	(StrategyTransformMap) BTCommute,
-	(StrategyTransformMap) BTNegateCommute,
-	BTEvaluationExpressions
-};
-
-/* ----------------------------------------------------------------
- *		RelationGetBTStrategy
- * ----------------------------------------------------------------
- */
-
-StrategyNumber
-_bt_getstrat(Relation rel,
-			 AttrNumber attno,
-			 RegProcedure proc)
-{
-	StrategyNumber strat;
-
-	strat = RelationGetStrategy(rel, attno, &BTEvaluationData, proc);
-
-	Assert(StrategyNumberIsValid(strat));
-
-	return strat;
-}
-
-#ifdef NOT_USED
-
-bool
-_bt_invokestrat(Relation rel,
-				AttrNumber attno,
-				StrategyNumber strat,
-				Datum left,
-				Datum right)
-{
-	return (RelationInvokeStrategy(rel, &BTEvaluationData, attno, strat,
-								   left, right));
-}
-
-#endif