diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-01-07 21:07:04 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-01-07 21:07:04 +0000 |
| commit | 679d39b9c8fbe8f5613879b11431d8152d85ec54 (patch) | |
| tree | 9d2a87706e8585160143a1d647bb7558818ccc3d /src/backend/optimizer/geqo | |
| parent | e6c6146eb8129f1ea1e1f68ef739c13824357225 (diff) | |
| download | postgresql-679d39b9c8fbe8f5613879b11431d8152d85ec54.tar.gz postgresql-679d39b9c8fbe8f5613879b11431d8152d85ec54.zip | |
Goodbye ABORT. Hello ERROR for all errors.
Diffstat (limited to 'src/backend/optimizer/geqo')
| -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 |
3 files changed, 8 insertions, 8 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; |