diff options
Diffstat (limited to 'src/backend/optimizer')
| -rw-r--r-- | src/backend/optimizer/path/clausesel.c | 18 | ||||
| -rw-r--r-- | src/backend/optimizer/path/indxpath.c | 45 |
2 files changed, 27 insertions, 36 deletions
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c index 2911f19f4c2..5e723d9603e 100644 --- a/src/backend/optimizer/path/clausesel.c +++ b/src/backend/optimizer/path/clausesel.c @@ -7,30 +7,26 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.6 1998/02/26 04:32:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.7 1998/04/27 04:05:49 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" +#include "catalog/pg_operator.h" +#include "fmgr.h" #include "nodes/pg_list.h" -#include "nodes/relation.h" #include "nodes/primnodes.h" - -#include "optimizer/internal.h" +#include "nodes/relation.h" #include "optimizer/clauses.h" #include "optimizer/clauseinfo.h" #include "optimizer/cost.h" +#include "optimizer/internal.h" #include "optimizer/plancat.h" - #include "parser/parsetree.h" /* for getrelid() */ - -#include "catalog/pg_proc.h" -#include "catalog/pg_operator.h" - -#include "utils/elog.h" #include "utils/lsyscache.h" + static Cost compute_selec(Query *root, List *clauses, List *or_selectivities); /**************************************************************************** @@ -254,7 +250,7 @@ compute_selec(Query *root, List *clauses, List *or_selectivities) * of that info. */ - s1 = restriction_selectivity(EqualSelectivityProcedure, + s1 = restriction_selectivity(F_EQSEL, BooleanEqualOperator, relid, ((Var *) clause)->varoattno, diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index 849b9f9406a..0a960033302 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -8,42 +8,37 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.14 1998/02/26 04:32:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.15 1998/04/27 04:05:53 momjian Exp $ * *------------------------------------------------------------------------- */ #include <math.h> + #include "postgres.h" + #include "access/attnum.h" #include "access/heapam.h" #include "access/nbtree.h" - -#include "nodes/pg_list.h" -#include "nodes/relation.h" +#include "catalog/catname.h" +#include "catalog/pg_amop.h" +#include "executor/executor.h" +#include "fmgr.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" - -#include "utils/lsyscache.h" -#include "utils/elog.h" - -#include "optimizer/internal.h" -#include "optimizer/paths.h" +#include "nodes/pg_list.h" +#include "nodes/relation.h" #include "optimizer/clauses.h" #include "optimizer/clauseinfo.h" -#include "optimizer/plancat.h" -#include "optimizer/keys.h" #include "optimizer/cost.h" +#include "optimizer/internal.h" +#include "optimizer/keys.h" +#include "optimizer/ordering.h" +#include "optimizer/paths.h" +#include "optimizer/plancat.h" #include "optimizer/pathnode.h" #include "optimizer/xfunc.h" -#include "optimizer/ordering.h" - - -#include "catalog/catname.h" -#include "catalog/pg_amop.h" -#include "catalog/pg_proc.h" - -#include "executor/executor.h" #include "parser/parsetree.h" /* for getrelid() */ +#include "utils/lsyscache.h" static void @@ -970,12 +965,12 @@ clause_pred_clause_test(Expr *predicate, Node *clause) /* XXX - hardcoded amopid value 403 to find "btree" operator classes */ ScanKeyEntryInitialize(&entry[0], 0, Anum_pg_amop_amopid, - ObjectIdEqualRegProcedure, + F_OIDEQ, ObjectIdGetDatum(403)); ScanKeyEntryInitialize(&entry[1], 0, Anum_pg_amop_amopopr, - ObjectIdEqualRegProcedure, + F_OIDEQ, ObjectIdGetDatum(pred_op)); relation = heap_openr(AccessMethodOperatorRelationName); @@ -1011,12 +1006,12 @@ clause_pred_clause_test(Expr *predicate, Node *clause) */ ScanKeyEntryInitialize(&entry[1], 0, Anum_pg_amop_amopclaid, - ObjectIdEqualRegProcedure, + F_OIDEQ, ObjectIdGetDatum(opclass_id)); ScanKeyEntryInitialize(&entry[2], 0, Anum_pg_amop_amopopr, - ObjectIdEqualRegProcedure, + F_OIDEQ, ObjectIdGetDatum(clause_op)); scan = heap_beginscan(relation, false, false, 3, entry); @@ -1048,7 +1043,7 @@ clause_pred_clause_test(Expr *predicate, Node *clause) ScanKeyEntryInitialize(&entry[2], 0, Anum_pg_amop_amopstrategy, - Integer16EqualRegProcedure, + F_INT2EQ, Int16GetDatum(test_strategy)); scan = heap_beginscan(relation, false, false, 3, entry); |