check for delay_pathman_shutdown() every time hook is called, refactoring, more comments, fix TODO regarding the collation Oid

funbringer · funbringer · commit 2d493986a523 · 2016-08-12T15:00:29.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -498,6 +498,10 @@ pathman_relcache_hook(Datum arg, Oid relid)
 	if (!IsPathmanReady())
 		return;
 
+	/* Invalidation event for PATHMAN_CONFIG table (probably DROP) */
+	if (relid == get_pathman_config_relid())
+		delay_pathman_shutdown();
+
 	/* Invalidate PartParentInfo cache if needed */
 	partitioned_table = forget_parent_of_partition(relid, &search);
 
@@ -517,11 +521,11 @@ pathman_relcache_hook(Datum arg, Oid relid)
 		/* Both syscache and pathman's cache say it isn't a partition */
 		case PPS_ENTRY_NOT_FOUND:
 			{
+				/* NOTE: Remove NOT_USED when it's time */
+#ifdef NOT_USED
 				elog(DEBUG2, "Invalidation message for relation %u [%u]",
 					 relid, MyProcPid);
-
-				if (relid == get_pathman_config_relid())
-					delay_pathman_shutdown();
+#endif
 			}
 			break;
 
diff --git a/src/init.c b/src/init.c
@@ -269,13 +269,11 @@ fill_prel_with_partitions(const Oid *partitions,
 	if (prel->parttype == PT_RANGE)
 	{
 		MemoryContext	old_mcxt;
-		TypeCacheEntry *tce = lookup_type_cache(prel->atttype,
-												TYPECACHE_CMP_PROC_FINFO);
 
 		/* Sort partitions by RangeEntry->min asc */
 		qsort_arg((void *) prel->ranges, PrelChildrenCount(prel),
 				  sizeof(RangeEntry), cmp_range_entries,
-				  (void *) &tce->cmp_proc_finfo);
+				  (void *) &prel->cmp_proc);
 
 		/* Initialize 'prel->children' array */
 		for (i = 0; i < PrelChildrenCount(prel); i++)
@@ -620,9 +618,10 @@ cmp_range_entries(const void *p1, const void *p2, void *arg)
 {
 	const RangeEntry   *v1 = (const RangeEntry *) p1;
 	const RangeEntry   *v2 = (const RangeEntry *) p2;
-	FmgrInfo		   *cmp_proc = (FmgrInfo *) arg;
 
-	return FunctionCall2(cmp_proc, v1->min, v2->min);
+	Oid					cmp_proc_oid = *(Oid *) arg;
+
+	return OidFunctionCall2(cmp_proc_oid, v1->min, v2->min);
 }
 
 /*
diff --git a/src/nodes_common.c b/src/nodes_common.c
@@ -160,7 +160,7 @@ append_part_attr_to_tlist(List *tlist, Index relno, PartRelationInfo *prel)
 								 prel->attnum,
 								 prel->atttype,
 								 prel->atttypmod,
-								 InvalidOid,
+								 prel->attcollid,
 								 0);
 
 		Index	last_item = list_length(tlist) + 1;
diff --git a/src/pathman.h b/src/pathman.h
@@ -50,11 +50,11 @@
  */
 #define PATHMAN_CONFIG						"pathman_config"
 #define Natts_pathman_config				5
-#define Anum_pathman_config_id				1
-#define Anum_pathman_config_partrel			2
-#define Anum_pathman_config_attname			3
-#define Anum_pathman_config_parttype		4
-#define Anum_pathman_config_range_interval	5
+#define Anum_pathman_config_id				1	/* primary key */
+#define Anum_pathman_config_partrel			2	/* partitioned relation (regclass) */
+#define Anum_pathman_config_attname			3	/* partitioned column (text) */
+#define Anum_pathman_config_parttype		4	/* partitioning type (1|2) */
+#define Anum_pathman_config_range_interval	5	/* interval for RANGE pt. (text) */
 
 /* type modifier (typmod) for 'range_interval' */
 #define PATHMAN_CONFIG_interval_typmod		-1
diff --git a/src/relation_info.c b/src/relation_info.c
@@ -60,7 +60,7 @@ static Oid get_parent_of_partition_internal(Oid partition,
  * refresh\invalidate\get\remove PartRelationInfo functions.
  */
 
-/* Create or update PartRelationInfo in local cache. */
+/* Create or update PartRelationInfo in local cache. Might emit ERROR. */
 PartRelationInfo *
 refresh_pathman_relation_info(Oid relid,
 							  PartType partitioning_type,
@@ -109,16 +109,23 @@ refresh_pathman_relation_info(Oid relid,
 
 	/* Initialize PartRelationInfo using syscache & typcache */
 	prel->attnum	= get_attnum(relid, part_column_name);
-	prel->atttype	= get_atttype(relid, prel->attnum);
-	prel->atttypmod	= get_atttypmod(relid, prel->attnum);
 
-	/* Fetch HASH & CMP fuctions for atttype */
+	/* Attribute number sanity check */
+	if (prel->attnum == InvalidAttrNumber)
+		elog(ERROR, "Relation \"%s\" has no column \"%s\"",
+			 get_rel_name_or_relid(relid), part_column_name);
+
+	/* Fetch atttypid, atttypmod, and attcollation in a single cache lookup */
+	get_atttypetypmodcoll(relid, prel->attnum,
+						  &prel->atttype, &prel->atttypmod, &prel->attcollid);
+
+	/* Fetch HASH & CMP fuctions and other stuff from type cache */
 	typcache = lookup_type_cache(prel->atttype,
 								 TYPECACHE_CMP_PROC | TYPECACHE_HASH_PROC);
 
-	prel->attbyval = typcache->typbyval;
-	prel->attlen = typcache->typlen;
-	prel->attalign = typcache->typalign;
+	prel->attbyval	= typcache->typbyval;
+	prel->attlen	= typcache->typlen;
+	prel->attalign	= typcache->typalign;
 
 	prel->cmp_proc	= typcache->cmp_proc;
 	prel->hash_proc	= typcache->hash_proc;
@@ -152,7 +159,7 @@ refresh_pathman_relation_info(Oid relid,
 	return prel;
 }
 
-/* Invalidate PartRelationInfo cache entry. Create new entry if 'found' is NULL */
+/* Invalidate PartRelationInfo cache entry. Create new entry if 'found' is NULL. */
 void
 invalidate_pathman_relation_info(Oid relid, bool *found)
 {
@@ -215,7 +222,8 @@ get_pathman_relation_info(Oid relid)
 
 			/* Refresh partitioned table cache entry */
 			/* TODO: possible refactoring, pass found 'prel' instead of searching */
-			refresh_pathman_relation_info(relid, part_type, attname);
+			prel = refresh_pathman_relation_info(relid, part_type, attname);
+			Assert(PrelIsValid(prel)); /* it MUST be valid if we got here */
 		}
 		/* Else clear remaining cache entry */
 		else remove_pathman_relation_info(relid);
@@ -400,7 +408,7 @@ forget_parent_of_partition(Oid partition, PartParentSearch *status)
 	return get_parent_of_partition_internal(partition, status, HASH_REMOVE);
 }
 
-/* Peturn partition parent's Oid */
+/* Return partition parent's Oid */
 Oid
 get_parent_of_partition(Oid partition, PartParentSearch *status)
 {
@@ -546,11 +554,13 @@ try_perform_parent_refresh(Oid parent)
 		parttype = DatumGetPartType(values[Anum_pathman_config_parttype - 1]);
 		attname = DatumGetTextP(values[Anum_pathman_config_attname - 1]);
 
-		if (!refresh_pathman_relation_info(parent, parttype, text_to_cstring(attname)))
+		/* If anything went wrong, return false (actually, it might throw ERROR) */
+		if (!PrelIsValid(refresh_pathman_relation_info(parent, parttype,
+													   text_to_cstring(attname))))
 			return false;
 	}
-	else
-		return false;
+	/* Not a partitioned relation */
+	else return false;
 
 	return true;
 }
diff --git a/src/relation_info.h b/src/relation_info.h
@@ -57,7 +57,8 @@ typedef struct
 	int32			atttypmod;		/* partitioned column type modifier */
 	bool			attbyval;		/* is partitioned column stored by value? */
 	int16			attlen;			/* length of the partitioned column's type */
-	int				attalign;
+	int				attalign;		/* alignment of the part column's type */
+	Oid				attcollid;		/* collation of the partitioned column */
 
 	Oid				cmp_proc,		/* comparison fuction for 'atttype' */
 					hash_proc;		/* hash function for 'atttype' */
