Author: bernt
Date: Thu Mar 23 00:20:06 2006
New Revision: 388100
URL: http://svn.apache.org/viewcvs?rev=388100&view=rev
Log:
DERBY-1058 derby fails supporting holdable scrollable resultset: ERROR XSCB8: The btree conglomerate
1,141,037,436,752 is closed.
Submitted by Andreas Konreliussen
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java?rev=388100&r1=388099&r2=388100&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
Thu Mar 23 00:20:06 2006
@@ -894,6 +894,7 @@
**/
public void init(
TransactionManager xact_manager,
+ boolean hold,
ContainerHandle container,
Transaction rawtran,
int open_mode,
@@ -911,7 +912,7 @@
super.init(
xact_manager, xact_manager,
- container, rawtran, false, open_mode,
+ container, rawtran, hold, open_mode,
lock_level, btree_locking_policy,
conglomerate, undo, dynamic_info);
}
@@ -989,11 +990,6 @@
}
else
{
- if (SanityManager.DEBUG)
- {
- SanityManager.THROWASSERT("There is currently no requirement for a held btree
conglomerate controller.");
- }
-
return(false);
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java?rev=388100&r1=388099&r2=388100&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
Thu Mar 23 00:20:06 2006
@@ -659,6 +659,7 @@
b2ic.init(
xact_manager, // current transaction
xact_manager.getRawStoreXact(), // current raw store xact
+ false, // Not holdable
open_mode,
TransactionController.MODE_TABLE,
xact_manager.getRawStoreXact().newLockingPolicy(
@@ -705,6 +706,7 @@
b2ic.init(
xact_manager, // current transaction
rawtran, // current raw store transaction
+ hold, // holdability
open_mode,
lock_level,
locking_policy,
@@ -813,6 +815,7 @@
b2ic.init(
xact_manager, // current transaction
xact_manager.getRawStoreXact(), // current raw store xact
+ false, // Not holdable
open_mode,
TransactionController.MODE_TABLE,
xact_manager.getRawStoreXact().newLockingPolicy(
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java?rev=388100&r1=388099&r2=388100&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java
Thu Mar 23 00:20:06 2006
@@ -77,6 +77,7 @@
void init(
TransactionManager xact_manager,
Transaction rawtran,
+ boolean hold,
int open_mode,
int lock_level,
LockingPolicy locking_policy,
@@ -146,6 +147,7 @@
// Do generic b-tree initialization.
super.init(
xact_manager,
+ hold,
(ContainerHandle) null,
rawtran,
open_mode,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude?rev=388100&r1=388099&r2=388100&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
Thu Mar 23 00:20:06 2006
@@ -35,8 +35,11 @@
# excluding jdbcapi/derbyStress.java - jcc runs out of memory with this test
jdbcapi/derbyStress.java
largedata/LobLimits.java
-# These next three fail with an error saying that a null username is not
-# supported
+# These next four fail with an error saying that a null username is not
+# supported. When fixing the username issue, they will fail since the
+# db2 driver produces statements which Derby cannot compile in
+# ResultSet.updateRow()
jdbcapi/SURQueryMixTest.junit
jdbcapi/SURTest.junit
jdbcapi/ConcurrencyTest.junit
+jdbcapi/HoldabilityTest.junit
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall?rev=388100&r1=388099&r2=388100&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
Thu Mar 23 00:20:06 2006
@@ -1,3 +1,4 @@
+jdbcapi/HoldabilityTest.junit
jdbcapi/bestrowidentifier.sql
jdbcapi/characterStreams.java
jdbcapi/checkDriver.java
|