mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

index strategy cleanup

Browse Source
This commit is contained in:
Bruce Momjian 1998-08-11 19:32:39 +00:00
parent f22c6f9237
commit 024d5f74ba
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/access/index/istrat.c
View File

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

5
src/backend/optimizer/path/indxpath.c
View File

@ -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,

6
src/include/access/strat.h
View File

@ -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
{