Change pg_amop's index on (amopclaid,amopopr) to index (amopopr,amopclaid).
authorTom Lane <tgl@sss.pgh.pa.us>
Tue, 13 May 2003 04:38:58 +0000 (04:38 +0000)
committerTom Lane <tgl@sss.pgh.pa.us>
Tue, 13 May 2003 04:38:58 +0000 (04:38 +0000)
This makes no difference for existing uses, but allows SelectSortFunction()
and pred_test_simple_clause() to use indexscans instead of seqscans to
locate entries for a particular operator in pg_amop.  Better yet, they can
use the SearchSysCacheList() API to cache the search results.

src/backend/optimizer/path/indxpath.c
src/backend/utils/cache/lsyscache.c
src/backend/utils/cache/syscache.c
src/backend/utils/sort/tuplesort.c
src/include/catalog/catversion.h
src/include/catalog/indexing.h

index 6d6d4db9f985673cc017fc8121bfbddc4b79dc9b..8254c6b039130747455c3b254c3cd67323fa9af7 100644 (file)
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.136 2003/03/23 01:49:02 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.137 2003/05/13 04:38:58 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <math.h>
 
-#include "access/heapam.h"
 #include "access/nbtree.h"
-#include "catalog/catname.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_operator.h"
+#include "catalog/pg_type.h"
 #include "executor/executor.h"
 #include "nodes/makefuncs.h"
-#include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
 #include "optimizer/cost.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/paths.h"
 #include "optimizer/restrictinfo.h"
 #include "optimizer/var.h"
-#include "parser/parse_coerce.h"
-#include "parser/parse_expr.h"
-#include "parser/parse_oper.h"
 #include "rewrite/rewriteManip.h"
 #include "utils/builtins.h"
-#include "utils/fmgroids.h"
+#include "utils/catcache.h"
 #include "utils/lsyscache.h"
 #include "utils/selfuncs.h"
 #include "utils/syscache.h"
@@ -1120,18 +1115,18 @@ pred_test_simple_clause(Expr *predicate, Node *clause)
                clause_op,
                test_op;
    Oid         opclass_id = InvalidOid;
+   bool        found = false;
    StrategyNumber pred_strategy = 0,
-               clause_strategy,
+               clause_strategy = 0,
                test_strategy;
    Expr       *test_expr;
    ExprState  *test_exprstate;
    Datum       test_result;
    bool        isNull;
-   Relation    relation;
-   HeapScanDesc scan;
-   HeapTuple   tuple;
-   ScanKeyData entry[1];
-   Form_pg_amop aform;
+   HeapTuple   test_tuple;
+   Form_pg_amop test_form;
+   CatCList   *catlist;
+   int         i;
    EState     *estate;
    MemoryContext oldcontext;
 
@@ -1141,7 +1136,8 @@ pred_test_simple_clause(Expr *predicate, Node *clause)
 
    /*
     * Can't do anything more unless they are both binary opclauses with a
-    * Var on the left and a Const on the right.
+    * Var on the left and a Const on the right.  (XXX someday try to
+    * commute Const/Var cases?)
     */
    if (!is_opclause(predicate))
        return false;
@@ -1174,101 +1170,95 @@ pred_test_simple_clause(Expr *predicate, Node *clause)
    clause_op = ((OpExpr *) clause)->opno;
 
    /*
-    * 1. Find a "btree" strategy number for the pred_op
+    * 1. Find "btree" strategy numbers for the pred_op and clause_op.
     *
-    * The following assumes that any given operator will only be in a single
-    * btree operator class.  This is true at least for all the
-    * pre-defined operator classes.  If it isn't true, then whichever
-    * operator class happens to be returned first for the given operator
-    * will be used to find the associated strategy numbers for the test.
-    * --Nels, Jan '93
+    * We must find a btree opclass that contains both operators, else the
+    * implication can't be determined.  If there are multiple such opclasses,
+    * assume we can use any one to determine the logical relationship of the
+    * two operators and the correct corresponding test operator.  This should
+    * work for any logically consistent opclasses.
     */
-   ScanKeyEntryInitialize(&entry[0], 0x0,
-                          Anum_pg_amop_amopopr,
-                          F_OIDEQ,
-                          ObjectIdGetDatum(pred_op));
-
-   relation = heap_openr(AccessMethodOperatorRelationName, AccessShareLock);
-   scan = heap_beginscan(relation, SnapshotNow, 1, entry);
+   catlist = SearchSysCacheList(AMOPOPID, 1,
+                                ObjectIdGetDatum(pred_op),
+                                0, 0, 0);
 
-   while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
+   for (i = 0; i < catlist->n_members; i++)
    {
-       aform = (Form_pg_amop) GETSTRUCT(tuple);
-       if (opclass_is_btree(aform->amopclaid))
+       HeapTuple   pred_tuple = &catlist->members[i]->tuple;
+       Form_pg_amop pred_form = (Form_pg_amop) GETSTRUCT(pred_tuple);
+       HeapTuple   clause_tuple;
+
+       if (!opclass_is_btree(pred_form->amopclaid))
+           continue;
+
+       /* Get the predicate operator's btree strategy number */
+       pred_strategy = (StrategyNumber) pred_form->amopstrategy;
+       Assert(pred_strategy >= 1 && pred_strategy <= 5);
+
+       /*
+        * Remember which operator class this strategy number came from
+        */
+       opclass_id = pred_form->amopclaid;
+
+       /*
+        * From the same opclass, find a strategy num for the clause_op,
+        * if possible
+        */
+       clause_tuple = SearchSysCache(AMOPOPID,
+                                     ObjectIdGetDatum(clause_op),
+                                     ObjectIdGetDatum(opclass_id),
+                                     0, 0);
+       if (HeapTupleIsValid(clause_tuple))
        {
-           /* Get the predicate operator's btree strategy number (1 to 5) */
-           pred_strategy = (StrategyNumber) aform->amopstrategy;
-           Assert(pred_strategy >= 1 && pred_strategy <= 5);
+           Form_pg_amop clause_form = (Form_pg_amop) GETSTRUCT(clause_tuple);
 
-           /*
-            * Remember which operator class this strategy number came
-            * from
-            */
-           opclass_id = aform->amopclaid;
+           /* Get the restriction clause operator's strategy number */
+           clause_strategy = (StrategyNumber) clause_form->amopstrategy;
+           Assert(clause_strategy >= 1 && clause_strategy <= 5);
+
+           ReleaseSysCache(clause_tuple);
+           found = true;
            break;
        }
    }
 
-   heap_endscan(scan);
-   heap_close(relation, AccessShareLock);
-
-   if (!OidIsValid(opclass_id))
-   {
-       /* predicate operator isn't btree-indexable */
-       return false;
-   }
+   ReleaseSysCacheList(catlist);
 
-   /*
-    * 2. From the same opclass, find a strategy num for the clause_op
-    */
-   tuple = SearchSysCache(AMOPOPID,
-                          ObjectIdGetDatum(opclass_id),
-                          ObjectIdGetDatum(clause_op),
-                          0, 0);
-   if (!HeapTupleIsValid(tuple))
+   if (!found)
    {
-       /* clause operator isn't btree-indexable, or isn't in this opclass */
+       /* couldn't find a btree opclass to interpret the operators */
        return false;
    }
-   aform = (Form_pg_amop) GETSTRUCT(tuple);
-
-   /* Get the restriction clause operator's strategy number (1 to 5) */
-   clause_strategy = (StrategyNumber) aform->amopstrategy;
-   Assert(clause_strategy >= 1 && clause_strategy <= 5);
-
-   ReleaseSysCache(tuple);
 
    /*
-    * 3. Look up the "test" strategy number in the implication table
+    * 2. Look up the "test" strategy number in the implication table
     */
    test_strategy = BT_implic_table[clause_strategy - 1][pred_strategy - 1];
    if (test_strategy == 0)
-   {
        return false;           /* the implication cannot be determined */
-   }
 
    /*
-    * 4. From the same opclass, find the operator for the test strategy
+    * 3. From the same opclass, find the operator for the test strategy
     */
-   tuple = SearchSysCache(AMOPSTRATEGY,
-                          ObjectIdGetDatum(opclass_id),
-                          Int16GetDatum(test_strategy),
-                          0, 0);
-   if (!HeapTupleIsValid(tuple))
+   test_tuple = SearchSysCache(AMOPSTRATEGY,
+                               ObjectIdGetDatum(opclass_id),
+                               Int16GetDatum(test_strategy),
+                               0, 0);
+   if (!HeapTupleIsValid(test_tuple))
    {
-       /* this probably shouldn't fail? */
-       elog(DEBUG1, "pred_test_simple_clause: unknown test_op");
-       return false;
+       /* This should not fail, else pg_amop entry is missing */
+       elog(ERROR, "Missing pg_amop entry for opclass %u strategy %d",
+            opclass_id, test_strategy);
    }
-   aform = (Form_pg_amop) GETSTRUCT(tuple);
+   test_form = (Form_pg_amop) GETSTRUCT(test_tuple);
 
    /* Get the test operator */
-   test_op = aform->amopopr;
+   test_op = test_form->amopopr;
 
-   ReleaseSysCache(tuple);
+   ReleaseSysCache(test_tuple);
 
    /*
-    * 5. Evaluate the test.  For this we need an EState.
+    * 4. Evaluate the test.  For this we need an EState.
     */
    estate = CreateExecutorState();
 
@@ -1298,6 +1288,7 @@ pred_test_simple_clause(Expr *predicate, Node *clause)
 
    if (isNull)
    {
+       /* Treat a null result as false ... but it's a tad fishy ... */
        elog(DEBUG1, "pred_test_simple_clause: null test result");
        return false;
    }
index 49e545b68496ee7483c18e42c0fe6b809ed102f8..19178cc5243f3cfa36a0d928a44a5a3b2d9a6b44 100644 (file)
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.93 2003/05/09 18:08:48 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.94 2003/05/13 04:38:58 tgl Exp $
  *
  * NOTES
  *   Eventually, the index information should go through here, too.
@@ -44,8 +44,8 @@ bool
 op_in_opclass(Oid opno, Oid opclass)
 {
    return SearchSysCacheExists(AMOPOPID,
-                               ObjectIdGetDatum(opclass),
                                ObjectIdGetDatum(opno),
+                               ObjectIdGetDatum(opclass),
                                0, 0);
 }
 
@@ -67,8 +67,8 @@ op_requires_recheck(Oid opno, Oid opclass)
    bool        result;
 
    tp = SearchSysCache(AMOPOPID,
-                       ObjectIdGetDatum(opclass),
                        ObjectIdGetDatum(opno),
+                       ObjectIdGetDatum(opclass),
                        0, 0);
    if (!HeapTupleIsValid(tp))
        elog(ERROR, "op_requires_recheck: op %u is not a member of opclass %u",
index 3eca49ba8a69ffa084bba99afc6bb350052642b4..1e435f9f3ab041f60d2c15aa9f683cc59c2989d8 100644 (file)
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.87 2002/09/04 20:31:30 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.88 2003/05/13 04:38:58 tgl Exp $
  *
  * NOTES
  *   These routines allow the parser/planner/executor to perform
@@ -128,8 +128,8 @@ static const struct cachedesc cacheinfo[] = {
        0,
        2,
        {
-           Anum_pg_amop_amopclaid,
            Anum_pg_amop_amopopr,
+           Anum_pg_amop_amopclaid,
            0,
            0
    }},
index f8fc25808fc5ea5ac28ef664c74e3c397bf3f7cf..5ffc9d810e14e3c74e6383cc50e22c463aae6f6c 100644 (file)
@@ -78,7 +78,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplesort.c,v 1.32 2002/11/13 00:39:48 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/utils/sort/tuplesort.c,v 1.33 2003/05/13 04:38:58 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "access/heapam.h"
 #include "access/nbtree.h"
-#include "catalog/catname.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"
 #include "catalog/pg_operator.h"
 #include "miscadmin.h"
+#include "utils/catcache.h"
 #include "utils/datum.h"
-#include "utils/fmgroids.h"
 #include "utils/logtape.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 #include "utils/tuplesort.h"
 
+
 /*
  * Possible states of a Tuplesort object.  These denote the states that
  * persist between calls of Tuplesort routines.
@@ -1708,32 +1708,30 @@ SelectSortFunction(Oid sortOperator,
                   RegProcedure *sortFunction,
                   SortFunctionKind *kind)
 {
-   Relation    relation;
-   HeapScanDesc scan;
-   ScanKeyData skey[1];
+   CatCList   *catlist;
+   int         i;
    HeapTuple   tuple;
    Form_pg_operator optup;
    Oid         opclass = InvalidOid;
 
    /*
-    * Scan pg_amop to see if the target operator is registered as the "<"
+    * Search pg_amop to see if the target operator is registered as the "<"
     * or ">" operator of any btree opclass.  It's possible that it might
     * be registered both ways (eg, if someone were to build a "reverse
     * sort" opclass for some reason); prefer the "<" case if so. If the
     * operator is registered the same way in multiple opclasses, assume
     * we can use the associated comparator function from any one.
     */
-   ScanKeyEntryInitialize(&skey[0], 0x0,
-                          Anum_pg_amop_amopopr,
-                          F_OIDEQ,
-                          ObjectIdGetDatum(sortOperator));
+   catlist = SearchSysCacheList(AMOPOPID, 1,
+                                ObjectIdGetDatum(sortOperator),
+                                0, 0, 0);
 
-   relation = heap_openr(AccessMethodOperatorRelationName, AccessShareLock);
-   scan = heap_beginscan(relation, SnapshotNow, 1, skey);
-
-   while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
+   for (i = 0; i < catlist->n_members; i++)
    {
-       Form_pg_amop aform = (Form_pg_amop) GETSTRUCT(tuple);
+       Form_pg_amop aform;
+
+       tuple = &catlist->members[i]->tuple;
+       aform = (Form_pg_amop) GETSTRUCT(tuple);
 
        if (!opclass_is_btree(aform->amopclaid))
            continue;
@@ -1751,8 +1749,7 @@ SelectSortFunction(Oid sortOperator,
        }
    }
 
-   heap_endscan(scan);
-   heap_close(relation, AccessShareLock);
+   ReleaseSysCacheList(catlist);
 
    if (OidIsValid(opclass))
    {
index c96df3034f1f6dac41d32ed11d97f7fa1e9d4743..4a538376ecc1abbe604583767a6338ab20426ae6 100644 (file)
@@ -37,7 +37,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catversion.h,v 1.191 2003/05/12 23:08:50 tgl Exp $
+ * $Id: catversion.h,v 1.192 2003/05/13 04:38:58 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,6 +53,6 @@
  */
 
 /*                         yyyymmddN */
-#define CATALOG_VERSION_NO 200305121
+#define CATALOG_VERSION_NO 200305122
 
 #endif
index 4a76a27dec6529d429b29e7c4f0eeeffe17ad4a4..ea251a329ce4569ec0500e8dce83408f4e5f80ca 100644 (file)
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: indexing.h,v 1.77 2002/11/15 02:50:10 momjian Exp $
+ * $Id: indexing.h,v 1.78 2003/05/13 04:38:58 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,7 +23,7 @@
  * References to specific system indexes in the C code should use these
  * macros rather than hardwiring the actual index name.
  */
-#define AccessMethodOperatorIndex  "pg_amop_opc_opr_index"
+#define AccessMethodOperatorIndex  "pg_amop_opr_opc_index"
 #define AccessMethodStrategyIndex  "pg_amop_opc_strategy_index"
 #define AccessMethodProcedureIndex "pg_amproc_opc_procnum_index"
 #define AggregateFnoidIndex            "pg_aggregate_fnoid_index"
@@ -115,7 +115,7 @@ extern void CatalogUpdateIndexes(Relation heapRel, HeapTuple heapTuple);
 DECLARE_UNIQUE_INDEX(pg_aggregate_fnoid_index on pg_aggregate using btree(aggfnoid oid_ops));
 DECLARE_UNIQUE_INDEX(pg_am_name_index on pg_am using btree(amname name_ops));
 DECLARE_UNIQUE_INDEX(pg_am_oid_index on pg_am using btree(oid oid_ops));
-DECLARE_UNIQUE_INDEX(pg_amop_opc_opr_index on pg_amop using btree(amopclaid oid_ops, amopopr oid_ops));
+DECLARE_UNIQUE_INDEX(pg_amop_opr_opc_index on pg_amop using btree(amopopr oid_ops, amopclaid oid_ops));
 DECLARE_UNIQUE_INDEX(pg_amop_opc_strategy_index on pg_amop using btree(amopclaid oid_ops, amopstrategy int2_ops));
 DECLARE_UNIQUE_INDEX(pg_amproc_opc_procnum_index on pg_amproc using btree(amopclaid oid_ops, amprocnum int2_ops));
 DECLARE_UNIQUE_INDEX(pg_attrdef_adrelid_adnum_index on pg_attrdef using btree(adrelid oid_ops, adnum int2_ops));