fix isolation tests for branch 'picky_nodes'

funbringer · funbringer · commit 143fb2542b3b · 2016-07-17T01:45:52.000+03:00
diff --git a/expected/rollback_on_create_partitions.out b/expected/rollback_on_create_partitions.out
@@ -74,8 +74,8 @@ create_range_partitions
 
 10             
 step savepoint_b: SAVEPOINT b;
-step drop_partitions: SELECT drop_range_partitions('range_rel');
-drop_range_partitions
+step drop_partitions: SELECT drop_partitions('range_rel');
+drop_partitions
 
 10             
 step show_rel: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;
@@ -100,8 +100,8 @@ create_range_partitions
 
 10             
 step savepoint_b: SAVEPOINT b;
-step drop_partitions: SELECT drop_range_partitions('range_rel');
-drop_range_partitions
+step drop_partitions: SELECT drop_partitions('range_rel');
+drop_partitions
 
 10             
 step show_rel: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;
@@ -124,8 +124,8 @@ create_range_partitions
 
 10             
 step savepoint_b: SAVEPOINT b;
-step drop_partitions: SELECT drop_range_partitions('range_rel');
-drop_range_partitions
+step drop_partitions: SELECT drop_partitions('range_rel');
+drop_partitions
 
 10             
 step savepoint_c: SAVEPOINT c;
@@ -161,8 +161,8 @@ create_range_partitions
 
 10             
 step savepoint_b: SAVEPOINT b;
-step drop_partitions: SELECT drop_range_partitions('range_rel');
-drop_range_partitions
+step drop_partitions: SELECT drop_partitions('range_rel');
+drop_partitions
 
 10             
 step savepoint_c: SAVEPOINT c;
@@ -207,8 +207,8 @@ create_range_partitions
 
 10             
 step savepoint_b: SAVEPOINT b;
-step drop_partitions: SELECT drop_range_partitions('range_rel');
-drop_range_partitions
+step drop_partitions: SELECT drop_partitions('range_rel');
+drop_partitions
 
 10             
 step show_rel: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;
@@ -238,8 +238,8 @@ create_range_partitions
 
 10             
 step savepoint_b: SAVEPOINT b;
-step drop_partitions: SELECT drop_range_partitions('range_rel');
-drop_range_partitions
+step drop_partitions: SELECT drop_partitions('range_rel');
+drop_partitions
 
 10             
 step show_rel: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;
@@ -269,8 +269,8 @@ create_range_partitions
 
 10             
 step savepoint_b: SAVEPOINT b;
-step drop_partitions: SELECT drop_range_partitions('range_rel');
-drop_range_partitions
+step drop_partitions: SELECT drop_partitions('range_rel');
+drop_partitions
 
 10             
 step show_rel: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;
@@ -280,8 +280,8 @@ Seq Scan on range_rel
 step savepoint_c: SAVEPOINT c;
 WARNING:  All changes in partitioned table 'range_rel' will be discarded
 step rollback_b: ROLLBACK TO SAVEPOINT b;
-step drop_partitions: SELECT drop_range_partitions('range_rel');
-drop_range_partitions
+step drop_partitions: SELECT drop_partitions('range_rel');
+drop_partitions
 
 10             
 step show_rel: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;
@@ -305,8 +305,8 @@ create_range_partitions
 
 10             
 step savepoint_b: SAVEPOINT b;
-step drop_partitions: SELECT drop_range_partitions('range_rel');
-drop_range_partitions
+step drop_partitions: SELECT drop_partitions('range_rel');
+drop_partitions
 
 10             
 step show_rel: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;
@@ -316,8 +316,8 @@ Seq Scan on range_rel
 step savepoint_c: SAVEPOINT c;
 WARNING:  All changes in partitioned table 'range_rel' will be discarded
 step rollback_b: ROLLBACK TO SAVEPOINT b;
-step drop_partitions: SELECT drop_range_partitions('range_rel');
-drop_range_partitions
+step drop_partitions: SELECT drop_partitions('range_rel');
+drop_partitions
 
 10             
 step show_rel: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;
@@ -339,8 +339,8 @@ create_range_partitions
 
 10             
 step savepoint_b: SAVEPOINT b;
-step drop_partitions: SELECT drop_range_partitions('range_rel');
-drop_range_partitions
+step drop_partitions: SELECT drop_partitions('range_rel');
+drop_partitions
 
 10             
 WARNING:  All changes in partitioned table 'range_rel' will be discarded
@@ -380,8 +380,8 @@ create_range_partitions
 
 10             
 step savepoint_b: SAVEPOINT b;
-step drop_partitions: SELECT drop_range_partitions('range_rel');
-drop_range_partitions
+step drop_partitions: SELECT drop_partitions('range_rel');
+drop_partitions
 
 10             
 WARNING:  All changes in partitioned table 'range_rel' will be discarded
diff --git a/specs/rollback_on_create_partitions.spec b/specs/rollback_on_create_partitions.spec
@@ -6,7 +6,6 @@ setup
 
 teardown
 {
-	SELECT drop_range_partitions('range_rel');
 	DROP TABLE range_rel CASCADE;
 	DROP EXTENSION pg_pathman;
 }
@@ -17,7 +16,7 @@ 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 "drop_partitions" { SELECT drop_range_partitions('range_rel'); }
+step "drop_partitions" { SELECT drop_partitions('range_rel'); }
 step "savepoint_a" { SAVEPOINT a; }
 step "rollback_a" { ROLLBACK TO SAVEPOINT a; }
 step "savepoint_b" { SAVEPOINT b; }

Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,8 @@ create_range_partitions`
`74`	`74`
`75`	`75`	`10`
`76`	`76`	`step savepoint_b: SAVEPOINT b;`
`77`		`-step drop_partitions: SELECT drop_range_partitions('range_rel');`
`78`		`-drop_range_partitions`
	`77`	`+step drop_partitions: SELECT drop_partitions('range_rel');`
	`78`	`+drop_partitions`
`79`	`79`
`80`	`80`	`10`
`81`	`81`	`step show_rel: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;`
`@@ -100,8 +100,8 @@ create_range_partitions`
`100`	`100`
`101`	`101`	`10`
`102`	`102`	`step savepoint_b: SAVEPOINT b;`
`103`		`-step drop_partitions: SELECT drop_range_partitions('range_rel');`
`104`		`-drop_range_partitions`
	`103`	`+step drop_partitions: SELECT drop_partitions('range_rel');`
	`104`	`+drop_partitions`
`105`	`105`
`106`	`106`	`10`
`107`	`107`	`step show_rel: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;`
`@@ -124,8 +124,8 @@ create_range_partitions`
`124`	`124`
`125`	`125`	`10`
`126`	`126`	`step savepoint_b: SAVEPOINT b;`
`127`		`-step drop_partitions: SELECT drop_range_partitions('range_rel');`
`128`		`-drop_range_partitions`
	`127`	`+step drop_partitions: SELECT drop_partitions('range_rel');`
	`128`	`+drop_partitions`
`129`	`129`
`130`	`130`	`10`
`131`	`131`	`step savepoint_c: SAVEPOINT c;`
`@@ -161,8 +161,8 @@ create_range_partitions`
`161`	`161`
`162`	`162`	`10`
`163`	`163`	`step savepoint_b: SAVEPOINT b;`
`164`		`-step drop_partitions: SELECT drop_range_partitions('range_rel');`
`165`		`-drop_range_partitions`
	`164`	`+step drop_partitions: SELECT drop_partitions('range_rel');`
	`165`	`+drop_partitions`
`166`	`166`
`167`	`167`	`10`
`168`	`168`	`step savepoint_c: SAVEPOINT c;`
`@@ -207,8 +207,8 @@ create_range_partitions`
`207`	`207`
`208`	`208`	`10`
`209`	`209`	`step savepoint_b: SAVEPOINT b;`
`210`		`-step drop_partitions: SELECT drop_range_partitions('range_rel');`
`211`		`-drop_range_partitions`
	`210`	`+step drop_partitions: SELECT drop_partitions('range_rel');`
	`211`	`+drop_partitions`
`212`	`212`
`213`	`213`	`10`
`214`	`214`	`step show_rel: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;`
`@@ -238,8 +238,8 @@ create_range_partitions`
`238`	`238`
`239`	`239`	`10`
`240`	`240`	`step savepoint_b: SAVEPOINT b;`
`241`		`-step drop_partitions: SELECT drop_range_partitions('range_rel');`
`242`		`-drop_range_partitions`
	`241`	`+step drop_partitions: SELECT drop_partitions('range_rel');`
	`242`	`+drop_partitions`
`243`	`243`
`244`	`244`	`10`
`245`	`245`	`step show_rel: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;`
`@@ -269,8 +269,8 @@ create_range_partitions`
`269`	`269`
`270`	`270`	`10`
`271`	`271`	`step savepoint_b: SAVEPOINT b;`
`272`		`-step drop_partitions: SELECT drop_range_partitions('range_rel');`
`273`		`-drop_range_partitions`
	`272`	`+step drop_partitions: SELECT drop_partitions('range_rel');`
	`273`	`+drop_partitions`
`274`	`274`
`275`	`275`	`10`
`276`	`276`	`step show_rel: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;`
`@@ -280,8 +280,8 @@ Seq Scan on range_rel`
`280`	`280`	`step savepoint_c: SAVEPOINT c;`
`281`	`281`	`WARNING: All changes in partitioned table 'range_rel' will be discarded`
`282`	`282`	`step rollback_b: ROLLBACK TO SAVEPOINT b;`
`283`		`-step drop_partitions: SELECT drop_range_partitions('range_rel');`
`284`		`-drop_range_partitions`
	`283`	`+step drop_partitions: SELECT drop_partitions('range_rel');`
	`284`	`+drop_partitions`
`285`	`285`
`286`	`286`	`10`
`287`	`287`	`step show_rel: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;`
`@@ -305,8 +305,8 @@ create_range_partitions`
`305`	`305`
`306`	`306`	`10`
`307`	`307`	`step savepoint_b: SAVEPOINT b;`
`308`		`-step drop_partitions: SELECT drop_range_partitions('range_rel');`
`309`		`-drop_range_partitions`
	`308`	`+step drop_partitions: SELECT drop_partitions('range_rel');`
	`309`	`+drop_partitions`
`310`	`310`
`311`	`311`	`10`
`312`	`312`	`step show_rel: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;`
`@@ -316,8 +316,8 @@ Seq Scan on range_rel`
`316`	`316`	`step savepoint_c: SAVEPOINT c;`
`317`	`317`	`WARNING: All changes in partitioned table 'range_rel' will be discarded`
`318`	`318`	`step rollback_b: ROLLBACK TO SAVEPOINT b;`
`319`		`-step drop_partitions: SELECT drop_range_partitions('range_rel');`
`320`		`-drop_range_partitions`
	`319`	`+step drop_partitions: SELECT drop_partitions('range_rel');`
	`320`	`+drop_partitions`
`321`	`321`
`322`	`322`	`10`
`323`	`323`	`step show_rel: EXPLAIN (COSTS OFF) SELECT * FROM range_rel;`
`@@ -339,8 +339,8 @@ create_range_partitions`
`339`	`339`
`340`	`340`	`10`
`341`	`341`	`step savepoint_b: SAVEPOINT b;`
`342`		`-step drop_partitions: SELECT drop_range_partitions('range_rel');`
`343`		`-drop_range_partitions`
	`342`	`+step drop_partitions: SELECT drop_partitions('range_rel');`
	`343`	`+drop_partitions`
`344`	`344`
`345`	`345`	`10`
`346`	`346`	`WARNING: All changes in partitioned table 'range_rel' will be discarded`
`@@ -380,8 +380,8 @@ create_range_partitions`
`380`	`380`
`381`	`381`	`10`
`382`	`382`	`step savepoint_b: SAVEPOINT b;`
`383`		`-step drop_partitions: SELECT drop_range_partitions('range_rel');`
`384`		`-drop_range_partitions`
	`383`	`+step drop_partitions: SELECT drop_partitions('range_rel');`
	`384`	`+drop_partitions`
`385`	`385`
`386`	`386`	`10`
`387`	`387`	`WARNING: All changes in partitioned table 'range_rel' will be discarded`