Skip to content

Commit d1103ed

Browse files
zhangwenchao-123my-ship-it
authored andcommitted
Fix singlenode mode isolation2 expected results not stable.
As there are three ao/aocs tables in the prevent_ao_wal isolation2 test, the expected results of wal are not stable after VACUUM. We fix this by truncate unrelated table in lockmodes test. Authored-by: Zhang Wenchao zwcpostgres@gmail.com
1 parent b49afa3 commit d1103ed

4 files changed

Lines changed: 8 additions & 3 deletions

File tree

src/test/regress/expected/misc_sanity_external_fts.out

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ ORDER BY 1, 2;
122122
pg_resqueuecapability | ressetting | text
123123
pg_stat_last_operation | stasubtype | text
124124
pg_stat_last_shoperation | stasubtype | text
125+
pg_tag | allowed_values | text[]
126+
pg_tag_description | tagvalue | text
125127
pg_task | command | text
126128
pg_task | database | text
127129
pg_task | jobname | text
@@ -133,7 +135,7 @@ ORDER BY 1, 2;
133135
pg_task_run_history | return_message | text
134136
pg_task_run_history | status | text
135137
pg_task_run_history | username | text
136-
(31 rows)
138+
(33 rows)
137139

138140
-- system catalogs without primary keys
139141
--

src/test/singlenode_isolation2/expected/lockmodes.out

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,3 +1089,6 @@ UPDATE 1
10891089
1: ROLLBACK;
10901090
ROLLBACK
10911091
1q: ... <quitting>
1092+
1093+
TRUNCATE t_lockmods_ao;
1094+
TRUNCATE

src/test/singlenode_isolation2/expected/prevent_ao_wal.out

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ rmgr: Appendonly len (rec/tot): 146/ 146, tx: 12664, lsn: 0/F8000B38,
7575
rmgr: Appendonly len (rec/tot): 58/ 58, tx: 12665, lsn: 0/F8000C98, prev 0/F8000C68, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180472 seg/offset:0/0
7676
rmgr: Appendonly len (rec/tot): 58/ 58, tx: 0, lsn: 0/F80412F8, prev 0/F80412C8, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180476 seg/offset:0/80
7777
rmgr: Appendonly len (rec/tot): 58/ 58, tx: 0, lsn: 0/F8041338, prev 0/F80412F8, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180476 seg/offset:128/80
78-
rmgr: Appendonly len (rec/tot): 58/ 58, tx: 0, lsn: 0/F80D2020, prev 0/F80D1FF0, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180445 seg/offset:0/112
7978
rmgr: Appendonly len (rec/tot): 58/ 58, tx: 0, lsn: 0/F8307118, prev 0/F83070E8, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180472 seg/offset:1/88
8079
rmgr: Appendonly len (rec/tot): 58/ 58, tx: 0, lsn: 0/F8307158, prev 0/F8307118, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180472 seg/offset:0/0
8180
rmgr: Appendonly len (rec/tot): 58/ 58, tx: 0, lsn: 0/F8307208, prev 0/F83071D8, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180476 seg/offset:0/80
@@ -86,7 +85,6 @@ rmgr: Appendonly len (rec/tot): 122/ 122, tx: 12673, lsn: 0/F83075A0,
8685
rmgr: Appendonly len (rec/tot): 122/ 122, tx: 12673, lsn: 0/F8307620, prev 0/F83075A0, desc: APPENDONLY_INSERT insert: rel 1663/221728/180476 seg/offset:129/0 len:64
8786
rmgr: Appendonly len (rec/tot): 58/ 58, tx: 12674, lsn: 0/F8307780, prev 0/F8307750, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180476 seg/offset:0/0
8887
rmgr: Appendonly len (rec/tot): 58/ 58, tx: 12674, lsn: 0/F83077C0, prev 0/F8307780, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180476 seg/offset:128/0
89-
rmgr: Appendonly len (rec/tot): 58/ 58, tx: 0, lsn: 0/F8327BF0, prev 0/F8327BC0, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180445 seg/offset:0/112
9088

9189

9290
-- *********** Set wal_level=minimal **************

src/test/singlenode_isolation2/sql/lockmodes.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,3 +381,5 @@ create table t_lockmods_ao1 (c int) with (appendonly=true);
381381
1: select * from show_locks_lockmodes;
382382
1: ROLLBACK;
383383
1q:
384+
385+
TRUNCATE t_lockmods_ao;

0 commit comments

Comments
 (0)