restore compatibility with PostgreSQL 9.5

funbringer · funbringer · commit c103ecc0c8f8 · 2017-03-28T19:05:20.000+03:00
diff --git a/src/compat/pg_compat.c b/src/compat/pg_compat.c
@@ -268,6 +268,45 @@ create_plain_partial_paths(PlannerInfo *root, RelOptInfo *rel)
 	add_partial_path(rel, create_seqscan_path(root, rel, NULL, parallel_workers));
 }
 
+/*
+ * Examine contents of MemoryContext.
+ */
+void
+McxtStatsInternal(MemoryContext context, int level,
+				  bool examine_children,
+				  MemoryContextCounters *totals)
+{
+	MemoryContextCounters	local_totals;
+	MemoryContext			child;
+
+	AssertArg(MemoryContextIsValid(context));
+
+	/* Examine the context itself */
+	(*context->methods->stats) (context, level, false, totals);
+
+	memset(&local_totals, 0, sizeof(local_totals));
+
+	if (!examine_children)
+		return;
+
+	/* Examine children */
+	for (child = context->firstchild;
+		 child != NULL;
+		 child = child->nextchild)
+	{
+
+		McxtStatsInternal(child, level + 1,
+						  examine_children,
+						  &local_totals);
+	}
+
+	/* Save children stats */
+	totals->nblocks += local_totals.nblocks;
+	totals->freechunks += local_totals.freechunks;
+	totals->totalspace += local_totals.totalspace;
+	totals->freespace += local_totals.freespace;
+}
+
 
 #else /* PG_VERSION_NUM >= 90500 */
 
diff --git a/src/include/compat/pg_compat.h b/src/include/compat/pg_compat.h
@@ -78,6 +78,12 @@ extern Result *make_result(List *tlist,
 		make_result((tlist), (resconstantqual), (subplan))
 
 
+/* McxtStatsInternal() */
+void McxtStatsInternal(MemoryContext context, int level,
+					   bool examine_children,
+					   MemoryContextCounters *totals);
+
+
 /* pull_var_clause() */
 #define pull_var_clause_compat(node, aggbehavior, phbehavior) \
 		pull_var_clause((node), (aggbehavior) | (phbehavior))
@@ -93,6 +99,9 @@ extern void set_rel_consider_parallel(PlannerInfo *root,
 
 #else /* PG_VERSION_NUM >= 90500 */
 
+#define ALLOCSET_DEFAULT_SIZES \
+	ALLOCSET_DEFAULT_MINSIZE, ALLOCSET_DEFAULT_INITSIZE, ALLOCSET_DEFAULT_MAXSIZE
+
 /* adjust_appendrel_attrs() */
 #define adjust_rel_targetlist_compat(root, dst_rel, src_rel, appinfo) \
 	do { \
diff --git a/src/include/utils.h b/src/include/utils.h
@@ -34,9 +34,6 @@ bool check_security_policy_internal(Oid relid, Oid role);
  */
 Oid get_pathman_schema(void);
 List * list_reverse(List *l);
-void McxtStatsInternal(MemoryContext context, int level,
-					   bool examine_children,
-					   MemoryContextCounters *totals);
 
 /*
  * Useful functions for relations.
diff --git a/src/init.c b/src/init.c
@@ -38,6 +38,12 @@
 #include "utils/typcache.h"
 
 
+/* Define ALLOCSET_DEFAULT_SIZES for our precious MemoryContexts */
+#if PG_VERSION_NUM < 90600
+#define ALLOCSET_DEFAULT_SIZES \
+	ALLOCSET_DEFAULT_MINSIZE, ALLOCSET_DEFAULT_INITSIZE, ALLOCSET_DEFAULT_MAXSIZE
+#endif
+
 /* Initial size of 'partitioned_rels' table */
 #define PART_RELS_SIZE	10
 #define CHILD_FACTOR	500
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -332,32 +332,45 @@ show_cache_stats_internal(PG_FUNCTION_ARGS)
 	{
 		HTAB				   *current_htab;
 		MemoryContext			current_mcxt;
-		MemoryContextCounters	mcxt_stats;
 		HeapTuple				htup;
 		Datum					values[Natts_pathman_cache_stats];
 		bool					isnull[Natts_pathman_cache_stats] = { 0 };
 
-		/* Prepare context counters */
-		memset(&mcxt_stats, 0, sizeof(mcxt_stats));
+#if PG_VERSION_NUM >= 90600
+		MemoryContextCounters	mcxt_stats;
+#endif
 
 		/* Select current memory context and hash table (cache) */
 		current_mcxt = usercxt->pathman_contexts[usercxt->current_item];
 		current_htab = usercxt->pathman_htables[usercxt->current_item];
 
+		values[Anum_pathman_cs_context - 1]	=
+				CStringGetTextDatum(simpify_mcxt_name(current_mcxt));
+
+/* We can't check stats of mcxt prior to 9.6 */
+#if PG_VERSION_NUM >= 90600
+
+		/* Prepare context counters */
+		memset(&mcxt_stats, 0, sizeof(mcxt_stats));
+
 		/* NOTE: we do not consider child contexts if it's TopPathmanContext */
 		McxtStatsInternal(current_mcxt, 0,
 						  (current_mcxt != TopPathmanContext),
 						  &mcxt_stats);
 
-		values[Anum_pathman_cs_context - 1]	=
-				CStringGetTextDatum(simpify_mcxt_name(current_mcxt));
-
 		values[Anum_pathman_cs_size - 1]	=
 				Int64GetDatum(mcxt_stats.totalspace);
 
 		values[Anum_pathman_cs_used - 1]	=
 				Int64GetDatum(mcxt_stats.totalspace - mcxt_stats.freespace);
 
+#else
+
+		/* Set unsupported fields to NULL */
+		isnull[Anum_pathman_cs_size - 1]	= true;
+		isnull[Anum_pathman_cs_used - 1]	= true;
+#endif
+
 		values[Anum_pathman_cs_entries - 1]	=
 				Int64GetDatum(current_htab ? hash_get_num_entries(current_htab) : 0);
 
diff --git a/src/utils.c b/src/utils.c
@@ -164,43 +164,6 @@ list_reverse(List *l)
 	return result;
 }
 
-void
-McxtStatsInternal(MemoryContext context, int level,
-				  bool examine_children,
-				  MemoryContextCounters *totals)
-{
-	MemoryContextCounters	local_totals;
-	MemoryContext			child;
-
-	AssertArg(MemoryContextIsValid(context));
-
-	/* Examine the context itself */
-	(*context->methods->stats) (context, level, false, totals);
-
-	memset(&local_totals, 0, sizeof(local_totals));
-
-	if (!examine_children)
-		return;
-
-	/* Examine children */
-	for (child = context->firstchild;
-		 child != NULL;
-		 child = child->nextchild)
-	{
-
-		McxtStatsInternal(child, level + 1,
-						  examine_children,
-						  &local_totals);
-	}
-
-	/* Save children stats */
-	totals->nblocks += local_totals.nblocks;
-	totals->freechunks += local_totals.freechunks;
-	totals->totalspace += local_totals.totalspace;
-	totals->freespace += local_totals.freespace;
-}
-
-
 
 /*
  * Get relation owner.
