diff options
| author | Andres Freund <andres@anarazel.de> | 2016-03-07 14:24:52 -0800 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2016-03-07 14:24:52 -0800 |
| commit | 250e5bd7129d0b54594dc225f7380545189b70c1 (patch) | |
| tree | 30eb398370d1067cfdc5e770d56c66a3aa846030 /src/backend/replication/logical/reorderbuffer.c | |
| parent | 45b87cc57fe02f571de33ce20b4d7bec881a785a (diff) | |
| download | postgresql-250e5bd7129d0b54594dc225f7380545189b70c1.tar.gz postgresql-250e5bd7129d0b54594dc225f7380545189b70c1.zip | |
Further improvements to c8f621c43.
Coverity and inspection for the issue addressed in fd45d16f found some
questionable code.
Specifically coverity noticed that the wrong length was added in
ReorderBufferSerializeChange() - without immediate negative consequences
as the variable isn't used afterwards. During code-review and testing I
noticed that a bit of space was wasted when allocating tuple bufs in
several places. Thirdly, the debug memset()s in
ReorderBufferGetTupleBuf() reduce the error checking valgrind can do.
Backpatch: 9.4, like c8f621c43.
Diffstat (limited to 'src/backend/replication/logical/reorderbuffer.c')
| -rw-r--r-- | src/backend/replication/logical/reorderbuffer.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c index 40d5c4833c2..d3830095c78 100644 --- a/src/backend/replication/logical/reorderbuffer.c +++ b/src/backend/replication/logical/reorderbuffer.c @@ -471,12 +471,15 @@ ReorderBufferGetTupleBuf(ReorderBuffer *rb, Size tuple_len) rb->nr_cached_tuplebufs--; tuple = slist_container(ReorderBufferTupleBuf, node, slist_pop_head_node(&rb->cached_tuplebufs)); + Assert(tuple->alloc_tuple_size == MaxHeapTupleSize); #ifdef USE_ASSERT_CHECKING memset(&tuple->tuple, 0xa9, sizeof(HeapTupleData)); + VALGRIND_MAKE_MEM_UNDEFINED(&tuple->tuple, sizeof(HeapTupleData)); #endif tuple->tuple.t_data = ReorderBufferTupleBufData(tuple); #ifdef USE_ASSERT_CHECKING memset(tuple->tuple.t_data, 0xa8, tuple->alloc_tuple_size); + VALGRIND_MAKE_MEM_UNDEFINED(tuple->tuple.t_data, tuple->alloc_tuple_size); #endif } else @@ -2152,7 +2155,7 @@ ReorderBufferSerializeChange(ReorderBuffer *rb, ReorderBufferTXN *txn, data += sizeof(HeapTupleData); memcpy(data, newtup->tuple.t_data, newlen); - data += oldlen; + data += newlen; } break; } |