index strategy cleanup

src/backend/access/index/istrat.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.22 1998/08/10 14:32:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.23 1998/08/11 19:32:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -148,10 +148,7 @@ StrategyTermIsValid(StrategyTerm term,
 	{
 		if (!StrategyOperatorIsValid(&term->operatorData[index],
 									 maxStrategy))
-		{
-
 			return false;
-		}
 	}
 
 	return true;
@@ -574,8 +571,7 @@ IndexSupportInitialize(IndexStrategy indexStrategy,
 			break;
 		}
 
-		operatorClassObjectId[attributeIndex]
-			= iform->indclass[attributeIndex];
+		operatorClassObjectId[attributeIndex] = iform->indclass[attributeIndex];
 	}
 
 	heap_endscan(scan);
@@ -592,14 +588,11 @@ IndexSupportInitialize(IndexStrategy indexStrategy,
 		ScanKeyEntryInitialize(&entry[1], 0, Anum_pg_amproc_amopclaid,
 							   F_OIDEQ, 0);
 
-/*		relation = heap_openr(Name_pg_amproc); */
 		relation = heap_openr(AccessMethodProcedureRelationName);
 
-
 		for (attributeNumber = maxAttributeNumber; attributeNumber > 0;
 			 attributeNumber--)
 		{
-
 			int16		support;
 			Form_pg_amproc form;
 			RegProcedure *loc;

src/backend/optimizer/path/indxpath.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.27 1998/08/10 04:49:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.28 1998/08/11 19:32:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -953,11 +953,10 @@ clause_pred_clause_test(Expr *predicate, Node *clause)
 	/*
 	 * 1. Find a "btree" strategy number for the pred_op
 	 */
-	/* XXX - hardcoded amopid value 403 to find "btree" operator classes */
 	ScanKeyEntryInitialize(&entry[0], 0,
 						   Anum_pg_amop_amopid,
 						   F_OIDEQ,
-						   ObjectIdGetDatum(403));
+						   ObjectIdGetDatum(BTREE_AM_OID));
 
 	ScanKeyEntryInitialize(&entry[1], 0,
 						   Anum_pg_amop_amopopr,

src/include/access/strat.h

@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: strat.h,v 1.9 1998/02/26 04:40:28 momjian Exp $
+ * $Id: strat.h,v 1.10 1998/08/11 19:32:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -74,11 +74,7 @@ typedef StrategyEvaluationData *StrategyEvaluation;
 #define StrategyTransformMapIsValid(transform) PointerIsValid(transform)
 
 
-#ifndef CorrectStrategies		/* XXX this should be removable */
-#define AMStrategies(foo)		12
-#else							/* !defined(CorrectStrategies) */
 #define AMStrategies(foo)		(foo)
-#endif							/* !defined(CorrectStrategies) */
 
 typedef struct StrategyMapData
 {