Fix regression test on runtime_append node

Maksim Milyutin · Maksim Milyutin · commit 241f2dd6f7ed · 2017-05-24T13:03:16.000+03:00
diff --git a/expected/pathman_runtime_nodes.out b/expected/pathman_runtime_nodes.out
@@ -64,6 +64,7 @@ create or replace function test.pathman_test_2() returns text as $$
 declare
 	plan jsonb;
 	num int;
+	c text;
 begin
 	plan = test.pathman_test('select * from test.runtime_test_1 where id = any (select * from test.run_values limit 4)');
 
@@ -82,11 +83,15 @@ begin
 	select count(*) from jsonb_array_elements_text(plan->0->'Plan'->'Plans'->1->'Plans') into num;
 	perform test.pathman_equal(num::text, '4', 'expected 4 child plans for custom scan');
 
-	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"', pathman.get_hash_part_idx(hashint4(i + 1), 6)),
-								   'wrong partition');
+	execute 'select string_agg(y.z, '','') from
+				(select (x->''Relation Name'')::text as z from
+					jsonb_array_elements($1->0->''Plan''->''Plans''->1->''Plans'') x
+				 order by x->''Relation Name'') y'
+		into c using plan;
+	perform test.pathman_equal(c, '"runtime_test_1_2","runtime_test_1_3","runtime_test_1_4","runtime_test_1_5"',
+								'wrong partitions');
 
+	for i in 0..3 loop
 		num = plan->0->'Plan'->'Plans'->1->'Plans'->i->'Actual Loops';
 		perform test.pathman_equal(num::text, '1', 'expected 1 loop');
 	end loop;
diff --git a/sql/pathman_runtime_nodes.sql b/sql/pathman_runtime_nodes.sql
@@ -71,6 +71,7 @@ create or replace function test.pathman_test_2() returns text as $$
 declare
 	plan jsonb;
 	num int;
+	c text;
 begin
 	plan = test.pathman_test('select * from test.runtime_test_1 where id = any (select * from test.run_values limit 4)');
 
@@ -89,11 +90,15 @@ begin
 	select count(*) from jsonb_array_elements_text(plan->0->'Plan'->'Plans'->1->'Plans') into num;
 	perform test.pathman_equal(num::text, '4', 'expected 4 child plans for custom scan');
 
-	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"', pathman.get_hash_part_idx(hashint4(i + 1), 6)),
-								   'wrong partition');
+	execute 'select string_agg(y.z, '','') from
+				(select (x->''Relation Name'')::text as z from
+					jsonb_array_elements($1->0->''Plan''->''Plans''->1->''Plans'') x
+				 order by x->''Relation Name'') y'
+		into c using plan;
+	perform test.pathman_equal(c, '"runtime_test_1_2","runtime_test_1_3","runtime_test_1_4","runtime_test_1_5"',
+								'wrong partitions');
 
+	for i in 0..3 loop
 		num = plan->0->'Plan'->'Plans'->1->'Plans'->i->'Actual Loops';
 		perform test.pathman_equal(num::text, '1', 'expected 1 loop');
 	end loop;
diff --git a/src/include/compat/pg_compat.h b/src/include/compat/pg_compat.h
@@ -215,6 +215,8 @@ extern void create_plain_partial_paths(PlannerInfo *root,
 extern Datum exprResult;
 extern ExprDoneCond isDone;
 static inline void
+dummy_handler() { }
+static inline void
 not_signle_result_handler()
 {
 	elog(ERROR, ERR_PART_ATTR_MULTIPLE_RESULTS);
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -1153,11 +1153,8 @@ extract_const(Param *param,
 {
 	ExprState  *estate = ExecInitExpr((Expr *) param, NULL);
 	bool		isnull;
-#if PG_VERSION_NUM >= 100000
-	Datum		value = ExecEvalExpr(estate, context->econtext, &isnull);
-#else
-	Datum		value = ExecEvalExpr(estate, context->econtext, &isnull, NULL);
-#endif
+	Datum		value = ExecEvalExprCompat(estate, context->econtext, &isnull,
+										   dummy_handler);
 
 	return makeConst(param->paramtype, param->paramtypmod,
 					 param->paramcollid, get_typlen(param->paramtype),

Original file line number	Diff line number	Diff line change
`@@ -215,6 +215,8 @@ extern void create_plain_partial_paths(PlannerInfo *root,`
`215`	`215`	`extern Datum exprResult;`
`216`	`216`	`extern ExprDoneCond isDone;`
`217`	`217`	`static inline void`
	`218`	`+dummy_handler() { }`
	`219`	`+static inline void`
`218`	`220`	`not_signle_result_handler()`
`219`	`221`	`{`
`220`	`222`	`elog(ERROR, ERR_PART_ATTR_MULTIPLE_RESULTS);`