postgres-xc-committers Mailing List for Postgres-XC

Project "Postgres-XC".

The branch, master has been updated
       via  ea13b66f4beaeb13db9741fb5a1347f976b9ebab (commit)
      from  d044db4cc1b8cf18f14cfaa6c65d39ec14905dfb (commit)


- Log -----------------------------------------------------------------
commit ea13b66f4beaeb13db9741fb5a1347f976b9ebab
Author: Mason Sharp <ma...@us...>
Date:   Mon Oct 4 16:53:07 2010 -0400

    Fixed bug where extra materialization nodes were being created.
    
    By Pavan Deolasee

diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 337f17b..818ea1b 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -321,15 +321,6 @@ create_scan_plan(PlannerInfo *root, Path *best_path)
 													  best_path,
 													  tlist,
 													  scan_clauses);
-
-			/* 
-			 * Insert a materialization plan above this temporarily
-			 * until we better handle multiple steps using the same connection.
-			 */
-			matplan = (Plan *) make_material(plan);
-			copy_plan_costsize(matplan, plan);
-			matplan->total_cost += cpu_tuple_cost * matplan->plan_rows;
-			plan = matplan;
 			break;
 #endif
 		default:
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index cbf7618..ca2e2a2 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -1325,9 +1325,15 @@ create_remotequery_path(PlannerInfo *root, RelOptInfo *rel)
 	pathnode->parent = rel;
 	pathnode->pathkeys = NIL;	/* result is always unordered */
 
-	// PGXCTODO - set cost properly
+	/* PGXCTODO - set cost properly */
 	cost_seqscan(pathnode, root, rel);
 
+	/* 
+	 * Insert a materialization plan above this temporarily
+	 * until we better handle multiple steps using the same connection.
+	 */
+	pathnode = create_material_path(rel, pathnode);
+
 	return pathnode;
 }
 #endif

-----------------------------------------------------------------------

Summary of changes:
 src/backend/optimizer/plan/createplan.c |    9 ---------
 src/backend/optimizer/util/pathnode.c   |    8 +++++++-
 2 files changed, 7 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, master has been updated
       via  d044db4cc1b8cf18f14cfaa6c65d39ec14905dfb (commit)
      from  e4978385ac1e81be3b95fe51656a0a166cfc22fb (commit)


- Log -----------------------------------------------------------------
commit d044db4cc1b8cf18f14cfaa6c65d39ec14905dfb
Author: Mason Sharp <ma...@us...>
Date:   Sat Oct 2 19:21:57 2010 +0900

    Fix a bug with EXPLAIN and EXPLAIN VERBOSE.
    
    If it was a single-step statement, the output plan would
    incorrectly display a coordinator-based standard plan
    instead of the simple one.
    
    Bug and cause of problem discovered by Pavan Deolasee

diff --git a/src/backend/pgxc/plan/planner.c b/src/backend/pgxc/plan/planner.c
index a88179b..29e4ee0 100644
--- a/src/backend/pgxc/plan/planner.c
+++ b/src/backend/pgxc/plan/planner.c
@@ -2218,10 +2218,12 @@ pgxc_planner(Query *query, int cursorOptions, ParamListInfo boundParams)
 			}
 
 			/*
-			 * If there already is an active portal, we may be doing planning within a function. 
-			 * Just use the standard plan
+			 * If there already is an active portal, we may be doing planning 
+			 * within a function.  Just use the standard plan, but check if 
+			 * it is part of an EXPLAIN statement so that we do not show that
+			 * we plan multiple steps when it is a single-step operation.
 			 */
-			if (ActivePortal)
+			if (ActivePortal && strcmp(ActivePortal->commandTag, "EXPLAIN"))
 				return standard_planner(query, cursorOptions, boundParams);
 
 			query_step->is_single_step = true;

-----------------------------------------------------------------------

Summary of changes:
 src/backend/pgxc/plan/planner.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Postgres-XC