diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-07-21 17:05:12 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-07-21 17:05:12 +0000 |
| commit | 5e6d691e0daf18fcb5ae13e2252536df416668aa (patch) | |
| tree | 2adf07e9e52286028ab21fba66fc478f995d58ee /src/backend/executor/nodeMergejoin.c | |
| parent | 82f18c4a2c7297f520051a50ee028d532a4b5ced (diff) | |
| download | postgresql-5e6d691e0daf18fcb5ae13e2252536df416668aa.tar.gz postgresql-5e6d691e0daf18fcb5ae13e2252536df416668aa.zip | |
Error message editing in backend/executor.
Diffstat (limited to 'src/backend/executor/nodeMergejoin.c')
| -rw-r--r-- | src/backend/executor/nodeMergejoin.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index 864008dd17c..57249d7d970 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.57 2003/05/05 17:57:47 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.58 2003/07/21 17:05:10 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -129,7 +129,7 @@ MJFormSkipQuals(List *qualList, List **ltQuals, List **gtQuals, * The two ops should be identical, so use either one for lookup. */ if (!IsA(ltop, OpExpr)) - elog(ERROR, "MJFormSkipQuals: op not an OpExpr!"); + elog(ERROR, "mergejoin clause is not an OpExpr"); /* * Lookup the operators, and replace the data in the copied @@ -398,7 +398,7 @@ ExecMergeJoin(MergeJoinState *node) doFillInner = true; break; default: - elog(ERROR, "ExecMergeJoin: unsupported join type %d", + elog(ERROR, "unrecognized join type: %d", (int) node->js.jointype); doFillOuter = false; /* keep compiler quiet */ doFillInner = false; @@ -1384,13 +1384,11 @@ ExecMergeJoin(MergeJoinState *node) break; /* - * if we get here it means our code is fouled up and so we - * just end the join prematurely. + * broken state value? */ default: - elog(WARNING, "ExecMergeJoin: invalid join state %d, aborting", - node->mj_JoinState); - return NULL; + elog(ERROR, "unrecognized mergejoin state: %d", + (int) node->mj_JoinState); } } } @@ -1473,10 +1471,12 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate) /* * Can't handle right or full join with non-nil extra - * joinclauses. + * joinclauses. This should have been caught by planner. */ if (node->join.joinqual != NIL) - elog(ERROR, "RIGHT JOIN is only supported with mergejoinable join conditions"); + ereport(ERROR, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("RIGHT JOIN is only supported with mergejoinable join conditions"))); break; case JOIN_FULL: mergestate->mj_NullOuterTupleSlot = @@ -1491,10 +1491,12 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate) * joinclauses. */ if (node->join.joinqual != NIL) - elog(ERROR, "FULL JOIN is only supported with mergejoinable join conditions"); + ereport(ERROR, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("FULL JOIN is only supported with mergejoinable join conditions"))); break; default: - elog(ERROR, "ExecInitMergeJoin: unsupported join type %d", + elog(ERROR, "unrecognized join type: %d", (int) node->join.jointype); } |