Skip to content

Commit 08817bd

Browse files
tglsfdctglsfdc
committed
Adjust GiST error messages to conform to message style guidelines.
1 parent a453951 commit 08817bd

File tree

4 files changed

+41
-36
lines changed

4 files changed

+41
-36
lines changed

‎src/backend/access/gist/gistscan.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/gist/gistscan.c,v 1.59 2005/06/27 12:45:22 teodor Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/gist/gistscan.c,v 1.60 2005/09/22 18:49:45 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -380,7 +380,7 @@ gistadjone(IndexScanDesc scan,
380380
*/
381381
static void
382382
adjustiptr(IndexScanDesc scan,
383-
ItemPointer iptr, GISTSearchStack *stk,
383+
ItemPointer iptr, GISTSearchStack *stk,
384384
int op,
385385
BlockNumber blkno,
386386
OffsetNumber offnum, XLogRecPtr newlsn, XLogRecPtr oldlsn)
@@ -422,7 +422,8 @@ adjustiptr(IndexScanDesc scan,
422422
}
423423
break;
424424
default:
425-
elog(ERROR, "Bad operation in GiST scan adjust: %d", op);
425+
elog(ERROR, "unrecognized GiST scan adjust operation: %d",
426+
op);
426427
}
427428
}
428429
}

‎src/backend/access/gist/gistutil.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/gist/gistutil.c,v 1.5 2005/06/30 17:52:14 teodor Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/gist/gistutil.c,v 1.6 2005/09/22 18:49:45 tgl Exp $
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include "postgres.h"
@@ -71,7 +71,7 @@ gistfillbuffer(Relation r, Page page, IndexTuple *itup,
7171
l = PageAddItem(page, (Item) itup[i], IndexTupleSize(itup[i]),
7272
off, LP_USED);
7373
if (l == InvalidOffsetNumber)
74-
elog(ERROR, "gistfillbuffer: failed to add index item to \"%s\"",
74+
elog(ERROR, "failed to add item to index page in \"%s\"",
7575
RelationGetRelationName(r));
7676
off++;
7777
}
@@ -645,8 +645,9 @@ gistchoose(Relation r, Page p, IndexTuple it, /* it has compressed entry */
645645
IndexTuple itup = (IndexTuple) PageGetItem(p, PageGetItemId(p, i));
646646

647647
if ( !GistPageIsLeaf(p) && GistTupleIsInvalid(itup) ) {
648-
elog(LOG, "It's desirable to vacuum or reindex GiST index '%s' due to crash recovery",
649-
RelationGetRelationName(r));
648+
ereport(LOG,
649+
(errmsg("index \"%s\" needs VACUUM or REINDEX to finish crash recovery",
650+
RelationGetRelationName(r))));
650651
continue;
651652
}
652653

‎src/backend/access/gist/gistvacuum.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/gist/gistvacuum.c,v 1.7 2005/09/02 19:02:19 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/gist/gistvacuum.c,v 1.8 2005/09/22 18:49:45 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -78,7 +78,8 @@ gistVacuumUpdate( GistVacuum *gv, BlockNumber blkno, bool needunion ) {
7878
needchildunion = (GistTupleIsInvalid(idxtuple)) ? true : false;
7979

8080
if ( needchildunion )
81-
elog(DEBUG2,"gistVacuumUpdate: Need union for block %u", ItemPointerGetBlockNumber(&(idxtuple->t_tid)));
81+
elog(DEBUG2, "gistVacuumUpdate: need union for block %u",
82+
ItemPointerGetBlockNumber(&(idxtuple->t_tid)));
8283

8384
chldtuple = gistVacuumUpdate( gv, ItemPointerGetBlockNumber(&(idxtuple->t_tid)),
8485
needchildunion );
@@ -309,10 +310,10 @@ gistvacuumcleanup(PG_FUNCTION_ARGS) {
309310
}
310311
freeGISTstate(&(gv.giststate));
311312
MemoryContextDelete(gv.opCtx);
312-
} else if (needFullVacuum) {
313-
elog(NOTICE,"It's desirable to vacuum full or reindex GiST index '%s' due to crash recovery",
314-
RelationGetRelationName(rel));
315-
}
313+
} else if (needFullVacuum)
314+
ereport(NOTICE,
315+
(errmsg("index \"%s\" needs VACUUM FULL or REINDEX to finish crash recovery",
316+
RelationGetRelationName(rel))));
316317

317318
needFullVacuum = false;
318319

‎src/backend/access/gist/gistxlog.c

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/gist/gistxlog.c,v 1.7 2005/07/01 13:18:17 teodor Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/gist/gistxlog.c,v 1.8 2005/09/22 18:49:45 tgl Exp $
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include "postgres.h"
@@ -162,7 +162,7 @@ gistRedoEntryUpdateRecord(XLogRecPtr lsn, XLogRecord *record, bool isnewroot) {
162162
return;
163163
buffer = XLogReadBuffer(false, reln, xlrec.data->blkno);
164164
if (!BufferIsValid(buffer))
165-
elog(PANIC, "gistRedoEntryUpdateRecord: block %u unfound", xlrec.data->blkno);
165+
elog(PANIC, "block %u unfound", xlrec.data->blkno);
166166
page = (Page) BufferGetPage(buffer);
167167

168168
if ( isnewroot ) {
@@ -173,7 +173,7 @@ gistRedoEntryUpdateRecord(XLogRecPtr lsn, XLogRecord *record, bool isnewroot) {
173173
}
174174
} else {
175175
if ( PageIsNew((PageHeader) page) )
176-
elog(PANIC, "gistRedoEntryUpdateRecord: uninitialized page blkno %u", xlrec.data->blkno);
176+
elog(PANIC, "uninitialized page %u", xlrec.data->blkno);
177177
if (XLByteLE(lsn, PageGetLSN(page))) {
178178
LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
179179
ReleaseBuffer(buffer);
@@ -270,11 +270,10 @@ gistRedoPageSplitRecord(XLogRecPtr lsn, XLogRecord *record ) {
270270
/* first of all wee need get F_LEAF flag from original page */
271271
buffer = XLogReadBuffer( false, reln, xlrec.data->origblkno);
272272
if (!BufferIsValid(buffer))
273-
elog(PANIC, "gistRedoEntryUpdateRecord: block %u unfound", xlrec.data->origblkno);
273+
elog(PANIC, "block %u unfound", xlrec.data->origblkno);
274274
page = (Page) BufferGetPage(buffer);
275275
if ( PageIsNew((PageHeader) page) )
276-
elog(PANIC, "gistRedoEntryUpdateRecord: uninitialized page blkno %u",
277-
xlrec.data->origblkno);
276+
elog(PANIC, "uninitialized page %u", xlrec.data->origblkno);
278277

279278
flags = ( GistPageIsLeaf(page) ) ? F_LEAF : 0;
280279
LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
@@ -287,7 +286,7 @@ gistRedoPageSplitRecord(XLogRecPtr lsn, XLogRecord *record ) {
287286

288287
buffer = XLogReadBuffer( !isorigpage, reln, newpage->header->blkno);
289288
if (!BufferIsValid(buffer))
290-
elog(PANIC, "gistRedoEntryUpdateRecord: block %u unfound", newpage->header->blkno);
289+
elog(PANIC, "block %u unfound", newpage->header->blkno);
291290
page = (Page) BufferGetPage(buffer);
292291

293292
if (XLByteLE(lsn, PageGetLSN(page))) {
@@ -330,7 +329,7 @@ gistRedoCreateIndex(XLogRecPtr lsn, XLogRecord *record) {
330329
return;
331330
buffer = XLogReadBuffer( true, reln, GIST_ROOT_BLKNO);
332331
if (!BufferIsValid(buffer))
333-
elog(PANIC, "gistRedoCreateIndex: block unfound");
332+
elog(PANIC, "root block unfound");
334333
page = (Page) BufferGetPage(buffer);
335334

336335
if (!PageIsNew((PageHeader) page) && XLByteLE(lsn, PageGetLSN(page))) {
@@ -450,6 +449,7 @@ gist_desc(char *buf, uint8 xl_info, char *rec)
450449
((gistxlogInsertComplete*)rec)->node.spcNode,
451450
((gistxlogInsertComplete*)rec)->node.dbNode,
452451
((gistxlogInsertComplete*)rec)->node.relNode);
452+
break;
453453
default:
454454
elog(PANIC, "gist_desc: unknown op code %u", info);
455455
}
@@ -474,9 +474,9 @@ static Buffer
474474
gistXLogReadAndLockBuffer( Relation r, BlockNumber blkno ) {
475475
Buffer buffer = XLogReadBuffer( false, r, blkno );
476476
if (!BufferIsValid(buffer))
477-
elog(PANIC, "gistXLogReadAndLockBuffer: block %u unfound", blkno);
477+
elog(PANIC, "block %u unfound", blkno);
478478
if ( PageIsNew( (PageHeader)(BufferGetPage(buffer)) ) )
479-
elog(PANIC, "gistXLogReadAndLockBuffer: uninitialized page blkno %u", blkno);
479+
elog(PANIC, "uninitialized page %u", blkno);
480480

481481
return buffer;
482482
}
@@ -507,7 +507,7 @@ gixtxlogFindPath( Relation index, gistIncompleteInsert *insert ) {
507507
ptr = ptr->parent;
508508
}
509509
} else
510-
elog(LOG, "gixtxlogFindPath: lost parent for block %u", insert->origblkno);
510+
elog(LOG, "lost parent for block %u", insert->origblkno);
511511
}
512512

513513
/*
@@ -545,7 +545,7 @@ gistContinueInsert(gistIncompleteInsert *insert) {
545545
Page page;
546546

547547
if (!BufferIsValid(buffer))
548-
elog(PANIC, "gistContinueInsert: root block unfound");
548+
elog(PANIC, "root block unfound");
549549

550550
page = BufferGetPage(buffer);
551551
if (XLByteLE(insert->lsn, PageGetLSN(page))) {
@@ -580,10 +580,10 @@ gistContinueInsert(gistIncompleteInsert *insert) {
580580
numbuffer=1;
581581
buffers[numbuffer-1] = XLogReadBuffer(false, index, insert->path[i]);
582582
if (!BufferIsValid(buffers[numbuffer-1]))
583-
elog(PANIC, "gistContinueInsert: block %u unfound", insert->path[i]);
583+
elog(PANIC, "block %u unfound", insert->path[i]);
584584
pages[numbuffer-1] = BufferGetPage( buffers[numbuffer-1] );
585585
if ( PageIsNew((PageHeader)(pages[numbuffer-1])) )
586-
elog(PANIC, "gistContinueInsert: uninitialized page blkno %u", insert->path[i]);
586+
elog(PANIC, "uninitialized page %u", insert->path[i]);
587587

588588
if (XLByteLE(insert->lsn, PageGetLSN(pages[numbuffer-1]))) {
589589
LockBuffer(buffers[numbuffer-1], BUFFER_LOCK_UNLOCK);
@@ -614,7 +614,7 @@ gistContinueInsert(gistIncompleteInsert *insert) {
614614
/* no space left on page, so we should split */
615615
buffers[numbuffer] = XLogReadBuffer(true, index, P_NEW);
616616
if (!BufferIsValid(buffers[numbuffer]))
617-
elog(PANIC, "gistContinueInsert: can't create new block");
617+
elog(PANIC, "could not obtain new block");
618618
GISTInitBuffer(buffers[numbuffer], 0);
619619
pages[numbuffer] = BufferGetPage( buffers[numbuffer] );
620620
gistfillbuffer( index, pages[numbuffer], itup, lenitup, FirstOffsetNumber );
@@ -628,13 +628,13 @@ gistContinueInsert(gistIncompleteInsert *insert) {
628628

629629
/* sanity check */
630630
if ( i+1 != insert->pathlen )
631-
elog(PANIC,"gistContinueInsert: can't restore index '%s'",
632-
RelationGetRelationName( index ));
631+
elog(PANIC,"unexpected pathlen in index \"%s\"",
632+
RelationGetRelationName( index ));
633633

634634
/* fill new page */
635635
buffers[numbuffer] = XLogReadBuffer(true, index, P_NEW);
636636
if (!BufferIsValid(buffers[numbuffer]))
637-
elog(PANIC, "gistContinueInsert: can't create new block");
637+
elog(PANIC, "could not obtain new block");
638638
GISTInitBuffer(buffers[numbuffer], 0);
639639
pages[numbuffer] = BufferGetPage( buffers[numbuffer] );
640640
gistfillbuffer(index, pages[numbuffer], parentitup, pituplen, FirstOffsetNumber);
@@ -644,12 +644,12 @@ gistContinueInsert(gistIncompleteInsert *insert) {
644644
GISTInitBuffer(buffers[0], 0);
645645
for(j=1;j<numbuffer;j++) {
646646
IndexTuple tuple = gist_form_invalid_tuple( BufferGetBlockNumber( buffers[j] ) );
647-
if ( InvalidOffsetNumber == PageAddItem(pages[0],
647+
if (PageAddItem(pages[0],
648648
(Item)tuple,
649649
IndexTupleSize( tuple ),
650650
(OffsetNumber)j,
651-
LP_USED) )
652-
elog( PANIC,"gistContinueInsert: can't restore index '%s'",
651+
LP_USED) == InvalidOffsetNumber)
652+
elog(PANIC, "failed to add item to index page in \"%s\"",
653653
RelationGetRelationName( index ));
654654
}
655655
}
@@ -668,8 +668,10 @@ gistContinueInsert(gistIncompleteInsert *insert) {
668668
}
669669
}
670670

671-
elog(LOG,"Detected incomplete insert into GiST index %u/%u/%u; It's desirable to vacuum or reindex index",
672-
insert->node.spcNode, insert->node.dbNode, insert->node.relNode);
671+
ereport(LOG,
672+
(errmsg("index %u/%u/%u needs VACUUM or REINDEX to finish crash recovery",
673+
insert->node.spcNode, insert->node.dbNode, insert->node.relNode),
674+
errdetail("Incomplete insertion detected during crash replay.")));
673675
}
674676

675677
void

0 commit comments

Comments
 (0)