diff options
| author | Tomas Vondra | 2022-02-12 22:50:42 +0000 |
|---|---|---|
| committer | Tomas Vondra | 2022-02-12 22:50:42 +0000 |
| commit | b779d7d8fdae088d70da5ed9fcd8205035676df3 (patch) | |
| tree | dc6733e833b2423d43ebb8e2385774cb9b9a3778 /contrib/test_decoding/test_decoding.c | |
| parent | faa189c932d51945b2285e277128b0f26b96afdd (diff) | |
Fix skip-empty-xacts with sequences in test_decoding
Regression tests need to use skip-empty-xacts = false, because there
might be accidental concurrent activity (like autovacuum), particularly
on slow machines. The tests added by 80901b3291 failed to do that in a
couple places, triggering occasional failures on buildfarm.
Fixing the tests however uncovered a bug in the code, because sequence
callbacks did not handle skip-empty-xacts properly. For trasactional
increments we need to check/update the xact_wrote_changes flag, and emit
the BEGIN if it's the first change in the transaction.
Reported-by: Andres Freund
Discussion: https://postgr.es/m/20220212220413.b25amklo7t4xb7ni%40alap3.anarazel.de
Diffstat (limited to 'contrib/test_decoding/test_decoding.c')
| -rw-r--r-- | contrib/test_decoding/test_decoding.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/contrib/test_decoding/test_decoding.c b/contrib/test_decoding/test_decoding.c index 6b6012e095b..ea22649e41d 100644 --- a/contrib/test_decoding/test_decoding.c +++ b/contrib/test_decoding/test_decoding.c @@ -774,10 +774,21 @@ pg_decode_sequence(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, int64 last_value, int64 log_cnt, bool is_called) { TestDecodingData *data = ctx->output_plugin_private; + TestDecodingTxnData *txndata = txn->output_plugin_private; if (!data->include_sequences) return; + /* output BEGIN if we haven't yet, but only for the transactional case */ + if (transactional) + { + if (data->skip_empty_xacts && !txndata->xact_wrote_changes) + { + pg_output_begin(ctx, data, txn, false); + } + txndata->xact_wrote_changes = true; + } + OutputPluginPrepareWrite(ctx, true); appendStringInfoString(ctx->out, "sequence "); appendStringInfoString(ctx->out, @@ -994,10 +1005,21 @@ pg_decode_stream_sequence(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, int64 last_value, int64 log_cnt, bool is_called) { TestDecodingData *data = ctx->output_plugin_private; + TestDecodingTxnData *txndata = txn->output_plugin_private; if (!data->include_sequences) return; + /* output BEGIN if we haven't yet, but only for the transactional case */ + if (transactional) + { + if (data->skip_empty_xacts && !txndata->xact_wrote_changes) + { + pg_output_begin(ctx, data, txn, false); + } + txndata->xact_wrote_changes = true; + } + OutputPluginPrepareWrite(ctx, true); appendStringInfoString(ctx->out, "streaming sequence "); appendStringInfoString(ctx->out, |