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

Commitea177a3

Browse files
committed
Remove unportable use of anonymous unions from reorderbuffer.h.
Inb89e151 I had assumed it was ok to use anonymous unions asstruct members, but while a longstanding extension in many compilers,it's only been standardized in C11.To fix, remove one of the anonymous unions which tried to hide someimplementation specific enum values and give the other a name. Thelatter unfortunately requires changes in output plugins, but since thefeature has only been added a few days ago...Andres Freund
1 parent83204e1 commitea177a3

File tree

4 files changed

+186
-182
lines changed

4 files changed

+186
-182
lines changed

‎contrib/test_decoding/test_decoding.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -358,43 +358,45 @@ pg_decode_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn,
358358
{
359359
caseREORDER_BUFFER_CHANGE_INSERT:
360360
appendStringInfoString(ctx->out," INSERT:");
361-
if (change->tp.newtuple==NULL)
361+
if (change->data.tp.newtuple==NULL)
362362
appendStringInfoString(ctx->out," (no-tuple-data)");
363363
else
364364
tuple_to_stringinfo(ctx->out,tupdesc,
365-
&change->tp.newtuple->tuple,
365+
&change->data.tp.newtuple->tuple,
366366
false);
367367
break;
368368
caseREORDER_BUFFER_CHANGE_UPDATE:
369369
appendStringInfoString(ctx->out," UPDATE:");
370-
if (change->tp.oldtuple!=NULL)
370+
if (change->data.tp.oldtuple!=NULL)
371371
{
372372
appendStringInfoString(ctx->out," old-key:");
373373
tuple_to_stringinfo(ctx->out,tupdesc,
374-
&change->tp.oldtuple->tuple,
374+
&change->data.tp.oldtuple->tuple,
375375
true);
376376
appendStringInfoString(ctx->out," new-tuple:");
377377
}
378378

379-
if (change->tp.newtuple==NULL)
379+
if (change->data.tp.newtuple==NULL)
380380
appendStringInfoString(ctx->out," (no-tuple-data)");
381381
else
382382
tuple_to_stringinfo(ctx->out,tupdesc,
383-
&change->tp.newtuple->tuple,
383+
&change->data.tp.newtuple->tuple,
384384
false);
385385
break;
386386
caseREORDER_BUFFER_CHANGE_DELETE:
387387
appendStringInfoString(ctx->out," DELETE:");
388388

389389
/* if there was no PK, we only know that a delete happened */
390-
if (change->tp.oldtuple==NULL)
390+
if (change->data.tp.oldtuple==NULL)
391391
appendStringInfoString(ctx->out," (no-tuple-data)");
392392
/* In DELETE, only the replica identity is present; display that */
393393
else
394394
tuple_to_stringinfo(ctx->out,tupdesc,
395-
&change->tp.oldtuple->tuple,
395+
&change->data.tp.oldtuple->tuple,
396396
true);
397397
break;
398+
default:
399+
Assert(false);
398400
}
399401

400402
MemoryContextSwitchTo(old);

‎src/backend/replication/logical/decode.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -586,17 +586,17 @@ DecodeInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
586586

587587
change=ReorderBufferGetChange(ctx->reorder);
588588
change->action=REORDER_BUFFER_CHANGE_INSERT;
589-
memcpy(&change->tp.relnode,&xlrec->target.node,sizeof(RelFileNode));
589+
memcpy(&change->data.tp.relnode,&xlrec->target.node,sizeof(RelFileNode));
590590

591591
if (xlrec->flags&XLOG_HEAP_CONTAINS_NEW_TUPLE)
592592
{
593593
Assert(r->xl_len> (SizeOfHeapInsert+SizeOfHeapHeader));
594594

595-
change->tp.newtuple=ReorderBufferGetTupleBuf(ctx->reorder);
595+
change->data.tp.newtuple=ReorderBufferGetTupleBuf(ctx->reorder);
596596

597597
DecodeXLogTuple((char*)xlrec+SizeOfHeapInsert,
598598
r->xl_len-SizeOfHeapInsert,
599-
change->tp.newtuple);
599+
change->data.tp.newtuple);
600600
}
601601

602602
ReorderBufferQueueChange(ctx->reorder,r->xl_xid,buf->origptr,change);
@@ -626,19 +626,19 @@ DecodeUpdate(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
626626

627627
change=ReorderBufferGetChange(ctx->reorder);
628628
change->action=REORDER_BUFFER_CHANGE_UPDATE;
629-
memcpy(&change->tp.relnode,&xlrec->target.node,sizeof(RelFileNode));
629+
memcpy(&change->data.tp.relnode,&xlrec->target.node,sizeof(RelFileNode));
630630

631631
data= (char*)&xlhdr->header;
632632

633633
if (xlrec->flags&XLOG_HEAP_CONTAINS_NEW_TUPLE)
634634
{
635635
Assert(r->xl_len> (SizeOfHeapUpdate+SizeOfHeapHeaderLen));
636636

637-
change->tp.newtuple=ReorderBufferGetTupleBuf(ctx->reorder);
637+
change->data.tp.newtuple=ReorderBufferGetTupleBuf(ctx->reorder);
638638

639639
DecodeXLogTuple(data,
640640
xlhdr->t_len+SizeOfHeapHeader,
641-
change->tp.newtuple);
641+
change->data.tp.newtuple);
642642
/* skip over the rest of the tuple header */
643643
data+=SizeOfHeapHeader;
644644
/* skip over the tuple data */
@@ -648,10 +648,10 @@ DecodeUpdate(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
648648
if (xlrec->flags&XLOG_HEAP_CONTAINS_OLD)
649649
{
650650
xlhdr= (xl_heap_header_len*)data;
651-
change->tp.oldtuple=ReorderBufferGetTupleBuf(ctx->reorder);
651+
change->data.tp.oldtuple=ReorderBufferGetTupleBuf(ctx->reorder);
652652
DecodeXLogTuple((char*)&xlhdr->header,
653653
xlhdr->t_len+SizeOfHeapHeader,
654-
change->tp.oldtuple);
654+
change->data.tp.oldtuple);
655655
data= (char*)&xlhdr->header;
656656
data+=SizeOfHeapHeader;
657657
data+=xlhdr->t_len;
@@ -681,18 +681,18 @@ DecodeDelete(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
681681
change=ReorderBufferGetChange(ctx->reorder);
682682
change->action=REORDER_BUFFER_CHANGE_DELETE;
683683

684-
memcpy(&change->tp.relnode,&xlrec->target.node,sizeof(RelFileNode));
684+
memcpy(&change->data.tp.relnode,&xlrec->target.node,sizeof(RelFileNode));
685685

686686
/* old primary key stored */
687687
if (xlrec->flags&XLOG_HEAP_CONTAINS_OLD)
688688
{
689689
Assert(r->xl_len> (SizeOfHeapDelete+SizeOfHeapHeader));
690690

691-
change->tp.oldtuple=ReorderBufferGetTupleBuf(ctx->reorder);
691+
change->data.tp.oldtuple=ReorderBufferGetTupleBuf(ctx->reorder);
692692

693693
DecodeXLogTuple((char*)xlrec+SizeOfHeapDelete,
694694
r->xl_len-SizeOfHeapDelete,
695-
change->tp.oldtuple);
695+
change->data.tp.oldtuple);
696696
}
697697
ReorderBufferQueueChange(ctx->reorder,r->xl_xid,buf->origptr,change);
698698
}
@@ -735,7 +735,7 @@ DecodeMultiInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
735735

736736
change=ReorderBufferGetChange(ctx->reorder);
737737
change->action=REORDER_BUFFER_CHANGE_INSERT;
738-
memcpy(&change->tp.relnode,&xlrec->node,sizeof(RelFileNode));
738+
memcpy(&change->data.tp.relnode,&xlrec->node,sizeof(RelFileNode));
739739

740740
/*
741741
* CONTAINS_NEW_TUPLE will always be set currently as multi_insert
@@ -746,9 +746,9 @@ DecodeMultiInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
746746
*/
747747
if (xlrec->flags&XLOG_HEAP_CONTAINS_NEW_TUPLE)
748748
{
749-
change->tp.newtuple=ReorderBufferGetTupleBuf(ctx->reorder);
749+
change->data.tp.newtuple=ReorderBufferGetTupleBuf(ctx->reorder);
750750

751-
tuple=change->tp.newtuple;
751+
tuple=change->data.tp.newtuple;
752752

753753
/* not a disk based tuple */
754754
ItemPointerSetInvalid(&tuple->tuple.t_self);

0 commit comments

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