[infinispan-commits] Infinispan SVN: r1576 - in trunk/cachestore/bdbje: src/main/java/org/infinispan/loaders/bdbje and 1 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Tue Mar 9 06:39:30 EST 2010
Author: manik.surtani at jboss.com
Date: 2010-03-09 06:39:29 -0500 (Tue, 09 Mar 2010)
New Revision: 1576
Modified:
trunk/cachestore/bdbje/pom.xml
trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeResourceFactory.java
trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/PreparableTransactionRunner.java
trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreTest.java
trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/PreparableTransactionRunnerTest.java
Log:
[ISPN-345] (Upgrade Berkeley DB JE to version 4.x)
Modified: trunk/cachestore/bdbje/pom.xml
===================================================================
--- trunk/cachestore/bdbje/pom.xml 2010-03-09 11:17:05 UTC (rev 1575)
+++ trunk/cachestore/bdbje/pom.xml 2010-03-09 11:39:29 UTC (rev 1576)
@@ -17,7 +17,7 @@
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
- <version>3.3.75</version>
+ <version>4.0.92</version>
</dependency>
</dependencies>
Modified: trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeResourceFactory.java
===================================================================
--- trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeResourceFactory.java 2010-03-09 11:17:05 UTC (rev 1575)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeResourceFactory.java 2010-03-09 11:39:29 UTC (rev 1576)
@@ -8,12 +8,15 @@
import com.sleepycat.collections.StoredSortedMap;
import com.sleepycat.je.*;
import com.sleepycat.util.ExceptionUnwrapper;
+import org.infinispan.CacheException;
import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.loaders.CacheLoaderException;
import org.infinispan.marshall.Marshaller;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
import java.io.File;
+import java.util.concurrent.TimeUnit;
/**
* Factory that assembles objects specific to the SleepyCat JE API.
@@ -54,8 +57,7 @@
EnvironmentConfig envConfig = new EnvironmentConfig();
envConfig.setAllowCreate(true);
envConfig.setTransactional(true);
- /* lock timeout is in microseconds */
- envConfig.setLockTimeout(config.getLockAcquistionTimeout() * 1000);
+ envConfig.setLockTimeout(config.getLockAcquistionTimeout(), TimeUnit.MILLISECONDS);
if (trace) log.trace("opening or creating je environment at {0}", envLocation);
Environment env = new Environment(envLocation, envConfig);
log.debug("opened je environment at {0}", envLocation);
@@ -101,7 +103,7 @@
storedEntryKeyBinding, storedEntryValueBinding, true);
} catch (Exception caught) {
caught = ExceptionUnwrapper.unwrap(caught);
- throw new DatabaseException("error opening stored map", caught);
+ throw new CacheException("Error opening stored map", caught);
}
}
@@ -124,7 +126,7 @@
expiryKeyBinding, expiryValueBinding, true);
} catch (Exception caught) {
caught = ExceptionUnwrapper.unwrap(caught);
- throw new DatabaseException("error opening stored map", caught);
+ throw new CacheException("error opening stored map", caught);
}
}
Modified: trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/PreparableTransactionRunner.java
===================================================================
--- trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/PreparableTransactionRunner.java 2010-03-09 11:17:05 UTC (rev 1575)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/PreparableTransactionRunner.java 2010-03-09 11:39:29 UTC (rev 1576)
@@ -4,11 +4,12 @@
import com.sleepycat.collections.TransactionRunner;
import com.sleepycat.collections.TransactionWorker;
import com.sleepycat.compat.DbCompat;
-import com.sleepycat.je.DeadlockException;
import com.sleepycat.je.Environment;
+import com.sleepycat.je.LockConflictException;
import com.sleepycat.je.Transaction;
import com.sleepycat.je.TransactionConfig;
import com.sleepycat.util.ExceptionUnwrapper;
+import org.infinispan.loaders.CacheLoaderException;
/**
* Adapted version of {@link TransactionRunner}, which allows us to prepare a transaction without committing it.<p/> The
@@ -59,8 +60,7 @@
currentTries = abortOverflowingCurrentTriesOnError(txn, currentTries);
caught = ExceptionUnwrapper.unwrapAny(caught);
rethrowIfNotDeadLock(caught);
- if (currentTries >= getMaxRetries())
- throw (DeadlockException) caught;
+ if (currentTries >= getMaxRetries()) throw (LockConflictException) caught;
}
}
}
@@ -82,7 +82,7 @@
}
void rethrowIfNotDeadLock(Throwable caught) throws Exception {
- if (!(caught instanceof DeadlockException)) {
+ if (!(caught instanceof LockConflictException)) {
if (caught instanceof Exception) {
throw (Exception) caught;
} else {
Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreTest.java 2010-03-09 11:17:05 UTC (rev 1575)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreTest.java 2010-03-09 11:39:29 UTC (rev 1576)
@@ -190,7 +190,7 @@
start();
cacheDb.close();
expiryDb.close();
- expectLastCall().andThrow(new DatabaseException());
+ expectLastCall().andThrow(new DatabaseException("Dummy"){});
catalog.close();
env.close();
replayAll();
@@ -205,7 +205,7 @@
cacheDb.close();
expiryDb.close();
catalog.close();
- expectLastCall().andThrow(new DatabaseException());
+ expectLastCall().andThrow(new DatabaseException("Dummy"){});
env.close();
replayAll();
cs.start();
@@ -220,7 +220,7 @@
expiryDb.close();
catalog.close();
env.close();
- expectLastCall().andThrow(new DatabaseException());
+ expectLastCall().andThrow(new DatabaseException("Dummy"){});
replayAll();
cs.start();
cs.stop();
@@ -233,7 +233,7 @@
factory = new MockBdbjeResourceFactory(cfg) {
@Override
public StoredClassCatalog createStoredClassCatalog(Database catalogDb) throws DatabaseException {
- throw new DatabaseException();
+ throw new DatabaseException("Dummy"){};
}
};
start();
@@ -280,7 +280,7 @@
public void testApplyModificationsThrowsOriginalDatabaseException() throws Exception {
start();
- DatabaseException ex = new DatabaseException();
+ DatabaseException ex = new DatabaseException("Dummy"){};
runner.run(isA(TransactionWorker.class));
expectLastCall().andThrow(new RuntimeExceptionWrapper(ex));
replayAll();
@@ -299,7 +299,7 @@
public void testCommitThrowsOriginalDatabaseException() throws Exception {
start();
- DatabaseException ex = new DatabaseException();
+ DatabaseException ex = new DatabaseException("Dummy"){};
com.sleepycat.je.Transaction txn = createMock(com.sleepycat.je.Transaction.class);
expect(currentTransaction.beginTransaction(null)).andReturn(txn);
runner.prepare(isA(TransactionWorker.class));
@@ -325,7 +325,7 @@
public void testPrepareThrowsOriginalDatabaseException() throws Exception {
start();
- DatabaseException ex = new DatabaseException();
+ DatabaseException ex = new DatabaseException("Dummy"){};
runner.prepare(isA(TransactionWorker.class));
expectLastCall().andThrow(new RuntimeExceptionWrapper(ex));
replayAll();
Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/PreparableTransactionRunnerTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/PreparableTransactionRunnerTest.java 2010-03-09 11:17:05 UTC (rev 1575)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/PreparableTransactionRunnerTest.java 2010-03-09 11:39:29 UTC (rev 1576)
@@ -2,9 +2,9 @@
import com.sleepycat.collections.CurrentTransaction;
import com.sleepycat.collections.TransactionWorker;
-import com.sleepycat.je.DeadlockException;
import com.sleepycat.je.Environment;
import com.sleepycat.je.EnvironmentConfig;
+import com.sleepycat.je.LockTimeoutException;
import com.sleepycat.je.Transaction;
import com.sleepycat.je.TransactionConfig;
import static org.easymock.EasyMock.expect;
@@ -52,22 +52,22 @@
@Test
public void testMoreDeadlocks() throws Exception {
worker.doWork();
- expectLastCall().andThrow(new DeadlockException());
+ expectLastCall().andThrow(new LockTimeoutException(null, null));
transaction.abort();
expect(env.beginTransaction(null, null)).andReturn(transaction);
worker.doWork();
- expectLastCall().andThrow(new DeadlockException());
+ expectLastCall().andThrow(new LockTimeoutException(null, null));
transaction.abort();
expect(env.beginTransaction(null, null)).andReturn(transaction);
worker.doWork();
- expectLastCall().andThrow(new DeadlockException());
+ expectLastCall().andThrow(new LockTimeoutException(null, null));
transaction.abort();
replayAll();
runner = new PreparableTransactionRunner(env, 2, null);
try {
runner.prepare(worker);
assert false : "should have gotten a deadlock exception";
- } catch (DeadlockException e) {
+ } catch (LockTimeoutException e) {
}
verifyAll();
@@ -208,7 +208,7 @@
public void testRethrowIfNotDeadLockDoesntThrowWhenGivenDeadlockException() throws Exception {
replayAll();
runner = new PreparableTransactionRunner(env);
- runner.rethrowIfNotDeadLock(createNiceMock(DeadlockException.class));
+ runner.rethrowIfNotDeadLock(createNiceMock(LockTimeoutException.class));
}
public void testThrowableDuringAbort() throws Exception {
More information about the infinispan-commits
mailing list