postgres-xc-committers Mailing List for Postgres-XC

Project "Postgres-XC".

The branch, master has been updated
       via  3bdbebb9ab2ea6fb9f3fbff5470df82f96b5f90c (commit)
      from  4a7fcb29f0ac168c99f78bdf86078be24015ddb0 (commit)


- Log -----------------------------------------------------------------
commit 3bdbebb9ab2ea6fb9f3fbff5470df82f96b5f90c
Author: Michael P <mic...@us...>
Date:   Thu May 26 15:40:07 2011 +0900

    Fix for bug 3299211: JDBC and DML queries
    
    Running DML queries through JDBC to an XC instance
    was crashing the server.
    
    Report and patch from sch19831106,
    with some code refactoring by me.

diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c
index a334a34..7d6e90e 100644
--- a/src/backend/commands/prepare.c
+++ b/src/backend/commands/prepare.c
@@ -476,6 +476,10 @@ InitQueryHashTable(void)
 static int
 set_remote_stmtname(Plan *plan, const char *stmt_name, int n)
 {
+	/* If no plan simply return */
+	if (!plan)
+		return 0;
+
 	if (IsA(plan, RemoteQuery))
 	{
 		DatanodeStatement *entry;
diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c
index 3cb09dc..2728c32 100644
--- a/src/backend/utils/cache/plancache.c
+++ b/src/backend/utils/cache/plancache.c
@@ -678,12 +678,17 @@ ReleaseCachedPlan(CachedPlan *plan, bool useResOwner)
 		if (plan->fully_planned)
 		{
 			ListCell *lc;
-			/* close any active datanode statements */
+
+			/* Close any active planned datanode statements */
 			foreach (lc, plan->stmt_list)
 			{
-				PlannedStmt *ps = (PlannedStmt *)lfirst(lc);
+				Node *node = lfirst(lc);
 
-				release_datanode_statements(ps->planTree);
+				if (IsA(node, PlannedStmt))
+				{
+					PlannedStmt *ps = (PlannedStmt *)node;
+					release_datanode_statements(ps->planTree);
+				}
 			}
 		}
 #endif

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

Summary of changes:
 src/backend/commands/prepare.c      |    4 ++++
 src/backend/utils/cache/plancache.c |   11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, PGXC-TrialMaster has been updated
       via  c07ee5cf650c03a298650ddaf5fa9f0aa9f91876 (commit)
      from  ac040624b275cca2c3b9c62c88be2bc88887f885 (commit)


- Log -----------------------------------------------------------------
commit c07ee5cf650c03a298650ddaf5fa9f0aa9f91876
Author: Michael P <mic...@us...>
Date:   Thu May 26 10:27:52 2011 +0900

    Fix for regression test float8
    
    Test was failing due to a query not correctly written.

diff --git a/src/test/regress/expected/float8_1.out b/src/test/regress/expected/float8_1.out
index 8ce7930..3708d21 100644
--- a/src/test/regress/expected/float8_1.out
+++ b/src/test/regress/expected/float8_1.out
@@ -382,7 +382,8 @@ UPDATE FLOAT8_TBL
    SET f1 = FLOAT8_TBL.f1 * '-1'
    WHERE FLOAT8_TBL.f1 > '0.0';
 ERROR:  Partition column can't be updated in current version
-SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f ORDER BY f1;
+   
+SELECT '' AS bad, f.f1 * '1e200' from FLOAT8_TBL f ORDER BY f1;
 ERROR:  value out of range: overflow
 SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f ORDER BY f1;
 ERROR:  value out of range: overflow

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

Summary of changes:
 src/test/regress/expected/float8_1.out |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Postgres-XC