Merge branch 'master' into picky_nodes (resolve conflicts)

funbringer · funbringer · commit 7d3e3246bc25 · 2016-07-12T15:55:43.000+03:00
diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ endif
 $(EXTENSION)--$(EXTVERSION).sql: init.sql hash.sql range.sql
 	cat $^ > $@
 
-ISOLATIONCHECKS=insert_nodes for_update
+ISOLATIONCHECKS=insert_nodes for_update rollback_on_create_partitions
 
 submake-isolation:
 	$(MAKE) -C $(top_builddir)/src/test/isolation all
diff --git a/expected/rollback_on_create_partitions.out b/expected/rollback_on_create_partitions.out
@@ -0,0 +1,38 @@
+Parsed test spec with 1 sessions
+
+starting permutation: begin insert_data create_partitions rollback show_me_what_you_got
+step begin: BEGIN;
+step insert_data: INSERT INTO range_rel SELECT generate_series(1, 10000);
+step create_partitions: SELECT create_range_partitions('range_rel', 'id', 1, 1000);
+create_range_partitions
+
+10             
+WARNING:  Removing 'range_rel' partitions from pg_pathman's cache
+step rollback: ROLLBACK;
+step show_me_what_you_got: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;
+QUERY PLAN     
+
+Seq Scan on range_rel
+
+starting permutation: begin insert_data create_partitions commit show_me_what_you_got
+step begin: BEGIN;
+step insert_data: INSERT INTO range_rel SELECT generate_series(1, 10000);
+step create_partitions: SELECT create_range_partitions('range_rel', 'id', 1, 1000);
+create_range_partitions
+
+10             
+step commit: COMMIT;
+step show_me_what_you_got: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;
+QUERY PLAN     
+
+Append         
+  ->  Seq Scan on range_rel_1
+  ->  Seq Scan on range_rel_2
+  ->  Seq Scan on range_rel_3
+  ->  Seq Scan on range_rel_4
+  ->  Seq Scan on range_rel_5
+  ->  Seq Scan on range_rel_6
+  ->  Seq Scan on range_rel_7
+  ->  Seq Scan on range_rel_8
+  ->  Seq Scan on range_rel_9
+  ->  Seq Scan on range_rel_10
diff --git a/specs/rollback_on_create_partitions.spec b/specs/rollback_on_create_partitions.spec
@@ -0,0 +1,23 @@
+setup
+{
+	CREATE EXTENSION pg_pathman;
+	CREATE TABLE range_rel(id serial primary key);
+}
+
+teardown
+{
+	SELECT drop_range_partitions('range_rel');
+	DROP TABLE range_rel CASCADE;
+	DROP EXTENSION pg_pathman;
+}
+
+session "s1"
+step "begin" { BEGIN; }
+step "rollback" { ROLLBACK; }
+step "commit" { COMMIT; }
+step "insert_data" { INSERT INTO range_rel SELECT generate_series(1, 10000); }
+step "create_partitions" { SELECT create_range_partitions('range_rel', 'id', 1, 1000); }
+step "show_me_what_you_got" { EXPLAIN (COSTS OFF) SELECT * FROM range_rel; }
+
+permutation "begin" "insert_data" "create_partitions" "rollback" "show_me_what_you_got"
+permutation "begin" "insert_data" "create_partitions" "commit" "show_me_what_you_got"
