[jboss-cvs] JBossCache/src/org/jboss/cache/loader/bdbje ...
Manik Surtani
manik at jboss.org
Tue Jun 19 13:46:50 EDT 2007
User: msurtani
Date: 07/06/19 13:46:50
Modified: src/org/jboss/cache/loader/bdbje BdbjeCacheLoader.java
Log:
Rolling back - additional locking not necessary
Revision Changes Path
1.30 +17 -84 JBossCache/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BdbjeCacheLoader.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- BdbjeCacheLoader.java 19 Jun 2007 16:40:02 -0000 1.29
+++ BdbjeCacheLoader.java 19 Jun 2007 17:46:50 -0000 1.30
@@ -24,7 +24,6 @@
import org.jboss.cache.Modification;
import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
import org.jboss.cache.loader.AbstractCacheLoader;
-import org.jboss.cache.lock.StripedLock;
import java.io.File;
import java.io.IOException;
@@ -32,7 +31,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -52,7 +50,7 @@
*
* @author Mark Hayes May 16, 2004
* @author Bela Ban
- * @version $Id: BdbjeCacheLoader.java,v 1.29 2007/06/19 16:40:02 msurtani Exp $
+ * @version $Id: BdbjeCacheLoader.java,v 1.30 2007/06/19 17:46:50 msurtani Exp $
*/
@ThreadSafe
public class BdbjeCacheLoader extends AbstractCacheLoader
@@ -73,7 +71,6 @@
private SerialBinding serialBinding;
private Map<Object, Transaction> txnMap;
private boolean transactional;
- private StripedLock lock = new StripedLock();
/*
* Service implementation -- lifecycle methods.
@@ -118,7 +115,6 @@
throws Exception
{
-
log.trace("Starting BdbjeCacheLoader instance.");
checkNotOpen();
@@ -168,8 +164,7 @@
* since it may be shared by transactional and non-transactional caches.
*/
transactional = cache.getTransactionManager() != null;
- // get a WL on the DB
- lock.acquireLock(Fqn.ROOT, true);
+
try
{
/* Open the environment, creating it if it doesn't exist. */
@@ -187,10 +182,6 @@
destroy();
throw e;
}
- finally
- {
- lock.releaseLock(Fqn.ROOT);
- }
}
/**
@@ -337,7 +328,6 @@
Set<String> set = null;
Cursor cursor = cacheDb.openCursor(null, null);
- lock.acquireLock(name, false);
try
{
while (true)
@@ -362,7 +352,6 @@
}
finally
{
- lock.releaseLock(name);
cursor.close();
}
if (set != null)
@@ -390,9 +379,6 @@
DatabaseEntry keyEntry = makeKeyEntry(name);
DatabaseEntry foundData = new DatabaseEntry();
- lock.acquireLock(name, false);
- try
- {
OperationStatus status = cacheDb.get(null, keyEntry, foundData, null);
if (status == OperationStatus.SUCCESS)
{
@@ -405,11 +391,6 @@
return null;
}
}
- finally
- {
- lock.releaseLock(name);
- }
- }
// See http://jira.jboss.com/jira/browse/JBCACHE-118 for why this is commented out.
@@ -443,17 +424,9 @@
DatabaseEntry keyEntry = makeKeyEntry(name);
DatabaseEntry foundData = new DatabaseEntry();
foundData.setPartial(0, 0, true);
- lock.acquireLock(name, false);
- try
- {
OperationStatus status = cacheDb.get(null, keyEntry, foundData, null);
return (status == OperationStatus.SUCCESS);
}
- finally
- {
- lock.releaseLock(name);
- }
- }
/**
@@ -477,7 +450,6 @@
}
else
{
-
oldVal = doPut(null, name, key, value);
}
return oldVal;
@@ -499,7 +471,6 @@
DatabaseEntry dataEntry = makeDataEntry(map);
DatabaseEntry keyEntry = makeKeyEntry(name);
Cursor cursor = cacheDb.openCursor(txn, null);
- if (!transactional) lock.acquireLock(name, true);
try
{
OperationStatus status = cursor.putNoOverwrite(keyEntry, dataEntry);
@@ -521,7 +492,6 @@
}
finally
{
- if (!transactional) lock.releaseLock(name);
cursor.close();
}
return oldVal;
@@ -568,7 +538,6 @@
DatabaseEntry dataEntry = makeDataEntry(values);
DatabaseEntry keyEntry = makeKeyEntry(name);
Cursor cursor = cacheDb.openCursor(txn, null);
- if (!transactional) lock.acquireLock(name, true);
try
{
OperationStatus status = cursor.putNoOverwrite(keyEntry, dataEntry);
@@ -593,7 +562,6 @@
}
finally
{
- if (!transactional) lock.releaseLock(name);
cursor.close();
}
}
@@ -612,7 +580,6 @@
DatabaseEntry dataEntry = makeDataEntry(values);
DatabaseEntry keyEntry = makeKeyEntry(name);
Cursor cursor = cacheDb.openCursor(txn, null);
- lock.acquireLock(name, true);
try
{
cursor.put(keyEntry, dataEntry);
@@ -620,7 +587,6 @@
}
finally
{
- if (!transactional) lock.releaseLock(name);
cursor.close();
}
}
@@ -743,7 +709,6 @@
DatabaseEntry foundData = new DatabaseEntry();
foundData.setPartial(0, 0, true);
Cursor cursor = cacheDb.openCursor(txn, null);
- if (!transactional) lock.acquireLock(name, true);
try
{
OperationStatus status =
@@ -761,7 +726,6 @@
}
finally
{
- if (!transactional) lock.releaseLock(name);
cursor.close();
}
}
@@ -805,7 +769,6 @@
DatabaseEntry keyEntry = makeKeyEntry(name);
DatabaseEntry foundData = new DatabaseEntry();
Cursor cursor = cacheDb.openCursor(txn, null);
- if (!transactional) lock.acquireLock(name, true);
try
{
OperationStatus status =
@@ -819,7 +782,6 @@
}
finally
{
- if (!transactional) lock.releaseLock(name);
cursor.close();
}
return oldVal;
@@ -857,7 +819,6 @@
dataEntry.setPartial(0, 0, true);
DatabaseEntry keyEntry = makeKeyEntry(name);
Cursor cursor = cacheDb.openCursor(txn, null);
- if (!transactional) lock.acquireLock(name, true);
try
{
OperationStatus status =
@@ -869,7 +830,6 @@
}
finally
{
- if (!transactional) lock.releaseLock(name);
cursor.close();
}
}
@@ -898,15 +858,8 @@
Transaction txn = performTransaction(modifications);
if (onePhase)
{
- try
- {
txn.commit();
}
- finally
- {
- lock.releaseAllLocks(getFqns(modifications));
- }
- }
else
{
txnMap.put(tx, txn);
@@ -935,29 +888,9 @@
{
if (!transactional) throw new IllegalStateException();
- List<Fqn> fqns = getFqns(mods);
- lock.acquireAllLocks(fqns, true);
- try
- {
Transaction txn = performTransaction(mods);
txn.commit();
}
- finally
- {
- lock.releaseAllLocks(fqns);
- }
- }
-
- private List<Fqn> getFqns(List<Modification> mods)
- {
- List<Fqn> fqns = new LinkedList<Fqn>();
- for (Modification m : mods)
- {
- fqns.add(m.getFqn());
- if (m.getType() == Modification.ModificationType.MOVE) fqns.add(m.getFqn2());
- }
- return fqns;
- }
/**
* Performs the given operation, starting a transaction and performing
More information about the jboss-cvs-commits
mailing list