diff options
Diffstat (limited to 'src/backend/optimizer/plan')
| -rw-r--r-- | src/backend/optimizer/plan/createplan.c | 12 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/planmain.c | 4 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/planner.c | 24 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/setrefs.c | 10 |
4 files changed, 25 insertions, 25 deletions
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index b9c1a9a9bb6..3640eabcbcc 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.21 1998/01/05 03:31:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.22 1998/01/07 21:04:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -185,7 +185,7 @@ create_scan_node(Path *best_path, List *tlist) break; default: - elog(ABORT, "create_scan_node: unknown node type", + elog(ERROR, "create_scan_node: unknown node type", best_path->pathtype); break; } @@ -252,7 +252,7 @@ create_join_node(JoinPath *best_path, List *tlist) break; default: /* do nothing */ - elog(ABORT, "create_join_node: unknown node type", + elog(ERROR, "create_join_node: unknown node type", best_path->path.pathtype); } @@ -294,7 +294,7 @@ create_seqscan_node(Path *best_path, List *tlist, List *scan_clauses) temp = best_path->parent->relids; if (temp == NULL) - elog(ABORT, "scanrelid is empty"); + elog(ERROR, "scanrelid is empty"); else scan_relid = (Index) lfirsti(temp); /* ??? who takes care of * lnext? - ay */ @@ -364,7 +364,7 @@ create_indexscan_node(IndexPath *best_path, ObjectIdGetDatum(lfirsti(ixid)), 0, 0, 0); if (!HeapTupleIsValid(indexTuple)) - elog(ABORT, "create_plan: index %d not found", + elog(ERROR, "create_plan: index %d not found", lfirsti(ixid)); index = (IndexTupleForm) GETSTRUCT(indexTuple); if (index->indislossy) @@ -915,7 +915,7 @@ make_temp(List *tlist, break; default: - elog(ABORT, "make_temp: unknown temp type %d", temptype); + elog(ERROR, "make_temp: unknown temp type %d", temptype); } return (retval); diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c index 730cd0dd7ea..69186d82c00 100644 --- a/src/backend/optimizer/plan/planmain.c +++ b/src/backend/optimizer/plan/planmain.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.14 1998/01/05 03:32:03 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.15 1998/01/07 21:04:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -407,7 +407,7 @@ make_groupPlan(List **tlist, if (length(glc) != 0) { - elog(ABORT, "group attribute disappeared from target list"); + elog(ERROR, "group attribute disappeared from target list"); } /* diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 057fca9d3b0..77419112d74 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.19 1998/01/05 03:32:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.20 1998/01/07 21:04:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -279,7 +279,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList) if (rettype == InvalidOid) return; else - elog(ABORT, "return type mismatch in function decl: final query is a catalog utility"); + elog(ERROR, "return type mismatch in function decl: final query is a catalog utility"); } /* okay, it's an ordinary query */ @@ -294,7 +294,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList) if (rettype == InvalidOid) { if (cmd == CMD_SELECT) - elog(ABORT, + elog(ERROR, "function declared with no return type, but final query is a retrieve"); else return; @@ -302,14 +302,14 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList) /* by here, the function is declared to return some type */ if ((typ = typeidType(rettype)) == NULL) - elog(ABORT, "can't find return type %d for function\n", rettype); + elog(ERROR, "can't find return type %d for function\n", rettype); /* * test 3: if the function is declared to return a value, then the * final query had better be a retrieve. */ if (cmd != CMD_SELECT) - elog(ABORT, "function declared to return type %s, but final query is not a retrieve", typeTypeName(typ)); + elog(ERROR, "function declared to return type %s, but final query is not a retrieve", typeTypeName(typ)); /* * test 4: for base type returns, the target list should have exactly @@ -319,11 +319,11 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList) if (typeTypeRelid(typ) == InvalidOid) { if (exec_tlist_length(tlist) > 1) - elog(ABORT, "function declared to return %s returns multiple values in final retrieve", typeTypeName(typ)); + elog(ERROR, "function declared to return %s returns multiple values in final retrieve", typeTypeName(typ)); resnode = (Resdom *) ((TargetEntry *) lfirst(tlist))->resdom; if (resnode->restype != rettype) - elog(ABORT, "return type mismatch in function: declared to return %s, returns %s", typeTypeName(typ), typeidTypeName(resnode->restype)); + elog(ERROR, "return type mismatch in function: declared to return %s, returns %s", typeTypeName(typ), typeidTypeName(resnode->restype)); /* by here, base return types match */ return; @@ -352,13 +352,13 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList) reln = heap_open(typeTypeRelid(typ)); if (!RelationIsValid(reln)) - elog(ABORT, "cannot open relation relid %d", typeTypeRelid(typ)); + elog(ERROR, "cannot open relation relid %d", typeTypeRelid(typ)); relid = reln->rd_id; relnatts = reln->rd_rel->relnatts; if (exec_tlist_length(tlist) != relnatts) - elog(ABORT, "function declared to return type %s does not retrieve (%s.*)", typeTypeName(typ), typeTypeName(typ)); + elog(ERROR, "function declared to return type %s does not retrieve (%s.*)", typeTypeName(typ), typeTypeName(typ)); /* expect attributes 1 .. n in order */ for (i = 1; i <= relnatts; i++) @@ -388,14 +388,14 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList) else if (IsA(thenode, Func)) tletype = (Oid) get_functype((Func *) thenode); else - elog(ABORT, "function declared to return type %s does not retrieve (%s.all)", typeTypeName(typ), typeTypeName(typ)); + elog(ERROR, "function declared to return type %s does not retrieve (%s.all)", typeTypeName(typ), typeTypeName(typ)); } else - elog(ABORT, "function declared to return type %s does not retrieve (%s.all)", typeTypeName(typ), typeTypeName(typ)); + elog(ERROR, "function declared to return type %s does not retrieve (%s.all)", typeTypeName(typ), typeTypeName(typ)); #endif /* reach right in there, why don't you? */ if (tletype != reln->rd_att->attrs[i - 1]->atttypid) - elog(ABORT, "function declared to return type %s does not retrieve (%s.all)", typeTypeName(typ), typeTypeName(typ)); + elog(ERROR, "function declared to return type %s does not retrieve (%s.all)", typeTypeName(typ), typeTypeName(typ)); } heap_close(reln); diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index b9d840154e3..96c6f44b099 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.11 1998/01/05 03:32:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.12 1998/01/07 21:04:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -201,7 +201,7 @@ set_temp_tlist_references(Temp *temp) } else { - elog(ABORT, "calling set_temp_tlist_references with empty lefttree"); + elog(ERROR, "calling set_temp_tlist_references with empty lefttree"); } } @@ -651,7 +651,7 @@ replace_result_clause(List *clause, /* * Ooops! we can not handle that! */ - elog(ABORT, "replace_result_clause: Can not handle this tlist!\n"); + elog(ERROR, "replace_result_clause: Can not handle this tlist!\n"); } } @@ -809,7 +809,7 @@ replace_agg_clause(Node *clause, List *subplanTargetList) /* * Ooops! we can not handle that! */ - elog(ABORT, "replace_agg_clause: Can not handle this tlist!\n"); + elog(ERROR, "replace_agg_clause: Can not handle this tlist!\n"); } } @@ -902,7 +902,7 @@ del_agg_clause(Node *clause) /* * Ooops! we can not handle that! */ - elog(ABORT, "del_agg_clause: Can not handle this tlist!\n"); + elog(ERROR, "del_agg_clause: Can not handle this tlist!\n"); } return NULL; } |