Commit72e3c00

committed

Add stub version of parse_partitioning_expression and ExprDoneCond flag as result of ExecEvalExpr for pg10

1 parent3cb69ae commit72e3c00Copy full SHA for 72e3c00

File tree

+22

-2

lines changed

+22

-2

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -600,7 +600,9 @@ partition_filter_exec(CustomScanState *node)`
`600`	`600`	`ResultRelInfoHolder*rri_holder;`
`601`	`601`	`boolisnull;`
`602`	`602`	`Datumvalue;`
	`603`	`+#ifPG_VERSION_NUM<100000`
`603`	`604`	`ExprDoneConditemIsDone;`
	`605`	`+#endif`
`604`	`606`	`TupleTableSlot*tmp_slot;`
`605`	`607`
`606`	`608`	`/* Fetch PartRelationInfo for this partitioned relation */`
`@@ -628,8 +630,10 @@ partition_filter_exec(CustomScanState *node)`
`628`	`630`	`if (isnull)`
`629`	`631`	`elog(ERROR,ERR_PART_ATTR_NULL);`
`630`	`632`
	`633`	`+#ifPG_VERSION_NUM<100000`
`631`	`634`	`if (itemIsDone!=ExprSingleResult)`
`632`	`635`	`elog(ERROR,ERR_PART_ATTR_MULTIPLE_RESULTS);`
	`636`	`+#endif`
`633`	`637`
`634`	`638`	`/* Search for a matching partition */`
`635`	`639`	`rri_holder=select_partition_for_insert(value,prel->ev_type,prel,`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1939,7 +1939,7 @@ get_cheapest_parameterized_child_path(PlannerInfo root, RelOptInfo rel,`
`1939`	`1939`	`NIL,`
`1940`	`1940`	`required_outer,`
`1941`	`1941`	`TOTAL_COST,`
`1942`		`-true);`
	`1942`	`+false);`
`1943`	`1943`	`#else`
`1944`	`1944`	`cheapest=get_cheapest_path_for_pathkeys(rel->pathlist,`
`1945`	`1945`	`NIL,`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1127,7 +1127,9 @@ pathman_update_trigger_func(PG_FUNCTION_ARGS)`
`1127`	`1127`	`Datumvalue;`
`1128`	`1128`	`Oidvalue_type;`
`1129`	`1129`	`boolisnull;`
	`1130`	`+#ifPG_VERSION_NUM<100000`
`1130`	`1131`	`ExprDoneConditemIsDone;`
	`1132`	`+#endif`
`1131`	`1133`
`1132`	`1134`	`Oid*parts;`
`1133`	`1135`	`intnparts;`
`@@ -1182,8 +1184,10 @@ pathman_update_trigger_func(PG_FUNCTION_ARGS)`
`1182`	`1184`	`if (isnull)`
`1183`	`1185`	`elog(ERROR,ERR_PART_ATTR_NULL);`
`1184`	`1186`
	`1187`	`+#ifPG_VERSION_NUM<100000`
`1185`	`1188`	`if (itemIsDone!=ExprSingleResult)`
`1186`	`1189`	`elog(ERROR,ERR_PART_ATTR_MULTIPLE_RESULTS);`
	`1190`	`+#endif`
`1187`	`1191`
`1188`	`1192`	`/* Search for matching partitions */`
`1189`	`1193`	`parts=find_partitions_for_value(value,value_type,prel,&nparts);`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -579,13 +579,21 @@ parse_partitioning_expression(const Oid relid,`
`579`	`579`	`if (list_length(parsetree_list)!=1)`
`580`	`580`	`elog(ERROR,"expression \"%s\" produced more than one query",exp_cstr);`
`581`	`581`
	`582`	`+#ifPG_VERSION_NUM >=100000`
	`583`	`+select_stmt= (SelectStmt) ((RawStmt)linitial(parsetree_list))->stmt;`
	`584`	`+#else`
`582`	`585`	`select_stmt= (SelectStmt*)linitial(parsetree_list);`
	`586`	`+#endif`
`583`	`587`
`584`	`588`	`if (query_string_out)`
`585`	`589`	`*query_string_out=query_string;`
`586`	`590`
`587`	`591`	`if (parsetree_out)`
	`592`	`+#ifPG_VERSION_NUM >=100000`
	`593`	`+parsetree_out= (Node)linitial(parsetree_list);`
	`594`	`+#else`
`588`	`595`	`parsetree_out= (Node)select_stmt;`
	`596`	`+#endif`
`589`	`597`
`590`	`598`	`return ((ResTarget*)linitial(select_stmt->targetList))->val;`
`591`	`599`	`}`
`@@ -662,7 +670,7 @@ cook_partitioning_expression(const Oid relid,`
`662`	`670`
`663`	`671`	`/* This will fail with elog in case of wrong expression */`
`664`	`672`	`#ifPG_VERSION_NUM >=100000`
`665`		`-querytree_list=pg_analyze_and_rewrite(NULL/* stub value */,query_string,NULL,0,NULL);`
	`673`	`+querytree_list=pg_analyze_and_rewrite((RawStmt)parsetree/ stub value */,query_string,NULL,0,NULL);`
`666`	`674`	`#else`
`667`	`675`	`querytree_list=pg_analyze_and_rewrite(parsetree,query_string,NULL,0);`
`668`	`676`	`#endif`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,9 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,`
`607`	`607`	`{`
`608`	`608`	`TupleTableSlot*slot,`
`609`	`609`	`*tmp_slot;`
	`610`	`+#ifPG_VERSION_NUM<100000`
`610`	`611`	`ExprDoneConditemIsDone;`
	`612`	`+#endif`
`611`	`613`	`boolskip_tuple,`
`612`	`614`	`isnull;`
`613`	`615`	`Oidtuple_oid=InvalidOid;`
`@@ -657,8 +659,10 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,`
`657`	`659`	`if (isnull)`
`658`	`660`	`elog(ERROR,ERR_PART_ATTR_NULL);`
`659`	`661`
	`662`	`+#ifPG_VERSION_NUM<100000`
`660`	`663`	`if (itemIsDone!=ExprSingleResult)`
`661`	`664`	`elog(ERROR,ERR_PART_ATTR_MULTIPLE_RESULTS);`
	`665`	`+#endif`
`662`	`666`
`663`	`667`	`/* Search for a matching partition */`
`664`	`668`	`rri_holder=select_partition_for_insert(value,`

Comments

(0)