postgres-xc-committers Mailing List for Postgres-XC (Page 104)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Project "Postgres-XC".

The branch, merge_postgres_9_0_3 has been updated
       via  0f0f1798b83b01d3323cd0a9e63e5069e4fb1d4c (commit)
      from  476f70fbc5292378da7d7e70283b2f44aa0d9d05 (commit)


- Log -----------------------------------------------------------------
commit 0f0f1798b83b01d3323cd0a9e63e5069e4fb1d4c
Author: Michael P <mic...@us...>
Date:   Mon Mar 21 23:22:37 2011 +0900

    Fix for bugs 3124253 and 3202554: Unique remote query node
    
    Postgres-XC has been implemented in a way that allowed the creation
    of multiple RemoteQuery nodes having the same query.
    This was resulting in launching several times the same query on backend nodes,
    making an error for queries that are internally transformed several times
    as a CREATE first and then ALTER for constraint treatments.
    
    In this commit, only top-level queries are allowed to create a RemoteQuery node,
    assuring the uniqueness of what is sent to backend nodes.
    
    Here are a couple of cases solved.
    For example REFERENCES:
    CREATE TABLE truncate_a (col1 integer primary key);
    CREATE TABLE trunc_b (a int REFERENCES truncate_a);
    
    or multiple schema queries:
    CREATE SCHEMA temp_view_test
    CREATE TABLE base_table (a int, id int)
    CREATE TABLE base_table2 (a int, id int);

diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c
index 0b7344f..09ae5c3 100644
--- a/src/backend/commands/schemacmds.c
+++ b/src/backend/commands/schemacmds.c
@@ -41,7 +41,11 @@ static void AlterSchemaOwner_internal(HeapTuple tup, Relation rel, Oid newOwnerI
  * CREATE SCHEMA
  */
 void
+#ifdef PGXC
+CreateSchemaCommand(CreateSchemaStmt *stmt, const char *queryString, bool is_top_level)
+#else
 CreateSchemaCommand(CreateSchemaStmt *stmt, const char *queryString)
+#endif
 {
 	const char *schemaName = stmt->schemaname;
 	const char *authId = stmt->authid;
@@ -122,6 +126,14 @@ CreateSchemaCommand(CreateSchemaStmt *stmt, const char *queryString)
 	 */
 	parsetree_list = transformCreateSchemaStmt(stmt);
 
+#ifdef PGXC
+	/*
+	 * Add a RemoteQuery node for a query at top level on a remote Coordinator
+	 */
+	if (is_top_level)
+		parsetree_list = AddRemoteQueryNode(parsetree_list, queryString);
+#endif
+
 	/*
 	 * Execute each command contained in the CREATE SCHEMA.  Since the grammar
 	 * allows only utility commands in CREATE SCHEMA, there is no need to pass
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index 0ed66ed..6cfc1e6 100644
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -278,17 +278,8 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 		stmt->distributeby->disttype = DISTTYPE_HASH;
 		stmt->distributeby->colname = cxt.fallback_dist_col;
 	}
-	/* Only a remote Coordinator is allowed to send a query to backend nodes */
-	if (IS_PGXC_COORDINATOR && !IsConnFromCoord())
-	{
-		RemoteQuery *step = makeNode(RemoteQuery);
-		step->combine_type = COMBINE_TYPE_SAME;
-		step->sql_statement = queryString;
-		/* This query is a DDL, Launch it on both Datanodes and Coordinators. */
-		step->exec_type = EXEC_ON_ALL_NODES;
-		result = lappend(result, step);
-	}
 #endif
+
 	return result;
 }
 
@@ -2224,17 +2215,7 @@ transformAlterTableStmt(AlterTableStmt *stmt, const char *queryString)
 	result = lappend(cxt.blist, stmt);
 	result = list_concat(result, cxt.alist);
 	result = list_concat(result, save_alist);
-#ifdef PGXC
-	if (IS_PGXC_COORDINATOR)
-	{
-		RemoteQuery *step = makeNode(RemoteQuery);
-		step->combine_type = COMBINE_TYPE_SAME;
-		step->sql_statement = queryString;
-		/* This query is a DDl, it is launched on both Coordinators and Datanodes. */
-		step->exec_type = EXEC_ON_ALL_NODES;
-		result = lappend(result, step);
-	}
-#endif
+
 	return result;
 }
 
@@ -2637,4 +2618,30 @@ checkLocalFKConstraints(CreateStmtContext *cxt)
 		}
 	}
 }
+
+/*
+ * AddRemoteQueryNode
+ *
+ * Add a Remote Query node to launch on Datanodes.
+ * This can only be done for a query a Top Level to avoid
+ * duplicated queries on Datanodes.
+ */
+List *
+AddRemoteQueryNode(List *stmts, const char *queryString)
+{
+	List *result = stmts;
+
+	/* Only a remote Coordinator is allowed to send a query to backend nodes */
+	if (IS_PGXC_COORDINATOR && !IsConnFromCoord())
+	{
+		RemoteQuery *step = makeNode(RemoteQuery);
+		step->combine_type = COMBINE_TYPE_SAME;
+		step->sql_statement = queryString;
+		/* This query is a DDL, Launch it on both Datanodes and Coordinators. */
+		step->exec_type = EXEC_ON_ALL_NODES;
+		result = lappend(result, step);
+	}
+
+	return result;
+}
 #endif
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index c278ea0..d06fdb2 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -592,11 +592,12 @@ standard_ProcessUtility(Node *parsetree,
 			 */
 		case T_CreateSchemaStmt:
 #ifdef PGXC
-			if (IS_PGXC_COORDINATOR)
-				ExecUtilityStmtOnNodes(queryString, NULL, false, EXEC_ON_ALL_NODES);
-#endif
+			CreateSchemaCommand((CreateSchemaStmt *) parsetree,
+								queryString, isTopLevel);
+#else
 			CreateSchemaCommand((CreateSchemaStmt *) parsetree,
 								queryString);
+#endif
 			break;
 
 		case T_CreateStmt:
@@ -605,11 +606,18 @@ standard_ProcessUtility(Node *parsetree,
 				ListCell   *l;
 				Oid			relOid;
 
-				/* PGXC transformCreateStmt also adds T_RemoteQuery node */
 				/* Run parse analysis ... */
 				stmts = transformCreateStmt((CreateStmt *) parsetree,
 											queryString);
 
+#ifdef PGXC
+				/*
+				 * Add a RemoteQuery node for a query at top level on a remote Coordinator
+				 */
+				if (isTopLevel)
+					stmts = AddRemoteQueryNode(stmts, queryString);
+#endif
+
 				/* ... and do it */
 				foreach(l, stmts)
 				{
@@ -879,10 +887,16 @@ standard_ProcessUtility(Node *parsetree,
 				List	   *stmts;
 				ListCell   *l;
 
-				/* PGXC transformCreateStmt also adds T_RemoteQuery node */
 				/* Run parse analysis ... */
 				stmts = transformAlterTableStmt((AlterTableStmt *) parsetree,
 												queryString);
+#ifdef PGXC
+				/*
+				 * Add a RemoteQuery node for a query at top level on a remote Coordinator
+				 */
+				if (isTopLevel)
+					stmts = AddRemoteQueryNode(stmts, queryString);
+#endif
 
 				/* ... and do it */
 				foreach(l, stmts)
diff --git a/src/include/commands/schemacmds.h b/src/include/commands/schemacmds.h
index 760d147..008fe41 100644
--- a/src/include/commands/schemacmds.h
+++ b/src/include/commands/schemacmds.h
@@ -17,9 +17,13 @@
 
 #include "nodes/parsenodes.h"
 
+#ifdef PGXC
+extern void CreateSchemaCommand(CreateSchemaStmt *parsetree,
+					const char *queryString, bool is_top_level);
+#else
 extern void CreateSchemaCommand(CreateSchemaStmt *parsetree,
 					const char *queryString);
-
+#endif
 extern void RemoveSchemas(DropStmt *drop);
 extern void RemoveSchemaById(Oid schemaOid);
 
diff --git a/src/include/parser/parse_utilcmd.h b/src/include/parser/parse_utilcmd.h
index 3f9b8f9..256c583 100644
--- a/src/include/parser/parse_utilcmd.h
+++ b/src/include/parser/parse_utilcmd.h
@@ -27,6 +27,7 @@ extern void transformRuleStmt(RuleStmt *stmt, const char *queryString,
 extern List *transformCreateSchemaStmt(CreateSchemaStmt *stmt);
 #ifdef PGXC
 extern bool CheckLocalIndexColumn (char loctype, char *partcolname, char *indexcolname);
+extern List *AddRemoteQueryNode(List *stmts, const char *queryString);
 #endif
 
 #endif   /* PARSE_UTILCMD_H */

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

Summary of changes:
 src/backend/commands/schemacmds.c  |   12 +++++++++
 src/backend/parser/parse_utilcmd.c |   49 ++++++++++++++++++++---------------
 src/backend/tcop/utility.c         |   24 ++++++++++++++---
 src/include/commands/schemacmds.h  |    6 +++-
 src/include/parser/parse_utilcmd.h |    1 +
 5 files changed, 65 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
Postgres-XC




2010	Jan	Feb	Mar	Apr (4)	May (28)	Jun (12)	Jul (11)	Aug (12)	Sep (5)	Oct (19)	Nov (14)	Dec (12)
2011	Jan (18)	Feb (30)	Mar (115)	Apr (89)	May (50)	Jun (44)	Jul (22)	Aug (13)	Sep (11)	Oct (30)	Nov (28)	Dec (39)
2012	Jan (38)	Feb (18)	Mar (43)	Apr (91)	May (108)	Jun (46)	Jul (37)	Aug (44)	Sep (33)	Oct (29)	Nov (36)	Dec (15)
2013	Jan (35)	Feb (611)	Mar (5)	Apr (55)	May (30)	Jun (28)	Jul (458)	Aug (34)	Sep (9)	Oct (39)	Nov (22)	Dec (32)
2014	Jan (16)	Feb (16)	Mar (42)	Apr (179)	May (7)	Jun (6)	Jul (9)	Aug	Sep (4)	Oct	Nov (3)	Dec
2015	Jan	Feb	Mar	Apr (2)	May (4)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

postgres-xc-committers Mailing List for Postgres-XC (Page 104)

postgres-xc-committers — Announces PG-XC repository commits