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

Commitd3c8ac1

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 parentedf68b2 commitd3c8ac1

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
@@ -5809,7 +5809,7 @@ heap_finish_speculative(Relation relation, HeapTuple tuple)
58095809
lp=PageGetItemId(page,offnum);
58105810

58115811
if (PageGetMaxOffsetNumber(page)<offnum|| !ItemIdIsNormal(lp))
5812-
elog(ERROR,"heap_confirm_insert:invalid lp");
5812+
elog(ERROR,"invalid lp");
58135813

58145814
htup= (HeapTupleHeader)PageGetItem(page,lp);
58155815

@@ -6050,14 +6050,14 @@ heap_inplace_update(Relation relation, HeapTuple tuple)
60506050
lp=PageGetItemId(page,offnum);
60516051

60526052
if (PageGetMaxOffsetNumber(page)<offnum|| !ItemIdIsNormal(lp))
6053-
elog(ERROR,"heap_inplace_update:invalid lp");
6053+
elog(ERROR,"invalid lp");
60546054

60556055
htup= (HeapTupleHeader)PageGetItem(page,lp);
60566056

60576057
oldlen=ItemIdGetLength(lp)-htup->t_hoff;
60586058
newlen=tuple->t_len-tuple->t_data->t_hoff;
60596059
if (oldlen!=newlen||htup->t_hoff!=tuple->t_data->t_hoff)
6060-
elog(ERROR,"heap_inplace_update:wrong tuple length");
6060+
elog(ERROR,"wrong tuple length");
60616061

60626062
/* NO EREPORT(ERROR) from here till changes are logged */
60636063
START_CRIT_SECTION();
@@ -7987,7 +7987,7 @@ heap_xlog_delete(XLogReaderState *record)
79877987
lp=PageGetItemId(page,xlrec->offnum);
79887988

79897989
if (PageGetMaxOffsetNumber(page)<xlrec->offnum|| !ItemIdIsNormal(lp))
7990-
elog(PANIC,"heap_delete_redo:invalid lp");
7990+
elog(PANIC,"invalid lp");
79917991

79927992
htup= (HeapTupleHeader)PageGetItem(page,lp);
79937993

@@ -8078,7 +8078,7 @@ heap_xlog_insert(XLogReaderState *record)
80788078
page=BufferGetPage(buffer);
80798079

80808080
if (PageGetMaxOffsetNumber(page)+1<xlrec->offnum)
8081-
elog(PANIC,"heap_insert_redo:invalid max offset number");
8081+
elog(PANIC,"invalid max offset number");
80828082

80838083
data=XLogRecGetBlockData(record,0,&datalen);
80848084

@@ -8103,7 +8103,7 @@ heap_xlog_insert(XLogReaderState *record)
81038103

81048104
if (PageAddItem(page, (Item)htup,newlen,xlrec->offnum,
81058105
true, true)==InvalidOffsetNumber)
8106-
elog(PANIC,"heap_insert_redo:failed to add tuple");
8106+
elog(PANIC,"failed to add tuple");
81078107

81088108
freespace=PageGetHeapFreeSpace(page);/* needed to update FSM below */
81098109

@@ -8213,7 +8213,7 @@ heap_xlog_multi_insert(XLogReaderState *record)
82138213
else
82148214
offnum=xlrec->offsets[i];
82158215
if (PageGetMaxOffsetNumber(page)+1<offnum)
8216-
elog(PANIC,"heap_multi_insert_redo:invalid max offset number");
8216+
elog(PANIC,"invalid max offset number");
82178217

82188218
xlhdr= (xl_multi_insert_tuple*)SHORTALIGN(tupdata);
82198219
tupdata= ((char*)xlhdr)+SizeOfMultiInsertTuple;
@@ -8239,10 +8239,10 @@ heap_xlog_multi_insert(XLogReaderState *record)
82398239

82408240
offnum=PageAddItem(page, (Item)htup,newlen,offnum, true, true);
82418241
if (offnum==InvalidOffsetNumber)
8242-
elog(PANIC,"heap_multi_insert_redo:failed to add tuple");
8242+
elog(PANIC,"failed to add tuple");
82438243
}
82448244
if (tupdata!=endptr)
8245-
elog(PANIC,"heap_multi_insert_redo:total tuple length mismatch");
8245+
elog(PANIC,"total tuple length mismatch");
82468246

82478247
freespace=PageGetHeapFreeSpace(page);/* needed to update FSM below */
82488248

@@ -8353,7 +8353,7 @@ heap_xlog_update(XLogReaderState *record, bool hot_update)
83538353
lp=PageGetItemId(page,offnum);
83548354

83558355
if (PageGetMaxOffsetNumber(page)<offnum|| !ItemIdIsNormal(lp))
8356-
elog(PANIC,"heap_update_redo:invalid lp");
8356+
elog(PANIC,"invalid lp");
83578357

83588358
htup= (HeapTupleHeader)PageGetItem(page,lp);
83598359

@@ -8431,7 +8431,7 @@ heap_xlog_update(XLogReaderState *record, bool hot_update)
84318431

84328432
offnum=xlrec->new_offnum;
84338433
if (PageGetMaxOffsetNumber(page)+1<offnum)
8434-
elog(PANIC,"heap_update_redo:invalid max offset number");
8434+
elog(PANIC,"invalid max offset number");
84358435

84368436
if (xlrec->flags&XLH_UPDATE_PREFIX_FROM_OLD)
84378437
{
@@ -8509,7 +8509,7 @@ heap_xlog_update(XLogReaderState *record, bool hot_update)
85098509

85108510
offnum=PageAddItem(page, (Item)htup,newlen,offnum, true, true);
85118511
if (offnum==InvalidOffsetNumber)
8512-
elog(PANIC,"heap_update_redo:failed to add tuple");
8512+
elog(PANIC,"failed to add tuple");
85138513

85148514
if (xlrec->flags&XLH_UPDATE_NEW_ALL_VISIBLE_CLEARED)
85158515
PageClearAllVisible(page);
@@ -8564,7 +8564,7 @@ heap_xlog_confirm(XLogReaderState *record)
85648564
lp=PageGetItemId(page,offnum);
85658565

85668566
if (PageGetMaxOffsetNumber(page)<offnum|| !ItemIdIsNormal(lp))
8567-
elog(PANIC,"heap_confirm_redo:invalid lp");
8567+
elog(PANIC,"invalid lp");
85688568

85698569
htup= (HeapTupleHeader)PageGetItem(page,lp);
85708570

@@ -8600,7 +8600,7 @@ heap_xlog_lock(XLogReaderState *record)
86008600
lp=PageGetItemId(page,offnum);
86018601

86028602
if (PageGetMaxOffsetNumber(page)<offnum|| !ItemIdIsNormal(lp))
8603-
elog(PANIC,"heap_lock_redo:invalid lp");
8603+
elog(PANIC,"invalid lp");
86048604

86058605
htup= (HeapTupleHeader)PageGetItem(page,lp);
86068606

@@ -8650,7 +8650,7 @@ heap_xlog_lock_updated(XLogReaderState *record)
86508650
lp=PageGetItemId(page,offnum);
86518651

86528652
if (PageGetMaxOffsetNumber(page)<offnum|| !ItemIdIsNormal(lp))
8653-
elog(PANIC,"heap_xlog_lock_updated:invalid lp");
8653+
elog(PANIC,"invalid lp");
86548654

86558655
htup= (HeapTupleHeader)PageGetItem(page,lp);
86568656

@@ -8689,13 +8689,13 @@ heap_xlog_inplace(XLogReaderState *record)
86898689
lp=PageGetItemId(page,offnum);
86908690

86918691
if (PageGetMaxOffsetNumber(page)<offnum|| !ItemIdIsNormal(lp))
8692-
elog(PANIC,"heap_inplace_redo:invalid lp");
8692+
elog(PANIC,"invalid lp");
86938693

86948694
htup= (HeapTupleHeader)PageGetItem(page,lp);
86958695

86968696
oldlen=ItemIdGetLength(lp)-htup->t_hoff;
86978697
if (oldlen!=newlen)
8698-
elog(PANIC,"heap_inplace_redo:wrong tuple length");
8698+
elog(PANIC,"wrong tuple length");
86998699

87008700
memcpy((char*)htup+htup->t_hoff,newtup,newlen);
87018701

0 commit comments

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