[Postgres-xc-committers] Postgres-XC branch, master, updated. v0.9.1-13-g5922956

[mason_s <ma...@us...>]

Project "Postgres-XC".

The branch, master has been updated
       via  592295640039744c89a1f319d87fb34072a10efa (commit)
      from  a32e437055fe9f9162651fd6edd811b77f443881 (commit)


- Log -----------------------------------------------------------------
commit 592295640039744c89a1f319d87fb34072a10efa
Author: Mason S <mas...@ma...>
Date:   Mon Jun 28 17:08:20 2010 +0200

    Allow rules to be created, provided that they do not use NOTIFY,
    which is not yet supported.
    
    Note that using rules is a bit unsafe. We currently end up
    passing down the original statement (or something close to it)
    to the data nodes, but based on the modifications to the
    rewritten tree from the rules.
    
    It is possible to do something that violates the distribution rules
    of the system. For example, on an update, one could insert into a
    table that is hash distributed, but populate it with a value that
    violates this.

diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index acd9f97..2608a3f 100644
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -1613,6 +1613,13 @@ transformRuleStmt(RuleStmt *stmt, const char *queryString,
 			bool		has_old,
 						has_new;
 
+#ifdef PGXC
+			if(IsA(action, NotifyStmt))
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+						 errmsg("Rule may not use NOTIFY, it is not yet supported")));
+				
+#endif
 			/*
 			 * Since outer ParseState isn't parent of inner, have to pass down
 			 * the query text by hand.
diff --git a/src/backend/pgxc/plan/planner.c b/src/backend/pgxc/plan/planner.c
index 7f45fb7..a4565e7 100644
--- a/src/backend/pgxc/plan/planner.c
+++ b/src/backend/pgxc/plan/planner.c
@@ -1757,6 +1757,7 @@ GetQueryPlan(Node *parsetree, const char *sql_statement, List *querytree_list)
 		case T_RemoveOpClassStmt:
 		case T_RemoveOpFamilyStmt:
 		case T_RenameStmt:
+		case T_RuleStmt:
 		case T_TruncateStmt:
 		case T_VariableSetStmt:
 		case T_ViewStmt:
@@ -1841,7 +1842,6 @@ GetQueryPlan(Node *parsetree, const char *sql_statement, List *querytree_list)
 		case T_LoadStmt:
 		case T_NotifyStmt:
 		case T_PrepareStmt:
-		case T_RuleStmt:
 		case T_UnlistenStmt:
 			/* fall through */
 		default:

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

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


hooks/post-receive
-- 
Postgres-XC