fix several issues

Author: funbringer

Diff for: src/hooks.c

@@ -167,6 +167,7 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 	if (IS_OUTER_JOIN(extra->sjinfo->jointype))
 	{
 		extract_actual_join_clauses(extra->restrictlist,
+									joinrel->relids,
 									&joinclauses, &otherclauses);
 	}
 	else

Diff for: src/include/relation_info.h

@@ -334,7 +334,6 @@ void invalidate_pathman_status_info(Oid relid);
 void invalidate_pathman_status_info_cache(void);
 
 /* Dispatch cache */
-void refresh_pathman_relation_info(Oid relid);
 void close_pathman_relation_info(PartRelationInfo *prel);
 bool has_pathman_relation_info(Oid relid);
 PartRelationInfo *get_pathman_relation_info(Oid relid);

Diff for: src/pl_range_funcs.c

@@ -432,7 +432,7 @@ get_part_range_by_oid(PG_FUNCTION_ARGS)
 	shout_if_prel_is_invalid(parent_relid, prel, PT_RANGE);
 
 	/* Check type of 'dummy' (for correct output) */
-	arg_type = get_fn_expr_argtype(fcinfo->flinfo, 2);
+	arg_type = get_fn_expr_argtype(fcinfo->flinfo, 1);
 	if (getBaseType(arg_type) != getBaseType(prel->ev_type))
 		ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 						errmsg("pg_typeof(dummy) should be %s",

Diff for: src/relation_info.c

@@ -205,35 +205,30 @@ invalidate_psin_entry(PartStatusInfo *psin)
 		 psin->relid, MyProcPid);
 #endif
 
-	/* Mark entry as invalid */
-	if (psin->prel && PrelReferenceCount(psin->prel) > 0)
-	{
-		PrelIsFresh(psin->prel) = false;
-	}
-	else
+	if (psin->prel)
 	{
-		if (psin->prel)
+		if (PrelReferenceCount(psin->prel) > 0)
+		{
+			/* Mark entry as outdated and detach it */
+			PrelIsFresh(psin->prel) = false;
+		}
+		else
+		{
 			free_pathman_relation_info(psin->prel);
-
-		(void) pathman_cache_search_relid(status_cache,
-										  psin->relid,
-										  HASH_REMOVE,
-										  NULL);
+		}
 	}
+
+	(void) pathman_cache_search_relid(status_cache,
+									  psin->relid,
+									  HASH_REMOVE,
+									  NULL);
 }
 
 
 /*
  * Dispatch cache routines.
  */
 
-/* Make changes to PartRelationInfo visible */
-void
-refresh_pathman_relation_info(Oid relid)
-{
-
-}
-
 /* Close PartRelationInfo entry */
 void
 close_pathman_relation_info(PartRelationInfo *prel)
@@ -242,6 +237,10 @@ close_pathman_relation_info(PartRelationInfo *prel)
 	Assert(PrelReferenceCount(prel) > 0);
 
 	PrelReferenceCount(prel) -= 1;
+
+	/* Remove entry is it's outdated and we're the last user */
+	if (PrelReferenceCount(prel) == 0 && !PrelIsFresh(prel))
+		free_pathman_relation_info(prel);
 }
 
 /* Check if relation is partitioned by pg_pathman */

Diff for: src/utility_stmt_hooking.c

@@ -213,6 +213,7 @@ is_pathman_related_alter_column_type(Node *parsetree,
 	AlterTableStmt	   *alter_table_stmt = (AlterTableStmt *) parsetree;
 	ListCell		   *lc;
 	Oid					parent_relid;
+	bool				result = false;
 	PartRelationInfo   *prel;
 
 	Assert(IsPathmanReady());
@@ -235,8 +236,6 @@ is_pathman_related_alter_column_type(Node *parsetree,
 		/* Return 'parent_relid' and 'prel->parttype' */
 		if (parent_relid_out) *parent_relid_out = parent_relid;
 		if (part_type_out) *part_type_out = prel->parttype;
-
-		close_pathman_relation_info(prel);
 	}
 	else return false;
 
@@ -264,11 +263,12 @@ is_pathman_related_alter_column_type(Node *parsetree,
 		if (attr_number_out) *attr_number_out = attnum;
 
 		/* Success! */
-		return true;
+		result = true;
 	}
 
-	/* Default failure */
-	return false;
+	close_pathman_relation_info(prel);
+
+	return result;
 }