Fix migration script, return to old version, so tests can work

Author: ildus

pg_pathman--1.3--1.4.sql

@@ -31,6 +31,31 @@ ALTER TABLE @extschema@.pathman_config
 /* mark 'expression_p' and 'atttype' to update on next start */
 UPDATE @extschema@.pathman_config SET upd_expr = TRUE;
 
+/* we've changed the format of constraint names, and we need rename them */
+CREATE OR REPLACE FUNCTION @extschema@.update_constraints()
+RETURNS BOOLEAN AS
+$$
+DECLARE
+	v_rec RECORD;
+BEGIN
+	FOR v_rec IN (SELECT conrelid::regclass AS t, conname, regexp_replace(conname, '\d+_check', 'check') as new_conname
+				  FROM pg_constraint
+				  WHERE conname ~ 'pathman_.*_\d+_\d+_check')
+	LOOP
+		EXECUTE format('ALTER TABLE %s RENAME CONSTRAINT %s TO %s',
+			v_rec.t, v_rec.conname, v_rec.new_conname);
+	END LOOP;
+
+	RETURN TRUE;
+END
+$$
+LANGUAGE plpgsql;
+
+SELECT @extschema@.update_constraints();
+
+/* we don't need this function anymore */
+DROP FUNCTION @extschema@.update_constraints();
+
 DROP FUNCTION @extschema@.common_relation_checks(REGCLASS, TEXT);
 CREATE OR REPLACE FUNCTION @extschema@.common_relation_checks(
 	relation		REGCLASS,

pg_pathman.control

@@ -1,4 +1,4 @@
 # pg_pathman extension
 comment = 'Partitioning tool for PostgreSQL'
-default_version = '1.4'
+default_version = '1.3'
 module_pathname = '$libdir/pg_pathman'

src/include/relation_info.h

@@ -237,6 +237,7 @@ PrelLastChild(const PartRelationInfo *prel)
 }
 
 
+PartRelationInfo *create_pathman_relation_info(Oid relid);
 const PartRelationInfo *refresh_pathman_relation_info(Oid relid,
 													  Datum *values,
 													  bool allow_incomplete);

src/init.c

@@ -733,16 +733,6 @@ read_pathman_config(void)
 	HeapScanDesc	scan;
 	Snapshot		snapshot;
 	HeapTuple		htup;
-	Oid			   *relids = NULL;
-	Size			relids_index = 0,
-					relids_count = 100,
-					j;
-
-	/*
-	 * Initialize relids array, we keep here relations that require
-	 * update their expression.
-	 */
-	relids = (Oid *) palloc(sizeof(Oid) * relids_count);
 
 	/* Open PATHMAN_CONFIG with latest snapshot available */
 	rel = heap_open(get_pathman_config_relid(false), AccessShareLock);
@@ -776,21 +766,9 @@ read_pathman_config(void)
 		Assert(!isnull[Anum_pathman_config_expression_p - 1]);
 		Assert(!isnull[Anum_pathman_config_upd_expression - 1]);
 
-		upd_expr = DatumGetBool(values[Anum_pathman_config_upd_expression - 1]);
-		if (upd_expr)
-		{
-			if (relids_index >= relids_count)
-			{
-				relids_count += 100;
-				relids = (Oid *) repalloc(relids, sizeof(Oid) * relids_count);
-			}
-
-			relids[relids_index] = relid;
-			relids_index += 1;
-		}
-
 		/* Extract values from Datums */
 		relid = DatumGetObjectId(values[Anum_pathman_config_partrel - 1]);
+		upd_expr = DatumGetBool(values[Anum_pathman_config_upd_expression - 1]);
 
 		/* Check that relation 'relid' exists */
 		if (get_rel_type_id(relid) == InvalidOid)
@@ -802,8 +780,9 @@ read_pathman_config(void)
 					 errhint(INIT_ERROR_HINT)));
 		}
 
-		/* get_pathman_relation_info() will refresh this entry */
-		if (!upd_expr)
+		if (upd_expr)
+			create_pathman_relation_info(relid);
+		else
 			refresh_pathman_relation_info(relid,
 									  values,
 									  true); /* allow lazy prel loading */
@@ -813,12 +792,6 @@ read_pathman_config(void)
 	heap_endscan(scan);
 	UnregisterSnapshot(snapshot);
 	heap_close(rel, AccessShareLock);
-
-	/* Update expressions */
-	for (j = 0; j < relids_index; j++)
-		get_pathman_relation_info(relids[j]);
-
-	pfree(relids);
 }
 
 

src/relation_info.c

@@ -116,35 +116,18 @@ init_relation_info_static_data(void)
 							 NULL);
 }
 
-
-/*
- * refresh\invalidate\get\remove PartRelationInfo functions.
- */
-
 /* Create or update PartRelationInfo in local cache. Might emit ERROR. */
-const PartRelationInfo *
-refresh_pathman_relation_info(Oid relid,
-							  Datum *values,
-							  bool allow_incomplete)
+PartRelationInfo *
+create_pathman_relation_info(Oid relid)
 {
-	const LOCKMODE			lockmode = AccessShareLock;
-	const TypeCacheEntry   *typcache;
-	Oid					   *prel_children;
-	uint32					prel_children_count = 0,
-							i;
-	bool					found_entry;
 	PartRelationInfo	   *prel;
-	Datum					param_values[Natts_pathman_config_params];
-	bool					param_isnull[Natts_pathman_config_params];
-	char				   *expr;
-	HeapTuple				tp;
-	MemoryContext			oldcontext;
+	bool					found_entry;
 
 	AssertTemporaryContext();
-
 	prel = (PartRelationInfo *) pathman_cache_search_relid(partitioned_rels,
 														   relid, HASH_ENTER,
 														   &found_entry);
+
 	elog(DEBUG2,
 		 found_entry ?
 			 "Refreshing record for relation %u in pg_pathman's cache [%u]" :
@@ -166,7 +149,33 @@ refresh_pathman_relation_info(Oid relid,
 	}
 
 	/* First we assume that this entry is invalid */
-	prel->valid		= false;
+	prel->valid = false;
+	return prel;
+}
+
+/*
+ * refresh\invalidate\get\remove PartRelationInfo functions.
+ */
+
+const PartRelationInfo *
+refresh_pathman_relation_info(Oid relid,
+							  Datum *values,
+							  bool allow_incomplete)
+{
+	const LOCKMODE			lockmode = AccessShareLock;
+	const TypeCacheEntry   *typcache;
+	Oid					   *prel_children;
+	uint32					prel_children_count = 0,
+							i;
+	PartRelationInfo	   *prel;
+	Datum					param_values[Natts_pathman_config_params];
+	bool					param_isnull[Natts_pathman_config_params];
+	char				   *expr;
+	HeapTuple				tp;
+	MemoryContext			oldcontext;
+
+	AssertTemporaryContext();
+	prel = create_pathman_relation_info(relid);
 
 	/* Try locking parent, exit fast if 'allow_incomplete' */
 	if (allow_incomplete)