db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r596443 - in /db/derby/code/branches/10.3/java: engine/org/apache/derby/impl/sql/conn/ testing/org/apache/derbyTesting/functionTests/master/
Date Mon, 19 Nov 2007 20:53:06 GMT
Author: kmarsden
Date: Mon Nov 19 12:53:05 2007
New Revision: 596443

URL: http://svn.apache.org/viewvc?rev=596443&view=rev
Log:
DERBY-3093 Intermittent transaction failure caused by internal duplicate
savepoint name for triggers

merge from trunk, revision 588202

Contributed by James F. Adams


Modified:
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
    db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/savepointJdbc30_JSR169.out
    db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/savepointJdbc30_XA.out

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java?rev=596443&r1=596442&r2=596443&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
(original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
Mon Nov 19 12:53:05 2007
@@ -105,14 +105,13 @@
 		super(lcc.getContextManager(), org.apache.derby.iapi.reference.ContextId.LANG_STATEMENT);
 		this.lcc = lcc;
 
-		internalSavePointName = "ISSP" + hashCode();
-
 		if (SanityManager.DEBUG)
 		{
 			SanityManager.ASSERT((lcc != null),
 					"Failed to get language connection context");
 		}
 
+        internalSavePointName = lcc.getUniqueSavepointName();
 	}
 
     /**

Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/savepointJdbc30_JSR169.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/savepointJdbc30_JSR169.out?rev=596443&r1=596442&r2=596443&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/savepointJdbc30_JSR169.out
(original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/savepointJdbc30_JSR169.out
Mon Nov 19 12:53:05 2007
@@ -79,8 +79,8 @@
 Test41b - Rollback to a savepoint, then try to rollback savepoint created after that savepoint
 Expected Exception is SAVEPOINT, s2 does not  exist or is not active in the current transaction.
 Test42 - Rollback/commit the transaction, then try to use savepoint from that transaction
-Expected Exception is SAVEPOINT, SAVEPT5 does not  exist or is not active in the current
transaction.
 Expected Exception is SAVEPOINT, SAVEPT6 does not  exist or is not active in the current
transaction.
+Expected Exception is SAVEPOINT, SAVEPT7 does not  exist or is not active in the current
transaction.
 Test43 - Release and reuse a savepoint name
 Expected Exception is A SAVEPOINT with the passed name already exists in the current transaction.
 Test 45 reuse savepoint name after rollback - should not work
@@ -91,11 +91,11 @@
 Expected Exception is ResultSet not open. Operation 'next' not permitted. Verify that autocommit
is OFF.
 Expected Exception is ResultSet not open. Operation 'next' not permitted. Verify that autocommit
is OFF.
 Test 47 multiple tests for getSavepointId()
-8
 9
 10
 11
 12
+13
 Test 48 No nested SQL savepoints allowed.
 Following SQL savepoint will fail because we are trying to nest it inside JDBC savepoint
 Expected Exception is The maximum number of savepoints has been reached. 

Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/savepointJdbc30_XA.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/savepointJdbc30_XA.out?rev=596443&r1=596442&r2=596443&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/savepointJdbc30_XA.out
(original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/savepointJdbc30_XA.out
Mon Nov 19 12:53:05 2007
@@ -78,8 +78,8 @@
 Test41b - Rollback to a savepoint, then try to rollback savepoint created after that savepoint
 Expected Exception is SAVEPOINT, s2 does not  exist or is not active in the current transaction.
 Test42 - Rollback/commit the transaction, then try to use savepoint from that transaction
-Expected Exception is SAVEPOINT, SAVEPT5 does not  exist or is not active in the current
transaction.
 Expected Exception is SAVEPOINT, SAVEPT6 does not  exist or is not active in the current
transaction.
+Expected Exception is SAVEPOINT, SAVEPT7 does not  exist or is not active in the current
transaction.
 Test43 - Release and reuse a savepoint name
 Expected Exception is A SAVEPOINT with the passed name already exists in the current transaction.
 Test 45 reuse savepoint name after rollback - should not work
@@ -90,11 +90,11 @@
 Expected Exception is ResultSet not open. Operation 'next' not permitted. Verify that autocommit
is OFF.
 Expected Exception is ResultSet not open. Operation 'next' not permitted. Verify that autocommit
is OFF.
 Test 47 multiple tests for getSavepointId()
-8
 9
 10
 11
 12
+13
 Test 48 No nested SQL savepoints allowed.
 Following SQL savepoint will fail because we are trying to nest it inside JDBC savepoint
 Expected Exception is The maximum number of savepoints has been reached. 



Mime
View raw message