Author: manik.surtani(a)jboss.com Date: 2008-12-15 09:33:25 -0500 (Mon, 15 Dec 2008) New Revision: 7331 Removed: core/branches/flat/src/main/java/org/jboss/starobrno/util/LinkedList.java Modified: core/branches/flat/src/main/java/org/jboss/starobrno/atomic/AtomicHashMapDelta.java core/branches/flat/src/main/java/org/jboss/starobrno/cluster/ReplicationQueue.java core/branches/flat/src/main/java/org/jboss/starobrno/context/TransactionContextImpl.java core/branches/flat/src/main/java/org/jboss/starobrno/eviction/algorithms/lfu/LFUQueue.java core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/InterceptorChain.java core/branches/flat/src/main/java/org/jboss/starobrno/loader/FileCacheLoader.java core/branches/flat/src/main/java/org/jboss/starobrno/marshall/CacheMarshallerStarobrno.java core/branches/flat/src/main/java/org/jboss/starobrno/transaction/DummyTransactionManager.java core/branches/flat/src/main/java/org/jboss/starobrno/util/ReflectionUtil.java core/branches/flat/src/test/java/org/jboss/starobrno/UnitTestCacheManager.java core/branches/flat/src/test/java/org/jboss/starobrno/api/tree/TreeCacheAPITest.java core/branches/flat/src/test/java/org/jboss/starobrno/profiling/MemConsumptionTest.java core/branches/flat/src/test/java/org/jboss/starobrno/profiling/ProfileTest.java core/branches/flat/src/test/java/org/jboss/starobrno/profiling/TreeProfileTest.java Log: Backed out custom LinkedList implementation Modified: core/branches/flat/src/main/java/org/jboss/starobrno/atomic/AtomicHashMapDelta.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/atomic/AtomicHashMapDelta.java 2008-12-13 15:31:53 UTC (rev 7330) +++ core/branches/flat/src/main/java/org/jboss/starobrno/atomic/AtomicHashMapDelta.java 2008-12-15 14:33:25 UTC (rev 7331) @@ -23,11 +23,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.starobrno.util.LinkedList; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.util.LinkedList; import java.util.List; /** Modified: core/branches/flat/src/main/java/org/jboss/starobrno/cluster/ReplicationQueue.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/cluster/ReplicationQueue.java 2008-12-13 15:31:53 UTC (rev 7330) +++ core/branches/flat/src/main/java/org/jboss/starobrno/cluster/ReplicationQueue.java 2008-12-15 14:33:25 UTC (rev 7331) @@ -31,9 +31,9 @@ import org.jboss.starobrno.factories.annotations.Start; import org.jboss.starobrno.factories.annotations.Stop; import org.jboss.starobrno.remoting.RPCManager; -import org.jboss.starobrno.util.LinkedList; import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; Modified: core/branches/flat/src/main/java/org/jboss/starobrno/context/TransactionContextImpl.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/context/TransactionContextImpl.java 2008-12-13 15:31:53 UTC (rev 7330) +++ core/branches/flat/src/main/java/org/jboss/starobrno/context/TransactionContextImpl.java 2008-12-15 14:33:25 UTC (rev 7331) @@ -27,7 +27,6 @@ import org.jboss.starobrno.transaction.GlobalTransaction; import org.jboss.starobrno.util.FastCopyHashMap; import org.jboss.starobrno.util.Immutables; -import org.jboss.starobrno.util.LinkedList; import javax.transaction.RollbackException; import javax.transaction.SystemException; @@ -35,6 +34,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashSet; +import java.util.LinkedList; import java.util.List; import java.util.Map; Modified: core/branches/flat/src/main/java/org/jboss/starobrno/eviction/algorithms/lfu/LFUQueue.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/eviction/algorithms/lfu/LFUQueue.java 2008-12-13 15:31:53 UTC (rev 7330) +++ core/branches/flat/src/main/java/org/jboss/starobrno/eviction/algorithms/lfu/LFUQueue.java 2008-12-15 14:33:25 UTC (rev 7331) @@ -23,17 +23,8 @@ import org.jboss.starobrno.eviction.KeyEntry; import org.jboss.starobrno.eviction.algorithms.SortedEvictionQueue; -import org.jboss.starobrno.util.LinkedList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Set; +import java.util.*; /** * LFUQueue EvictionQueue implementation for LFU Policy. Modified: core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/InterceptorChain.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/InterceptorChain.java 2008-12-13 15:31:53 UTC (rev 7330) +++ core/branches/flat/src/main/java/org/jboss/starobrno/interceptors/InterceptorChain.java 2008-12-15 14:33:25 UTC (rev 7331) @@ -30,10 +30,10 @@ import org.jboss.starobrno.factories.annotations.Start; import org.jboss.starobrno.interceptors.base.CommandInterceptor; import org.jboss.starobrno.invocation.InvocationContextContainer; -import org.jboss.starobrno.util.LinkedList; import java.util.ArrayList; import java.util.Collections; +import java.util.LinkedList; import java.util.List; /** Modified: core/branches/flat/src/main/java/org/jboss/starobrno/loader/FileCacheLoader.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/loader/FileCacheLoader.java 2008-12-13 15:31:53 UTC (rev 7330) +++ core/branches/flat/src/main/java/org/jboss/starobrno/loader/FileCacheLoader.java 2008-12-15 14:33:25 UTC (rev 7331) @@ -28,7 +28,6 @@ import org.jboss.starobrno.config.CacheLoaderConfig.IndividualCacheLoaderConfig; import org.jboss.starobrno.lock.StripedLock; import org.jboss.starobrno.marshall.EntryData; -import org.jboss.starobrno.util.LinkedList; import org.jboss.util.stream.MarshalledValueInputStream; import java.io.Closeable; @@ -39,6 +38,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.util.LinkedList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: core/branches/flat/src/main/java/org/jboss/starobrno/marshall/CacheMarshallerStarobrno.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/marshall/CacheMarshallerStarobrno.java 2008-12-13 15:31:53 UTC (rev 7330) +++ core/branches/flat/src/main/java/org/jboss/starobrno/marshall/CacheMarshallerStarobrno.java 2008-12-15 14:33:25 UTC (rev 7331) @@ -47,17 +47,7 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.IdentityHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; +import java.util.*; /** * Abstract AbstractMarshaller for JBoss Cache. @@ -202,7 +192,7 @@ out.writeByte(MAGICNUMBER_ARRAY_LIST); marshallCollection((Collection) o, out, refMap); } - else if (o.getClass().equals(LinkedList.class)) + else if (o instanceof LinkedList) { out.writeByte(MAGICNUMBER_LINKED_LIST); marshallCollection((Collection) o, out, refMap); Modified: core/branches/flat/src/main/java/org/jboss/starobrno/transaction/DummyTransactionManager.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/transaction/DummyTransactionManager.java 2008-12-13 15:31:53 UTC (rev 7330) +++ core/branches/flat/src/main/java/org/jboss/starobrno/transaction/DummyTransactionManager.java 2008-12-15 14:33:25 UTC (rev 7331) @@ -63,7 +63,7 @@ } catch (NamingException e) { - log.error("binding of DummyTransactionManager failed", e); + log.debug("binding of DummyTransactionManager failed", e); } } return instance; Deleted: core/branches/flat/src/main/java/org/jboss/starobrno/util/LinkedList.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/util/LinkedList.java 2008-12-13 15:31:53 UTC (rev 7330) +++ core/branches/flat/src/main/java/org/jboss/starobrno/util/LinkedList.java 2008-12-15 14:33:25 UTC (rev 7331) @@ -1,17 +0,0 @@ -package org.jboss.starobrno.util; - -import java.util.Iterator; - -/** - * Similar to JDK LinkedList, except this implementation uses a more efficient iterator making use of the next and previous - * object references in each Entry. - */ - -public class LinkedList<E> extends java.util.LinkedList<E> -{ - @Override - public Iterator<E> iterator() - { - return listIterator(0); - } -} Modified: core/branches/flat/src/main/java/org/jboss/starobrno/util/ReflectionUtil.java =================================================================== --- core/branches/flat/src/main/java/org/jboss/starobrno/util/ReflectionUtil.java 2008-12-13 15:31:53 UTC (rev 7330) +++ core/branches/flat/src/main/java/org/jboss/starobrno/util/ReflectionUtil.java 2008-12-15 14:33:25 UTC (rev 7331) @@ -30,6 +30,7 @@ import java.lang.reflect.Method; import java.util.Arrays; import java.util.Collection; +import java.util.LinkedList; import java.util.List; /** Modified: core/branches/flat/src/test/java/org/jboss/starobrno/UnitTestCacheManager.java =================================================================== --- core/branches/flat/src/test/java/org/jboss/starobrno/UnitTestCacheManager.java 2008-12-13 15:31:53 UTC (rev 7330) +++ core/branches/flat/src/test/java/org/jboss/starobrno/UnitTestCacheManager.java 2008-12-15 14:33:25 UTC (rev 7331) @@ -16,7 +16,7 @@ public UnitTestCacheManager(Configuration c) { - this.c = c; + this.c = c.clone(); } protected Cache createNewCache() Modified: core/branches/flat/src/test/java/org/jboss/starobrno/api/tree/TreeCacheAPITest.java =================================================================== --- core/branches/flat/src/test/java/org/jboss/starobrno/api/tree/TreeCacheAPITest.java 2008-12-13 15:31:53 UTC (rev 7330) +++ core/branches/flat/src/test/java/org/jboss/starobrno/api/tree/TreeCacheAPITest.java 2008-12-15 14:33:25 UTC (rev 7331) @@ -37,9 +37,10 @@ // start a single cache instance Configuration c = new Configuration(); c.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName()); + c.setInvocationBatchingEnabled(true); CacheManager cm = new CacheManager(c); - Cache flatcache = cm.getCache(getClass().getSimpleName()); + Cache flatcache = cm.getCache(); cache = new TreeCacheImpl(flatcache); tm = ((CacheSPI) cache.getCache()).getTransactionManager(); Modified: core/branches/flat/src/test/java/org/jboss/starobrno/profiling/MemConsumptionTest.java =================================================================== --- core/branches/flat/src/test/java/org/jboss/starobrno/profiling/MemConsumptionTest.java 2008-12-13 15:31:53 UTC (rev 7330) +++ core/branches/flat/src/test/java/org/jboss/starobrno/profiling/MemConsumptionTest.java 2008-12-15 14:33:25 UTC (rev 7331) @@ -32,7 +32,7 @@ import java.util.Arrays; import java.util.Random; -@Test(groups = "profiling") +@Test(groups = "profiling", enabled = false) public class MemConsumptionTest { // adjust the next 4 values Modified: core/branches/flat/src/test/java/org/jboss/starobrno/profiling/ProfileTest.java =================================================================== --- core/branches/flat/src/test/java/org/jboss/starobrno/profiling/ProfileTest.java 2008-12-13 15:31:53 UTC (rev 7330) +++ core/branches/flat/src/test/java/org/jboss/starobrno/profiling/ProfileTest.java 2008-12-15 14:33:25 UTC (rev 7331) @@ -28,7 +28,7 @@ * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik@jboss.org</a>) * @since 2.1.0 */ -@Test(groups = "profiling", sequential = true) +@Test(groups = "profiling", sequential = true, enabled = false) public class ProfileTest extends AbstractProfileTest { /* Modified: core/branches/flat/src/test/java/org/jboss/starobrno/profiling/TreeProfileTest.java =================================================================== --- core/branches/flat/src/test/java/org/jboss/starobrno/profiling/TreeProfileTest.java 2008-12-13 15:31:53 UTC (rev 7330) +++ core/branches/flat/src/test/java/org/jboss/starobrno/profiling/TreeProfileTest.java 2008-12-15 14:33:25 UTC (rev 7331) @@ -35,7 +35,7 @@ * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik@jboss.org</a>) * @since 2.1.0 */ -@Test(groups = "profiling", sequential = true) +@Test(groups = "profiling", sequential = true, enabled = false) public class TreeProfileTest { /* @@ -76,7 +76,6 @@ Log log = LogFactory.getLog(TreeProfileTest.class); - @Test(enabled = true) public void testLocalMode() throws Exception { runCompleteTest();