Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6f8519d

Browse files
committed
Remove function names from some elog() calls in heapam.c.
At least one of the names was, due to a function renaming late in thedevelopment of ON CONFLICT, wrong. Since including function names inerror messages is against the message style guide anyway, remove themfrom the messages.Discussion: CAM3SWZT8paz=usgMVHm0XOETkQvzjRtAUthATnmaHQQY0obnGw@mail.gmail.comBackpatch: 9.5, where ON CONFLICT was introduced
1 parent659d472 commit6f8519d

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

‎src/backend/access/heap/heapam.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5585,7 +5585,7 @@ heap_finish_speculative(Relation relation, HeapTuple tuple)
55855585
lp=PageGetItemId(page,offnum);
55865586

55875587
if (PageGetMaxOffsetNumber(page)<offnum|| !ItemIdIsNormal(lp))
5588-
elog(ERROR,"heap_confirm_insert:invalid lp");
5588+
elog(ERROR,"invalid lp");
55895589

55905590
htup= (HeapTupleHeader)PageGetItem(page,lp);
55915591

@@ -5826,14 +5826,14 @@ heap_inplace_update(Relation relation, HeapTuple tuple)
58265826
lp=PageGetItemId(page,offnum);
58275827

58285828
if (PageGetMaxOffsetNumber(page)<offnum|| !ItemIdIsNormal(lp))
5829-
elog(ERROR,"heap_inplace_update:invalid lp");
5829+
elog(ERROR,"invalid lp");
58305830

58315831
htup= (HeapTupleHeader)PageGetItem(page,lp);
58325832

58335833
oldlen=ItemIdGetLength(lp)-htup->t_hoff;
58345834
newlen=tuple->t_len-tuple->t_data->t_hoff;
58355835
if (oldlen!=newlen||htup->t_hoff!=tuple->t_data->t_hoff)
5836-
elog(ERROR,"heap_inplace_update:wrong tuple length");
5836+
elog(ERROR,"wrong tuple length");
58375837

58385838
/* NO EREPORT(ERROR) from here till changes are logged */
58395839
START_CRIT_SECTION();
@@ -7763,7 +7763,7 @@ heap_xlog_delete(XLogReaderState *record)
77637763
lp=PageGetItemId(page,xlrec->offnum);
77647764

77657765
if (PageGetMaxOffsetNumber(page)<xlrec->offnum|| !ItemIdIsNormal(lp))
7766-
elog(PANIC,"heap_delete_redo:invalid lp");
7766+
elog(PANIC,"invalid lp");
77677767

77687768
htup= (HeapTupleHeader)PageGetItem(page,lp);
77697769

@@ -7854,7 +7854,7 @@ heap_xlog_insert(XLogReaderState *record)
78547854
page=BufferGetPage(buffer);
78557855

78567856
if (PageGetMaxOffsetNumber(page)+1<xlrec->offnum)
7857-
elog(PANIC,"heap_insert_redo:invalid max offset number");
7857+
elog(PANIC,"invalid max offset number");
78587858

78597859
data=XLogRecGetBlockData(record,0,&datalen);
78607860

@@ -7879,7 +7879,7 @@ heap_xlog_insert(XLogReaderState *record)
78797879

78807880
if (PageAddItem(page, (Item)htup,newlen,xlrec->offnum,
78817881
true, true)==InvalidOffsetNumber)
7882-
elog(PANIC,"heap_insert_redo:failed to add tuple");
7882+
elog(PANIC,"failed to add tuple");
78837883

78847884
freespace=PageGetHeapFreeSpace(page);/* needed to update FSM below */
78857885

@@ -7989,7 +7989,7 @@ heap_xlog_multi_insert(XLogReaderState *record)
79897989
else
79907990
offnum=xlrec->offsets[i];
79917991
if (PageGetMaxOffsetNumber(page)+1<offnum)
7992-
elog(PANIC,"heap_multi_insert_redo:invalid max offset number");
7992+
elog(PANIC,"invalid max offset number");
79937993

79947994
xlhdr= (xl_multi_insert_tuple*)SHORTALIGN(tupdata);
79957995
tupdata= ((char*)xlhdr)+SizeOfMultiInsertTuple;
@@ -8015,10 +8015,10 @@ heap_xlog_multi_insert(XLogReaderState *record)
80158015

80168016
offnum=PageAddItem(page, (Item)htup,newlen,offnum, true, true);
80178017
if (offnum==InvalidOffsetNumber)
8018-
elog(PANIC,"heap_multi_insert_redo:failed to add tuple");
8018+
elog(PANIC,"failed to add tuple");
80198019
}
80208020
if (tupdata!=endptr)
8021-
elog(PANIC,"heap_multi_insert_redo:total tuple length mismatch");
8021+
elog(PANIC,"total tuple length mismatch");
80228022

80238023
freespace=PageGetHeapFreeSpace(page);/* needed to update FSM below */
80248024

@@ -8129,7 +8129,7 @@ heap_xlog_update(XLogReaderState *record, bool hot_update)
81298129
lp=PageGetItemId(page,offnum);
81308130

81318131
if (PageGetMaxOffsetNumber(page)<offnum|| !ItemIdIsNormal(lp))
8132-
elog(PANIC,"heap_update_redo:invalid lp");
8132+
elog(PANIC,"invalid lp");
81338133

81348134
htup= (HeapTupleHeader)PageGetItem(page,lp);
81358135

@@ -8207,7 +8207,7 @@ heap_xlog_update(XLogReaderState *record, bool hot_update)
82078207

82088208
offnum=xlrec->new_offnum;
82098209
if (PageGetMaxOffsetNumber(page)+1<offnum)
8210-
elog(PANIC,"heap_update_redo:invalid max offset number");
8210+
elog(PANIC,"invalid max offset number");
82118211

82128212
if (xlrec->flags&XLH_UPDATE_PREFIX_FROM_OLD)
82138213
{
@@ -8285,7 +8285,7 @@ heap_xlog_update(XLogReaderState *record, bool hot_update)
82858285

82868286
offnum=PageAddItem(page, (Item)htup,newlen,offnum, true, true);
82878287
if (offnum==InvalidOffsetNumber)
8288-
elog(PANIC,"heap_update_redo:failed to add tuple");
8288+
elog(PANIC,"failed to add tuple");
82898289

82908290
if (xlrec->flags&XLH_UPDATE_NEW_ALL_VISIBLE_CLEARED)
82918291
PageClearAllVisible(page);
@@ -8340,7 +8340,7 @@ heap_xlog_confirm(XLogReaderState *record)
83408340
lp=PageGetItemId(page,offnum);
83418341

83428342
if (PageGetMaxOffsetNumber(page)<offnum|| !ItemIdIsNormal(lp))
8343-
elog(PANIC,"heap_confirm_redo:invalid lp");
8343+
elog(PANIC,"invalid lp");
83448344

83458345
htup= (HeapTupleHeader)PageGetItem(page,lp);
83468346

@@ -8376,7 +8376,7 @@ heap_xlog_lock(XLogReaderState *record)
83768376
lp=PageGetItemId(page,offnum);
83778377

83788378
if (PageGetMaxOffsetNumber(page)<offnum|| !ItemIdIsNormal(lp))
8379-
elog(PANIC,"heap_lock_redo:invalid lp");
8379+
elog(PANIC,"invalid lp");
83808380

83818381
htup= (HeapTupleHeader)PageGetItem(page,lp);
83828382

@@ -8426,7 +8426,7 @@ heap_xlog_lock_updated(XLogReaderState *record)
84268426
lp=PageGetItemId(page,offnum);
84278427

84288428
if (PageGetMaxOffsetNumber(page)<offnum|| !ItemIdIsNormal(lp))
8429-
elog(PANIC,"heap_xlog_lock_updated:invalid lp");
8429+
elog(PANIC,"invalid lp");
84308430

84318431
htup= (HeapTupleHeader)PageGetItem(page,lp);
84328432

@@ -8465,13 +8465,13 @@ heap_xlog_inplace(XLogReaderState *record)
84658465
lp=PageGetItemId(page,offnum);
84668466

84678467
if (PageGetMaxOffsetNumber(page)<offnum|| !ItemIdIsNormal(lp))
8468-
elog(PANIC,"heap_inplace_redo:invalid lp");
8468+
elog(PANIC,"invalid lp");
84698469

84708470
htup= (HeapTupleHeader)PageGetItem(page,lp);
84718471

84728472
oldlen=ItemIdGetLength(lp)-htup->t_hoff;
84738473
if (oldlen!=newlen)
8474-
elog(PANIC,"heap_inplace_redo:wrong tuple length");
8474+
elog(PANIC,"wrong tuple length");
84758475

84768476
memcpy((char*)htup+htup->t_hoff,newtup,newlen);
84778477

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp