postgres-xc-committers Mailing List for Postgres-XC

Project "Postgres-XC".

The branch, master has been updated
       via  b170fe2d7fc4bd175c72c2e4370fab223bac24d6 (commit)
      from  1580ed848d0577c52949c52fe2cec867b5ee1746 (commit)


- Log -----------------------------------------------------------------
commit b170fe2d7fc4bd175c72c2e4370fab223bac24d6
Author: Michael P <mic...@us...>
Date:   Wed May 11 18:29:55 2011 +0900

    Support for single-prepared PL/PGSQL functions
    
    This commit fixes primarily problems like in bug 3138450
    (cache lookup for type 0) where XC was not able to set up
    plpgsql parameter values because values were not correctly fetched.
    
    This commit does not yet solve the special case of multiple
    uses of same plpgsql datum within a SQL command.
    PL/PGSQL functions using subqueries are out of scope for
    the moment due to XC's restrictions regarding multi-prepared
    statements.

diff --git a/src/backend/pgxc/pool/execRemote.c b/src/backend/pgxc/pool/execRemote.c
index 47a07f0..43d9606 100644
--- a/src/backend/pgxc/pool/execRemote.c
+++ b/src/backend/pgxc/pool/execRemote.c
@@ -4057,17 +4057,45 @@ ParamListToDataRow(ParamListInfo params, char** result)
 	StringInfoData buf;
 	uint16 n16;
 	int i;
+	int real_num_params = params->numParams;
+
+	/*
+	 * It is necessary to fetch parameters
+	 * before looking at the output value.
+	 */
+	for (i = 0; i < params->numParams; i++)
+	{
+		ParamExternData *param;
+
+		param = &params->params[i];
+
+		if (!OidIsValid(param->ptype) && params->paramFetch != NULL)
+			(*params->paramFetch) (params, i + 1);
+
+		/*
+		 * In case parameter type is not defined, it is not necessary to include
+		 * it in message sent to backend nodes.
+		 */
+		if (!OidIsValid(param->ptype))
+			real_num_params--;
+	}
 
 	initStringInfo(&buf);
+
 	/* Number of parameter values */
-	n16 = htons(params->numParams);
+	n16 = htons(real_num_params);
 	appendBinaryStringInfo(&buf, (char *) &n16, 2);
 
 	/* Parameter values */
 	for (i = 0; i < params->numParams; i++)
 	{
-		ParamExternData *param = params->params + i;
+		ParamExternData *param = &params->params[i];
 		uint32 n32;
+
+		/* If parameter has no type defined it is not necessary to include it in message */
+		if (!OidIsValid(param->ptype))
+			continue;
+
 		if (param->isnull)
 		{
 			n32 = htonl(-1);

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

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


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, ha_support has been updated
       via  cf27a768d5e2f74c88d029a03d857a8d57040e34 (commit)
      from  3cf91c1fec8c9756b0f1b417a35d4e02b4ad427a (commit)


- Log -----------------------------------------------------------------
commit cf27a768d5e2f74c88d029a03d857a8d57040e34
Author: Michael P <mic...@us...>
Date:   Wed May 11 16:01:21 2011 +0900

    Fix for GXID feed
    
    This fix is already done on master branch,
    but it became also necessary here for HA test purposes.

diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 1f3c09f..a619fd4 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -1751,13 +1751,14 @@ CommitTransaction(bool contact_gtm)
 	bool PrepareLocalCoord = false;
 	bool PreparePGXCNodes = false;
 	char implicitgid[256];
-	TransactionId xid = GetCurrentTransactionId();
+	TransactionId xid = InvalidTransactionId;
 
 	if (IS_PGXC_COORDINATOR && !IsConnFromCoord() && contact_gtm)
 		PreparePGXCNodes = PGXCNodeIsImplicit2PC(&PrepareLocalCoord);
 
 	if (PrepareLocalCoord || PreparePGXCNodes)
 	{
+		xid = GetCurrentTransactionId();
 		sprintf(implicitgid, "T%d", xid);
 
 		/* Build Implicit 2PC Data for implicit PREPARE */

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

Summary of changes:
 src/backend/access/transam/xact.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, ha has been deleted
       was  b426d4842f40c91e170378876e0c8107691c4272

-----------------------------------------------------------------------
b426d4842f40c91e170378876e0c8107691c4272 Fix for GXID feed
-----------------------------------------------------------------------


hooks/post-receive
-- 
Postgres-XC