Put missing in pg10 functions into pg_compat

Maksim Milyutin · Maksim Milyutin · commit 6187a4e0180b · 2017-05-26T18:12:43.000+03:00
diff --git a/src/compat/pg_compat.c b/src/compat/pg_compat.c
@@ -213,6 +213,79 @@ ExprDoneCond isDone;
 #endif
 
 
+/*
+ * get_all_actual_clauses
+ */
+#if PG_VERSION_NUM >= 100000
+List *
+get_all_actual_clauses(List *restrictinfo_list)
+{
+	List	   *result = NIL;
+	ListCell   *l;
+
+	foreach(l, restrictinfo_list)
+	{
+		RestrictInfo *rinfo = (RestrictInfo *) lfirst(l);
+
+		Assert(IsA(rinfo, RestrictInfo));
+
+		result = lappend(result, rinfo->clause);
+	}
+	return result;
+}
+#endif
+
+
+/*
+ * make_restrictinfos_from_actual_clauses
+ */
+#if PG_VERSION_NUM >= 100000
+#include "optimizer/restrictinfo.h"
+#include "optimizer/var.h"
+
+List *
+make_restrictinfos_from_actual_clauses(PlannerInfo *root,
+									   List *clause_list)
+{
+	List	   *result = NIL;
+	ListCell   *l;
+
+	foreach(l, clause_list)
+	{
+		Expr	   *clause = (Expr *) lfirst(l);
+		bool		pseudoconstant;
+		RestrictInfo *rinfo;
+
+		/*
+		 * It's pseudoconstant if it contains no Vars and no volatile
+		 * functions.  We probably can't see any sublinks here, so
+		 * contain_var_clause() would likely be enough, but for safety use
+		 * contain_vars_of_level() instead.
+		 */
+		pseudoconstant =
+			!contain_vars_of_level((Node *) clause, 0) &&
+			!contain_volatile_functions((Node *) clause);
+		if (pseudoconstant)
+		{
+			/* tell createplan.c to check for gating quals */
+			root->hasPseudoConstantQuals = true;
+		}
+
+		rinfo = make_restrictinfo(clause,
+								  true,
+								  false,
+								  pseudoconstant,
+								  root->qual_security_level,
+								  NULL,
+								  NULL,
+								  NULL);
+		result = lappend(result, rinfo);
+	}
+	return result;
+}
+#endif
+
+
 /*
  * make_result
  *	  Build a Result plan node
diff --git a/src/include/compat/pg_compat.h b/src/include/compat/pg_compat.h
@@ -270,6 +270,14 @@ not_signle_result_handler()
 #endif
 
 
+/*
+ * get_all_actual_clauses()
+ */
+#if PG_VERSION_NUM >= 100000
+extern List *get_all_actual_clauses(List *restrictinfo_list);
+#endif
+
+
 /*
  * get_parameterized_joinrel_size()
  */
@@ -335,6 +343,15 @@ char get_rel_persistence(Oid relid);
 #endif
 
 
+/*
+ * make_restrictinfo()
+ */
+#if PG_VERSION_NUM >= 100000
+extern List * make_restrictinfos_from_actual_clauses(PlannerInfo *root,
+													 List *clause_list);
+#endif
+
+
 /*
  * make_result()
  */
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -686,6 +686,8 @@ create_single_partition_internal(Oid parent_relid,
 
 	/* Elements of the "CREATE TABLE" query tree */
 	RangeVar		   *parent_rv;
+	TableLikeClause		like_clause;
+	CreateStmt			create_stmt;
 	List			   *create_stmts;
 	ListCell		   *lc;
 
@@ -739,9 +741,34 @@ create_single_partition_internal(Oid parent_relid,
 	if (!tablespace)
 		tablespace = get_tablespace_name(get_rel_tablespace(parent_relid));
 
+	/* Initialize TableLikeClause structure */
+	NodeSetTag(&like_clause, T_TableLikeClause);
+	like_clause.relation		= copyObject(parent_rv);
+	like_clause.options			= CREATE_TABLE_LIKE_DEFAULTS |
+								  CREATE_TABLE_LIKE_INDEXES |
+								  CREATE_TABLE_LIKE_STORAGE;
+
+	/* Initialize CreateStmt structure */
+	NodeSetTag(&create_stmt, T_CreateStmt);
+	create_stmt.relation		= copyObject(partition_rv);
+	create_stmt.tableElts		= list_make1(copyObject(&like_clause));
+	create_stmt.inhRelations	= list_make1(copyObject(parent_rv));
+	create_stmt.ofTypename		= NULL;
+	create_stmt.constraints		= NIL;
+	create_stmt.options			= NIL;
+	create_stmt.oncommit		= ONCOMMIT_NOOP;
+	create_stmt.tablespacename	= tablespace;
+	create_stmt.if_not_exists	= false;
+#if defined(PGPRO_EE) && PG_VERSION_NUM >= 90600
+	create_stmt.partition_info	= NULL;
+#endif
+#if PG_VERSION_NUM >= 100000
+	create_stmt.partbound = NULL;
+	create_stmt.partspec = NULL;
+#endif
+
 	/* Obtain the sequence of Stmts to create partition and link it to parent */
-	create_stmts = init_createstmts_for_partition(parent_rv, partition_rv,
-												  tablespace);
+	create_stmts = transformCreateStmt(&create_stmt, NULL);
 
 	/* Create the partition and all required relations */
 	foreach (lc, create_stmts)
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -232,68 +232,6 @@ get_pathman_config_params_relid(bool invalid_is_ok)
  * ----------------------------------------
  */
 
-#if PG_VERSION_NUM >= 100000
-static List *
-get_all_actual_clauses(List *restrictinfo_list)
-{
-	List	   *result = NIL;
-	ListCell   *l;
-
-	foreach(l, restrictinfo_list)
-	{
-		RestrictInfo *rinfo = (RestrictInfo *) lfirst(l);
-
-		Assert(IsA(rinfo, RestrictInfo));
-
-		result = lappend(result, rinfo->clause);
-	}
-	return result;
-}
-
-#include "optimizer/var.h"
-
-static List *
-make_restrictinfos_from_actual_clauses(PlannerInfo *root,
-									   List *clause_list)
-{
-	List	   *result = NIL;
-	ListCell   *l;
-
-	foreach(l, clause_list)
-	{
-		Expr	   *clause = (Expr *) lfirst(l);
-		bool		pseudoconstant;
-		RestrictInfo *rinfo;
-
-		/*
-		 * It's pseudoconstant if it contains no Vars and no volatile
-		 * functions.  We probably can't see any sublinks here, so
-		 * contain_var_clause() would likely be enough, but for safety use
-		 * contain_vars_of_level() instead.
-		 */
-		pseudoconstant =
-			!contain_vars_of_level((Node *) clause, 0) &&
-			!contain_volatile_functions((Node *) clause);
-		if (pseudoconstant)
-		{
-			/* tell createplan.c to check for gating quals */
-			root->hasPseudoConstantQuals = true;
-		}
-
-		rinfo = make_restrictinfo(clause,
-								  true,
-								  false,
-								  pseudoconstant,
-								  root->qual_security_level,
-								  NULL,
-								  NULL,
-								  NULL);
-		result = lappend(result, rinfo);
-	}
-	return result;
-}
-#endif
-
 /*
  * Creates child relation and adds it to root.
  * Returns child index in simple_rel_array.
