postgres-xc-committers Mailing List for Postgres-XC

Project "Postgres-XC".

The branch, master has been updated
       via  06c882f78694a31749746aad0cb76347a3f7bcef (commit)
      from  58d1f0d4fe5de5db3655f52df9031abc1ce5b84e (commit)


- Log -----------------------------------------------------------------
commit 06c882f78694a31749746aad0cb76347a3f7bcef
Author: Mason Sharp <ma...@us...>
Date:   Tue Aug 31 13:21:36 2010 -0400

    Fix a bug with AVG()
    We tried to avoid coordinator aggregate handling when only a
    single node is involved, but that causes a problem for some
    aggregates.

diff --git a/src/backend/pgxc/plan/planner.c b/src/backend/pgxc/plan/planner.c
index c8911b7..e18e813 100644
--- a/src/backend/pgxc/plan/planner.c
+++ b/src/backend/pgxc/plan/planner.c
@@ -2158,10 +2158,14 @@ pgxc_planner(Query *query, int cursorOptions, ParamListInfo boundParams)
 			if (query_step->exec_nodes)
 				query_step->combine_type = get_plan_combine_type(
 						query, query_step->exec_nodes->baselocatortype);
-			/* Only set up if running on more than one node */
-			if (query_step->exec_nodes && query_step->exec_nodes->nodelist &&
-							list_length(query_step->exec_nodes->nodelist) > 1)
-				query_step->simple_aggregates = get_simple_aggregates(query);
+
+			/* Set up simple aggregates */
+			/* PGXCTODO - we should detect what types of aggregates are used. 
+			 * in some cases we can avoid the final step and merely proxy results
+			 * (when there is only one data node involved) instead of using 
+			 * coordinator consolidation. At the moment this is needed for AVG()
+			 */
+			query_step->simple_aggregates = get_simple_aggregates(query);
 
 			/*
 			 * Add sorting to the step

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

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


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, master has been updated
       via  58d1f0d4fe5de5db3655f52df9031abc1ce5b84e (commit)
      from  9894afcd6d20b47c303c49b8ed5141d2b7902237 (commit)


- Log -----------------------------------------------------------------
commit 58d1f0d4fe5de5db3655f52df9031abc1ce5b84e
Author: Mason Sharp <ma...@us...>
Date:   Tue Aug 31 13:09:34 2010 -0400

    Fixed a bug in GTM introduced with timestamp piggybacking with GXID.
    Without this, one could not use GTM directly, only through the proxy
    
    Discovered and written by Andrei Martsinchyk

diff --git a/src/gtm/main/gtm_txn.c b/src/gtm/main/gtm_txn.c
index dec0a63..2205167 100644
--- a/src/gtm/main/gtm_txn.c
+++ b/src/gtm/main/gtm_txn.c
@@ -894,6 +894,7 @@ ProcessBeginTransactionGetGXIDCommand(Port *myport, StringInfo message)
 	StringInfoData buf;
 	GTM_TransactionHandle txn;
 	GlobalTransactionId gxid;
+	GTM_Timestamp timestamp;
 	MemoryContext oldContext;
 
 	txn_isolation_level = pq_getmsgint(message, sizeof (GTM_IsolationLevel));
@@ -901,6 +902,9 @@ ProcessBeginTransactionGetGXIDCommand(Port *myport, StringInfo message)
 
 	oldContext = MemoryContextSwitchTo(TopMemoryContext);
 
+	/* GXID has been received, now it's time to get a GTM timestamp */
+	timestamp = GTM_TimestampGetCurrent();
+
 	/*
 	 * Start a new transaction
 	 *
@@ -931,6 +935,7 @@ ProcessBeginTransactionGetGXIDCommand(Port *myport, StringInfo message)
 		pq_sendbytes(&buf, (char *)&proxyhdr, sizeof (GTM_ProxyMsgHeader));
 	}
 	pq_sendbytes(&buf, (char *)&gxid, sizeof(gxid));
+	pq_sendbytes(&buf, (char *)&timestamp, sizeof (GTM_Timestamp));
 	pq_endmessage(myport, &buf);
 
 	if (!myport->is_proxy)

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

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


hooks/post-receive
-- 
Postgres-XC