Skip to content

Commit 5457a13

Browse files
simonat2ndQuadrantsimonat2ndQuadrant
committed
Reduce scope of changes for COPY FREEZE.
Allow support only for freezing tuples by explicit command. Previous coding mistakenly extended slightly beyond what was agreed as correct on -hackers. So essentially a partial revoke of earlier work, leaving just the COPY FREEZE command.
1 parent 3114cb6 commit 5457a13

File tree

5 files changed

+57
-47
lines changed

5 files changed

+57
-47
lines changed

‎src/backend/access/heap/heapam.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1875,13 +1875,11 @@ FreeBulkInsertState(BulkInsertState bistate)
18751875
* The HEAP_INSERT_SKIP_FSM option is passed directly to
18761876
* RelationGetBufferForTuple, which see for more info.
18771877
*
1878-
* HEAP_INSERT_COMMITTED should only be specified for inserts into
1878+
* HEAP_INSERT_FROZEN should only be specified for inserts into
18791879
* relfilenodes created during the current subtransaction and when
18801880
* there are no prior snapshots or pre-existing portals open.
1881-
*
1882-
* HEAP_INSERT_FROZEN only has meaning when HEAP_INSERT_COMMITTED is
1883-
* also set. This causes rows to be frozen, which is an MVCC violation
1884-
* and requires explicit options chosen by user.
1881+
* This causes rows to be frozen, which is an MVCC violation and
1882+
* requires explicit options chosen by user.
18851883
*
18861884
* Note that these options will be applied when inserting into the heap's
18871885
* TOAST table, too, if the tuple requires any out-of-line data.
@@ -2086,11 +2084,10 @@ heap_prepare_insert(Relation relation, HeapTuple tup, TransactionId xid,
20862084
tup->t_data->t_infomask &= ~(HEAP_XACT_MASK);
20872085
tup->t_data->t_infomask2 &= ~(HEAP2_XACT_MASK);
20882086
tup->t_data->t_infomask |= HEAP_XMAX_INVALID;
2089-
if (options & HEAP_INSERT_COMMITTED)
2087+
if (options & HEAP_INSERT_FROZEN)
20902088
{
20912089
tup->t_data->t_infomask |= HEAP_XMIN_COMMITTED;
2092-
if (options & HEAP_INSERT_FROZEN)
2093-
HeapTupleHeaderSetXmin(tup->t_data, FrozenTransactionId);
2090+
HeapTupleHeaderSetXmin(tup->t_data, FrozenTransactionId);
20942091
}
20952092
else
20962093
HeapTupleHeaderSetXmin(tup->t_data, xid);

‎src/backend/commands/copy.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1994,14 +1994,11 @@ CopyFrom(CopyState cstate)
19941994
* which subtransaction created it is crucial for correctness
19951995
* of this optimisation.
19961996
*/
1997-
if (ThereAreNoPriorRegisteredSnapshots() &&
1997+
if (cstate->freeze &&
1998+
ThereAreNoPriorRegisteredSnapshots() &&
19981999
ThereAreNoReadyPortals() &&
19992000
cstate->rel->rd_newRelfilenodeSubid == GetCurrentSubTransactionId())
2000-
{
2001-
hi_options |= HEAP_INSERT_COMMITTED;
2002-
if (cstate->freeze)
2003-
hi_options |= HEAP_INSERT_FROZEN;
2004-
}
2001+
hi_options |= HEAP_INSERT_FROZEN;
20052002
}
20062003

20072004
if (cstate->freeze && (hi_options & HEAP_INSERT_FROZEN) == 0)

‎src/include/access/heapam.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
/* "options" flag bits for heap_insert */
2727
#define HEAP_INSERT_SKIP_WAL 0x0001
2828
#define HEAP_INSERT_SKIP_FSM 0x0002
29-
#define HEAP_INSERT_COMMITTED 0x0004
30-
#define HEAP_INSERT_FROZEN 0x0008
29+
#define HEAP_INSERT_FROZEN 0x0004
3130

3231
typedef struct BulkInsertStateData *BulkInsertState;
3332

‎src/test/regress/expected/copy2.out

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -259,44 +259,58 @@ BEGIN;
259259
TRUNCATE vistest;
260260
COPY vistest FROM stdin CSV;
261261
SELECT * FROM vistest;
262-
a
263-
---
264-
a
262+
a
263+
----
264+
a1
265265
b
266266
(2 rows)
267267

268268
SAVEPOINT s1;
269269
TRUNCATE vistest;
270270
COPY vistest FROM stdin CSV;
271271
SELECT * FROM vistest;
272-
a
273-
---
274-
d
272+
a
273+
----
274+
d1
275275
e
276276
(2 rows)
277277

278278
COMMIT;
279+
SELECT * FROM vistest;
280+
a
281+
----
282+
d1
283+
e
284+
(2 rows)
285+
279286
BEGIN;
280287
TRUNCATE vistest;
281288
COPY vistest FROM stdin CSV FREEZE;
282289
SELECT * FROM vistest;
283-
a
284-
---
285-
a
290+
a
291+
----
292+
a2
286293
b
287294
(2 rows)
288295

289296
SAVEPOINT s1;
290297
TRUNCATE vistest;
291298
COPY vistest FROM stdin CSV FREEZE;
292299
SELECT * FROM vistest;
293-
a
294-
---
295-
d
300+
a
301+
----
302+
d2
296303
e
297304
(2 rows)
298305

299306
COMMIT;
307+
SELECT * FROM vistest;
308+
a
309+
----
310+
d2
311+
e
312+
(2 rows)
313+
300314
BEGIN;
301315
TRUNCATE vistest;
302316
COPY vistest FROM stdin CSV FREEZE;
@@ -319,23 +333,23 @@ ROLLBACK TO SAVEPOINT s1;
319333
COPY vistest FROM stdin CSV FREEZE;
320334
NOTICE: FREEZE option specified but pre-conditions not met
321335
SELECT * FROM vistest;
322-
a
323-
---
336+
a
337+
----
324338
p
325339
g
326340
z
327-
d
341+
d3
328342
e
329343
(5 rows)
330344

331345
COMMIT;
332346
CREATE FUNCTION truncate_in_subxact() RETURNS VOID AS
333347
$$
334348
BEGIN
335-
SELECT * FROM nonexistent;
349+
TRUNCATE vistest;
336350
EXCEPTION
337351
WHEN OTHERS THEN
338-
TRUNCATE vistest;
352+
INSERT INTO vistest VALUES ('subxact failure');
339353
END;
340354
$$ language plpgsql;
341355
BEGIN;
@@ -348,17 +362,17 @@ SELECT truncate_in_subxact();
348362

349363
COPY vistest FROM stdin CSV FREEZE;
350364
SELECT * FROM vistest;
351-
a
352-
---
353-
d
365+
a
366+
----
367+
d4
354368
e
355369
(2 rows)
356370

357371
COMMIT;
358372
SELECT * FROM vistest;
359-
a
360-
---
361-
d
373+
a
374+
----
375+
d4
362376
e
363377
(2 rows)
364378

‎src/test/regress/sql/copy2.sql

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -183,34 +183,37 @@ CREATE TABLE vistest (LIKE testeoc);
183183
BEGIN;
184184
TRUNCATE vistest;
185185
COPY vistest FROM stdin CSV;
186-
a
186+
a1
187187
b
188188
\.
189189
SELECT * FROM vistest;
190190
SAVEPOINT s1;
191191
TRUNCATE vistest;
192192
COPY vistest FROM stdin CSV;
193-
d
193+
d1
194194
e
195195
\.
196196
SELECT * FROM vistest;
197197
COMMIT;
198+
SELECT * FROM vistest;
198199

199200
BEGIN;
200201
TRUNCATE vistest;
201202
COPY vistest FROM stdin CSV FREEZE;
202-
a
203+
a2
203204
b
204205
\.
205206
SELECT * FROM vistest;
206207
SAVEPOINT s1;
207208
TRUNCATE vistest;
208209
COPY vistest FROM stdin CSV FREEZE;
209-
d
210+
d2
210211
e
211212
\.
212213
SELECT * FROM vistest;
213214
COMMIT;
215+
SELECT * FROM vistest;
216+
214217
BEGIN;
215218
TRUNCATE vistest;
216219
COPY vistest FROM stdin CSV FREEZE;
@@ -230,25 +233,25 @@ SAVEPOINT s1;
230233
TRUNCATE vistest;
231234
ROLLBACK TO SAVEPOINT s1;
232235
COPY vistest FROM stdin CSV FREEZE;
233-
d
236+
d3
234237
e
235238
\.
236239
SELECT * FROM vistest;
237240
COMMIT;
238241
CREATE FUNCTION truncate_in_subxact() RETURNS VOID AS
239242
$$
240243
BEGIN
241-
SELECT * FROM nonexistent;
244+
TRUNCATE vistest;
242245
EXCEPTION
243246
WHEN OTHERS THEN
244-
TRUNCATE vistest;
247+
INSERT INTO vistest VALUES ('subxact failure');
245248
END;
246249
$$ language plpgsql;
247250
BEGIN;
248251
INSERT INTO vistest VALUES ('z');
249252
SELECT truncate_in_subxact();
250253
COPY vistest FROM stdin CSV FREEZE;
251-
d
254+
d4
252255
e
253256
\.
254257
SELECT * FROM vistest;

0 commit comments

Comments
 (0)