postgres-xc-committers Mailing List for Postgres-XC

Project "Postgres-XC".

The branch, master has been updated
       via  f0f4ae5fddf646b1a41dd4d512fccdf9c9587254 (commit)
      from  7fea05bf15f8f214c2ffffd72d80ae4912af4ad6 (commit)


- Log -----------------------------------------------------------------
commit f0f4ae5fddf646b1a41dd4d512fccdf9c9587254
Author: Michael P <mic...@us...>
Date:   Tue Jul 12 09:07:41 2011 +0900

    Fix for WHERE planning when analyzing forwign quals
    
    Now the analysis of foreign quals is limited to WHERE clauses.
    This was causing errors with DBT-1 for queries like that:
    UPDATE table SET column1 = now() WHERE column2 > 1;
    by causing an UPDATE trying to occur on local Coordinator.

diff --git a/src/backend/pgxc/plan/planner.c b/src/backend/pgxc/plan/planner.c
index 098f8c9..f2ee26f 100644
--- a/src/backend/pgxc/plan/planner.c
+++ b/src/backend/pgxc/plan/planner.c
@@ -1239,12 +1239,6 @@ examine_conditions_walker(Node *expr_node, XCWalkerContext *context)
 					 */
 					return false;
 				}
-				else
-				{
-					/* Check if this node can be pushed down. */
-					if (!is_foreign_qual((Node *) arg2))
-						return true;
-				}
 
 				/*
 				 * Check if it is an expression like pcol = expr, where pcol is
@@ -1274,22 +1268,9 @@ examine_conditions_walker(Node *expr_node, XCWalkerContext *context)
 					return false;
 				}
 			}
-			else
-			{
-				/* Check if this node can be pushed down. */
-				if (!is_foreign_qual((Node *) arg2))
-					return true;
-			}
 		}
 	}
 
-	/* See if the function is immutable, otherwise give up */
-	if (IsA(expr_node, FuncExpr))
-	{
-		if (!is_foreign_qual((Node *) expr_node))
-			return true;
-	}
-
 	/* Handle subquery */
 	if (IsA(expr_node, SubLink))
 	{
@@ -1660,7 +1641,8 @@ get_plan_nodes_walker(Node *query_node, XCWalkerContext *context)
 	}
 
 	/* Examine the WHERE clause, too */
-	if (examine_conditions_walker(query->jointree->quals, context))
+	if (examine_conditions_walker(query->jointree->quals, context) ||
+		!is_foreign_qual(query->jointree->quals))
 		return true;
 
 	if (context->query_step->exec_nodes)

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

Summary of changes:
 src/backend/pgxc/plan/planner.c |   22 ++--------------------
 1 files changed, 2 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
Postgres-XC