Commit241f2dd

Maksim Milyutin

committed

Fix regression test on runtime_append node

1 parent6d968d2 commit241f2ddCopy full SHA for 241f2dd

File tree

+22

-13

lines changed

+22

-13

lines changed

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ create or replace function test.pathman_test_2() returns text as $$`
`64`	`64`	`declare`
`65`	`65`	`plan jsonb;`
`66`	`66`	`num int;`
	`67`	`+c text;`
`67`	`68`	`begin`
`68`	`69`	`plan = test.pathman_test('select * from test.runtime_test_1 where id = any (select * from test.run_values limit 4)');`
`69`	`70`
`@@ -82,11 +83,15 @@ begin`
`82`	`83`	`select count(*) from jsonb_array_elements_text(plan->0->'Plan'->'Plans'->1->'Plans') into num;`
`83`	`84`	`perform test.pathman_equal(num::text, '4', 'expected 4 child plans for custom scan');`
`84`	`85`
`85`		`-for i in 0..3 loop`
`86`		`-perform test.pathman_equal((plan->0->'Plan'->'Plans'->1->'Plans'->i->'Relation Name')::text,`
`87`		`- format('"runtime_test_1_%s"', pathman.get_hash_part_idx(hashint4(i + 1), 6)),`
`88`		`- 'wrong partition');`
	`86`	`+execute 'select string_agg(y.z, '','') from`
	`87`	`+(select (x->''Relation Name'')::text as z from`
	`88`	`+jsonb_array_elements($1->0->''Plan''->''Plans''->1->''Plans'') x`
	`89`	`+ order by x->''Relation Name'') y'`
	`90`	`+into c using plan;`
	`91`	`+perform test.pathman_equal(c, '"runtime_test_1_2","runtime_test_1_3","runtime_test_1_4","runtime_test_1_5"',`
	`92`	`+'wrong partitions');`
`89`	`93`
	`94`	`+for i in 0..3 loop`
`90`	`95`	`num = plan->0->'Plan'->'Plans'->1->'Plans'->i->'Actual Loops';`
`91`	`96`	`perform test.pathman_equal(num::text, '1', 'expected 1 loop');`
`92`	`97`	`end loop;`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ create or replace function test.pathman_test_2() returns text as $$`
`71`	`71`	`declare`
`72`	`72`	`plan jsonb;`
`73`	`73`	`numint;`
	`74`	`+ctext;`
`74`	`75`	`begin`
`75`	`76`	`plan=test.pathman_test('select * from test.runtime_test_1 where id = any (select * from test.run_values limit 4)');`
`76`	`77`
`@@ -89,11 +90,15 @@ begin`
`89`	`90`	`selectcount(*)from jsonb_array_elements_text(plan->0->'Plan'->'Plans'->1->'Plans') into num;`
`90`	`91`	`performtest.pathman_equal(num::text,'4','expected 4 child plans for custom scan');`
`91`	`92`
`92`		`-for iin0..3 loop`
`93`		`-performtest.pathman_equal((plan->0->'Plan'->'Plans'->1->'Plans'->i->'Relation Name')::text,`
`94`		`- format('"runtime_test_1_%s"',pathman.get_hash_part_idx(hashint4(i+1),6)),`
`95`		`-'wrong partition');`
	`93`	`+execute'select string_agg(y.z,'','') from`
	`94`	`+(select (x->''Relation Name'')::text as z from`
	`95`	`+jsonb_array_elements($1->0->''Plan''->''Plans''->1->''Plans'') x`
	`96`	`+ order by x->''Relation Name'') y'`
	`97`	`+into c using plan;`
	`98`	`+performtest.pathman_equal(c,'"runtime_test_1_2","runtime_test_1_3","runtime_test_1_4","runtime_test_1_5"',`
	`99`	`+'wrong partitions');`
`96`	`100`
	`101`	`+for iin0..3 loop`
`97`	`102`	`num= plan->0->'Plan'->'Plans'->1->'Plans'->i->'Actual Loops';`
`98`	`103`	`performtest.pathman_equal(num::text,'1','expected 1 loop');`
`99`	`104`	`end loop;`

Lines changed: 2 additions & 0 deletions

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

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1153,11 +1153,8 @@ extract_const(Param *param,`
`1153`	`1153`	`{`
`1154`	`1154`	`ExprStateestate=ExecInitExpr((Expr)param,NULL);`
`1155`	`1155`	`boolisnull;`
`1156`		`-#ifPG_VERSION_NUM >=100000`
`1157`		`-Datumvalue=ExecEvalExpr(estate,context->econtext,&isnull);`
`1158`		`-#else`
`1159`		`-Datumvalue=ExecEvalExpr(estate,context->econtext,&isnull,NULL);`
`1160`		`-#endif`
	`1156`	`+Datumvalue=ExecEvalExprCompat(estate,context->econtext,&isnull,`
	`1157`	`+dummy_handler);`
`1161`	`1158`
`1162`	`1159`	`returnmakeConst(param->paramtype,param->paramtypmod,`
`1163`	`1160`	`param->paramcollid,get_typlen(param->paramtype),`

Comments

(0)