diff options
Diffstat (limited to 'src/backend/access/nbtree')
| -rw-r--r-- | src/backend/access/nbtree/nbtinsert.c | 6 | ||||
| -rw-r--r-- | src/backend/access/nbtree/nbtpage.c | 14 | ||||
| -rw-r--r-- | src/backend/access/nbtree/nbtscan.c | 8 | ||||
| -rw-r--r-- | src/backend/access/nbtree/nbtsearch.c | 14 | ||||
| -rw-r--r-- | src/backend/access/nbtree/nbtsort.c | 12 | ||||
| -rw-r--r-- | src/backend/access/nbtree/nbtutils.c | 8 |
6 files changed, 31 insertions, 31 deletions
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index c57c1e6f767..c903c6fd34a 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.23 1998/01/05 03:29:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.24 1998/01/07 21:01:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -123,7 +123,7 @@ _bt_doinsert(Relation rel, BTItem btitem, bool index_is_unique, Relation heapRel htup = heap_fetch(heapRel, true, &(itup->t_tid), NULL); if (htup != (HeapTuple) NULL) { /* it is a duplicate */ - elog(ABORT, "Cannot insert a duplicate key into a unique index"); + elog(ERROR, "Cannot insert a duplicate key into a unique index"); } /* get next offnum */ if (offset < maxoff) @@ -1442,7 +1442,7 @@ _bt_updateitem(Relation rel, * if(IndexTupleDSize(newItem->bti_itup) > * IndexTupleDSize(item->bti_itup)) { elog(NOTICE, "trying to * overwrite a smaller value with a bigger one in _bt_updateitem"); - * elog(ABORT, "this is not good."); } + * elog(ERROR, "this is not good."); } */ oldIndexTuple = &(item->bti_itup); diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index 7e0f76398d3..1d714166558 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.14 1998/01/05 03:29:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.15 1998/01/07 21:01:53 momjian Exp $ * * NOTES * Postgres btree pages look like ordinary relation pages. The opaque @@ -97,7 +97,7 @@ _bt_metapinit(Relation rel) if ((nblocks = RelationGetNumberOfBlocks(rel)) != 0) { - elog(ABORT, "Cannot initialize non-empty btree %s", + elog(ERROR, "Cannot initialize non-empty btree %s", RelationGetRelationName(rel)); } @@ -146,20 +146,20 @@ _bt_checkmeta(Relation rel) op = (BTPageOpaque) PageGetSpecialPointer(metap); if (!(op->btpo_flags & BTP_META)) { - elog(ABORT, "Invalid metapage for index %s", + elog(ERROR, "Invalid metapage for index %s", RelationGetRelationName(rel)); } metad = BTPageGetMeta(metap); if (metad->btm_magic != BTREE_MAGIC) { - elog(ABORT, "Index %s is not a btree", + elog(ERROR, "Index %s is not a btree", RelationGetRelationName(rel)); } if (metad->btm_version != BTREE_VERSION) { - elog(ABORT, "Version mismatch on %s: version %d file, version %d code", + elog(ERROR, "Version mismatch on %s: version %d file, version %d code", RelationGetRelationName(rel), metad->btm_version, BTREE_VERSION); } @@ -204,13 +204,13 @@ _bt_getroot(Relation rel, int access) if (metad->btm_magic != BTREE_MAGIC) { - elog(ABORT, "Index %s is not a btree", + elog(ERROR, "Index %s is not a btree", RelationGetRelationName(rel)); } if (metad->btm_version != BTREE_VERSION) { - elog(ABORT, "Version mismatch on %s: version %d file, version %d code", + elog(ERROR, "Version mismatch on %s: version %d file, version %d code", RelationGetRelationName(rel), metad->btm_version, BTREE_VERSION); } diff --git a/src/backend/access/nbtree/nbtscan.c b/src/backend/access/nbtree/nbtscan.c index 510c72d2c80..2462a54d099 100644 --- a/src/backend/access/nbtree/nbtscan.c +++ b/src/backend/access/nbtree/nbtscan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.11 1998/01/05 03:29:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.12 1998/01/07 21:01:54 momjian Exp $ * * * NOTES @@ -77,7 +77,7 @@ _bt_dropscan(IndexScanDesc scan) } if (chk == (BTScanList) NULL) - elog(ABORT, "btree scan list trashed; can't find 0x%lx", scan); + elog(ERROR, "btree scan list trashed; can't find 0x%lx", scan); if (last == (BTScanList) NULL) BTScans = chk->btsl_next; @@ -154,7 +154,7 @@ _bt_scandel(IndexScanDesc scan, int op, BlockNumber blkno, OffsetNumber offno) _bt_step(scan, &buf, BackwardScanDirection); break; default: - elog(ABORT, "_bt_scandel: bad operation '%d'", op); + elog(ERROR, "_bt_scandel: bad operation '%d'", op); /* NOTREACHED */ } so->btso_curbuf = buf; @@ -179,7 +179,7 @@ _bt_scandel(IndexScanDesc scan, int op, BlockNumber blkno, OffsetNumber offno) _bt_step(scan, &buf, BackwardScanDirection); break; default: - elog(ABORT, "_bt_scandel: bad operation '%d'", op); + elog(ERROR, "_bt_scandel: bad operation '%d'", op); /* NOTREACHED */ } so->btso_mrkbuf = buf; diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index a0f6fa7b34a..f763af2ee76 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.28 1998/01/05 03:29:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.29 1998/01/07 21:01:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -617,7 +617,7 @@ _bt_compare(Relation rel, */ if (!P_RIGHTMOST(opaque)) { - elog(ABORT, "_bt_compare: invalid comparison to high key"); + elog(ERROR, "_bt_compare: invalid comparison to high key"); } #if 0 @@ -839,7 +839,7 @@ _bt_first(IndexScanDesc scan, ScanDirection dir) /* _bt_orderkeys disallows it, but it's place to add some code latter */ if (so->keyData[0].sk_flags & SK_ISNULL) { - elog(ABORT, "_bt_first: btree doesn't support is(not)null, yet"); + elog(ERROR, "_bt_first: btree doesn't support is(not)null, yet"); return ((RetrieveIndexResult) NULL); } proc = index_getprocid(rel, 1, BTORDER_PROC); @@ -1331,7 +1331,7 @@ _bt_twostep(IndexScanDesc scan, Buffer *bufP, ScanDirection dir) * us up less often since they're only done by the vacuum daemon. */ - elog(ABORT, "btree synchronization error: concurrent update botched scan"); + elog(ERROR, "btree synchronization error: concurrent update botched scan"); return (false); } @@ -1416,7 +1416,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir) if (ScanDirectionIsForward(dir)) { if (!P_LEFTMOST(opaque))/* non-leftmost page ? */ - elog(ABORT, "_bt_endpoint: leftmost page (%u) has not leftmost flag", blkno); + elog(ERROR, "_bt_endpoint: leftmost page (%u) has not leftmost flag", blkno); start = P_RIGHTMOST(opaque) ? P_HIKEY : P_FIRSTKEY; /* @@ -1440,7 +1440,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir) if (PageIsEmpty(page)) { if (start != P_HIKEY) /* non-rightmost page */ - elog(ABORT, "_bt_endpoint: non-rightmost page (%u) is empty", blkno); + elog(ERROR, "_bt_endpoint: non-rightmost page (%u) is empty", blkno); /* * It's left- & right- most page - root page, - and it's @@ -1512,7 +1512,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir) } else { - elog(ABORT, "Illegal scan direction %d", dir); + elog(ERROR, "Illegal scan direction %d", dir); } btitem = (BTItem) PageGetItem(page, PageGetItemId(page, start)); diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index 1d17bd0eaa3..e292e21b7af 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -5,7 +5,7 @@ * * * IDENTIFICATION - * $Id: nbtsort.c,v 1.25 1998/01/05 03:29:55 momjian Exp $ + * $Id: nbtsort.c,v 1.26 1998/01/07 21:01:59 momjian Exp $ * * NOTES * @@ -212,7 +212,7 @@ _bt_isortcmp(BTSortKey *k1, BTSortKey *k2) if (_bt_inspool->isunique && !equal_isnull) { _bt_spooldestroy((void *) _bt_inspool); - elog(ABORT, "Cannot create unique index. Table contains non-unique values"); + elog(ERROR, "Cannot create unique index. Table contains non-unique values"); } return (0); /* 1 = 2 */ } @@ -333,7 +333,7 @@ _bt_pqadd(BTPriQueue *q, BTPriQueueElem *e) if (q->btpq_nelem >= MAXELEM) { - elog(ABORT, "_bt_pqadd: queue overflow"); + elog(ERROR, "_bt_pqadd: queue overflow"); } child = q->btpq_nelem++; @@ -426,7 +426,7 @@ _bt_tapecreate(char *fname) if (tape == (BTTapeBlock *) NULL) { - elog(ABORT, "_bt_tapecreate: out of memory"); + elog(ERROR, "_bt_tapecreate: out of memory"); } tape->bttb_magic = BTTAPEMAGIC; @@ -563,7 +563,7 @@ _bt_spoolinit(Relation index, int ntapes, bool isunique) if (btspool == (BTSpool *) NULL || fname == (char *) NULL) { - elog(ABORT, "_bt_spoolinit: out of memory"); + elog(ERROR, "_bt_spoolinit: out of memory"); } MemSet((char *) btspool, 0, sizeof(BTSpool)); btspool->bts_ntapes = ntapes; @@ -577,7 +577,7 @@ _bt_spoolinit(Relation index, int ntapes, bool isunique) if (btspool->bts_itape == (BTTapeBlock **) NULL || btspool->bts_otape == (BTTapeBlock **) NULL) { - elog(ABORT, "_bt_spoolinit: out of memory"); + elog(ERROR, "_bt_spoolinit: out of memory"); } for (i = 0; i < ntapes; ++i) diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c index 33b5cc56d89..ce6b3449de2 100644 --- a/src/backend/access/nbtree/nbtutils.c +++ b/src/backend/access/nbtree/nbtutils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.16 1998/01/05 03:29:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.17 1998/01/07 21:02:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -119,7 +119,7 @@ _bt_orderkeys(Relation relation, BTScanOpaque so) cur = &key[0]; if (cur->sk_attno != 1) - elog(ABORT, "_bt_orderkeys: key(s) for attribute 1 missed"); + elog(ERROR, "_bt_orderkeys: key(s) for attribute 1 missed"); if (numberOfKeys == 1) { @@ -159,7 +159,7 @@ _bt_orderkeys(Relation relation, BTScanOpaque so) { if (cur->sk_attno != attno + 1 && i < numberOfKeys) { - elog(ABORT, "_bt_orderkeys: key(s) for attribute %d missed", attno + 1); + elog(ERROR, "_bt_orderkeys: key(s) for attribute %d missed", attno + 1); } /* @@ -296,7 +296,7 @@ _bt_formitem(IndexTuple itup) /* * see comments in btbuild * - * if (itup->t_info & INDEX_NULL_MASK) elog(ABORT, "btree indices cannot + * if (itup->t_info & INDEX_NULL_MASK) elog(ERROR, "btree indices cannot * include null keys"); */ |