1
0
mirror of https://github.com/postgres/postgres.git synced 2025-06-11 20:28:21 +03:00

Goodbye ABORT. Hello ERROR for all errors.

This commit is contained in:
Bruce Momjian
1998-01-07 21:07:04 +00:00
parent e6c6146eb8
commit 679d39b9c8
99 changed files with 493 additions and 497 deletions

View File

@ -130,7 +130,7 @@ gistbuild(Relation heap,
*/
if (oldPred == NULL && (nb = RelationGetNumberOfBlocks(index)) != 0)
elog(ABORT, "%.16s already contains data", &(index->rd_rel->relname.data[0]));
elog(ERROR, "%.16s already contains data", &(index->rd_rel->relname.data[0]));
/* initialize the root page (if this is a new index) */
if (oldPred == NULL)
@ -1182,7 +1182,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
0, 0, 0);
itupform = (IndexTupleForm) GETSTRUCT(htup);
if (!HeapTupleIsValid(htup))
elog(ABORT, "initGISTstate: index %d not found", index->rd_id);
elog(ERROR, "initGISTstate: index %d not found", index->rd_id);
giststate->haskeytype = itupform->indhaskeytype;
if (giststate->haskeytype)
{
@ -1193,7 +1193,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
0, 0);
if (!HeapTupleIsValid(htup))
{
elog(ABORT, "initGISTstate: no attribute tuple %d %d",
elog(ERROR, "initGISTstate: no attribute tuple %d %d",
itupform->indexrelid, FirstOffsetNumber);
return;
}

View File

@ -83,7 +83,7 @@ gistrescan(IndexScanDesc s, bool fromEnd, ScanKey key)
if (!IndexScanIsValid(s))
{
elog(ABORT, "gistrescan: invalid scan.");
elog(ERROR, "gistrescan: invalid scan.");
return;
}
@ -281,7 +281,7 @@ gistdropscan(IndexScanDesc s)
}
if (l == (GISTScanList) NULL)
elog(ABORT, "GiST scan list corrupted -- cannot find 0x%lx", s);
elog(ERROR, "GiST scan list corrupted -- cannot find 0x%lx", s);
if (prev == (GISTScanList) NULL)
GISTScans = l->gsl_next;
@ -397,7 +397,7 @@ adjustiptr(IndexScanDesc s,
break;
default:
elog(ABORT, "Bad operation in GiST scan adjust: %d", op);
elog(ERROR, "Bad operation in GiST scan adjust: %d", op);
}
}
}