new isolation test for 'FOR UPDATE' feature, rename 'insert_trigger.spec'

funbringer · funbringer · commit 720629cef07e · 2016-06-22T14:33:56.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .deps
+isolation_output
 results/pg_pathman.out
 regression.diffs
 regression.out
diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ endif
 $(EXTENSION)--$(EXTVERSION).sql: init.sql hash.sql range.sql
 	cat $^ > $@
 
-ISOLATIONCHECKS=insert_trigger
+ISOLATIONCHECKS=insert_nodes for_update
 
 submake-isolation:
 	$(MAKE) -C $(top_builddir)/src/test/isolation all
diff --git a/expected/for_update.out b/expected/for_update.out
@@ -0,0 +1,38 @@
+Parsed test spec with 2 sessions
+
+starting permutation: s1_b s1_update s2_select s1_r
+create_range_partitions
+
+10             
+step s1_b: begin;
+step s1_update: update test_tbl set id = 2 where id = 1;
+step s2_select: select * from test_tbl where id = 1;
+id             val            
+
+1              1              
+step s1_r: rollback;
+
+starting permutation: s1_b s1_update s2_select_locked s1_r
+create_range_partitions
+
+10             
+step s1_b: begin;
+step s1_update: update test_tbl set id = 2 where id = 1;
+step s2_select_locked: select * from test_tbl where id = 1 for share; <waiting ...>
+step s1_r: rollback;
+step s2_select_locked: <... completed>
+id             val            
+
+1              1              
+
+starting permutation: s1_b s1_update s2_select_locked s1_c
+create_range_partitions
+
+10             
+step s1_b: begin;
+step s1_update: update test_tbl set id = 2 where id = 1;
+step s2_select_locked: select * from test_tbl where id = 1 for share; <waiting ...>
+step s1_c: commit;
+step s2_select_locked: <... completed>
+id             val            
+
diff --git a/expected/insert_nodes.out b/expected/insert_nodes.out
diff --git a/specs/for_update.spec b/specs/for_update.spec
@@ -0,0 +1,32 @@
+setup
+{
+	create extension pg_pathman;
+	create table test_tbl(id int not null, val real);
+	insert into test_tbl select i, i from generate_series(1, 1000) as i;
+	select create_range_partitions('test_tbl', 'id', 1, 100, 10);
+}
+
+teardown
+{
+	drop table test_tbl cascade;
+	drop extension pg_pathman;
+}
+
+session "s1"
+step "s1_b" { begin; }
+step "s1_c" { commit; }
+step "s1_r" { rollback; }
+step "s1_update" { update test_tbl set id = 2 where id = 1; }
+
+session "s2"
+step "s2_b" { begin; }
+step "s2_c" { commit; }
+step "s2_select_locked" { select * from test_tbl where id = 1 for share; }
+step "s2_select" { select * from test_tbl where id = 1; }
+
+
+permutation "s1_b" "s1_update" "s2_select" "s1_r"
+
+permutation "s1_b" "s1_update" "s2_select_locked" "s1_r"
+
+permutation "s1_b" "s1_update" "s2_select_locked" "s1_c"
diff --git a/specs/insert_nodes.spec b/specs/insert_nodes.spec
@@ -7,7 +7,7 @@ setup
 
 teardown
 {
-	SELECT drop_range_partitions('range_rel');
+	SELECT drop_partitions('range_rel');
 	DROP TABLE range_rel CASCADE;
 	DROP EXTENSION pg_pathman;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`.deps`
	`2`	`+isolation_output`
`2`	`3`	`results/pg_pathman.out`
`3`	`4`	`regression.diffs`
`4`	`5`	`regression.out`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ setup`
`7`	`7`
`8`	`8`	`teardown`
`9`	`9`	`{`
`10`		`- SELECT drop_range_partitions('range_rel');`
	`10`	`+ SELECT drop_partitions('range_rel');`
`11`	`11`	`DROP TABLE range_rel CASCADE;`
`12`	`12`	`DROP EXTENSION pg_pathman;`
`13`	`13`	`}`