diff options
Diffstat (limited to 'src/backend/access/nbtree')
| -rw-r--r-- | src/backend/access/nbtree/nbtinsert.c | 14 | ||||
| -rw-r--r-- | src/backend/access/nbtree/nbtree.c | 46 |
2 files changed, 30 insertions, 30 deletions
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index fa19d7741d7..d85fc2a966e 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.88 2002/01/01 20:32:37 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.89 2002/03/02 21:39:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -507,7 +507,7 @@ _bt_insertonpg(Relation rel, /* If root page was splitted */ if (stack == (BTStack) NULL) { - elog(DEBUG, "btree: concurrent ROOT page split"); + elog(LOG, "btree: concurrent ROOT page split"); /* * If root page splitter failed to create new root page @@ -735,7 +735,7 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright, item = (BTItem) PageGetItem(origpage, itemid); if (PageAddItem(rightpage, (Item) item, itemsz, rightoff, LP_USED) == InvalidOffsetNumber) - elog(STOP, "btree: failed to add hikey to the right sibling"); + elog(PANIC, "btree: failed to add hikey to the right sibling"); rightoff = OffsetNumberNext(rightoff); } @@ -761,7 +761,7 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright, lhikey = item; if (PageAddItem(leftpage, (Item) item, itemsz, leftoff, LP_USED) == InvalidOffsetNumber) - elog(STOP, "btree: failed to add hikey to the left sibling"); + elog(PANIC, "btree: failed to add hikey to the left sibling"); leftoff = OffsetNumberNext(leftoff); /* @@ -1316,7 +1316,7 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf) * the two items will go into positions P_HIKEY and P_FIRSTKEY. */ if (PageAddItem(rootpage, (Item) new_item, itemsz, P_HIKEY, LP_USED) == InvalidOffsetNumber) - elog(STOP, "btree: failed to add leftkey to new root page"); + elog(PANIC, "btree: failed to add leftkey to new root page"); pfree(new_item); /* @@ -1333,7 +1333,7 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf) * insert the right page pointer into the new root page. */ if (PageAddItem(rootpage, (Item) new_item, itemsz, P_FIRSTKEY, LP_USED) == InvalidOffsetNumber) - elog(STOP, "btree: failed to add rightkey to new root page"); + elog(PANIC, "btree: failed to add rightkey to new root page"); pfree(new_item); metad->btm_root = rootblknum; @@ -2034,7 +2034,7 @@ _bt_pgaddtup(Relation rel, if (PageAddItem(page, (Item) btitem, itemsize, itup_off, LP_USED) == InvalidOffsetNumber) - elog(STOP, "btree: failed to add item to the %s for %s", + elog(PANIC, "btree: failed to add item to the %s for %s", where, RelationGetRelationName(rel)); } diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index da54ed5adc9..2cd9476c4e4 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -12,7 +12,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.87 2002/01/06 00:37:43 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.88 2002/03/02 21:39:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -776,7 +776,7 @@ _bt_restore_page(Page page, char *from, int len) itemsz = MAXALIGN(itemsz); if (PageAddItem(page, (Item) from, itemsz, FirstOffsetNumber, LP_USED) == InvalidOffsetNumber) - elog(STOP, "_bt_restore_page: can't add item to page"); + elog(PANIC, "_bt_restore_page: can't add item to page"); from += itemsz; } } @@ -799,10 +799,10 @@ btree_xlog_delete(bool redo, XLogRecPtr lsn, XLogRecord *record) buffer = XLogReadBuffer(false, reln, ItemPointerGetBlockNumber(&(xlrec->target.tid))); if (!BufferIsValid(buffer)) - elog(STOP, "btree_delete_redo: block unfound"); + elog(PANIC, "btree_delete_redo: block unfound"); page = (Page) BufferGetPage(buffer); if (PageIsNew((PageHeader) page)) - elog(STOP, "btree_delete_redo: uninitialized page"); + elog(PANIC, "btree_delete_redo: uninitialized page"); if (XLByteLE(lsn, PageGetLSN(page))) { @@ -838,10 +838,10 @@ btree_xlog_insert(bool redo, XLogRecPtr lsn, XLogRecord *record) buffer = XLogReadBuffer(false, reln, ItemPointerGetBlockNumber(&(xlrec->target.tid))); if (!BufferIsValid(buffer)) - elog(STOP, "btree_insert_%sdo: block unfound", (redo) ? "re" : "un"); + elog(PANIC, "btree_insert_%sdo: block unfound", (redo) ? "re" : "un"); page = (Page) BufferGetPage(buffer); if (PageIsNew((PageHeader) page)) - elog(STOP, "btree_insert_%sdo: uninitialized page", (redo) ? "re" : "un"); + elog(PANIC, "btree_insert_%sdo: uninitialized page", (redo) ? "re" : "un"); pageop = (BTPageOpaque) PageGetSpecialPointer(page); if (redo) @@ -855,7 +855,7 @@ btree_xlog_insert(bool redo, XLogRecPtr lsn, XLogRecord *record) record->xl_len - SizeOfBtreeInsert, ItemPointerGetOffsetNumber(&(xlrec->target.tid)), LP_USED) == InvalidOffsetNumber) - elog(STOP, "btree_insert_redo: failed to add item"); + elog(PANIC, "btree_insert_redo: failed to add item"); PageSetLSN(page, lsn); PageSetSUI(page, ThisStartUpID); @@ -864,7 +864,7 @@ btree_xlog_insert(bool redo, XLogRecPtr lsn, XLogRecord *record) else { if (XLByteLT(PageGetLSN(page), lsn)) - elog(STOP, "btree_insert_undo: bad page LSN"); + elog(PANIC, "btree_insert_undo: bad page LSN"); if (!P_ISLEAF(pageop)) { @@ -872,7 +872,7 @@ btree_xlog_insert(bool redo, XLogRecPtr lsn, XLogRecord *record) return; } - elog(STOP, "btree_insert_undo: unimplemented"); + elog(PANIC, "btree_insert_undo: unimplemented"); } return; @@ -899,13 +899,13 @@ btree_xlog_split(bool redo, bool onleft, XLogRecPtr lsn, XLogRecord *record) BlockIdGetBlockNumber(&(xlrec->otherblk)); buffer = XLogReadBuffer(false, reln, blkno); if (!BufferIsValid(buffer)) - elog(STOP, "btree_split_%s: lost left sibling", op); + elog(PANIC, "btree_split_%s: lost left sibling", op); page = (Page) BufferGetPage(buffer); if (redo) _bt_pageinit(page, BufferGetPageSize(buffer)); else if (PageIsNew((PageHeader) page)) - elog(STOP, "btree_split_undo: uninitialized left sibling"); + elog(PANIC, "btree_split_undo: uninitialized left sibling"); pageop = (BTPageOpaque) PageGetSpecialPointer(page); if (redo) @@ -928,8 +928,8 @@ btree_xlog_split(bool redo, bool onleft, XLogRecPtr lsn, XLogRecord *record) /* undo */ { if (XLByteLT(PageGetLSN(page), lsn)) - elog(STOP, "btree_split_undo: bad left sibling LSN"); - elog(STOP, "btree_split_undo: unimplemented"); + elog(PANIC, "btree_split_undo: bad left sibling LSN"); + elog(PANIC, "btree_split_undo: unimplemented"); } /* Right (new) sibling */ @@ -937,13 +937,13 @@ btree_xlog_split(bool redo, bool onleft, XLogRecPtr lsn, XLogRecord *record) ItemPointerGetBlockNumber(&(xlrec->target.tid)); buffer = XLogReadBuffer((redo) ? true : false, reln, blkno); if (!BufferIsValid(buffer)) - elog(STOP, "btree_split_%s: lost right sibling", op); + elog(PANIC, "btree_split_%s: lost right sibling", op); page = (Page) BufferGetPage(buffer); if (redo) _bt_pageinit(page, BufferGetPageSize(buffer)); else if (PageIsNew((PageHeader) page)) - elog(STOP, "btree_split_undo: uninitialized right sibling"); + elog(PANIC, "btree_split_undo: uninitialized right sibling"); pageop = (BTPageOpaque) PageGetSpecialPointer(page); if (redo) @@ -967,8 +967,8 @@ btree_xlog_split(bool redo, bool onleft, XLogRecPtr lsn, XLogRecord *record) /* undo */ { if (XLByteLT(PageGetLSN(page), lsn)) - elog(STOP, "btree_split_undo: bad right sibling LSN"); - elog(STOP, "btree_split_undo: unimplemented"); + elog(PANIC, "btree_split_undo: bad right sibling LSN"); + elog(PANIC, "btree_split_undo: unimplemented"); } if (!redo || (record->xl_info & XLR_BKP_BLOCK_1)) @@ -981,11 +981,11 @@ btree_xlog_split(bool redo, bool onleft, XLogRecPtr lsn, XLogRecord *record) buffer = XLogReadBuffer(false, reln, blkno); if (!BufferIsValid(buffer)) - elog(STOP, "btree_split_redo: lost next right page"); + elog(PANIC, "btree_split_redo: lost next right page"); page = (Page) BufferGetPage(buffer); if (PageIsNew((PageHeader) page)) - elog(STOP, "btree_split_redo: uninitialized next right page"); + elog(PANIC, "btree_split_redo: uninitialized next right page"); if (XLByteLE(lsn, PageGetLSN(page))) { @@ -1022,10 +1022,10 @@ btree_xlog_newroot(bool redo, XLogRecPtr lsn, XLogRecord *record) return; buffer = XLogReadBuffer(true, reln, BlockIdGetBlockNumber(&(xlrec->rootblk))); if (!BufferIsValid(buffer)) - elog(STOP, "btree_newroot_redo: no root page"); + elog(PANIC, "btree_newroot_redo: no root page"); metabuf = XLogReadBuffer(false, reln, BTREE_METAPAGE); if (!BufferIsValid(buffer)) - elog(STOP, "btree_newroot_redo: no metapage"); + elog(PANIC, "btree_newroot_redo: no metapage"); page = (Page) BufferGetPage(buffer); _bt_pageinit(page, BufferGetPageSize(buffer)); pageop = (BTPageOpaque) PageGetSpecialPointer(page); @@ -1079,7 +1079,7 @@ btree_redo(XLogRecPtr lsn, XLogRecord *record) else if (info == XLOG_BTREE_NEWROOT) btree_xlog_newroot(true, lsn, record); else - elog(STOP, "btree_redo: unknown op code %u", info); + elog(PANIC, "btree_redo: unknown op code %u", info); } void @@ -1099,7 +1099,7 @@ btree_undo(XLogRecPtr lsn, XLogRecord *record) else if (info == XLOG_BTREE_NEWROOT) btree_xlog_newroot(false, lsn, record); else - elog(STOP, "btree_undo: unknown op code %u", info); + elog(PANIC, "btree_undo: unknown op code %u", info); } static void |