Commit1405e92

Maksim Milyutin

committed

Refine compat version of ExecEvalExpr routine

1 parent10838a1 commit1405e92Copy full SHA for 1405e92

File tree

+16

-31

lines changed

+16

-31

lines changed

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -165,13 +165,20 @@ extern void create_plain_partial_paths(PlannerInfo *root,`
`165`	`165`
`166`	`166`	`/*`
`167`	`167`	`* ExecEvalExpr`
	`168`	`+ *`
	`169`	`+ * 'errmsg' specifies error string when result of ExecEvalExpr doesn't return`
	`170`	`+ * a single value`
`168`	`171`	`*/`
`169`	`172`	`#ifPG_VERSION_NUM >=100000`
`170`		`-#defineExecEvalExprCompat(expr,econtext,isNull,isDone) \`
	`173`	`+#defineExecEvalExprCompat(expr,econtext,isNull,errmsg) \`
`171`	`174`	`ExecEvalExpr((expr), (econtext), (isNull))`
`172`		`-#else`
`173`		`-#defineExecEvalExprCompat(expr,econtext,isNull,isDone) \`
`174`		`-ExecEvalExpr((expr), (econtext), (isNull), (isDone))`
	`175`	`+#elifPG_VERSION_NUM >=90500`
	`176`	`+#defineExecEvalExprCompat(expr,econtext,isNull,errmsg) \`
	`177`	`+do { \`
	`178`	`+ExecEvalExpr((expr), (econtext), (isNull), (isDone)); \`
	`179`	`+if (isDone != ExprSingleResult) \`
	`180`	`+elog(ERROR, (errmsg)); \`
	`181`	`+} while (0)`
`175`	`182`	`#endif`
`176`	`183`
`177`	`184`

Lines changed: 1 addition & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -600,9 +600,6 @@ partition_filter_exec(CustomScanState *node)`
`600`	`600`	`ResultRelInfoHolder*rri_holder;`
`601`	`601`	`boolisnull;`
`602`	`602`	`Datumvalue;`
`603`		`-#ifPG_VERSION_NUM<100000`
`604`		`-ExprDoneConditemIsDone;`
`605`		`-#endif`
`606`	`603`	`TupleTableSlot*tmp_slot;`
`607`	`604`
`608`	`605`	`/* Fetch PartRelationInfo for this partitioned relation */`
`@@ -624,17 +621,12 @@ partition_filter_exec(CustomScanState *node)`
`624`	`621`	`tmp_slot=econtext->ecxt_scantuple;`
`625`	`622`	`econtext->ecxt_scantuple=slot;`
`626`	`623`	`value=ExecEvalExprCompat(state->expr_state,econtext,&isnull,`
`627`		`-&itemIsDone);`
	`624`	`+ERR_PART_ATTR_MULTIPLE_RESULTS);`
`628`	`625`	`econtext->ecxt_scantuple=tmp_slot;`
`629`	`626`
`630`	`627`	`if (isnull)`
`631`	`628`	`elog(ERROR,ERR_PART_ATTR_NULL);`
`632`	`629`
`633`		`-#ifPG_VERSION_NUM<100000`
`634`		`-if (itemIsDone!=ExprSingleResult)`
`635`		`-elog(ERROR,ERR_PART_ATTR_MULTIPLE_RESULTS);`
`636`		`-#endif`
`637`		`-`
`638`	`630`	`/* Search for a matching partition */`
`639`	`631`	`rri_holder=select_partition_for_insert(value,prel->ev_type,prel,`
`640`	`632`	`&state->result_parts,estate);`

Lines changed: 2 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1153,9 +1153,6 @@ pathman_update_trigger_func(PG_FUNCTION_ARGS)`
`1153`	`1153`	`Datumvalue;`
`1154`	`1154`	`Oidvalue_type;`
`1155`	`1155`	`boolisnull;`
`1156`		`-#ifPG_VERSION_NUM<100000`
`1157`		`-ExprDoneConditemIsDone;`
`1158`		`-#endif`
`1159`	`1156`
`1160`	`1157`	`Oid*parts;`
`1161`	`1158`	`intnparts;`
`@@ -1204,17 +1201,13 @@ pathman_update_trigger_func(PG_FUNCTION_ARGS)`
`1204`	`1201`	`source_rel,`
`1205`	`1202`	`new_tuple,`
`1206`	`1203`	`&value_type);`
`1207`		`-value=ExecEvalExprCompat(expr_state,econtext,&isnull,&itemIsDone);`
	`1204`	`+value=ExecEvalExprCompat(expr_state,econtext,&isnull,`
	`1205`	`+ERR_PART_ATTR_MULTIPLE_RESULTS);`
`1208`	`1206`	`MemoryContextSwitchTo(old_mcxt);`
`1209`	`1207`
`1210`	`1208`	`if (isnull)`
`1211`	`1209`	`elog(ERROR,ERR_PART_ATTR_NULL);`
`1212`	`1210`
`1213`		`-#ifPG_VERSION_NUM<100000`
`1214`		`-if (itemIsDone!=ExprSingleResult)`
`1215`		`-elog(ERROR,ERR_PART_ATTR_MULTIPLE_RESULTS);`
`1216`		`-#endif`
`1217`		`-`
`1218`	`1211`	`/* Search for matching partitions */`
`1219`	`1212`	`parts=find_partitions_for_value(value,value_type,prel,&nparts);`
`1220`	`1213`

Lines changed: 2 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -607,9 +607,6 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,`
`607`	`607`	`{`
`608`	`608`	`TupleTableSlot*slot,`
`609`	`609`	`*tmp_slot;`
`610`		`-#ifPG_VERSION_NUM<100000`
`611`		`-ExprDoneConditemIsDone;`
`612`		`-#endif`
`613`	`610`	`boolskip_tuple,`
`614`	`611`	`isnull;`
`615`	`612`	`Oidtuple_oid=InvalidOid;`
`@@ -653,17 +650,13 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,`
`653`	`650`	`/* Execute expression */`
`654`	`651`	`tmp_slot=econtext->ecxt_scantuple;`
`655`	`652`	`econtext->ecxt_scantuple=slot;`
`656`		`-value=ExecEvalExprCompat(expr_state,econtext,&isnull,&itemIsDone);`
	`653`	`+value=ExecEvalExprCompat(expr_state,econtext,&isnull,`
	`654`	`+ERR_PART_ATTR_MULTIPLE_RESULTS);`
`657`	`655`	`econtext->ecxt_scantuple=tmp_slot;`
`658`	`656`
`659`	`657`	`if (isnull)`
`660`	`658`	`elog(ERROR,ERR_PART_ATTR_NULL);`
`661`	`659`
`662`		`-#ifPG_VERSION_NUM<100000`
`663`		`-if (itemIsDone!=ExprSingleResult)`
`664`		`-elog(ERROR,ERR_PART_ATTR_MULTIPLE_RESULTS);`
`665`		`-#endif`
`666`		`-`
`667`	`660`	`/* Search for a matching partition */`
`668`	`661`	`rri_holder=select_partition_for_insert(value,`
`669`	`662`	`prel->ev_type,prel,`

Comments

(0)