Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 9283ab7

Browse files
kovdb75kovdb75
committed
[PGPRO-9334] Corrections for isolation tests
Tags: pg_pathman
1 parent 35ab52f commit 9283ab7

7 files changed

+509
-278
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ ISOLATIONCHECKS=insert_nodes for_update rollback_on_create_partitions
9999
submake-isolation:
100100
$(MAKE) -C $(top_builddir)/src/test/isolation all
101101

102-
isolationcheck: | submake-isolation
102+
isolationcheck: | submake-isolation temp-install
103103
$(MKDIR_P) isolation_output
104104
$(pg_isolation_regress_check) \
105105
--temp-config=$(top_srcdir)/$(subdir)/conf.add \

‎expected/for_update.out

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,49 @@ Parsed test spec with 2 sessions
22

33
starting permutation: s1_b s1_update s2_select s1_r
44
create_range_partitions
5+
-----------------------
6+
10
7+
(1 row)
58

6-
10
79
step s1_b: begin;
810
step s1_update: update test_tbl set id = 2 where id = 1;
911
step s2_select: select * from test_tbl where id = 1;
10-
id val
12+
id|val
13+
--+---
14+
1| 1
15+
(1 row)
1116

12-
1 1
1317
step s1_r: rollback;
1418

1519
starting permutation: s1_b s1_update s2_select_locked s1_r
1620
create_range_partitions
21+
-----------------------
22+
10
23+
(1 row)
1724

18-
10
1925
step s1_b: begin;
2026
step s1_update: update test_tbl set id = 2 where id = 1;
2127
step s2_select_locked: select * from test_tbl where id = 1 for share; <waiting ...>
2228
step s1_r: rollback;
2329
step s2_select_locked: <... completed>
24-
id val
30+
id|val
31+
--+---
32+
1| 1
33+
(1 row)
2534

26-
1 1
2735

2836
starting permutation: s1_b s1_update s2_select_locked s1_c
2937
create_range_partitions
38+
-----------------------
39+
10
40+
(1 row)
3041

31-
10
3242
step s1_b: begin;
3343
step s1_update: update test_tbl set id = 2 where id = 1;
3444
step s2_select_locked: select * from test_tbl where id = 1 for share; <waiting ...>
3545
step s1_c: commit;
3646
step s2_select_locked: <... completed>
37-
id val
47+
id|val
48+
--+---
49+
(0 rows)
3850

‎expected/insert_nodes.out

Lines changed: 76 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,122 +2,144 @@ Parsed test spec with 2 sessions
22

33
starting permutation: s1b s1_insert_150 s1r s1_show_partitions s2b s2_insert_150 s2c s2_show_partitions
44
set_spawn_using_bgw
5+
-------------------
6+
7+
(1 row)
58

6-
79
step s1b: BEGIN;
810
step s1_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
911
step s1r: ROLLBACK;
10-
step s1_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c
12+
step s1_show_partitions: SELECT pg_get_constraintdef(c.oid) FROM pg_inherits i LEFT JOIN pg_constraint c
1113
ON c.conrelid = i.inhrelid
1214
WHERE i.inhparent = 'range_rel'::regclass
1315
ORDER BY c.oid;
14-
consrc
16+
pg_get_constraintdef
17+
------------------------------------
18+
PRIMARY KEY (id)
19+
CHECK (((id >= 1) AND (id < 101)))
20+
PRIMARY KEY (id)
21+
CHECK (((id >= 101) AND (id < 201)))
22+
(4 rows)
1523

16-
17-
((id >= 1) AND (id < 101))
18-
19-
((id >= 101) AND (id < 201))
2024
step s2b: BEGIN;
2125
step s2_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
2226
step s2c: COMMIT;
23-
step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c
27+
step s2_show_partitions: SELECT pg_get_constraintdef(c.oid) FROM pg_inherits i LEFT JOIN pg_constraint c
2428
ON c.conrelid = i.inhrelid
2529
WHERE i.inhparent = 'range_rel'::regclass
2630
ORDER BY c.oid;
27-
consrc
31+
pg_get_constraintdef
32+
------------------------------------
33+
PRIMARY KEY (id)
34+
CHECK (((id >= 1) AND (id < 101)))
35+
PRIMARY KEY (id)
36+
CHECK (((id >= 101) AND (id < 201)))
37+
(4 rows)
2838

29-
30-
((id >= 1) AND (id < 101))
31-
32-
((id >= 101) AND (id < 201))
3339

3440
starting permutation: s1b s1_insert_150 s1r s1_show_partitions s2b s2_insert_300 s2c s2_show_partitions
3541
set_spawn_using_bgw
42+
-------------------
43+
44+
(1 row)
3645

37-
3846
step s1b: BEGIN;
3947
step s1_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
4048
step s1r: ROLLBACK;
41-
step s1_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c
49+
step s1_show_partitions: SELECT pg_get_constraintdef(c.oid) FROM pg_inherits i LEFT JOIN pg_constraint c
4250
ON c.conrelid = i.inhrelid
4351
WHERE i.inhparent = 'range_rel'::regclass
4452
ORDER BY c.oid;
45-
consrc
53+
pg_get_constraintdef
54+
------------------------------------
55+
PRIMARY KEY (id)
56+
CHECK (((id >= 1) AND (id < 101)))
57+
PRIMARY KEY (id)
58+
CHECK (((id >= 101) AND (id < 201)))
59+
(4 rows)
4660

47-
48-
((id >= 1) AND (id < 101))
49-
50-
((id >= 101) AND (id < 201))
5161
step s2b: BEGIN;
5262
step s2_insert_300: INSERT INTO range_rel SELECT generate_series(151, 300);
5363
step s2c: COMMIT;
54-
step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c
64+
step s2_show_partitions: SELECT pg_get_constraintdef(c.oid) FROM pg_inherits i LEFT JOIN pg_constraint c
5565
ON c.conrelid = i.inhrelid
5666
WHERE i.inhparent = 'range_rel'::regclass
5767
ORDER BY c.oid;
58-
consrc
68+
pg_get_constraintdef
69+
------------------------------------
70+
PRIMARY KEY (id)
71+
CHECK (((id >= 1) AND (id < 101)))
72+
PRIMARY KEY (id)
73+
CHECK (((id >= 101) AND (id < 201)))
74+
PRIMARY KEY (id)
75+
CHECK (((id >= 201) AND (id < 301)))
76+
(6 rows)
5977

60-
61-
((id >= 1) AND (id < 101))
62-
63-
((id >= 101) AND (id < 201))
64-
65-
((id >= 201) AND (id < 301))
6678

6779
starting permutation: s1b s1_insert_300 s1r s1_show_partitions s2b s2_insert_150 s2c s2_show_partitions
6880
set_spawn_using_bgw
81+
-------------------
82+
83+
(1 row)
6984

70-
7185
step s1b: BEGIN;
7286
step s1_insert_300: INSERT INTO range_rel SELECT generate_series(151, 300);
7387
step s1r: ROLLBACK;
74-
step s1_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c
88+
step s1_show_partitions: SELECT pg_get_constraintdef(c.oid) FROM pg_inherits i LEFT JOIN pg_constraint c
7589
ON c.conrelid = i.inhrelid
7690
WHERE i.inhparent = 'range_rel'::regclass
7791
ORDER BY c.oid;
78-
consrc
92+
pg_get_constraintdef
93+
------------------------------------
94+
PRIMARY KEY (id)
95+
CHECK (((id >= 1) AND (id < 101)))
96+
PRIMARY KEY (id)
97+
CHECK (((id >= 101) AND (id < 201)))
98+
PRIMARY KEY (id)
99+
CHECK (((id >= 201) AND (id < 301)))
100+
(6 rows)
79101

80-
81-
((id >= 1) AND (id < 101))
82-
83-
((id >= 101) AND (id < 201))
84-
85-
((id >= 201) AND (id < 301))
86102
step s2b: BEGIN;
87103
step s2_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
88104
step s2c: COMMIT;
89-
step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c
105+
step s2_show_partitions: SELECT pg_get_constraintdef(c.oid) FROM pg_inherits i LEFT JOIN pg_constraint c
90106
ON c.conrelid = i.inhrelid
91107
WHERE i.inhparent = 'range_rel'::regclass
92108
ORDER BY c.oid;
93-
consrc
109+
pg_get_constraintdef
110+
------------------------------------
111+
PRIMARY KEY (id)
112+
CHECK (((id >= 1) AND (id < 101)))
113+
PRIMARY KEY (id)
114+
CHECK (((id >= 101) AND (id < 201)))
115+
PRIMARY KEY (id)
116+
CHECK (((id >= 201) AND (id < 301)))
117+
(6 rows)
94118

95-
96-
((id >= 1) AND (id < 101))
97-
98-
((id >= 101) AND (id < 201))
99-
100-
((id >= 201) AND (id < 301))
101119

102120
starting permutation: s1b s1_insert_150 s2b s2_insert_300 s1r s2r s2_show_partitions
103121
set_spawn_using_bgw
122+
-------------------
123+
124+
(1 row)
104125

105-
106126
step s1b: BEGIN;
107127
step s1_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
108128
step s2b: BEGIN;
109129
step s2_insert_300: INSERT INTO range_rel SELECT generate_series(151, 300);
110130
step s1r: ROLLBACK;
111131
step s2r: ROLLBACK;
112-
step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c
132+
step s2_show_partitions: SELECT pg_get_constraintdef(c.oid) FROM pg_inherits i LEFT JOIN pg_constraint c
113133
ON c.conrelid = i.inhrelid
114134
WHERE i.inhparent = 'range_rel'::regclass
115135
ORDER BY c.oid;
116-
consrc
136+
pg_get_constraintdef
137+
------------------------------------
138+
PRIMARY KEY (id)
139+
CHECK (((id >= 1) AND (id < 101)))
140+
PRIMARY KEY (id)
141+
CHECK (((id >= 101) AND (id < 201)))
142+
PRIMARY KEY (id)
143+
CHECK (((id >= 201) AND (id < 301)))
144+
(6 rows)
117145

118-
119-
((id >= 1) AND (id < 101))
120-
121-
((id >= 101) AND (id < 201))
122-
123-
((id >= 201) AND (id < 301))

0 commit comments

Comments
 (0)