NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit57891c2

Amit Kapila

committed

Add STREAM_START/STREAM_STOP for transactional messages during decoding.

In test_decoding module, when skip_empty_xacts option was specified, addstream_start/stop for streaming transactional messages. This makes thehandling of transactional messages stream consistent irrespective ofwhether skip_empty_xacts option was specified.Commit26dd028 made a similar change for non-streaming messages butforgot to update the streaming cases.Author: Peter SmithReviewed-by: Amit KapilaDiscussion:http://postgr.es/m/OS0PR01MB5716AEBD2988F8F5E9D5985794DFA@OS0PR01MB5716.jpnprd01.prod.outlook.com

1 parent675fed4 commit57891c2Copy full SHA for 57891c2

File tree

3 files changed

+25

-3

lines changed

contrib/test_decoding
- expected
  - stream.out
  - twophase_stream.out
- test_decoding.c

3 files changed

+25

-3

lines changed

`‎contrib/test_decoding/expected/stream.out`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,10 @@ COMMIT;`
`29`	`29`	`SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL, 'include-xids', '0', 'skip-empty-xacts', '1', 'stream-changes', '1');`
`30`	`30`	`data`
`31`	`31`	`----------------------------------------------------------`
	`32`	`+ opening a streamed block for transaction`
`32`	`33`	`streaming message: transactional: 1 prefix: test, sz: 50`
	`34`	`+ closing a streamed block for transaction`
	`35`	`+ aborting streamed (sub)transaction`
`33`	`36`	`opening a streamed block for transaction`
`34`	`37`	`streaming change for transaction`
`35`	`38`	`streaming change for transaction`
`@@ -53,7 +56,7 @@ SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL, 'incl`
`53`	`56`	`streaming change for transaction`
`54`	`57`	`closing a streamed block for transaction`
`55`	`58`	`committing streamed transaction`
`56`		`-(24 rows)`
	`59`	`+(27 rows)`
`57`	`60`
`58`	`61`	`-- streaming test for toast changes`
`59`	`62`	`ALTER TABLE stream_test ALTER COLUMN data set storage external;`

`‎contrib/test_decoding/expected/twophase_stream.out`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,10 @@ PREPARE TRANSACTION 'test1';`
`31`	`31`	`SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL, 'include-xids', '0', 'skip-empty-xacts', '1', 'stream-changes', '1');`
`32`	`32`	`data`
`33`	`33`	`----------------------------------------------------------`
	`34`	`+ opening a streamed block for transaction`
`34`	`35`	`streaming message: transactional: 1 prefix: test, sz: 50`
	`36`	`+ closing a streamed block for transaction`
	`37`	`+ aborting streamed (sub)transaction`
`35`	`38`	`opening a streamed block for transaction`
`36`	`39`	`streaming change for transaction`
`37`	`40`	`streaming change for transaction`
`@@ -55,7 +58,7 @@ SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL, 'incl`
`55`	`58`	`streaming change for transaction`
`56`	`59`	`closing a streamed block for transaction`
`57`	`60`	`preparing streamed transaction 'test1'`
`58`		`-(24 rows)`
	`61`	`+(27 rows)`
`59`	`62`
`60`	`63`	`COMMIT PREPARED 'test1';`
`61`	`64`	`--should show the COMMIT PREPARED and the other changes in the transaction`
`@@ -84,8 +87,11 @@ PREPARE TRANSACTION 'test1_nodecode';`
`84`	`87`	`SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL,NULL, 'include-xids', '0', 'skip-empty-xacts', '1', 'stream-changes', '1');`
`85`	`88`	`data`
`86`	`89`	`----------------------------------------------------------`
	`90`	`+ opening a streamed block for transaction`
`87`	`91`	`streaming message: transactional: 1 prefix: test, sz: 50`
`88`		`-(1 row)`
	`92`	`+ closing a streamed block for transaction`
	`93`	`+ aborting streamed (sub)transaction`
	`94`	`+(4 rows)`
`89`	`95`
`90`	`96`	`COMMIT PREPARED 'test1_nodecode';`
`91`	`97`	`-- should show the inserts but not show a COMMIT PREPARED but a COMMIT`

`‎contrib/test_decoding/test_decoding.c`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -944,6 +944,19 @@ pg_decode_stream_message(LogicalDecodingContext *ctx,`
`944`	`944`	`ReorderBufferTXN*txn,XLogRecPtrlsn,booltransactional,`
`945`	`945`	`constcharprefix,Sizesz,constcharmessage)`
`946`	`946`	`{`
	`947`	`+/* Output stream start if we haven't yet for transactional messages. */`
	`948`	`+if (transactional)`
	`949`	`+{`
	`950`	`+TestDecodingData*data=ctx->output_plugin_private;`
	`951`	`+TestDecodingTxnData*txndata=txn->output_plugin_private;`
	`952`	`+`
	`953`	`+if (data->skip_empty_xacts&& !txndata->stream_wrote_changes)`
	`954`	`+{`
	`955`	`+pg_output_stream_start(ctx,data,txn, false);`
	`956`	`+}`
	`957`	`+txndata->xact_wrote_changes=txndata->stream_wrote_changes= true;`
	`958`	`+}`
	`959`	`+`
`947`	`960`	`OutputPluginPrepareWrite(ctx, true);`
`948`	`961`
`949`	`962`	`if (transactional)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit57891c2

File tree

3 files changed

3 files changed

`‎contrib/test_decoding/expected/stream.out`

`‎contrib/test_decoding/expected/twophase_stream.out`

`‎contrib/test_decoding/test_decoding.c`

0 commit comments