From 0836852a942a37d99510aea8de079979f5c3b632 Mon Sep 17 00:00:00 2001 From: ChangAo Chen Date: Thu, 8 Aug 2024 15:06:24 +0800 Subject: [PATCH v2 2/2] Add test case snapshot_build for test_decoding. --- contrib/test_decoding/Makefile | 2 +- .../test_decoding/expected/snapshot_build.out | 33 +++++++++++++ contrib/test_decoding/meson.build | 1 + .../test_decoding/specs/snapshot_build.spec | 46 +++++++++++++++++++ 4 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 contrib/test_decoding/expected/snapshot_build.out create mode 100644 contrib/test_decoding/specs/snapshot_build.spec diff --git a/contrib/test_decoding/Makefile b/contrib/test_decoding/Makefile index a4ba1a509a..8113e2d99c 100644 --- a/contrib/test_decoding/Makefile +++ b/contrib/test_decoding/Makefile @@ -9,7 +9,7 @@ REGRESS = ddl xact rewrite toast permissions decoding_in_xact \ ISOLATION = mxact delayed_startup ondisk_startup concurrent_ddl_dml \ oldest_xmin snapshot_transfer subxact_without_top concurrent_stream \ twophase_snapshot slot_creation_error catalog_change_snapshot \ - skip_snapshot_restore + skip_snapshot_restore snapshot_build REGRESS_OPTS = --temp-config $(top_srcdir)/contrib/test_decoding/logical.conf ISOLATION_OPTS = --temp-config $(top_srcdir)/contrib/test_decoding/logical.conf diff --git a/contrib/test_decoding/expected/snapshot_build.out b/contrib/test_decoding/expected/snapshot_build.out new file mode 100644 index 0000000000..0fcf20cce8 --- /dev/null +++ b/contrib/test_decoding/expected/snapshot_build.out @@ -0,0 +1,33 @@ +Parsed test spec with 4 sessions + +starting permutation: s1_begin s1_insert s2_init s3_begin s3_insert s4_create s1_commit s4_begin s4_insert s3_commit s4_commit s2_get_changes +step s1_begin: BEGIN; +step s1_insert: INSERT INTO tbl1 VALUES (1); +step s2_init: SELECT 'init' FROM pg_create_logical_replication_slot('isolation_slot', 'test_decoding'); +step s3_begin: BEGIN; +step s3_insert: INSERT INTO tbl1 VALUES (1); +step s4_create: CREATE TABLE tbl2 (val1 integer); +step s1_commit: COMMIT; +step s4_begin: BEGIN; +step s4_insert: INSERT INTO tbl2 VALUES (1); +step s3_commit: COMMIT; +step s2_init: <... completed> +?column? +-------- +init +(1 row) + +step s4_commit: COMMIT; +step s2_get_changes: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'skip-empty-xacts', '1', 'include-xids', '0'); +data +------------------------------------------ +BEGIN +table public.tbl2: INSERT: val1[integer]:1 +COMMIT +(3 rows) + +?column? +-------- +stop +(1 row) + diff --git a/contrib/test_decoding/meson.build b/contrib/test_decoding/meson.build index f643dc81a2..2b7e80ba71 100644 --- a/contrib/test_decoding/meson.build +++ b/contrib/test_decoding/meson.build @@ -63,6 +63,7 @@ tests += { 'twophase_snapshot', 'slot_creation_error', 'skip_snapshot_restore', + 'snapshot_build', ], 'regress_args': [ '--temp-config', files('logical.conf'), diff --git a/contrib/test_decoding/specs/snapshot_build.spec b/contrib/test_decoding/specs/snapshot_build.spec new file mode 100644 index 0000000000..63c6b21cc1 --- /dev/null +++ b/contrib/test_decoding/specs/snapshot_build.spec @@ -0,0 +1,46 @@ +# Test snapshot build correctly + +setup +{ + DROP TABLE IF EXISTS tbl1; + DROP TABLE IF EXISTS tbl2; + CREATE TABLE tbl1 (val1 integer); +} + +teardown +{ + DROP TABLE tbl1; + DROP TABLE tbl2; + SELECT 'stop' FROM pg_drop_replication_slot('isolation_slot'); +} + +session "s1" +setup { SET synchronous_commit=on; } +step "s1_begin" { BEGIN; } +step "s1_insert" { INSERT INTO tbl1 VALUES (1); } +step "s1_commit" { COMMIT; } + +session "s2" +setup { SET synchronous_commit=on; } +step "s2_init" { SELECT 'init' FROM pg_create_logical_replication_slot('isolation_slot', 'test_decoding'); } +step "s2_get_changes" { SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'skip-empty-xacts', '1', 'include-xids', '0'); } + +session "s3" +setup { SET synchronous_commit=on; } +step "s3_begin" { BEGIN; } +step "s3_insert" { INSERT INTO tbl1 VALUES (1); } +step "s3_commit" { COMMIT; } + +session "s4" +setup { SET synchronous_commit=on; } +step "s4_create" { CREATE TABLE tbl2 (val1 integer); } +step "s4_begin" { BEGIN; } +step "s4_insert" { INSERT INTO tbl2 VALUES (1); } +step "s4_commit" { COMMIT; } + +# T1: s1_begin -> s1_insert -> BUILDING_SNAPSHOT -> s1_commit -> FULL_SNAPSHOT +# T2: BUILDING_SNAPSHOT -> s3_begin -> s3_insert -> FULL_SNAPSHOT -> s3_commit -> CONSISTENT +# T3: BUILDING_SNAPSHOT -> s4_create -> FULL_SNAPSHOT +# T4: FULL_SNAPSHOT -> s4_begin -> s4_insert -> CONSISTENT -> s4_commit +# The snapshot must track T3 or the replay of T4 will fail because its snapshot cannot see tbl2 +permutation "s1_begin" "s1_insert" "s2_init" "s3_begin" "s3_insert" "s4_create" "s1_commit" "s4_begin" "s4_insert" "s3_commit" "s4_commit" "s2_get_changes" -- 2.34.1