postgres-xc-committers Mailing List for Postgres-XC

Project "Postgres-XC".

The branch, master has been updated
       via  1c63e1870b95ddad3fdee284a0744f31add39919 (commit)
      from  43edae4ce7bc8a2533e49778dbb567829ec45e4e (commit)


- Log -----------------------------------------------------------------
commit 1c63e1870b95ddad3fdee284a0744f31add39919
Author: Abbas <abb...@en...>
Date:   Fri Apr 22 08:25:26 2011 +0500

    This patch fixes memory leak problems.
    Each call to pgxc_get_all_transaction_nodes must be accompanied by a call to pfree_pgxc_all_handles.
    This patch also corrects a logic mistake in CommitTransaction.

diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 2dbc860..86b903b 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -2041,7 +2041,12 @@ CommitTransaction(bool contact_gtm)
 	 * This is called only if it is not necessary to prepare the nodes.
 	 */
 	if (IS_PGXC_COORDINATOR && !IsConnFromCoord() && (!PreparePGXCNodes || IsHoldableCursor) && contact_gtm)
-		PGXCNodeCommit(!IsHoldableCursor);
+	{
+		if (IsHoldableCursor)
+			PGXCNodeCommit(!PreparePGXCNodes);
+		else
+			PGXCNodeCommit(true);
+	}
 #endif
 
 	/* Prevent cancel/die interrupt while cleaning up */
diff --git a/src/backend/pgxc/pool/execRemote.c b/src/backend/pgxc/pool/execRemote.c
index 2fc6cbd..c04a98c 100644
--- a/src/backend/pgxc/pool/execRemote.c
+++ b/src/backend/pgxc/pool/execRemote.c
@@ -1796,6 +1796,9 @@ finish:
 	if (!autocommit)
 		stat_transaction(pgxc_connections->dn_conn_count);
 
+	/* Clean up connections */
+	pfree_pgxc_all_handles(pgxc_connections);
+
 	return res;
 }
 
@@ -1875,6 +1878,9 @@ finish:
 	is_ddl = false;
 	clear_write_node_list();
 
+	/* Clean up connections */
+	pfree_pgxc_all_handles(pgxc_connections);
+
 	if (res != 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_INTERNAL_ERROR),
@@ -4619,6 +4625,9 @@ PGXCNodeIsImplicit2PC(bool *prepare_local_coord)
 	int co_conn_count = pgxc_handles->co_conn_count;
 	int total_count = pgxc_handles->co_conn_count + pgxc_handles->dn_conn_count;
 
+	/* Clean up connections */
+	pfree_pgxc_all_handles(pgxc_handles);
+
 	/*
 	 * Prepare Local Coord only if DDL is involved.
 	 * Even 1Co/1Dn cluster needs 2PC as more than 1 node is involved.
@@ -4676,6 +4685,9 @@ PGXCNodeGetNodeList(PGXC_NodeId **datanodes,
 	 */
 	if (!PersistentConnections)
 		release_handles();
+
+	/* Clean up connections */
+	pfree_pgxc_all_handles(pgxc_connections);
 }
 
 /*

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

Summary of changes:
 src/backend/access/transam/xact.c  |    7 ++++++-
 src/backend/pgxc/pool/execRemote.c |   12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Postgres-XC