Merge branch 'picky_nodes' into arrange_append

funbringer · funbringer · commit bd54b37a9ea1 · 2016-04-29T17:34:40.000+03:00
diff --git a/pg_pathman.c b/pg_pathman.c
@@ -161,14 +161,14 @@ _PG_init(void)
 	runtimeappend_plan_methods.CustomName 				= "RuntimeAppend";
 	runtimeappend_plan_methods.CreateCustomScanState	= runtimeappend_create_scan_state;
 
-	runtimeppend_exec_methods.CustomName				= "RuntimeAppend";
-	runtimeppend_exec_methods.BeginCustomScan			= runtimeappend_begin;
-	runtimeppend_exec_methods.ExecCustomScan			= runtimeappend_exec;
-	runtimeppend_exec_methods.EndCustomScan				= runtimeappend_end;
-	runtimeppend_exec_methods.ReScanCustomScan			= runtimeappend_rescan;
-	runtimeppend_exec_methods.MarkPosCustomScan			= NULL;
-	runtimeppend_exec_methods.RestrPosCustomScan		= NULL;
-	runtimeppend_exec_methods.ExplainCustomScan			= runtimeppend_explain;
+	runtimeappend_exec_methods.CustomName				= "RuntimeAppend";
+	runtimeappend_exec_methods.BeginCustomScan			= runtimeappend_begin;
+	runtimeappend_exec_methods.ExecCustomScan			= runtimeappend_exec;
+	runtimeappend_exec_methods.EndCustomScan			= runtimeappend_end;
+	runtimeappend_exec_methods.ReScanCustomScan			= runtimeappend_rescan;
+	runtimeappend_exec_methods.MarkPosCustomScan		= NULL;
+	runtimeappend_exec_methods.RestrPosCustomScan		= NULL;
+	runtimeappend_exec_methods.ExplainCustomScan		= runtimeappend_explain;
 
 	DefineCustomBoolVariable("pg_pathman.enable",
 							 "Enables pg_pathman's optimizations during the planner stage",
diff --git a/runtimeappend.c b/runtimeappend.c
@@ -8,6 +8,7 @@
  * ------------------------------------------------------------------------
  */
 #include "postgres.h"
+#include "utils/memutils.h"
 #include "runtimeappend.h"
 #include "pathman.h"
 
@@ -16,7 +17,7 @@ bool				pg_pathman_enable_runtimeappend = true;
 
 CustomPathMethods	runtimeappend_path_methods;
 CustomScanMethods	runtimeappend_plan_methods;
-CustomExecMethods	runtimeppend_exec_methods;
+CustomExecMethods	runtimeappend_exec_methods;
 
 
 Path *
@@ -48,7 +49,7 @@ Node *
 runtimeappend_create_scan_state(CustomScan *node)
 {
 	return create_append_scan_state_common(node,
-										   &runtimeppend_exec_methods,
+										   &runtimeappend_exec_methods,
 										   sizeof(RuntimeAppendState));
 }
 
@@ -84,6 +85,8 @@ runtimeappend_exec(CustomScanState *node)
 			quals = ExecQual(scan_state->custom_expr_states,
 							 node->ss.ps.ps_ExprContext, false);
 
+			ResetExprContext(node->ss.ps.ps_ExprContext);
+
 			if (quals)
 				return slot;
 		}
@@ -109,7 +112,7 @@ runtimeappend_rescan(CustomScanState *node)
 }
 
 void
-runtimeppend_explain(CustomScanState *node, List *ancestors, ExplainState *es)
+runtimeappend_explain(CustomScanState *node, List *ancestors, ExplainState *es)
 {
 	RuntimeAppendState *scan_state = (RuntimeAppendState *) node;
 
diff --git a/runtimeappend.h b/runtimeappend.h
@@ -54,7 +54,7 @@ extern bool					pg_pathman_enable_runtimeappend;
 
 extern CustomPathMethods	runtimeappend_path_methods;
 extern CustomScanMethods	runtimeappend_plan_methods;
-extern CustomExecMethods	runtimeppend_exec_methods;
+extern CustomExecMethods	runtimeappend_exec_methods;
 
 Path * create_runtimeappend_path(PlannerInfo *root, AppendPath *inner_append,
 								 ParamPathInfo *param_info, List *runtime_clauses,
@@ -74,6 +74,6 @@ void runtimeappend_end(CustomScanState *node);
 
 void runtimeappend_rescan(CustomScanState *node);
 
-void runtimeppend_explain(CustomScanState *node, List *ancestors, ExplainState *es);
+void runtimeappend_explain(CustomScanState *node, List *ancestors, ExplainState *es);
 
 #endif
