Add support for CREATE TABLE .. PARTITION OF

Author: ildus

expected/pathman_declarative.out

@@ -7,6 +7,10 @@ CREATE TABLE test.range_rel (
 	id	SERIAL PRIMARY KEY,
 	dt	DATE NOT NULL
 );
+CREATE TABLE test.r2 (LIKE test.range_rel);
+ALTER TABLE test.range_rel ATTACH PARTITION test.r2
+	FOR VALUES FROM ('2015-05-01') TO ('2015-06-01');
+ERROR:  "range_rel" is not partitioned
 INSERT INTO test.range_rel (dt)
 SELECT g FROM generate_series('2015-01-01', '2015-04-30', '1 day'::interval) AS g;
 SELECT pathman.create_range_partitions('test.range_rel', 'dt',
@@ -25,7 +29,12 @@ SELECT * FROM pathman.pathman_partition_list;
  test.range_rel | test.range_rel_4 |        2 | dt   | 04-01-2015 | 05-01-2015
 (4 rows)
 
-CREATE TABLE test.r2 (LIKE test.range_rel);
+ALTER TABLE test.range_rel ATTACH PARTITION test.r2
+	FOR VALUES IN ('2015-05-01', '2015-06-01');
+ERROR:  pg_pathman only supports queries for range partitions
+ALTER TABLE test.range_rel ATTACH PARTITION test.r2
+	FOR VALUES FROM ('2014-05-01') TO ('2015-06-01');
+ERROR:  specified range [05-01-2014, 06-01-2015) overlaps with existing partitions
 ALTER TABLE test.range_rel ATTACH PARTITION test.r2
 	FOR VALUES FROM ('2015-05-01') TO ('2015-06-01');
 SELECT * FROM pathman.pathman_partition_list;
@@ -66,7 +75,27 @@ SELECT * FROM pathman.pathman_partition_list;
  id     | integer |           | not null |         | plain   |              | 
  dt     | date    |           | not null |         | plain   |              | 
 
+CREATE TABLE test.r4 PARTITION OF test.range_rel
+	FOR VALUES IN ('2015-05-01', '2015-06-01');
+ERROR:  pg_pathman only supports queries for range partitions
+CREATE TABLE test.r4 PARTITION OF test.range_rel
+	FOR VALUES FROM ('2014-05-01') TO ('2015-06-01');
+ERROR:  specified range [05-01-2014, 06-01-2015) overlaps with existing partitions
+CREATE TABLE test.r4 PARTITION OF test.range_rel
+	FOR VALUES FROM ('2015-06-01') TO ('2016-01-01');
+\d+ test.r4;
+                                                       Table "test.r4"
+ Column |  Type   | Collation | Nullable |                  Default                   | Storage | Stats target | Description 
+--------+---------+-----------+----------+--------------------------------------------+---------+--------------+-------------
+ id     | integer |           | not null | nextval('test.range_rel_id_seq'::regclass) | plain   |              | 
+ dt     | date    |           | not null |                                            | plain   |              | 
+Indexes:
+    "r4_pkey" PRIMARY KEY, btree (id)
+Check constraints:
+    "pathman_r4_check" CHECK (dt >= '06-01-2015'::date AND dt < '01-01-2016'::date)
+Inherits: test.range_rel
+
 DROP SCHEMA test CASCADE;
-NOTICE:  drop cascades to 7 other objects
+NOTICE:  drop cascades to 8 other objects
 DROP EXTENSION pg_pathman CASCADE;
 DROP SCHEMA pathman CASCADE;

sql/pathman_declarative.sql

@@ -9,14 +9,20 @@ CREATE TABLE test.range_rel (
 	id	SERIAL PRIMARY KEY,
 	dt	DATE NOT NULL
 );
+CREATE TABLE test.r2 (LIKE test.range_rel);
+ALTER TABLE test.range_rel ATTACH PARTITION test.r2
+	FOR VALUES FROM ('2015-05-01') TO ('2015-06-01');
 
 INSERT INTO test.range_rel (dt)
 SELECT g FROM generate_series('2015-01-01', '2015-04-30', '1 day'::interval) AS g;
 SELECT pathman.create_range_partitions('test.range_rel', 'dt',
 	'2015-01-01'::DATE, '1 month'::INTERVAL);
 
 SELECT * FROM pathman.pathman_partition_list;
-CREATE TABLE test.r2 (LIKE test.range_rel);
+ALTER TABLE test.range_rel ATTACH PARTITION test.r2
+	FOR VALUES IN ('2015-05-01', '2015-06-01');
+ALTER TABLE test.range_rel ATTACH PARTITION test.r2
+	FOR VALUES FROM ('2014-05-01') TO ('2015-06-01');
 ALTER TABLE test.range_rel ATTACH PARTITION test.r2
 	FOR VALUES FROM ('2015-05-01') TO ('2015-06-01');
 SELECT * FROM pathman.pathman_partition_list;
@@ -25,6 +31,14 @@ ALTER TABLE test.range_rel DETACH PARTITION test.r2;
 SELECT * FROM pathman.pathman_partition_list;
 \d+ test.r2;
 
+CREATE TABLE test.r4 PARTITION OF test.range_rel
+	FOR VALUES IN ('2015-05-01', '2015-06-01');
+CREATE TABLE test.r4 PARTITION OF test.range_rel
+	FOR VALUES FROM ('2014-05-01') TO ('2015-06-01');
+CREATE TABLE test.r4 PARTITION OF test.range_rel
+	FOR VALUES FROM ('2015-06-01') TO ('2016-01-01');
+\d+ test.r4;
+
 DROP SCHEMA test CASCADE;
 DROP EXTENSION pg_pathman CASCADE;
 DROP SCHEMA pathman CASCADE;

src/declarative.c

@@ -1,5 +1,6 @@
 #include "declarative.h"
 #include "utils.h"
+#include "partition_creation.h"
 
 #include "fmgr.h"
 #include "access/htup_details.h"
@@ -57,31 +58,37 @@ modify_declative_partitioning_query(Query *query)
 }
 
 /* is it one of declarative partitioning commands? */
-bool is_pathman_related_partitioning_cmd(Node *parsetree)
+bool
+is_pathman_related_partitioning_cmd(Node *parsetree, Oid *parent_relid)
 {
 	if (IsA(parsetree, AlterTableStmt))
 	{
 		ListCell	   *lc;
 		AlterTableStmt *stmt = (AlterTableStmt *) parsetree;
 		int				cnt = 0;
 
+		*parent_relid = RangeVarGetRelid(stmt->relation, NoLock, false);
+		if (get_pathman_relation_info(*parent_relid) == NULL)
+			return false;
+
+		/*
+		 * Since cmds can contain multiple commmands but we can handle only
+		 * two of them here, so we need to check that there are only commands
+		 * we can handle. In case if cmds contain other commands we skip all
+		 * commands in this statement.
+		 */
 		foreach(lc, stmt->cmds)
 		{
 			AlterTableCmd  *cmd = (AlterTableCmd *) lfirst(lc);
-			int				subtype = cmd->subtype;
-
-			if (subtype < 0)
-				subtype = -subtype;
-
-			switch (subtype)
+			switch (abs(cmd->subtype))
 			{
 				case AT_AttachPartition:
 				case AT_DetachPartition:
 					/*
-					 * we need to fix all subtypes,
+					 * We need to fix all subtypes,
 					 * possibly we're not going to handle this
 					 */
-					cmd->subtype = -(cmd->subtype);
+					cmd->subtype = abs(cmd->subtype);
 					continue;
 				default:
 					cnt++;
@@ -90,6 +97,26 @@ bool is_pathman_related_partitioning_cmd(Node *parsetree)
 
 		return (cnt == 0);
 	}
+	else if (IsA(parsetree, CreateStmt))
+	{
+		/* inhRelations != NULL, partbound != NULL, tableElts == NULL */
+		CreateStmt	*stmt = (CreateStmt *) parsetree;
+
+		if (stmt->inhRelations && stmt->partbound != NULL)
+		{
+			RangeVar *rv = castNode(RangeVar, linitial(stmt->inhRelations));
+			*parent_relid = RangeVarGetRelid(rv, NoLock, false);
+			if (get_pathman_relation_info(*parent_relid) == NULL)
+				return false;
+
+			if (stmt->tableElts != NIL)
+				elog(ERROR, "pg_pathman doesn't support column definitions "
+						"in declarative syntax yet");
+
+			return true;
+
+		}
+	}
 	return false;
 }
 
@@ -157,10 +184,10 @@ transform_bound_value(ParseState *pstate, A_Const *con,
 }
 
 /* handle ALTER TABLE .. ATTACH PARTITION command */
-void handle_attach_partition(AlterTableStmt *stmt, AlterTableCmd *cmd)
+void
+handle_attach_partition(Oid parent_relid, AlterTableCmd *cmd)
 {
-	Oid		parent_relid,
-			partition_relid,
+	Oid		partition_relid,
 			proc_args[] = { REGCLASSOID, REGCLASSOID,
 							ANYELEMENTOID, ANYELEMENTOID };
 
@@ -181,7 +208,10 @@ void handle_attach_partition(AlterTableStmt *stmt, AlterTableCmd *cmd)
 
 	Assert(cmd->subtype == AT_AttachPartition);
 
-	parent_relid = RangeVarGetRelid(stmt->relation, NoLock, false);
+	if (pcmd->bound->strategy != PARTITION_STRATEGY_RANGE)
+		ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+		errmsg("pg_pathman only supports queries for range partitions")));
+
 	if ((prel = get_pathman_relation_info(parent_relid)) == NULL)
 		elog(ERROR, "relation is not partitioned");
 
@@ -231,7 +261,8 @@ void handle_attach_partition(AlterTableStmt *stmt, AlterTableCmd *cmd)
 }
 
 /* handle ALTER TABLE .. DETACH PARTITION command */
-void handle_detach_partition(AlterTableStmt *stmt, AlterTableCmd *cmd)
+void
+handle_detach_partition(AlterTableCmd *cmd)
 {
 	List				   *proc_name;
 	FmgrInfo				proc_flinfo;
@@ -262,3 +293,63 @@ void handle_detach_partition(AlterTableStmt *stmt, AlterTableCmd *cmd)
 	/* Invoke the callback */
 	FunctionCallInvoke(&proc_fcinfo);
 }
+
+/* handle CREATE TABLE .. PARTITION OF <parent> FOR VALUES FROM .. TO .. */
+void
+handle_create_partition_of(Oid parent_relid, CreateStmt *stmt)
+{
+	Bound					start,
+							end;
+	const PartRelationInfo *prel;
+	ParseState			   *pstate = make_parsestate(NULL);
+	PartitionRangeDatum	   *ldatum,
+						   *rdatum;
+	Const				   *lval,
+						   *rval;
+	A_Const				   *con;
+
+	/* we show errors earlier for these asserts */
+	Assert(stmt->inhRelations != NULL);
+	Assert(stmt->tableElts == NIL);
+
+	if (stmt->partbound->strategy != PARTITION_STRATEGY_RANGE)
+		ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+		errmsg("pg_pathman only supports queries for range partitions")));
+
+	if ((prel = get_pathman_relation_info(parent_relid)) == NULL)
+		ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("table \"%s\" is not partitioned",
+								get_rel_name_or_relid(parent_relid))));
+
+	if (prel->parttype != PT_RANGE)
+		ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("table \"%s\" is not partitioned by RANGE",
+								get_rel_name_or_relid(parent_relid))));
+
+	ldatum = (PartitionRangeDatum *) linitial(stmt->partbound->lowerdatums);
+	con = castNode(A_Const, ldatum->value);
+	lval = transform_bound_value(pstate, con, prel->ev_type, prel->ev_typmod);
+
+	rdatum = (PartitionRangeDatum *) linitial(stmt->partbound->upperdatums);
+	con = castNode(A_Const, rdatum->value);
+	rval = transform_bound_value(pstate, con, prel->ev_type, prel->ev_typmod);
+
+	start = lval->constisnull?
+		MakeBoundInf(MINUS_INFINITY) :
+		MakeBound(lval->constvalue);
+
+	end = rval->constisnull?
+		MakeBoundInf(PLUS_INFINITY) :
+		MakeBound(rval->constvalue);
+
+	/* more checks */
+	check_range_available(parent_relid, &start, &end, lval->consttype, true);
+
+	/* Create a new RANGE partition and return its Oid */
+	create_single_range_partition_internal(parent_relid,
+										   &start,
+										   &end,
+										   lval->consttype,
+										   stmt->relation,
+										   stmt->tablespacename);
+}

src/hooks.c

@@ -963,9 +963,9 @@ pathman_process_utility_hook(Node *first_arg,
 								get_rel_name(relation_oid))));
 		}
 #if PG_VERSION_NUM >= 100000
-		else if (is_pathman_related_partitioning_cmd(parsetree))
+		else if (is_pathman_related_partitioning_cmd(parsetree, &relation_oid))
 		{
-			/* we can handle all the partitioning commands */
+			/* we can handle all the partitioning commands in ALTER .. TABLE */
 			if (IsA(parsetree, AlterTableStmt))
 			{
 				ListCell		*lc;
@@ -977,16 +977,21 @@ pathman_process_utility_hook(Node *first_arg,
 					switch (cmd->subtype)
 					{
 						case AT_AttachPartition:
-							handle_attach_partition(stmt, cmd);
+							handle_attach_partition(relation_oid, cmd);
 							return;
 						case AT_DetachPartition:
-							handle_detach_partition(stmt, cmd);
+							handle_detach_partition(cmd);
 							return;
 						default:
 							elog(ERROR, "can't handle this command");
 					}
 				}
 			}
+			else if (IsA(parsetree, CreateStmt))
+			{
+				handle_create_partition_of(relation_oid, (CreateStmt *) parsetree);
+				return;
+			}
 		}
 #endif
 	}

src/include/declarative.h

@@ -6,10 +6,11 @@
 #include "nodes/parsenodes.h"
 
 void modify_declative_partitioning_query(Query *query);
-bool is_pathman_related_partitioning_cmd(Node *parsetree);
+bool is_pathman_related_partitioning_cmd(Node *parsetree, Oid *parent_relid);
 
 /* actual actions */
-void handle_attach_partition(AlterTableStmt *stmt, AlterTableCmd *cmd);
-void handle_detach_partition(AlterTableStmt *stmt, AlterTableCmd *cmd);
+void handle_attach_partition(Oid parent_relid, AlterTableCmd *cmd);
+void handle_detach_partition(AlterTableCmd *cmd);
+void handle_create_partition_of(Oid parent_relid, CreateStmt *stmt);
 
 #endif /* DECLARATIVE_H */