add PickyAppend user GUC

funbringer · funbringer · commit b05ee92a2cd6 · 2016-04-13T14:17:46.000+03:00
diff --git a/pg_pathman.c b/pg_pathman.c
@@ -33,6 +33,7 @@
 #include "utils/date.h"
 #include "utils/typcache.h"
 #include "utils/lsyscache.h"
+#include "utils/guc.h"
 #include "access/heapam.h"
 #include "access/nbtree.h"
 #include "storage/ipc.h"
@@ -157,6 +158,17 @@ _PG_init(void)
 	pickyappend_exec_methods.MarkPosCustomScan		= NULL;
 	pickyappend_exec_methods.RestrPosCustomScan		= NULL;
 	pickyappend_exec_methods.ExplainCustomScan		= pickyppend_explain;
+
+	DefineCustomBoolVariable("pg_pathman.enable_pickyappend",
+							 "Enables the planner's use of PickyAppend custom node.",
+							 NULL,
+							 &pg_pathman_enable_pickyappend,
+							 true,
+							 PGC_USERSET,
+							 0,
+							 NULL,
+							 NULL,
+							 NULL);
 }
 
 void
diff --git a/pickyappend.c b/pickyappend.c
@@ -10,6 +10,9 @@
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
 
+
+bool pg_pathman_enable_pickyappend = true;
+
 set_join_pathlist_hook_type		set_join_pathlist_next = NULL;
 
 CustomPathMethods				pickyappend_path_methods;
@@ -293,7 +296,7 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		set_join_pathlist_next(root, joinrel, outerrel,
 							   innerrel, jointype, extra);
 
-	if (jointype == JOIN_FULL)
+	if (jointype == JOIN_FULL || !pg_pathman_enable_pickyappend)
 		return;
 
 	if (innerrel->reloptkind == RELOPT_BASEREL &&
diff --git a/pickyappend.h b/pickyappend.h
@@ -6,6 +6,9 @@
 
 #include "pathman.h"
 
+
+extern bool pg_pathman_enable_pickyappend;
+
 typedef struct
 {
 	Oid		relid;

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@`
`6`	`6`
`7`	`7`	`#include "pathman.h"`
`8`	`8`
	`9`	`+`
	`10`	`+extern bool pg_pathman_enable_pickyappend;`
	`11`	`+`
`9`	`12`	`typedef struct`
`10`	`13`	`{`
`11`	`14`	`Oid relid;`