postgres-xc-committers Mailing List for Postgres-XC

Project "Postgres-XC".

The branch, merge_postgres_9_0_3 has been updated
       via  acef8b6dde2c598a727e2eaf2cca5b66db0b592f (commit)
      from  df5e5dc0ea901385e7be446ca6d9ebec7e58cb12 (commit)


- Log -----------------------------------------------------------------
commit acef8b6dde2c598a727e2eaf2cca5b66db0b592f
Author: Abbas <abb...@en...>
Date:   Mon Mar 7 22:11:14 2011 +0500

    To fix a server crash in aggregates as reported in ID 3125430

diff --git a/src/backend/pgxc/pool/execRemote.c b/src/backend/pgxc/pool/execRemote.c
index 8a553d4..af2f80c 100644
--- a/src/backend/pgxc/pool/execRemote.c
+++ b/src/backend/pgxc/pool/execRemote.c
@@ -3550,7 +3550,6 @@ ExecRemoteQuery(RemoteQueryState *node)
 	TupleTableSlot *scanslot = node->ss.ss_ScanTupleSlot;
 	bool have_tuple = false;
 
-
 	if (!node->query_Done)
 	{
 		/*
@@ -3677,7 +3676,22 @@ handle_results:
 		 */
 		if (node->simple_aggregates)
 		{
+			int i, natts;
+
 			finish_simple_aggregates(node, resultslot);
+
+			/*
+			 * PGXCTODO :In fact exec_simple_aggregates & finish_simple_aggregates
+			 * should not be resulting in a TupleTableSlot with NULL pointer in 
+			 * per attribute value, but for now to fix the crash this check would do
+			 */
+			natts = resultslot->tts_tupleDescriptor->natts;
+			for (i = 0; i < natts; ++i)
+			{
+				if (resultslot->tts_values[i] == NULL)
+					return NULL;
+			}
+
 			if (!TupIsNull(resultslot))
 				have_tuple = true;
 		}

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

Summary of changes:
 src/backend/pgxc/pool/execRemote.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, merge_postgres_9_0_3 has been updated
       via  df5e5dc0ea901385e7be446ca6d9ebec7e58cb12 (commit)
      from  93781551114d9fe5826459caaf8aa03d63bac001 (commit)


- Log -----------------------------------------------------------------
commit df5e5dc0ea901385e7be446ca6d9ebec7e58cb12
Author: Abbas <abb...@en...>
Date:   Mon Mar 7 20:00:38 2011 +0500

    To avoid a crash caused by an insert select statement in vacuum.sql

diff --git a/src/backend/pgxc/plan/planner.c b/src/backend/pgxc/plan/planner.c
index d3aaaa4..378d9b4 100644
--- a/src/backend/pgxc/plan/planner.c
+++ b/src/backend/pgxc/plan/planner.c
@@ -603,9 +603,14 @@ get_plan_nodes_insert(PlannerInfo *root, RemoteQuery *step)
 							(errcode(ERRCODE_STATEMENT_TOO_COMPLEX),
 							(errmsg("Could not find relation for oid = %d", rte->relid))));
 
-				if ((strcmp(col_base->colname, source_rel_loc_info->partAttrName) == 0) &&
-					( (source_rel_loc_info->locatorType == LOCATOR_TYPE_HASH) ||
-					  (source_rel_loc_info->locatorType == LOCATOR_TYPE_MODULO) ))
+				if (	col_base->colname != NULL &&
+					source_rel_loc_info->partAttrName != NULL &&
+					strcmp(col_base->colname, source_rel_loc_info->partAttrName) == 0 &&
+					(
+					  source_rel_loc_info->locatorType == LOCATOR_TYPE_HASH ||
+					  source_rel_loc_info->locatorType == LOCATOR_TYPE_MODULO
+					)
+				   )
 				{
 					/*
 					 * Partition columns match, we have a "single-step INSERT SELECT".

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

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


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, merge_postgres_9_0_3 has been updated
       via  93781551114d9fe5826459caaf8aa03d63bac001 (commit)
      from  fa427af446193741501c72e6e026ac493a125137 (commit)


- Log -----------------------------------------------------------------
commit 93781551114d9fe5826459caaf8aa03d63bac001
Author: Abbas <abb...@en...>
Date:   Mon Mar 7 15:42:27 2011 +0500

    Block creation of concurrent indices

diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index bf122db..2bb2200 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -1057,6 +1057,16 @@ standard_ProcessUtility(Node *parsetree,
 			{
 				IndexStmt  *stmt = (IndexStmt *) parsetree;
 
+#ifdef PGXC
+				if (stmt->concurrent)
+				{
+					ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						errmsg("PGXC does not support concurrent indexes"),
+						errdetail("The feature is not currently supported")));
+				}
+#endif
+
 				if (stmt->concurrent)
 					PreventTransactionChain(isTopLevel,
 											"CREATE INDEX CONCURRENTLY");
@@ -1087,7 +1097,7 @@ standard_ProcessUtility(Node *parsetree,
 							false,		/* quiet */
 							stmt->concurrent);	/* concurrent */
 #ifdef PGXC
-				if (IS_PGXC_COORDINATOR && !stmt->isconstraint)
+				if (IS_PGXC_COORDINATOR && !stmt->isconstraint && !IsConnFromCoord())
 					ExecUtilityStmtOnNodes(queryString, NULL,
 										   stmt->concurrent, EXEC_ON_ALL_NODES);
 #endif

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

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


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, merge_postgres_9_0_3 has been updated
       via  fa427af446193741501c72e6e026ac493a125137 (commit)
       via  a6a956e4d1303161750161c0629adb1b4514d345 (commit)
       via  33342d8d44bb2c36239712d9e7318df0776ce018 (commit)
      from  9ecde28ad6b6ed00b7588928480bf0bd8a741421 (commit)


- Log -----------------------------------------------------------------
commit fa427af446193741501c72e6e026ac493a125137
Author: Michael P <mic...@us...>
Date:   Mon Mar 7 16:09:54 2011 +0900

    CREATE TABLE default distribution to REPLICATED
    
    Change distribution type of table to REPLICATED when no
    distribution is specified like with:
    CREATE TABLE aa (int a);

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 59231a8..ea20e66 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -874,34 +874,17 @@ AddRelationDistribution (Oid relid,
 						 errmsg("Invalid parent table distribution type")));
 					break;
 			}
-		} else
+		}
+		else
 		{
 			/* 
 			 * If no distribution was specified, and we have not chosen
-			 * one based on primary key or foreign key, use first column with
-			 * a supported data type.
+			 * distribute table by replication.
 			 */
-			Form_pg_attribute attr;
-			int i;
-
-			locatortype = LOCATOR_TYPE_HASH;
-
-			for (i = 0; i < descriptor->natts; i++)
-			{
-				attr = descriptor->attrs[i];
-				if (IsHashDistributable(attr->atttypid))
-				{
-					/* distribute on this column */
-					attnum = i + 1;
-					break;
-				}
-			}
-
-			/* If we did not find a usable type, fall back to round robin */
-			if (attnum == 0)
-				locatortype = LOCATOR_TYPE_RROBIN;
+			locatortype = LOCATOR_TYPE_REPLICATED;
 		}
-	} else 
+	}
+	else 
 	{
 		/* 
 		 * User specified distribution type

commit a6a956e4d1303161750161c0629adb1b4514d345
Author: Michael P <mic...@us...>
Date:   Mon Mar 7 16:00:16 2011 +0900

    Block PREPARE and EXECUTE for the time being
    
    It has been noticed that PREPARE crashed the server in some pg_regress
    test cases.

diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 1240614..bf122db 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -804,11 +804,21 @@ standard_ProcessUtility(Node *parsetree,
 			break;
 
 		case T_PrepareStmt:
+#ifdef PGXC
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("PREPARE is not supported")));
+#endif
 			CheckRestrictedOperation("PREPARE");
 			PrepareQuery((PrepareStmt *) parsetree, queryString);
 			break;
 
 		case T_ExecuteStmt:
+#ifdef PGXC
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("EXECUTE is not supported")));
+#endif
 			ExecuteQuery((ExecuteStmt *) parsetree, queryString, params,
 						 dest, completionTag);
 			break;

commit 33342d8d44bb2c36239712d9e7318df0776ce018
Author: Michael P <mic...@us...>
Date:   Mon Mar 7 15:58:13 2011 +0900

    Fix for CREATE INDEX CONCURRENTLY
    
    When an index is created concurrently, Coordinator tried to take
    a snapshot that had already been deleted.
    We need to take a new one from Coordinator.
    
    Patch written by Abbas Butt

diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c
index a735fc3..8140321 100644
--- a/src/backend/utils/time/snapmgr.c
+++ b/src/backend/utils/time/snapmgr.c
@@ -34,7 +34,9 @@
 #include "utils/resowner.h"
 #include "utils/snapmgr.h"
 #include "utils/tqual.h"
-
+#ifdef PGXC
+#include "pgxc/pgxc.h"
+#endif
 
 /*
  * CurrentSnapshot points to the only snapshot taken in a serializable
@@ -344,6 +346,14 @@ PopActiveSnapshot(void)
 Snapshot
 GetActiveSnapshot(void)
 {
+#ifdef PGXC
+	/*
+	 * Check if topmost snapshot is null or not,
+	 * if it is, a new one will be taken from GTM.
+	 */
+	if (!ActiveSnapshot && IS_PGXC_COORDINATOR && !IsConnFromCoord())
+		return NULL;
+#endif
 	Assert(ActiveSnapshot != NULL);
 
 	return ActiveSnapshot->as_snap;

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

Summary of changes:
 src/backend/catalog/heap.c       |   29 ++++++-----------------------
 src/backend/tcop/utility.c       |   10 ++++++++++
 src/backend/utils/time/snapmgr.c |   12 +++++++++++-
 3 files changed, 27 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, merge_postgres_9_0_3 has been updated
       via  9ecde28ad6b6ed00b7588928480bf0bd8a741421 (commit)
       via  fbb0afd7b8858b13dc1f1f212742ffafcf4b7d8f (commit)
      from  062ecec9ab0e36f17f31624307470b8662dcfd80 (commit)


- Log -----------------------------------------------------------------
commit 9ecde28ad6b6ed00b7588928480bf0bd8a741421
Merge: 062ecec fbb0afd
Author: Michael P <mic...@us...>
Date:   Mon Mar 7 09:31:27 2011 +0900

    Merge branch 'master' into merge_postgres_9_0_3


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

Summary of changes:
 src/backend/pgxc/pool/execRemote.c |   37 +++++++++++------------------------
 1 files changed, 12 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, ha_support has been updated
       via  6ee7a8fb4ca7ca60504b443da95c0c3314b1c88d (commit)
       via  fbb0afd7b8858b13dc1f1f212742ffafcf4b7d8f (commit)
      from  2876389f146b01bba0654c63e4d5eb635ffa8d8b (commit)


- Log -----------------------------------------------------------------
commit 6ee7a8fb4ca7ca60504b443da95c0c3314b1c88d
Merge: 2876389 fbb0afd
Author: Michael P <mic...@us...>
Date:   Mon Mar 7 09:30:00 2011 +0900

    Merge branch 'master' into ha_support


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

Summary of changes:
 src/backend/pgxc/pool/execRemote.c |   37 +++++++++++------------------------
 1 files changed, 12 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, master has been updated
       via  fbb0afd7b8858b13dc1f1f212742ffafcf4b7d8f (commit)
      from  2e8115a86a7660fbb43a1cae72b8e406c7f82054 (commit)


- Log -----------------------------------------------------------------
commit fbb0afd7b8858b13dc1f1f212742ffafcf4b7d8f
Author: Michael P <mic...@us...>
Date:   Mon Mar 7 09:17:21 2011 +0900

    Improve error handling when launching DDL or utilities
    
    This commit corrects a problem with error handling of ExecRemoteUtility
    in execRemote.c. When an error occurred on a Datanode during a DDL or
    utility process, connections were sent back to pooler when checking
    error message in remote state.
    This assumes that all the connections are clean.
    
    However, Coordinator connections whose messages have not been treated
    were also sent back to pooler.
    This could have resulted in data inconsistency of dirty coordinator-coordinator
    connections.
    
    Patch written by Benny Wang.

diff --git a/src/backend/pgxc/pool/execRemote.c b/src/backend/pgxc/pool/execRemote.c
index dc1d68c..711cd1f 100644
--- a/src/backend/pgxc/pool/execRemote.c
+++ b/src/backend/pgxc/pool/execRemote.c
@@ -4242,19 +4242,6 @@ ExecRemoteUtility(RemoteQuery *node)
 				}
 			}
 		}
-
-		/*
-		 * We have processed all responses from the data nodes and if we have
-		 * error message pending we can report it. All connections should be in
-		 * consistent state now and can be released to the pool after rollback.
-		 */
-		if (remotestate->errorMessage)
-		{
-			char *code = remotestate->errorCode;
-			ereport(ERROR,
-					(errcode(MAKE_SQLSTATE(code[0], code[1], code[2], code[3], code[4])),
-					 errmsg("%s", remotestate->errorMessage)));
-		}
 	}
 
 	/* Make the same for Coordinators */
@@ -4295,18 +4282,18 @@ ExecRemoteUtility(RemoteQuery *node)
 				}
 			}
 		}
-		/*
-		 * We have processed all responses from the data nodes and if we have
-		 * error message pending we can report it. All connections should be in
-		 * consistent state now and can be released to the pool after rollback.
-		 */
-		if (remotestate->errorMessage)
-		{
-			char *code = remotestate->errorCode;
-			ereport(ERROR,
-					(errcode(MAKE_SQLSTATE(code[0], code[1], code[2], code[3], code[4])),
-					 errmsg("%s", remotestate->errorMessage)));
-		}
+	}
+	/*
+	 * We have processed all responses from nodes and if we have
+	 * error message pending we can report it. All connections should be in
+	 * consistent state now and so they can be released to the pool after ROLLBACK.
+	 */
+	if (remotestate->errorMessage)
+	{
+		char *code = remotestate->errorCode;
+		ereport(ERROR,
+				(errcode(MAKE_SQLSTATE(code[0], code[1], code[2], code[3], code[4])),
+				 errmsg("%s", remotestate->errorMessage)));
 	}
 }
 

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

Summary of changes:
 src/backend/pgxc/pool/execRemote.c |   37 +++++++++++------------------------
 1 files changed, 12 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
Postgres-XC