Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit ac44946

Browse files
committed
Rename alloc/free functions in reorderbuffer.c
There used to be bespoken pools for these structs to reduce the palloc/pfree overhead, but that was ripped out a long time ago and replaced with the generic, cheaper generational memory allocator (commit a4ccc1c). The Get/Return terminology made sense with the pools, as you "got" an object from the pool and "returned" it later, but now it just looks weird. Rename to Alloc/Free. Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://www.postgresql.org/message-id/c9e43d2d-8e83-444f-b111-430377368989@iki.fi
1 parent 025e7e1 commit ac44946

File tree

3 files changed

+64
-66
lines changed

3 files changed

+64
-66
lines changed

src/backend/replication/logical/decode.c

+13-13
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ DecodeInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
915915
if (FilterByOrigin(ctx, XLogRecGetOrigin(r)))
916916
return;
917917

918-
change = ReorderBufferGetChange(ctx->reorder);
918+
change = ReorderBufferAllocChange(ctx->reorder);
919919
if (!(xlrec->flags & XLH_INSERT_IS_SPECULATIVE))
920920
change->action = REORDER_BUFFER_CHANGE_INSERT;
921921
else
@@ -928,7 +928,7 @@ DecodeInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
928928
tuplelen = datalen - SizeOfHeapHeader;
929929

930930
change->data.tp.newtuple =
931-
ReorderBufferGetTupleBuf(ctx->reorder, tuplelen);
931+
ReorderBufferAllocTupleBuf(ctx->reorder, tuplelen);
932932

933933
DecodeXLogTuple(tupledata, datalen, change->data.tp.newtuple);
934934

@@ -965,7 +965,7 @@ DecodeUpdate(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
965965
if (FilterByOrigin(ctx, XLogRecGetOrigin(r)))
966966
return;
967967

968-
change = ReorderBufferGetChange(ctx->reorder);
968+
change = ReorderBufferAllocChange(ctx->reorder);
969969
change->action = REORDER_BUFFER_CHANGE_UPDATE;
970970
change->origin_id = XLogRecGetOrigin(r);
971971
memcpy(&change->data.tp.rlocator, &target_locator, sizeof(RelFileLocator));
@@ -980,7 +980,7 @@ DecodeUpdate(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
980980
tuplelen = datalen - SizeOfHeapHeader;
981981

982982
change->data.tp.newtuple =
983-
ReorderBufferGetTupleBuf(ctx->reorder, tuplelen);
983+
ReorderBufferAllocTupleBuf(ctx->reorder, tuplelen);
984984

985985
DecodeXLogTuple(data, datalen, change->data.tp.newtuple);
986986
}
@@ -996,7 +996,7 @@ DecodeUpdate(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
996996
tuplelen = datalen - SizeOfHeapHeader;
997997

998998
change->data.tp.oldtuple =
999-
ReorderBufferGetTupleBuf(ctx->reorder, tuplelen);
999+
ReorderBufferAllocTupleBuf(ctx->reorder, tuplelen);
10001000

10011001
DecodeXLogTuple(data, datalen, change->data.tp.oldtuple);
10021002
}
@@ -1031,7 +1031,7 @@ DecodeDelete(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
10311031
if (FilterByOrigin(ctx, XLogRecGetOrigin(r)))
10321032
return;
10331033

1034-
change = ReorderBufferGetChange(ctx->reorder);
1034+
change = ReorderBufferAllocChange(ctx->reorder);
10351035

10361036
if (xlrec->flags & XLH_DELETE_IS_SUPER)
10371037
change->action = REORDER_BUFFER_CHANGE_INTERNAL_SPEC_ABORT;
@@ -1051,7 +1051,7 @@ DecodeDelete(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
10511051
Assert(XLogRecGetDataLen(r) > (SizeOfHeapDelete + SizeOfHeapHeader));
10521052

10531053
change->data.tp.oldtuple =
1054-
ReorderBufferGetTupleBuf(ctx->reorder, tuplelen);
1054+
ReorderBufferAllocTupleBuf(ctx->reorder, tuplelen);
10551055

10561056
DecodeXLogTuple((char *) xlrec + SizeOfHeapDelete,
10571057
datalen, change->data.tp.oldtuple);
@@ -1083,16 +1083,16 @@ DecodeTruncate(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
10831083
if (FilterByOrigin(ctx, XLogRecGetOrigin(r)))
10841084
return;
10851085

1086-
change = ReorderBufferGetChange(ctx->reorder);
1086+
change = ReorderBufferAllocChange(ctx->reorder);
10871087
change->action = REORDER_BUFFER_CHANGE_TRUNCATE;
10881088
change->origin_id = XLogRecGetOrigin(r);
10891089
if (xlrec->flags & XLH_TRUNCATE_CASCADE)
10901090
change->data.truncate.cascade = true;
10911091
if (xlrec->flags & XLH_TRUNCATE_RESTART_SEQS)
10921092
change->data.truncate.restart_seqs = true;
10931093
change->data.truncate.nrelids = xlrec->nrelids;
1094-
change->data.truncate.relids = ReorderBufferGetRelids(ctx->reorder,
1095-
xlrec->nrelids);
1094+
change->data.truncate.relids = ReorderBufferAllocRelids(ctx->reorder,
1095+
xlrec->nrelids);
10961096
memcpy(change->data.truncate.relids, xlrec->relids,
10971097
xlrec->nrelids * sizeof(Oid));
10981098
ReorderBufferQueueChange(ctx->reorder, XLogRecGetXid(r),
@@ -1149,7 +1149,7 @@ DecodeMultiInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
11491149
HeapTuple tuple;
11501150
HeapTupleHeader header;
11511151

1152-
change = ReorderBufferGetChange(ctx->reorder);
1152+
change = ReorderBufferAllocChange(ctx->reorder);
11531153
change->action = REORDER_BUFFER_CHANGE_INSERT;
11541154
change->origin_id = XLogRecGetOrigin(r);
11551155

@@ -1160,7 +1160,7 @@ DecodeMultiInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
11601160
datalen = xlhdr->datalen;
11611161

11621162
change->data.tp.newtuple =
1163-
ReorderBufferGetTupleBuf(ctx->reorder, datalen);
1163+
ReorderBufferAllocTupleBuf(ctx->reorder, datalen);
11641164

11651165
tuple = change->data.tp.newtuple;
11661166
header = tuple->t_data;
@@ -1224,7 +1224,7 @@ DecodeSpecConfirm(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
12241224
if (FilterByOrigin(ctx, XLogRecGetOrigin(r)))
12251225
return;
12261226

1227-
change = ReorderBufferGetChange(ctx->reorder);
1227+
change = ReorderBufferAllocChange(ctx->reorder);
12281228
change->action = REORDER_BUFFER_CHANGE_INTERNAL_SPEC_CONFIRM;
12291229
change->origin_id = XLogRecGetOrigin(r);
12301230

0 commit comments

Comments
 (0)