Skip to content

P
Postgres FD Implementation
Commit 626bfad6 authored by Andres Freund's avatar Andres Freund
Browse files
Options

Fix decoding of consecutive MULTI_INSERTs emitted by one heap_multi_insert(). 

Commit 1b86c81d fixed the decoding of toasted columns for the rows
contained in one xl_heap_multi_insert record. But that's not actually
enough, because heap_multi_insert() will actually first toast all
passed in rows and then emit several *_multi_insert records; one for
each page it fills with tuples.

Add a XLOG_HEAP_LAST_MULTI_INSERT flag which is set in
xl_heap_multi_insert->flag denoting that this multi_insert record is
the last emitted by one heap_multi_insert() call. Then use that flag
in decode.c to only set clear_toast_afterwards in the right situation.

Expand the number of rows inserted via COPY in the corresponding
regression test to make sure that more than one heap page is filled
with tuples by one heap_multi_insert() call.

Backpatch to 9.4 like the previous commit.
parent deee42ab
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 419 additions and 3 deletions
contrib/test_decoding/expected/toast.out
View file @ 626bfad6
This diff is collapsed.
contrib/test_decoding/sql/toast.sql
View file @ 626bfad6
......@@ -59,6 +59,205 @@ ALTER TABLE toasted_copy ALTER COLUMN data SET STORAGE EXTERNAL;
2 toasted1-12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
3 untoasted2
4 toasted2-12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
5 untoasted3
6 untoasted4
7 untoasted5
8 untoasted6
9 untoasted7
10 untoasted8
11 untoasted9
12 untoasted10
13 untoasted11
14 untoasted12
15 untoasted13
16 untoasted14
17 untoasted15
18 untoasted16
19 untoasted17
20 untoasted18
21 untoasted19
22 untoasted20
23 untoasted21
24 untoasted22
25 untoasted23
26 untoasted24
27 untoasted25
28 untoasted26
29 untoasted27
30 untoasted28
31 untoasted29
32 untoasted30
33 untoasted31
34 untoasted32
35 untoasted33
36 untoasted34
37 untoasted35
38 untoasted36
39 untoasted37
40 untoasted38
41 untoasted39
42 untoasted40
43 untoasted41
44 untoasted42
45 untoasted43
46 untoasted44
47 untoasted45
48 untoasted46
49 untoasted47
50 untoasted48
51 untoasted49
52 untoasted50
53 untoasted51
54 untoasted52
55 untoasted53
56 untoasted54
57 untoasted55
58 untoasted56
59 untoasted57
60 untoasted58
61 untoasted59
62 untoasted60
63 untoasted61
64 untoasted62
65 untoasted63
66 untoasted64
67 untoasted65
68 untoasted66
69 untoasted67
70 untoasted68
71 untoasted69
72 untoasted70
73 untoasted71
74 untoasted72
75 untoasted73
76 untoasted74
77 untoasted75
78 untoasted76
79 untoasted77
80 untoasted78
81 untoasted79
82 untoasted80
83 untoasted81
84 untoasted82
85 untoasted83
86 untoasted84
87 untoasted85
88 untoasted86
89 untoasted87
90 untoasted88
91 untoasted89
92 untoasted90
93 untoasted91
94 untoasted92
95 untoasted93
96 untoasted94
97 untoasted95
98 untoasted96
99 untoasted97
100 untoasted98
101 untoasted99
102 untoasted100
103 untoasted101
104 untoasted102
105 untoasted103
106 untoasted104
107 untoasted105
108 untoasted106
109 untoasted107
110 untoasted108
111 untoasted109
112 untoasted110
113 untoasted111
114 untoasted112
115 untoasted113
116 untoasted114
117 untoasted115
118 untoasted116
119 untoasted117
120 untoasted118
121 untoasted119
122 untoasted120
123 untoasted121
124 untoasted122
125 untoasted123
126 untoasted124
127 untoasted125
128 untoasted126
129 untoasted127
130 untoasted128
131 untoasted129
132 untoasted130
133 untoasted131
134 untoasted132
135 untoasted133
136 untoasted134
137 untoasted135
138 untoasted136
139 untoasted137
140 untoasted138
141 untoasted139
142 untoasted140
143 untoasted141
144 untoasted142
145 untoasted143
146 untoasted144
147 untoasted145
148 untoasted146
149 untoasted147
150 untoasted148
151 untoasted149
152 untoasted150
153 untoasted151
154 untoasted152
155 untoasted153
156 untoasted154
157 untoasted155
158 untoasted156
159 untoasted157
160 untoasted158
161 untoasted159
162 untoasted160
163 untoasted161
164 untoasted162
165 untoasted163
166 untoasted164
167 untoasted165
168 untoasted166
169 untoasted167
170 untoasted168
171 untoasted169
172 untoasted170
173 untoasted171
174 untoasted172
175 untoasted173
176 untoasted174
177 untoasted175
178 untoasted176
179 untoasted177
180 untoasted178
181 untoasted179
182 untoasted180
183 untoasted181
184 untoasted182
185 untoasted183
186 untoasted184
187 untoasted185
188 untoasted186
189 untoasted187
190 untoasted188
191 untoasted189
192 untoasted190
193 untoasted191
194 untoasted192
195 untoasted193
196 untoasted194
197 untoasted195
198 untoasted196
199 untoasted197
200 untoasted198
201 toasted3-12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
202 untoasted199
203 untoasted200
\.
SELECT substr(data, 1, 200) FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0');
SELECT pg_drop_replication_slot('regression_slot');
src/backend/access/heap/heapam.c
View file @ 626bfad6
......@@ -2515,6 +2515,14 @@ heap_multi_insert(Relation relation, HeapTuple *tuples, int ntuples,
info |= XLOG_HEAP_INIT_PAGE;
}
/*
* Signal that this is the last xl_heap_multi_insert record
* emitted by this call to heap_multi_insert(). Needed for logical
* decoding so it knows when to cleanup temporary data.
*/
if (ndone + nthispage == ntuples)
xlrec->flags |= XLOG_HEAP_LAST_MULTI_INSERT;
recptr = XLogInsert(RM_HEAP2_ID, info, rdata);
PageSetLSN(page, recptr);
......
src/backend/replication/logical/decode.c
View file @ 626bfad6
......@@ -802,8 +802,16 @@ DecodeMultiInsert(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
tuple->header.t_hoff = xlhdr->t_hoff;
}
/* reset toast reassembly only after the last chunk */
change->data.tp.clear_toast_afterwards = (i + 1) == xlrec->ntuples;
/*
* Reset toast reassembly state only after the last row in the last
* xl_multi_insert_tuple record emitted by one heap_multi_insert()
* call.
*/
if (xlrec->flags & XLOG_HEAP_LAST_MULTI_INSERT &&
(i + 1) == xlrec->ntuples)
change->data.tp.clear_toast_afterwards = true;
else
change->data.tp.clear_toast_afterwards = false;
ReorderBufferQueueChange(ctx->reorder, r->xl_xid,
buf->origptr, change);
......
src/include/access/heapam_xlog.h
View file @ 626bfad6
......@@ -69,6 +69,8 @@
#define XLOG_HEAP_CONTAINS_NEW_TUPLE (1<<4)
#define XLOG_HEAP_PREFIX_FROM_OLD (1<<5)
#define XLOG_HEAP_SUFFIX_FROM_OLD (1<<6)
/* last xl_heap_multi_insert record for one heap_multi_insert() call */
#define XLOG_HEAP_LAST_MULTI_INSERT (1<<7)
/* convenience macro for checking whether any form of old tuple was logged */
#define XLOG_HEAP_CONTAINS_OLD \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment