fix regression tests for RuntimeXXX nodes

funbringer · funbringer · commit 96fa7c36bb14 · 2016-05-23T14:39:10.000+03:00
diff --git a/expected/pg_pathman.out b/expected/pg_pathman.out
@@ -194,7 +194,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.hash_rel WHERE value = 2 OR value = 1;
 
 -- Temporarily commented out
 -- EXPLAIN (COSTS OFF) SELECT * FROM test.hash_rel WHERE value BETWEEN 1 AND 2;
---                    QUERY PLAN                    
+--                    QUERY PLAN
 -- -------------------------------------------------
 --  Append
 --    ->  Seq Scan on hash_rel_1
@@ -619,7 +619,7 @@ begin
 							   'wrong plan provider');
 
 	perform test.pathman_equal((plan->0->'Plan'->'Plans'->1->'Relation Name')::text,
-							   '"runtime_test_1_1"',
+							   format('"runtime_test_1_%s"', pathman.get_hash(hashint4(1), 6)),
 							   'wrong partition');
 
 	select count(*) from jsonb_array_elements_text(plan->0->'Plan'->'Plans') into num;
@@ -652,7 +652,7 @@ begin
 
 	for i in 0..3 loop
 		perform test.pathman_equal((plan->0->'Plan'->'Plans'->1->'Plans'->i->'Relation Name')::text,
-								   format('"runtime_test_1_%s"', i + 1),
+								   format('"runtime_test_1_%s"', pathman.get_hash(hashint4(i + 1), 6)),
 								   'wrong partition');
 
 		num = plan->0->'Plan'->'Plans'->1->'Plans'->i->'Actual Loops';
@@ -686,7 +686,7 @@ begin
 
 	for i in 0..5 loop
 		num = plan->0->'Plan'->'Plans'->1->'Plans'->i->'Actual Loops';
-		perform test.pathman_assert(num > 0 and num <= 1667, 'expected no more than 1667 loops');
+		perform test.pathman_assert(num > 0 and num <= 1718, 'expected no more than 1718 loops');
 	end loop;
 
 	return 'ok';
@@ -718,7 +718,7 @@ begin
 
 	for i in 0..3 loop
 		perform test.pathman_equal((plan->0->'Plan'->'Plans'->1->'Plans'->0->'Plans'->i->'Relation Name')::text,
-								   format('"runtime_test_2_%s"', i + 1),
+								   format('"runtime_test_2_%s"', pathman.get_hash(hashint4(i + 1), 6)),
 								   'wrong partition');
 
 		num = plan->0->'Plan'->'Plans'->1->'Plans'->0->'Plans'->i->'Actual Loops';
diff --git a/sql/pg_pathman.sql b/sql/pg_pathman.sql
@@ -71,7 +71,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.hash_rel WHERE value = 2;
 EXPLAIN (COSTS OFF) SELECT * FROM test.hash_rel WHERE value = 2 OR value = 1;
 -- Temporarily commented out
 -- EXPLAIN (COSTS OFF) SELECT * FROM test.hash_rel WHERE value BETWEEN 1 AND 2;
---                    QUERY PLAN                    
+--                    QUERY PLAN
 -- -------------------------------------------------
 --  Append
 --    ->  Seq Scan on hash_rel_1
@@ -203,7 +203,7 @@ begin
 							   'wrong plan provider');
 
 	perform test.pathman_equal((plan->0->'Plan'->'Plans'->1->'Relation Name')::text,
-							   '"runtime_test_1_1"',
+							   format('"runtime_test_1_%s"', pathman.get_hash(hashint4(1), 6)),
 							   'wrong partition');
 
 	select count(*) from jsonb_array_elements_text(plan->0->'Plan'->'Plans') into num;
@@ -237,7 +237,7 @@ begin
 
 	for i in 0..3 loop
 		perform test.pathman_equal((plan->0->'Plan'->'Plans'->1->'Plans'->i->'Relation Name')::text,
-								   format('"runtime_test_1_%s"', i + 1),
+								   format('"runtime_test_1_%s"', pathman.get_hash(hashint4(i + 1), 6)),
 								   'wrong partition');
 
 		num = plan->0->'Plan'->'Plans'->1->'Plans'->i->'Actual Loops';
@@ -272,7 +272,7 @@ begin
 
 	for i in 0..5 loop
 		num = plan->0->'Plan'->'Plans'->1->'Plans'->i->'Actual Loops';
-		perform test.pathman_assert(num > 0 and num <= 1667, 'expected no more than 1667 loops');
+		perform test.pathman_assert(num > 0 and num <= 1718, 'expected no more than 1718 loops');
 	end loop;
 
 	return 'ok';
@@ -305,7 +305,7 @@ begin
 
 	for i in 0..3 loop
 		perform test.pathman_equal((plan->0->'Plan'->'Plans'->1->'Plans'->0->'Plans'->i->'Relation Name')::text,
-								   format('"runtime_test_2_%s"', i + 1),
+								   format('"runtime_test_2_%s"', pathman.get_hash(hashint4(i + 1), 6)),
 								   'wrong partition');
 
 		num = plan->0->'Plan'->'Plans'->1->'Plans'->0->'Plans'->i->'Actual Loops';
