postgres-xc-committers Mailing List for Postgres-XC

Project "Postgres-XC".

The branch, ha_support has been updated
       via  2d3b90de7d334184f5be3e6ae5faeaa34b4ab7d6 (commit)
       via  69838d0f61e1599983d5036ffcc30bcc5166af79 (commit)
       via  f4e30a760b14921cca1b84ac249f1861685950fd (commit)
       via  a1e1a0eb08a0094ecfc2eafb8d8b7f9e804dad07 (commit)
      from  de1318f64694a7a668d445e26be1fcb2e3be3e65 (commit)


- Log -----------------------------------------------------------------
commit 2d3b90de7d334184f5be3e6ae5faeaa34b4ab7d6
Merge: de1318f 69838d0
Author: Michael P <mic...@us...>
Date:   Tue Feb 22 17:07:03 2011 +0900

    Merge branch 'master' into ha_support


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

Summary of changes:
 src/backend/rewrite/rewriteHandler.c |   43 ++++++++++++---------------------
 src/backend/tcop/utility.c           |    6 ++++
 src/gtm/main/gtm_txn.c               |    9 +-----
 3 files changed, 24 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, master has been updated
       via  69838d0f61e1599983d5036ffcc30bcc5166af79 (commit)
      from  f4e30a760b14921cca1b84ac249f1861685950fd (commit)


- Log -----------------------------------------------------------------
commit 69838d0f61e1599983d5036ffcc30bcc5166af79
Author: Michael P <mic...@us...>
Date:   Tue Feb 22 16:03:39 2011 +0900

    Fix for bug 3136262: PREPARE information not correctly got
    
    This caused errors for the following series of queries
    if repeated 2 times in a row:
    BEGIN;
    CREATE TABLE pxtest2 (a int);
    INSERT INTO pxtest2 VALUES (1);
    INSERT INTO pxtest2 VALUES (2);
    PREPARE TRANSACTION 'regress-one';
    COMMIT PREPARED 'regress-one';
    SELECT * FROM pxtest2;
    ---
    create table test(a int);
    BEGIN;
    DROP TABLE test;
    PREPARE TRANSACTION 'prepare_test';
    COMMIT PREPARED 'prepare_test';
    
    An \0 was forgotten when saving the gid in transaction handle of GTM,
    what had as consequence not to be able to find the handle for a given transaction ID
    the second time the same GID was used.
    The first time memory was used was OK because memeory is clean, but it gets dirty
    after finishing the first series.
    At second time, the dirty memory area let by first transaction is still there,
    causing uses when trying to find transaction handles on GTM for given GID

diff --git a/src/gtm/main/gtm_txn.c b/src/gtm/main/gtm_txn.c
index ab5a09b..c16570a 100644
--- a/src/gtm/main/gtm_txn.c
+++ b/src/gtm/main/gtm_txn.c
@@ -916,7 +916,7 @@ GTM_StartPreparedTransaction(GTM_TransactionHandle txn,
 
 	if (gtm_txninfo->gti_gid == NULL)
 		gtm_txninfo->gti_gid = (char *)MemoryContextAlloc(TopMostMemoryContext, GTM_MAX_GID_LEN);
-	memcpy(gtm_txninfo->gti_gid, gid, strlen(gid));
+	memcpy(gtm_txninfo->gti_gid, gid, strlen(gid) + 1);
 
 	GTM_RWLockRelease(&gtm_txninfo->gti_lock);
 
@@ -1419,14 +1419,13 @@ ProcessGetGIDDataTransactionCommand(Port *myport, StringInfo message)
 
 	pq_getmsgend(message);
 
+	/* Get the prepared Transaction for given GID */
 	prepared_txn = GTM_GIDToHandle(gid);
 	if (prepared_txn == InvalidTransactionHandle)
 		ereport(ERROR,
 				(EINVAL,
 				 errmsg("Failed to get GID Data for prepared transaction")));
 
-	oldContext = MemoryContextSwitchTo(TopMemoryContext);
-
 	/* First get the GXID for the new transaction */
 	txn = GTM_BeginTransaction(0, txn_isolation_level, txn_read_only);
 	if (txn == InvalidTransactionHandle)
@@ -1444,13 +1443,9 @@ ProcessGetGIDDataTransactionCommand(Port *myport, StringInfo message)
 	 * Make the internal process, get the prepared information from GID.
 	 */
 	if (GTM_GetGIDData(prepared_txn, &prepared_gxid, &datanodecnt, &datanodes, &coordcnt, &coordinators) != STATUS_OK)
-	{
 		ereport(ERROR,
 				(EINVAL,
 				 errmsg("Failed to get the information of prepared transaction")));
-	}
-
-	MemoryContextSwitchTo(oldContext);
 
 	/*
 	 * Send a SUCCESS message back to the client

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

Summary of changes:
 src/gtm/main/gtm_txn.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Postgres-XC

Project "website".

The branch, master has been updated
       via  6180d077309d20675daf8ba1101d173a18724baa (commit)
      from  d71e7047cde9775855104225592e2a6b9cba7bc3 (commit)


- Log -----------------------------------------------------------------
commit 6180d077309d20675daf8ba1101d173a18724baa
Author: Michael P <mic...@us...>
Date:   Tue Feb 22 14:48:42 2011 +0900

    Couple of typos corrected
    
    Corrections done by Devrim

diff --git a/events.html b/events.html
index 9a14813..0ded082 100755
--- a/events.html
+++ b/events.html
@@ -13,7 +13,7 @@
 -->
 <h2 class="plain">Events</h2>
 <p class="plain">
-A lot of opportunities to meet the Core developpers!!
+A lot of opportunities to meet the Core developers!!
 <ul>
 <li>PgCon 2011 in May 2011</li>
 </ul>
diff --git a/getting_started.html b/getting_started.html
index e3ea444..9e0b4a5 100755
--- a/getting_started.html
+++ b/getting_started.html
@@ -40,7 +40,7 @@ memory even in this case.
 <p> 
 You may be able to choose any popular Linux operating system for 
 Intel 64bit architecture.
-The developemnt team uses CentOS 5.4 for test and evaluation.
+The developemnt team uses CentOS 5.4 for testing and evaluation.
 </p> 
 <p> 
 A minimum hardware configuration will be useful to test Postgres-XC features.
diff --git a/maincontents.html b/maincontents.html
index 267f8fc..dd74dc3 100755
--- a/maincontents.html
+++ b/maincontents.html
@@ -96,7 +96,7 @@ memory even in this case.
 You may be able to choose any popular Linux operating system for 

 Intel 64bit architecture.

 For your information, 

-the developemnt team uses CentOS 5.4 for test and evaluation.

+the developemnt team uses CentOS 5.4 for testing and evaluation.

 </p>

 <p>

 Minimum hardware configuration will be useful to test Postgres-XC feature.

diff --git a/members.html b/members.html
index 1300a32..88bdf2a 100755
--- a/members.html
+++ b/members.html
@@ -52,7 +52,7 @@ He is also helping in source code review and PostgreSQL internals.<br />
 

 <p class="inner">

 He has worked on Data Node, connection pooling and cursor support<br />

-He is also GridSQL developer and is now developping aggregate

+He is also GridSQL developer and is now developing aggregate

 functions and other cross-node operation.

 </p>

 

@@ -75,7 +75,7 @@ Test, performance evaluation and analysis, related documents and utilities.
 

 <p class="inner">

 Binary buiding for releases.<br />

-He is also developping binary packages of PostgreSQL.

+He is also developing binary packages of PostgreSQL.

 </p>

 

 </body>

diff --git a/roadmap.html b/roadmap.html
index f01ff86..56bdca1 100755
--- a/roadmap.html
+++ b/roadmap.html
@@ -96,7 +96,7 @@ Version 0.9.4 (March, 2011)
 <li>Merge with PostgreSQL 9.0.3</li>
 <li>HA Capability
   <ul>
-  <li>Datanode mirroring functionnality: multiple Datanodes seen as only one node,<br />
+  <li>Datanode mirroring functionality: multiple Datanodes seen as only one node,<br />
       SQL-based replication</li>
   <li>XC Cluster Manager: manage in an allocated shared memory space node information,<br />
       used to report node failures</li>

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

Summary of changes:
 events.html          |    2 +-
 getting_started.html |    2 +-
 maincontents.html    |    2 +-
 members.html         |    4 ++--
 roadmap.html         |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
website

Project "Postgres-XC".

The branch, ha_support has been updated
       via  de1318f64694a7a668d445e26be1fcb2e3be3e65 (commit)
      from  249f1124281a7a00532b2c86a423582563b0b085 (commit)


- Log -----------------------------------------------------------------
commit de1318f64694a7a668d445e26be1fcb2e3be3e65
Author: Koichi Suzuki <ko...@in...>
Date:   Tue Feb 22 14:09:58 2011 +0900

    This patch fixes the bug ID 3188179, xcm_initmember's SEGV issue
    when no argument is given.
    
    This commit also include change history of xcm_initmember.c and
    xcm_canstart.c.

diff --git a/src/pgxc/xcm/xcm_canstart.c b/src/pgxc/xcm/xcm_canstart.c
index 21913f5..07a23d4 100644
--- a/src/pgxc/xcm/xcm_canstart.c
+++ b/src/pgxc/xcm/xcm_canstart.c
@@ -25,6 +25,9 @@
  * History
  *		Feb. 2011: First Version
  *
+ *		Feb.21, 2011: Fixed the check of argument count.  It should be
+ *		1, not 2.
+ *
  * Author: Koichi Suzuki
  *
  * Copyright (c) 2011, Nippon Telegraph and Telephone Corporation
diff --git a/src/pgxc/xcm/xcm_initmember.c b/src/pgxc/xcm/xcm_initmember.c
index 840b08b..2e71542 100644
--- a/src/pgxc/xcm/xcm_initmember.c
+++ b/src/pgxc/xcm/xcm_initmember.c
@@ -41,6 +41,10 @@
  *
  * 		Feb. 2011: First Version
  *
+ *		Feb.21, 2011: Fixed the bug to encouter SEGV when invoked
+ *		without arguments.  Error in the timing to convert argv[1] to
+ *		lower case.
+ *
  * Author: Koichi Suzuki
  *
  * Copyright (c) 2011, Nippon Telegraph and Telephone Corporation
@@ -269,10 +273,10 @@ int main(int argc, char *argv[])
 	/*
 	 * Version and usage.
 	 */
-	strncpy(argv_1, argv[1], MAXPATH-1);
-	conv_tolower(argv_1);
 	if (argc == 2)
 	{
+		strncpy(argv_1, argv[1], MAXPATH-1);
+		conv_tolower(argv_1);
 		if (strcmp(argv_1, "--version") == 0)
 			version(0);
 

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

Summary of changes:
 src/pgxc/xcm/xcm_canstart.c   |    3 +++
 src/pgxc/xcm/xcm_initmember.c |    8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, master has been updated
       via  f4e30a760b14921cca1b84ac249f1861685950fd (commit)
      from  a1e1a0eb08a0094ecfc2eafb8d8b7f9e804dad07 (commit)


- Log -----------------------------------------------------------------
commit f4e30a760b14921cca1b84ac249f1861685950fd
Author: Michael P <mic...@us...>
Date:   Tue Feb 22 13:30:14 2011 +0900

    Block SAVEPOINT because of non-support
    
    This functionnality is not yet supported.

diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index bccea10..b8c7b0d 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -433,6 +433,12 @@ ProcessUtility(Node *parsetree,
 							ListCell   *cell;
 							char	   *name = NULL;
 
+#ifdef PGXC
+							ereport(ERROR,
+									(errcode(ERRCODE_STATEMENT_TOO_COMPLEX),
+									 (errmsg("SAVEPOINT is not yet supported."))));
+#endif
+
 							RequireTransactionChain(isTopLevel, "SAVEPOINT");
 
 							foreach(cell, stmt->options)

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

Summary of changes:
 src/backend/tcop/utility.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, master has been updated
       via  a1e1a0eb08a0094ecfc2eafb8d8b7f9e804dad07 (commit)
      from  9c2e68462db0e41ddacb4a0c4ea935b54f6dccc1 (commit)


- Log -----------------------------------------------------------------
commit a1e1a0eb08a0094ecfc2eafb8d8b7f9e804dad07
Author: Michael P <mic...@us...>
Date:   Tue Feb 22 11:29:55 2011 +0900

    Fix for bug 3188711: Fire rules only on Coordinator
    
    Rules are just launched on Coordinator.
    Coordinator is then in charge on locating the correct nodes
    for queries in rules

diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index 62875f8..255be72 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -1725,8 +1725,13 @@ RewriteQuery(Query *parsetree, List *rewrite_events)
 
 		if (locks != NIL)
 		{
-			List	   *product_queries;
+#ifdef PGXC
+			List	   *product_queries = NIL;
 
+			if (IS_PGXC_COORDINATOR)
+#else
+			List	   *product_queries;
+#endif
 			product_queries = fireRules(parsetree,
 										result_relation,
 										event,
@@ -1835,16 +1840,16 @@ RewriteQuery(Query *parsetree, List *rewrite_events)
 								   result_relation, parsetree);
 				if (locks != NIL)
 				{
-					List	   *product_queries;
+					List	   *product_queries = NIL;
 
-
-					product_queries = fireRules(query,
-									result_relation,
-									event,
-									locks,
-									&instead,
-									&returning,
-									&qual_product);
+					if (IS_PGXC_COORDINATOR)
+						product_queries = fireRules(query,
+										result_relation,
+										event,
+										locks,
+										&instead,
+										&returning,
+										&qual_product);
 					
 					qual_product_list = lappend(qual_product_list,  qual_product);
 
@@ -1931,23 +1936,7 @@ RewriteQuery(Query *parsetree, List *rewrite_events)
 			heap_close(rt_entry_relation, NoLock);
 		}
 	}
-#endif
-		
-	
-		
-	/*
-	 * For INSERTs, the original query is done first; for UPDATE/DELETE, it is
-	 * done last.  This is needed because update and delete rule actions might
-	 * not do anything if they are invoked after the update or delete is
-	 * performed. The command counter increment between the query executions
-	 * makes the deleted (and maybe the updated) tuples disappear so the scans
-	 * for them in the rule actions cannot find them.
-	 *
-	 * If we found any unqualified INSTEAD, the original query is not done at
-	 * all, in any form.  Otherwise, we add the modified form if qualified
-	 * INSTEADs were found, else the unmodified form.
-	 */
-#ifdef PGXC
+
 	if (parsetree_list == NIL)
 	{
 #endif

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

Summary of changes:
 src/backend/rewrite/rewriteHandler.c |   43 ++++++++++++---------------------
 1 files changed, 16 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
Postgres-XC