diff options
Diffstat (limited to 'src/backend/optimizer')
-rw-r--r-- | src/backend/optimizer/geqo/geqo_erx.c | 8 | ||||
-rw-r--r-- | src/backend/optimizer/geqo/geqo_eval.c | 4 | ||||
-rw-r--r-- | src/backend/optimizer/geqo/geqo_misc.c | 4 | ||||
-rw-r--r-- | src/backend/optimizer/path/predmig.c | 10 | ||||
-rw-r--r-- | src/backend/optimizer/path/prune.c | 4 | ||||
-rw-r--r-- | src/backend/optimizer/path/xfunc.c | 24 | ||||
-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 | ||||
-rw-r--r-- | src/backend/optimizer/util/plancat.c | 22 |
11 files changed, 63 insertions, 63 deletions
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c index 584a6b87c24..de001f9ee90 100644 --- a/src/backend/optimizer/geqo/geqo_erx.c +++ b/src/backend/optimizer/geqo/geqo_erx.c @@ -3,7 +3,7 @@ * geqo_erx.c-- * edge recombination crossover [ER] * -* $Id: geqo_erx.c,v 1.6 1998/01/05 03:31:48 momjian Exp $ +* $Id: geqo_erx.c,v 1.7 1998/01/07 21:03:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -353,7 +353,7 @@ gimme_gene(Edge edge, Edge *edge_table) minimum_count = 1; } else if (minimum_count == -1) - elog(ABORT, "gimme_gene: Internal error - minimum_count not set"); + elog(ERROR, "gimme_gene: Internal error - minimum_count not set"); else if (edge_table[(int) friend].unused_edges == minimum_edges) minimum_count++; @@ -379,7 +379,7 @@ gimme_gene(Edge edge, Edge *edge_table) } /* ... should never be reached */ - elog(ABORT, "gimme_gene: neither shared nor minimum number nor random edge found"); + elog(ERROR, "gimme_gene: neither shared nor minimum number nor random edge found"); return 0; /* to keep the compiler quiet */ } @@ -487,6 +487,6 @@ edge_failure(Gene *gene, int index, Edge *edge_table, int num_gene) /* ... should never be reached */ - elog(ABORT, "edge_failure: no edge detected"); + elog(ERROR, "edge_failure: no edge detected"); return 0; /* to keep the compiler quiet */ } diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c index 97cda4ce78f..89ce1625055 100644 --- a/src/backend/optimizer/geqo/geqo_eval.c +++ b/src/backend/optimizer/geqo/geqo_eval.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_eval.c,v 1.16 1998/01/05 03:31:49 momjian Exp $ + * $Id: geqo_eval.c,v 1.17 1998/01/07 21:03:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -737,6 +737,6 @@ geqo_nth(int stop, List *rels) return lfirst(r); i++; } - elog(ABORT, "geqo_nth: Internal error - ran off end of list"); + elog(ERROR, "geqo_nth: Internal error - ran off end of list"); return NULL; /* to keep compiler happy */ } diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c index d88954b2653..edb29e5154a 100644 --- a/src/backend/optimizer/geqo/geqo_misc.c +++ b/src/backend/optimizer/geqo/geqo_misc.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_misc.c,v 1.6 1998/01/05 03:31:51 momjian Exp $ + * $Id: geqo_misc.c,v 1.7 1998/01/07 21:03:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,7 +53,7 @@ avg_pool(Pool *pool) double cumulative = 0.0; if (pool->size == 0) - elog(ABORT, "avg_pool: pool_size of zero"); + elog(ERROR, "avg_pool: pool_size of zero"); for (i = 0; i < pool->size; i++) cumulative = cumulative + pool->data[i].worth; diff --git a/src/backend/optimizer/path/predmig.c b/src/backend/optimizer/path/predmig.c index 12c1a336c85..807a297f0cc 100644 --- a/src/backend/optimizer/path/predmig.c +++ b/src/backend/optimizer/path/predmig.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/predmig.c,v 1.7 1998/01/05 03:31:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/predmig.c,v 1.8 1998/01/07 21:03:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -133,7 +133,7 @@ xfunc_predmig(JoinPath pathnode,/* root of the join tree */ /* sanity check */ if ((!streamroot && laststream) || (streamroot && !laststream)) - elog(ABORT, "called xfunc_predmig with bad inputs"); + elog(ERROR, "called xfunc_predmig with bad inputs"); if (streamroot) Assert(xfunc_check_stream(streamroot)); @@ -333,7 +333,7 @@ xfunc_prdmig_pullup(Stream origstream, Stream pullme, JoinPath joinpath) orignode = (Stream) get_downstream(orignode)) /* empty body in for loop */ ; if (!orignode) - elog(ABORT, "Didn't find matching node in original stream"); + elog(ERROR, "Didn't find matching node in original stream"); /* pull up this node as far as it should go */ @@ -790,14 +790,14 @@ xfunc_check_stream(Stream node) { if ((Stream) get_upstream((Stream) get_downstream(temp)) != temp) { - elog(ABORT, "bad pointers in stream"); + elog(ERROR, "bad pointers in stream"); return (false); } if (!is_clause(temp)) { if ((tmp = xfunc_num_relids(temp)) >= numrelids) { - elog(ABORT, "Joins got reordered!"); + elog(ERROR, "Joins got reordered!"); return (false); } numrelids = tmp; diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c index 2a8c49e624d..e6b83a643dd 100644 --- a/src/backend/optimizer/path/prune.c +++ b/src/backend/optimizer/path/prune.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.10 1998/01/06 18:52:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.11 1998/01/07 21:03:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -130,7 +130,7 @@ prune_rel_paths(List *rel_list) rel->size = compute_joinrel_size(cheapest); } else - elog(ABORT, "non JoinPath called"); + elog(ERROR, "non JoinPath called"); } } diff --git a/src/backend/optimizer/path/xfunc.c b/src/backend/optimizer/path/xfunc.c index f04e8d3acf7..4e74de508fb 100644 --- a/src/backend/optimizer/path/xfunc.c +++ b/src/backend/optimizer/path/xfunc.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/xfunc.c,v 1.10 1998/01/05 03:31:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/xfunc.c,v 1.11 1998/01/07 21:03:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -461,7 +461,7 @@ xfunc_local_expense(LispValue clause) } else { - elog(ABORT, "Clause node of undetermined type"); + elog(ERROR, "Clause node of undetermined type"); return (-1); } } @@ -497,7 +497,7 @@ xfunc_func_expense(LispValue node, LispValue args) { /* don't trust the opid in the Oper node. Use the opno. */ if (!(funcid = get_opcode(get_opno((Oper) node)))) - elog(ABORT, "Oper's function is undefined"); + elog(ERROR, "Oper's function is undefined"); } else { @@ -507,7 +507,7 @@ xfunc_func_expense(LispValue node, LispValue args) /* look up tuple in cache */ tupl = SearchSysCacheTuple(PROOID, ObjectIdGetDatum(funcid), 0, 0, 0); if (!HeapTupleIsValid(tupl)) - elog(ABORT, "Cache lookup failed for procedure %d", funcid); + elog(ERROR, "Cache lookup failed for procedure %d", funcid); proc = (Form_pg_proc) GETSTRUCT(tupl); /* @@ -622,7 +622,7 @@ xfunc_width(LispValue clause) PointerGetDatum(get_vartype((Var) clause)), 0, 0, 0); if (!HeapTupleIsValid(tupl)) - elog(ABORT, "Cache lookup failed for type %d", + elog(ERROR, "Cache lookup failed for type %d", get_vartype((Var) clause)); type = (TypeTupleForm) GETSTRUCT(tupl); if (get_varattno((Var) clause) == 0) @@ -686,7 +686,7 @@ xfunc_width(LispValue clause) ObjectIdGetDatum(get_opno((Oper) get_op(clause))), 0, 0, 0); if (!HeapTupleIsValid(tupl)) - elog(ABORT, "Cache lookup failed for procedure %d", + elog(ERROR, "Cache lookup failed for procedure %d", get_opno((Oper) get_op(clause))); return (xfunc_func_width ((RegProcedure) (((OperatorTupleForm) (GETSTRUCT(tupl)))->oprcode), @@ -717,7 +717,7 @@ xfunc_width(LispValue clause) } else { - elog(ABORT, "Clause node of undetermined type"); + elog(ERROR, "Clause node of undetermined type"); return (-1); } @@ -855,7 +855,7 @@ xfunc_find_references(LispValue clause) } else { - elog(ABORT, "Clause node of undetermined type"); + elog(ERROR, "Clause node of undetermined type"); return ((List) LispNil); } } @@ -1192,7 +1192,7 @@ xfunc_fixvars(LispValue clause, /* clause being pulled up */ xfunc_fixvars(lfirst(tmpclause), rel, varno); else { - elog(ABORT, "Clause node of undetermined type"); + elog(ERROR, "Clause node of undetermined type"); } } @@ -1320,7 +1320,7 @@ xfunc_func_width(RegProcedure funcid, LispValue args) Assert(RegProcedureIsValid(funcid)); tupl = SearchSysCacheTuple(PROOID, ObjectIdGetDatum(funcid), 0, 0, 0); if (!HeapTupleIsValid(tupl)) - elog(ABORT, "Cache lookup failed for procedure %d", funcid); + elog(ERROR, "Cache lookup failed for procedure %d", funcid); proc = (Form_pg_proc) GETSTRUCT(tupl); /* if function returns a tuple, get the width of that */ @@ -1338,7 +1338,7 @@ xfunc_func_width(RegProcedure funcid, LispValue args) ObjectIdGetDatum(proc->prorettype), 0, 0, 0); if (!HeapTupleIsValid(tupl)) - elog(ABORT, "Cache lookup failed for type %d", proc->prorettype); + elog(ERROR, "Cache lookup failed for type %d", proc->prorettype); type = (TypeTupleForm) GETSTRUCT(tupl); /* if the type length is known, return that */ if (type->typlen != -1) @@ -1421,7 +1421,7 @@ xfunc_LispRemove(LispValue foo, List bar) sanity = true; /* found a matching item to remove! */ if (!sanity) - elog(ABORT, "xfunc_LispRemove: didn't find a match!"); + elog(ERROR, "xfunc_LispRemove: didn't find a match!"); return (result); } 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; } diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index 0c7e52f82c8..47da53703f9 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.12 1998/01/05 03:32:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.13 1998/01/07 21:04:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -77,7 +77,7 @@ relation_info(Query *root, Index relid, } else { - elog(ABORT, "RelationCatalogInformation: Relation %d not found", + elog(ERROR, "RelationCatalogInformation: Relation %d not found", relationObjectId); } @@ -152,7 +152,7 @@ index_info(Query *root, bool first, int relid, IdxInfoRetval *info) 1, &indexKey); } if (!HeapScanIsValid(scan)) - elog(ABORT, "index_info: scan not started"); + elog(ERROR, "index_info: scan not started"); indexTuple = heap_getnext(scan, 0, (Buffer *) NULL); if (!HeapTupleIsValid(indexTuple)) { @@ -218,7 +218,7 @@ index_info(Query *root, bool first, int relid, IdxInfoRetval *info) UInt16GetDatum(amstrategy), 0); if (!HeapTupleIsValid(amopTuple)) - elog(ABORT, "index_info: no amop %d %d %d", + elog(ERROR, "index_info: no amop %d %d %d", relam, index->indclass[i], amstrategy); info->orderOprs[i] = ((Form_pg_amop) GETSTRUCT(amopTuple))->amopopr; @@ -349,10 +349,10 @@ restriction_selectivity(Oid functionObjectId, (char *) constFlag, NULL); if (!PointerIsValid(result)) - elog(ABORT, "RestrictionClauseSelectivity: bad pointer"); + elog(ERROR, "RestrictionClauseSelectivity: bad pointer"); if (*result < 0.0 || *result > 1.0) - elog(ABORT, "RestrictionClauseSelectivity: bad value %lf", + elog(ERROR, "RestrictionClauseSelectivity: bad value %lf", *result); return ((Cost) *result); @@ -388,10 +388,10 @@ join_selectivity(Oid functionObjectId, (char *) (int) attributeNumber2, NULL); if (!PointerIsValid(result)) - elog(ABORT, "JoinClauseSelectivity: bad pointer"); + elog(ERROR, "JoinClauseSelectivity: bad pointer"); if (*result < 0.0 || *result > 1.0) - elog(ABORT, "JoinClauseSelectivity: bad value %lf", + elog(ERROR, "JoinClauseSelectivity: bad value %lf", *result); return ((Cost) *result); @@ -532,7 +532,7 @@ IndexSelectivity(Oid indexrelid, ObjectIdGetDatum(indexrelid), 0, 0, 0); if (!HeapTupleIsValid(indRel)) - elog(ABORT, "IndexSelectivity: index %d not found", + elog(ERROR, "IndexSelectivity: index %d not found", indexrelid); relam = ((Form_pg_class) GETSTRUCT(indRel))->relam; @@ -540,7 +540,7 @@ IndexSelectivity(Oid indexrelid, ObjectIdGetDatum(indexrelid), 0, 0, 0); if (!HeapTupleIsValid(indexTuple)) - elog(ABORT, "IndexSelectivity: index %d not found", + elog(ERROR, "IndexSelectivity: index %d not found", indexrelid); index = (IndexTupleForm) GETSTRUCT(indexTuple); @@ -595,7 +595,7 @@ IndexSelectivity(Oid indexrelid, ObjectIdGetDatum(relam), 0); if (!HeapTupleIsValid(amopTuple)) - elog(ABORT, "IndexSelectivity: no amop %d %d", + elog(ERROR, "IndexSelectivity: no amop %d %d", indclass, operatorObjectIds[n]); amop = (Form_pg_amop) GETSTRUCT(amopTuple); |