rewrite split_range_partition() function in C; fix merge_range_partitions() func; fix drop_range_partition_expand_next(); tests added

Author: zilder

Makefile

@@ -41,6 +41,9 @@ REGRESS = pathman_basic \
 		  pathman_calamity \
 		  pathman_ri
 
+# REGRESS = pathman_ri
+# REGRESS = pathman_basic
+
 EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
 
 EXTRA_CLEAN = pg_pathman--$(EXTVERSION).sql ./isolation_output

expected/pathman_basic.out

@@ -943,7 +943,7 @@ NOTICE:  drop cascades to 4 other objects
 SELECT pathman.split_range_partition('test.num_range_rel_1', 500);
  split_range_partition 
 -----------------------
- {0,1000}
+ test.num_range_rel_5
 (1 row)
 
 EXPLAIN (COSTS OFF) SELECT * FROM test.num_range_rel WHERE id BETWEEN 100 AND 700;
@@ -957,9 +957,9 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.num_range_rel WHERE id BETWEEN 100 AND 70
 (5 rows)
 
 SELECT pathman.split_range_partition('test.range_rel_1', '2015-01-15'::DATE);
-  split_range_partition  
--------------------------
- {01-01-2015,02-01-2015}
+ split_range_partition 
+-----------------------
+ test.range_rel_5
 (1 row)
 
 /* Merge two partitions into one */
@@ -1242,7 +1242,7 @@ SELECT pathman.prepend_range_partition('test.zero', 'test.zero_prepended');
 SELECT pathman.split_range_partition('test.zero_50', 60, 'test.zero_60');
  split_range_partition 
 -----------------------
- {50,70}
+ test.zero_60
 (1 row)
 
 DROP TABLE test.zero CASCADE;
@@ -1567,9 +1567,9 @@ SELECT pathman.merge_range_partitions('test."RangeRel_1"', 'test."RangeRel_' ||
 (1 row)
 
 SELECT pathman.split_range_partition('test."RangeRel_1"', '2015-01-01'::DATE);
-  split_range_partition  
--------------------------
- {12-31-2014,01-02-2015}
+ split_range_partition 
+-----------------------
+ test."RangeRel_6"
 (1 row)
 
 SELECT pathman.drop_partitions('test."RangeRel"');
@@ -1669,9 +1669,9 @@ SELECT merge_range_partitions('test.range_rel_1', 'test.range_rel_2');
 (1 row)
 
 SELECT split_range_partition('test.range_rel_1', '2010-02-15'::date);
-  split_range_partition  
--------------------------
- {01-01-2010,03-01-2010}
+ split_range_partition 
+-----------------------
+ test.range_rel_13
 (1 row)
 
 SELECT append_range_partition('test.range_rel');

expected/pathman_domains.out

@@ -47,7 +47,7 @@ SELECT merge_range_partitions('domains.dom_table_1', 'domains.dom_table_2');
 SELECT split_range_partition('domains.dom_table_1', 50);
  split_range_partition 
 -----------------------
- {1,201}
+ domains.dom_table_14
 (1 row)
 
 INSERT INTO domains.dom_table VALUES(1101);

expected/pathman_ri.out

@@ -77,6 +77,30 @@ SELECT append_range_partition('abc');
 
 INSERT INTO abc VALUES (350);
 INSERT INTO xxx (abc_id) VALUES (350);
+/* Partition cannot be dropped unless there are references from FK table */
 DROP TABLE abc_4;
+ERROR:  update or delete on table "abc_4" violates foreign key constraint "xxx_abc_id_fkey" on table "xxx"
+/* Successful partition drop */
+DELETE FROM xxx WHERE abc_id = 350;
+DROP TABLE abc_4;
+/* Quick check for essential pg_pathman's functions */
+SELECT merge_range_partitions('abc_2', 'abc_3');
+ merge_range_partitions 
+------------------------
+ 
+(1 row)
+
+SELECT split_range_partition('abc_2', 200);
+ split_range_partition 
+-----------------------
+ abc_5
+(1 row)
+
+SELECT add_range_partition('abc', 301, 401, 'abc_x');
+ add_range_partition 
+---------------------
+ abc_x
+(1 row)
+
 DROP EXTENSION pg_pathman CASCADE;
 NOTICE:  drop cascades to constraint xxx_abc_id_fkey on table xxx

range.sql

@@ -494,6 +494,15 @@ LANGUAGE C;
  * Split RANGE partition
  */
 CREATE OR REPLACE FUNCTION @extschema@.split_range_partition(
+	partition_relid	REGCLASS,
+	split_value		ANYELEMENT,
+	partition_name	TEXT DEFAULT NULL,
+	tablespace		TEXT DEFAULT NULL)
+RETURNS REGCLASS AS 'pg_pathman', 'split_range_partitions'
+LANGUAGE C;
+
+
+CREATE OR REPLACE FUNCTION @extschema@._split_range_partition(
 	partition_relid	REGCLASS,
 	split_value		ANYELEMENT,
 	partition_name	TEXT DEFAULT NULL,

sql/pathman_ri.sql

@@ -54,6 +54,17 @@ DROP INDEX abc_1_id_idx;
 SELECT append_range_partition('abc');
 INSERT INTO abc VALUES (350);
 INSERT INTO xxx (abc_id) VALUES (350);
+
+/* Partition cannot be dropped unless there are references from FK table */
+DROP TABLE abc_4;
+
+/* Successful partition drop */
+DELETE FROM xxx WHERE abc_id = 350;
 DROP TABLE abc_4;
 
+/* Quick check for essential pg_pathman's functions */
+SELECT merge_range_partitions('abc_2', 'abc_3');
+SELECT split_range_partition('abc_2', 200);
+SELECT add_range_partition('abc', 301, 401, 'abc_x');
+
 DROP EXTENSION pg_pathman CASCADE;

src/hooks.c

@@ -49,7 +49,7 @@ post_parse_analyze_hook_type	post_parse_analyze_hook_next = NULL;
 shmem_startup_hook_type			shmem_startup_hook_next = NULL;
 ProcessUtility_hook_type		process_utility_hook_next = NULL;
 
-static void pathman_drop_fkeys(Node *parsetree);
+static void pathman_prepare_drop(Node *parsetree);
 
 
 /* Take care of joins */
@@ -729,10 +729,11 @@ pathman_process_utility_hook(Node *parsetree,
 				break;
 			case T_DropStmt:
 				/*
-				 * Check if there are pg_pathman's tables involved and drop
-				 * foreign key constraints if exist
+				 * Check if there are pg_pathman's tables involved:
+				 *	if partitioned table involved then drop FK constraints
+				 *	if partition then drop dependencies and check for references
 				 */
-				pathman_drop_fkeys(parsetree);
+				pathman_prepare_drop(parsetree);
 				break;
 			default:
 				; /* skip */
@@ -752,10 +753,10 @@ pathman_process_utility_hook(Node *parsetree,
 }
 
 /*
- * Drop foreign key constraints referencing pg_pathman's tables being dropped
+ * Prepare partitioned table or partition to be dropped
  */
 static void
-pathman_drop_fkeys(Node *parsetree)
+pathman_prepare_drop(Node *parsetree)
 {
 	DropStmt	   *drop_stmt = (DropStmt *) parsetree;
 	ListCell	   *cell;
@@ -789,7 +790,7 @@ pathman_drop_fkeys(Node *parsetree)
 								rv->relname)));
 		}
 
-		/* Is it pg_pathman's table? */
+		/* Is it pg_pathman's partitioned table? */
 		if (get_pathman_relation_info(relid) != NULL)
 		{
 			List	   *ri_constr = NIL,
@@ -817,46 +818,14 @@ pathman_drop_fkeys(Node *parsetree)
 		{
 			PartParentSearch	parent_search;
 			Oid					parent_relid;
-			// Relation relation = heap_open(relid, NoLock);
 
 			/* Try fetching parent of this table */
 			parent_relid = get_parent_of_partition(relid, &parent_search);
 			if (parent_search == PPS_ENTRY_PART_PARENT)
 			{
-				ri_removePartitionDependencies(parent_relid, rel);
-				// ri_removeTriggersDependency(parent_relid, relid);
+				ri_preparePartitionDrop(parent_relid, rel, true);
 				CommandCounterIncrement();
-
-				// {
-				// 	const PartRelationInfo *prel;
-				// 	const char * attname;
-				// 	AttrNumber attnum;
-				// 	Oid indexOid;
-				// 	HeapTuple indexTuple;
-
-				// 	if ((prel = get_pathman_relation_info(parent_relid)) == NULL)
-				// 	{
-				// 		heap_close(relation, NoLock);
-				// 		continue;
-				// 	}
-
-				// 	attname = get_attname(parent_relid, prel->attnum);
-				// 	attnum = get_attnum(relid, attname);
-				// 	indexTuple = get_index_for_key(relation, attnum, &indexOid);
-
-				// 	/* If there is an index remove dependency */
-				// 	if (HeapTupleIsValid(indexTuple))
-				// 	{
-				// 		deleteDependencyRecordsRef(RelationRelationId, indexOid);
-				// 		ReleaseSysCache(indexTuple);
-
-				// 		/* Make changes visible */
-				// 		CommandCounterIncrement();
-				// 	}
-				// }
 			}
-
-			// heap_close(relation, NoLock);
 		}
 		heap_close(rel, lockmode);
 	}

src/include/ref_integrity.h

@@ -12,5 +12,9 @@ void createPartitionForeignKeyTriggers(Oid partition,
 									   List *del_funcname);
 HeapTuple get_index_for_key(Relation rel, AttrNumber attnum, Oid *index_id);
 List *get_ri_triggers_list(Oid relid, Oid constr);
-void ri_removePartitionDependencies(Oid parent, Relation partition);
-void ri_checkReferences(Relation partition, Oid constraintOid);
+void ri_preparePartitionDrop(Oid parent,
+							 Relation partition,
+							 bool check_referencies);
+void ri_checkReferences(Relation partition, Oid constraintOid);
+void enable_ri_triggers(void);
+void disable_ri_triggers(void);

src/include/relation_info.h

@@ -36,6 +36,9 @@ typedef struct
 #define IsPlusInfinity(i)		( (i)->is_infinite == PLUS_INFINITY )
 #define IsMinusInfinity(i)		( (i)->is_infinite == MINUS_INFINITY )
 
+#define BoundAsString(i, type) \
+	( !IsInfinite(i) ? datum_to_cstring(BoundGetValue(i), (type)) : "NULL" )
+
 
 inline static Bound
 CopyBound(const Bound *src, bool byval, int typlen)

src/include/utils.h

@@ -70,7 +70,5 @@ RangeVar ** qualified_relnames_to_rangevars(char **relnames, size_t nrelnames);
  */
 long deleteDependencyRecords(Oid classId, Oid objId,
 							 Oid refClassId, Oid refObjId);
-long deleteDependencyRecordsRef(Oid classId, Oid objectId);
-
 
 #endif /* PATHMAN_UTILS_H */