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

maksm90 · maksm90 · commit 72e3c002d4d6 · 2017-05-15T18:39:29.000+03:00
diff --git a/src/partition_filter.c b/src/partition_filter.c
@@ -600,7 +600,9 @@ partition_filter_exec(CustomScanState *node)
 		ResultRelInfoHolder		   *rri_holder;
 		bool						isnull;
 		Datum						value;
+#if PG_VERSION_NUM < 100000
 		ExprDoneCond				itemIsDone;
+#endif
 		TupleTableSlot			   *tmp_slot;
 
 		/* Fetch PartRelationInfo for this partitioned relation */
@@ -628,8 +630,10 @@ partition_filter_exec(CustomScanState *node)
 		if (isnull)
 			elog(ERROR, ERR_PART_ATTR_NULL);
 
+#if PG_VERSION_NUM < 100000
 		if (itemIsDone != ExprSingleResult)
 			elog(ERROR, ERR_PART_ATTR_MULTIPLE_RESULTS);
+#endif
 
 		/* Search for a matching partition */
 		rri_holder = select_partition_for_insert(value, prel->ev_type, prel,
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -1939,7 +1939,7 @@ get_cheapest_parameterized_child_path(PlannerInfo *root, RelOptInfo *rel,
 											  NIL,
 											  required_outer,
 											  TOTAL_COST,
-											  true);
+											  false);
 #else
 	cheapest = get_cheapest_path_for_pathkeys(rel->pathlist,
 											  NIL,
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -1127,7 +1127,9 @@ pathman_update_trigger_func(PG_FUNCTION_ARGS)
 	Datum					value;
 	Oid						value_type;
 	bool					isnull;
+#if PG_VERSION_NUM < 100000
 	ExprDoneCond			itemIsDone;
+#endif
 
 	Oid					   *parts;
 	int						nparts;
@@ -1182,8 +1184,10 @@ pathman_update_trigger_func(PG_FUNCTION_ARGS)
 	if (isnull)
 		elog(ERROR, ERR_PART_ATTR_NULL);
 
+#if PG_VERSION_NUM < 100000
 	if (itemIsDone != ExprSingleResult)
 		elog(ERROR, ERR_PART_ATTR_MULTIPLE_RESULTS);
+#endif
 
 	/* Search for matching partitions */
 	parts = find_partitions_for_value(value, value_type, prel, &nparts);
diff --git a/src/relation_info.c b/src/relation_info.c
@@ -579,13 +579,21 @@ parse_partitioning_expression(const Oid relid,
 	if (list_length(parsetree_list) != 1)
 		elog(ERROR, "expression \"%s\" produced more than one query", exp_cstr);
 
+#if PG_VERSION_NUM >= 100000
+	select_stmt = (SelectStmt *) ((RawStmt *) linitial(parsetree_list))->stmt;
+#else
 	select_stmt = (SelectStmt *) linitial(parsetree_list);
+#endif
 
 	if (query_string_out)
 		*query_string_out = query_string;
 
 	if (parsetree_out)
+#if PG_VERSION_NUM >= 100000
+		*parsetree_out = (Node *) linitial(parsetree_list);
+#else
 		*parsetree_out = (Node *) select_stmt;
+#endif
 
 	return ((ResTarget *) linitial(select_stmt->targetList))->val;
 }
@@ -662,7 +670,7 @@ cook_partitioning_expression(const Oid relid,
 
 	/* This will fail with elog in case of wrong expression */
 #if PG_VERSION_NUM >= 100000
-	querytree_list = pg_analyze_and_rewrite(NULL/* stub value */, query_string, NULL, 0, NULL);
+	querytree_list = pg_analyze_and_rewrite((RawStmt *) parsetree/* stub value */, query_string, NULL, 0, NULL);
 #else
 	querytree_list = pg_analyze_and_rewrite(parsetree, query_string, NULL, 0);
 #endif
diff --git a/src/utility_stmt_hooking.c b/src/utility_stmt_hooking.c
@@ -607,7 +607,9 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,
 	{
 		TupleTableSlot		   *slot,
 							   *tmp_slot;
+#if PG_VERSION_NUM < 100000
 		ExprDoneCond			itemIsDone;
+#endif
 		bool					skip_tuple,
 								isnull;
 		Oid						tuple_oid = InvalidOid;
@@ -657,8 +659,10 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,
 		if (isnull)
 			elog(ERROR, ERR_PART_ATTR_NULL);
 
+#if PG_VERSION_NUM < 100000
 		if (itemIsDone != ExprSingleResult)
 			elog(ERROR, ERR_PART_ATTR_MULTIPLE_RESULTS);
+#endif
 
 		/* Search for a matching partition */
 		rri_holder = select_partition_for_insert(value,
