You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by an...@apache.org on 2006/06/09 22:16:29 UTC
svn commit: r413150 - in
/db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/access/btree:
BTreeController.java index/B2I.java index/B2IController.java
Author: andreask
Date: Fri Jun 9 13:16:28 2006
New Revision: 413150
URL: http://svn.apache.org/viewvc?rev=413150&view=rev
Log:
DERBY-1058 Derby fails supporting holdable scrollable resultsets
Modified:
db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java
Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java?rev=413150&r1=413149&r2=413150&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java (original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java Fri Jun 9 13:16:28 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/branches/10.1/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java?rev=413150&r1=413149&r2=413150&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java (original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java Fri Jun 9 13:16:28 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/branches/10.1/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java?rev=413150&r1=413149&r2=413150&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java (original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java Fri Jun 9 13:16:28 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,