From 6cef5d2549110c6c0abb92215c2593e652024493 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 16 Apr 2002 23:08:12 +0000 Subject: Operators live in namespaces. CREATE/DROP/COMMENT ON OPERATOR take qualified operator names directly, for example CREATE OPERATOR myschema.+ ( ... ). To qualify an operator name in an expression you need to write OPERATOR(myschema.+) (thanks to Peter for suggesting an escape hatch). I also took advantage of having to reformat pg_operator to fix something that'd been bugging me for a while: mergejoinable operators should have explicit links to the associated cross-data-type comparison operators, rather than hardwiring an assumption that they are named < and >. --- src/backend/optimizer/path/indxpath.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/backend/optimizer/path/indxpath.c') diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index 60a7dd95038..21599b08bd7 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.115 2002/04/05 00:31:26 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.116 2002/04/16 23:08:10 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -21,6 +21,7 @@ #include "access/nbtree.h" #include "catalog/catname.h" #include "catalog/pg_amop.h" +#include "catalog/pg_namespace.h" #include "catalog/pg_operator.h" #include "executor/executor.h" #include "nodes/makefuncs.h" @@ -911,7 +912,8 @@ indexable_operator(Expr *clause, Oid opclass, bool indexkey_on_left) * operator, but in practice that seems pretty unlikely for * binary-compatible types.) */ - new_op = compatible_oper_opid(opname, indexkeytype, indexkeytype, true); + new_op = compatible_oper_opid(makeList1(makeString(opname)), + indexkeytype, indexkeytype, true); if (OidIsValid(new_op)) { @@ -2143,14 +2145,15 @@ network_prefix_quals(Var *leftop, Oid expr_op, Datum rightop) */ /* See if there is a binary op of the given name for the given datatype */ +/* NB: we assume that only built-in system operators are searched for */ static Oid find_operator(const char *opname, Oid datatype) { - return GetSysCacheOid(OPERNAME, + return GetSysCacheOid(OPERNAMENSP, PointerGetDatum(opname), ObjectIdGetDatum(datatype), ObjectIdGetDatum(datatype), - CharGetDatum('b')); + ObjectIdGetDatum(PG_CATALOG_NAMESPACE)); } /* -- cgit v1.2.3