diff options
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/analyze.c | 15 | ||||
| -rw-r--r-- | src/backend/commands/indexcmds.c | 5 | ||||
| -rw-r--r-- | src/backend/commands/opclasscmds.c | 6 |
3 files changed, 11 insertions, 15 deletions
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 2272d7bf3fb..aea5e45b231 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.58 2003/08/04 02:39:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.59 2003/08/17 19:58:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -390,7 +390,6 @@ examine_attribute(Relation onerel, int attnum) { Form_pg_attribute attr = onerel->rd_att->attrs[attnum - 1]; Operator func_operator; - Oid oprrest; HeapTuple typtuple; Oid eqopr = InvalidOid; Oid eqfunc = InvalidOid; @@ -409,12 +408,8 @@ examine_attribute(Relation onerel, int attnum) func_operator = equality_oper(attr->atttypid, true); if (func_operator != NULL) { - oprrest = ((Form_pg_operator) GETSTRUCT(func_operator))->oprrest; - if (oprrest == F_EQSEL) - { - eqopr = oprid(func_operator); - eqfunc = oprfuncid(func_operator); - } + eqopr = oprid(func_operator); + eqfunc = oprfuncid(func_operator); ReleaseSysCache(func_operator); } if (!OidIsValid(eqfunc)) @@ -447,9 +442,7 @@ examine_attribute(Relation onerel, int attnum) func_operator = ordering_oper(attr->atttypid, true); if (func_operator != NULL) { - oprrest = ((Form_pg_operator) GETSTRUCT(func_operator))->oprrest; - if (oprrest == F_SCALARLTSEL) - ltopr = oprid(func_operator); + ltopr = oprid(func_operator); ReleaseSysCache(func_operator); } stats->ltopr = ltopr; diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 36baf4690e3..45f4c3b4f7d 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.105 2003/08/04 02:39:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.106 2003/08/17 19:58:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -529,7 +529,8 @@ GetDefaultOpClass(Oid attrType, Oid accessMethodId) * than one exact match, then someone put bogus entries in pg_opclass. * * The initial search is done by namespace.c so that we only consider - * opclasses visible in the current namespace search path. + * opclasses visible in the current namespace search path. (See also + * typcache.c, which applies the same logic, but over all opclasses.) */ for (opclass = OpclassGetCandidates(accessMethodId); opclass != NULL; diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index 0677751ead4..a93af3e6046 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/opclasscmds.c,v 1.17 2003/08/04 02:39:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/opclasscmds.c,v 1.18 2003/08/17 19:58:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -261,7 +261,9 @@ DefineOpClass(CreateOpClassStmt *stmt) /* * If we are creating a default opclass, check there isn't one - * already. (XXX should we restrict this test to visible opclasses?) + * already. (Note we do not restrict this test to visible opclasses; + * this ensures that typcache.c can find unique solutions to its + * questions.) */ if (stmt->isDefault) { |