aboutsummaryrefslogtreecommitdiff
path: root/src/backend/commands
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/commands')
-rw-r--r--src/backend/commands/analyze.c6
-rw-r--r--src/backend/commands/comment.c57
-rw-r--r--src/backend/commands/operatorcmds.c142
3 files changed, 85 insertions, 120 deletions
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index e36f21273d5..f4c8e6919e1 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.31 2002/04/12 20:38:20 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.32 2002/04/16 23:08:10 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -398,7 +398,7 @@ examine_attribute(Relation onerel, int attnum)
return NULL;
/* If column has no "=" operator, we can't do much of anything */
- func_operator = compatible_oper("=",
+ func_operator = compatible_oper(makeList1(makeString("=")),
attr->atttypid,
attr->atttypid,
true);
@@ -436,7 +436,7 @@ examine_attribute(Relation onerel, int attnum)
stats->eqfunc = eqfunc;
/* Is there a "<" operator with suitable semantics? */
- func_operator = compatible_oper("<",
+ func_operator = compatible_oper(makeList1(makeString("<")),
attr->atttypid,
attr->atttypid,
true);
diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c
index b7de77067db..3eb9a5eb67a 100644
--- a/src/backend/commands/comment.c
+++ b/src/backend/commands/comment.c
@@ -7,7 +7,7 @@
* Copyright (c) 1999-2001, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/comment.c,v 1.40 2002/04/11 19:59:57 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/comment.c,v 1.41 2002/04/16 23:08:10 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,6 +28,7 @@
#include "commands/comment.h"
#include "miscadmin.h"
#include "parser/parse_func.h"
+#include "parser/parse_oper.h"
#include "parser/parse_type.h"
#include "parser/parse.h"
#include "utils/acl.h"
@@ -53,7 +54,7 @@ static void CommentRule(List *qualname, char *comment);
static void CommentType(List *typename, char *comment);
static void CommentAggregate(List *aggregate, List *arguments, char *comment);
static void CommentProc(List *function, List *arguments, char *comment);
-static void CommentOperator(List *qualname, List *arguments, char *comment);
+static void CommentOperator(List *opername, List *arguments, char *comment);
static void CommentTrigger(List *qualname, char *comment);
@@ -643,63 +644,29 @@ CommentProc(List *function, List *arguments, char *comment)
* to be visible for both operator and function.
*/
static void
-CommentOperator(List *qualname, List *arguments, char *comment)
+CommentOperator(List *opername, List *arguments, char *comment)
{
- char *opername = strVal(lfirst(qualname)); /* XXX */
TypeName *typenode1 = (TypeName *) lfirst(arguments);
TypeName *typenode2 = (TypeName *) lsecond(arguments);
- char oprtype = 0;
- Form_pg_operator data;
- HeapTuple optuple;
- Oid oid,
- leftoid = InvalidOid,
- rightoid = InvalidOid;
-
- /* Attempt to fetch the left type oid, if specified */
- if (typenode1 != NULL)
- leftoid = typenameTypeId(typenode1);
-
- /* Attempt to fetch the right type oid, if specified */
- if (typenode2 != NULL)
- rightoid = typenameTypeId(typenode2);
-
- /* Determine operator type */
-
- if (OidIsValid(leftoid) && (OidIsValid(rightoid)))
- oprtype = 'b';
- else if (OidIsValid(leftoid))
- oprtype = 'r';
- else if (OidIsValid(rightoid))
- oprtype = 'l';
- else
- elog(ERROR, "operator '%s' is of an illegal type'", opername);
-
- /* Attempt to fetch the operator oid */
+ Oid oid;
- optuple = SearchSysCache(OPERNAME,
- PointerGetDatum(opername),
- ObjectIdGetDatum(leftoid),
- ObjectIdGetDatum(rightoid),
- CharGetDatum(oprtype));
- if (!HeapTupleIsValid(optuple))
- elog(ERROR, "operator '%s' does not exist", opername);
+ /* Look up the operator */
- oid = optuple->t_data->t_oid;
+ oid = LookupOperNameTypeNames(opername, typenode1, typenode2,
+ "CommentOperator");
/* Valid user's ability to comment on this operator */
if (!pg_oper_ownercheck(oid, GetUserId()))
elog(ERROR, "you are not permitted to comment on operator '%s'",
- opername);
+ NameListToString(opername));
/* Get the procedure associated with the operator */
- data = (Form_pg_operator) GETSTRUCT(optuple);
- oid = data->oprcode;
+ oid = get_opcode(oid);
if (oid == InvalidOid)
- elog(ERROR, "operator '%s' does not have an underlying function", opername);
-
- ReleaseSysCache(optuple);
+ elog(ERROR, "operator '%s' does not have an underlying function",
+ NameListToString(opername));
/* Call CreateComments() to create/drop the comments */
diff --git a/src/backend/commands/operatorcmds.c b/src/backend/commands/operatorcmds.c
index 54f48928b41..ffc35ea1ae9 100644
--- a/src/backend/commands/operatorcmds.c
+++ b/src/backend/commands/operatorcmds.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/operatorcmds.c,v 1.1 2002/04/15 05:22:03 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/operatorcmds.c,v 1.2 2002/04/16 23:08:10 tgl Exp $
*
* DESCRIPTION
* The "DefineFoo" routines take the parse tree and pick out the
@@ -41,6 +41,7 @@
#include "commands/comment.h"
#include "commands/defrem.h"
#include "miscadmin.h"
+#include "parser/parse_oper.h"
#include "parser/parse_type.h"
#include "utils/acl.h"
#include "utils/syscache.h"
@@ -59,23 +60,26 @@ DefineOperator(List *names, List *parameters)
{
char *oprName;
Oid oprNamespace;
- uint16 precedence = 0; /* operator precedence */
- bool canHash = false; /* operator hashes */
+ uint16 precedence = 0; /* operator precedence */
+ bool canHash = false; /* operator hashes */
+ bool canMerge = false; /* operator merges */
bool isLeftAssociative = true; /* operator is left
* associative */
- char *functionName = NULL; /* function for operator */
+ List *functionName = NIL; /* function for operator */
TypeName *typeName1 = NULL; /* first type name */
TypeName *typeName2 = NULL; /* second type name */
Oid typeId1 = InvalidOid; /* types converted to OID */
Oid typeId2 = InvalidOid;
- char *commutatorName = NULL; /* optional commutator operator
+ List *commutatorName = NIL; /* optional commutator operator
* name */
- char *negatorName = NULL; /* optional negator operator name */
- char *restrictionName = NULL; /* optional restrict. sel.
+ List *negatorName = NIL; /* optional negator operator name */
+ List *restrictionName = NIL; /* optional restrict. sel.
* procedure */
- char *joinName = NULL; /* optional join sel. procedure name */
- char *sortName1 = NULL; /* optional first sort operator */
- char *sortName2 = NULL; /* optional second sort operator */
+ List *joinName = NIL; /* optional join sel. procedure */
+ List *leftSortName = NIL; /* optional left sort operator */
+ List *rightSortName = NIL; /* optional right sort operator */
+ List *ltCompareName = NIL; /* optional < compare operator */
+ List *gtCompareName = NIL; /* optional > compare operator */
List *pl;
/* Convert list of names to a name and namespace */
@@ -101,7 +105,7 @@ DefineOperator(List *names, List *parameters)
elog(ERROR, "setof type not implemented for rightarg");
}
else if (strcasecmp(defel->defname, "procedure") == 0)
- functionName = defGetString(defel);
+ functionName = defGetQualifiedName(defel);
else if (strcasecmp(defel->defname, "precedence") == 0)
{
/* NOT IMPLEMENTED (never worked in v4.2) */
@@ -113,19 +117,25 @@ DefineOperator(List *names, List *parameters)
elog(NOTICE, "CREATE OPERATOR: associativity not implemented");
}
else if (strcasecmp(defel->defname, "commutator") == 0)
- commutatorName = defGetString(defel);
+ commutatorName = defGetQualifiedName(defel);
else if (strcasecmp(defel->defname, "negator") == 0)
- negatorName = defGetString(defel);
+ negatorName = defGetQualifiedName(defel);
else if (strcasecmp(defel->defname, "restrict") == 0)
- restrictionName = defGetString(defel);
+ restrictionName = defGetQualifiedName(defel);
else if (strcasecmp(defel->defname, "join") == 0)
- joinName = defGetString(defel);
+ joinName = defGetQualifiedName(defel);
else if (strcasecmp(defel->defname, "hashes") == 0)
canHash = TRUE;
+ else if (strcasecmp(defel->defname, "merges") == 0)
+ canMerge = TRUE;
else if (strcasecmp(defel->defname, "sort1") == 0)
- sortName1 = defGetString(defel);
+ leftSortName = defGetQualifiedName(defel);
else if (strcasecmp(defel->defname, "sort2") == 0)
- sortName2 = defGetString(defel);
+ rightSortName = defGetQualifiedName(defel);
+ else if (strcasecmp(defel->defname, "ltcmp") == 0)
+ ltCompareName = defGetQualifiedName(defel);
+ else if (strcasecmp(defel->defname, "gtcmp") == 0)
+ gtCompareName = defGetQualifiedName(defel);
else
{
elog(WARNING, "DefineOperator: attribute \"%s\" not recognized",
@@ -136,7 +146,7 @@ DefineOperator(List *names, List *parameters)
/*
* make sure we have our required definitions
*/
- if (functionName == NULL)
+ if (functionName == NIL)
elog(ERROR, "Define: \"procedure\" unspecified");
/* Transform type names to type OIDs */
@@ -146,9 +156,30 @@ DefineOperator(List *names, List *parameters)
typeId2 = typenameTypeId(typeName2);
/*
+ * If any of the mergejoin support operators were given, then canMerge
+ * is implicit. If canMerge is specified or implicit, fill in default
+ * operator names for any missing mergejoin support operators.
+ */
+ if (leftSortName || rightSortName || ltCompareName || gtCompareName)
+ canMerge = true;
+
+ if (canMerge)
+ {
+ if (!leftSortName)
+ leftSortName = makeList1(makeString("<"));
+ if (!rightSortName)
+ rightSortName = makeList1(makeString("<"));
+ if (!ltCompareName)
+ ltCompareName = makeList1(makeString("<"));
+ if (!gtCompareName)
+ gtCompareName = makeList1(makeString(">"));
+ }
+
+ /*
* now have OperatorCreate do all the work..
*/
OperatorCreate(oprName, /* operator name */
+ oprNamespace, /* namespace */
typeId1, /* left type id */
typeId2, /* right type id */
functionName, /* function for operator */
@@ -161,9 +192,10 @@ DefineOperator(List *names, List *parameters)
* procedure */
joinName, /* optional join sel. procedure name */
canHash, /* operator hashes */
- sortName1, /* optional first sort operator */
- sortName2); /* optional second sort operator */
-
+ leftSortName, /* optional left sort operator */
+ rightSortName, /* optional right sort operator */
+ ltCompareName, /* optional < comparison op */
+ gtCompareName); /* optional < comparison op */
}
@@ -178,70 +210,36 @@ DefineOperator(List *names, List *parameters)
* ...
*/
void
-RemoveOperator(char *operatorName, /* operator name */
+RemoveOperator(List *operatorName, /* operator name */
TypeName *typeName1, /* left argument type name */
TypeName *typeName2) /* right argument type name */
{
+ Oid operOid;
Relation relation;
HeapTuple tup;
- Oid typeId1 = InvalidOid;
- Oid typeId2 = InvalidOid;
- char oprtype;
- if (typeName1)
- typeId1 = typenameTypeId(typeName1);
+ operOid = LookupOperNameTypeNames(operatorName, typeName1, typeName2,
+ "RemoveOperator");
- if (typeName2)
- typeId2 = typenameTypeId(typeName2);
+ relation = heap_openr(OperatorRelationName, RowExclusiveLock);
- if (OidIsValid(typeId1) && OidIsValid(typeId2))
- oprtype = 'b';
- else if (OidIsValid(typeId1))
- oprtype = 'r';
- else
- oprtype = 'l';
+ tup = SearchSysCacheCopy(OPEROID,
+ ObjectIdGetDatum(operOid),
+ 0, 0, 0);
- relation = heap_openr(OperatorRelationName, RowExclusiveLock);
+ if (!HeapTupleIsValid(tup)) /* should not happen */
+ elog(ERROR, "RemoveOperator: failed to find tuple for operator '%s'",
+ NameListToString(operatorName));
- tup = SearchSysCacheCopy(OPERNAME,
- PointerGetDatum(operatorName),
- ObjectIdGetDatum(typeId1),
- ObjectIdGetDatum(typeId2),
- CharGetDatum(oprtype));
+ if (!pg_oper_ownercheck(operOid, GetUserId()))
+ elog(ERROR, "RemoveOperator: operator '%s': permission denied",
+ NameListToString(operatorName));
- if (HeapTupleIsValid(tup))
- {
- if (!pg_oper_ownercheck(tup->t_data->t_oid, GetUserId()))
- elog(ERROR, "RemoveOperator: operator '%s': permission denied",
- operatorName);
+ /* Delete any comments associated with this operator */
+ DeleteComments(operOid, RelationGetRelid(relation));
- /* Delete any comments associated with this operator */
- DeleteComments(tup->t_data->t_oid, RelationGetRelid(relation));
+ simple_heap_delete(relation, &tup->t_self);
- simple_heap_delete(relation, &tup->t_self);
- }
- else
- {
- if (OidIsValid(typeId1) && OidIsValid(typeId2))
- {
- elog(ERROR, "RemoveOperator: binary operator '%s' taking '%s' and '%s' does not exist",
- operatorName,
- TypeNameToString(typeName1),
- TypeNameToString(typeName2));
- }
- else if (OidIsValid(typeId1))
- {
- elog(ERROR, "RemoveOperator: right unary operator '%s' taking '%s' does not exist",
- operatorName,
- TypeNameToString(typeName1));
- }
- else
- {
- elog(ERROR, "RemoveOperator: left unary operator '%s' taking '%s' does not exist",
- operatorName,
- TypeNameToString(typeName2));
- }
- }
heap_freetuple(tup);
heap_close(relation, RowExclusiveLock);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 10:10:48 +0000