JBoss Cache SVN: r6422 - in core/trunk/src/main/java/org/jboss/cache/loader: tcp and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-29 18:55:16 -0400 (Tue, 29 Jul 2008)
New Revision: 6422
Modified:
core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java
core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java
Log:
Added more debug, sync on loader and not on stream
Modified: core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java 2008-07-29 21:40:01 UTC (rev 6421)
+++ core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java 2008-07-29 22:55:16 UTC (rev 6422)
@@ -42,11 +42,12 @@
*/
public class TcpDelegatingCacheLoader extends AbstractCacheLoader
{
- private Socket sock;
+ volatile private Socket sock;
private TcpDelegatingCacheLoaderConfig config;
- ObjectInputStream in;
- ObjectOutputStream out;
+ volatile ObjectInputStream in;
+ volatile ObjectOutputStream out;
private static final Log log = LogFactory.getLog(TcpDelegatingCacheLoader.class);
+ private static final boolean trace = log.isTraceEnabled();
private static Method GET_CHILDREN_METHOD, GET_METHOD, PUT_KEY_METHOD, PUT_DATA_METHOD, REMOVE_KEY_METHOD, REMOVE_METHOD, PUT_MODS_METHOD, EXISTS_METHOD, REMOVE_DATA_METHOD;
static
@@ -106,7 +107,10 @@
{
try
{
- return m.invoke(this, params);
+ if (trace) log.trace("About to invoke operation " + m);
+ Object rv = m.invoke(this, params);
+ if (trace) log.trace("Completed invocation of " + m);
+ return rv;
}
catch (IllegalAccessException e)
{
@@ -137,7 +141,8 @@
throw new CacheException("Problems invoking method call!", e);
}
}
- } while (System.currentTimeMillis() < endTime);
+ }
+ while (System.currentTimeMillis() < endTime);
throw new CacheException("Unable to communicate with TCPCacheServer(" + config.getHost() + ":" + config.getPort() + ") after " + config.getTimeout() + " millis, with reconnects every " + config.getReconnectWaitTime() + " millis.");
}
@@ -149,6 +154,7 @@
return (Set<?>) invokeWithRetries(GET_CHILDREN_METHOD, fqn);
}
+ @SuppressWarnings("unchecked")
public Map<Object, Object> get(Fqn name) throws Exception
{
return (Map<Object, Object>) invokeWithRetries(GET_METHOD, name);
@@ -195,7 +201,7 @@
protected Set<?> _getChildrenNames(Fqn fqn) throws Exception
{
Set cn;
- synchronized (out)
+ synchronized (this)
{
out.reset();
out.writeByte(TcpCacheOperations.GET_CHILDREN_NAMES);
@@ -214,9 +220,10 @@
return cn;
}
+ @SuppressWarnings("unchecked")
protected Map<Object, Object> _get(Fqn name) throws Exception
{
- synchronized (out)
+ synchronized (this)
{
out.reset();
@@ -234,7 +241,7 @@
protected boolean _exists(Fqn name) throws Exception
{
- synchronized (out)
+ synchronized (this)
{
out.reset();
@@ -252,7 +259,7 @@
protected Object _put(Fqn name, Object key, Object value) throws Exception
{
- synchronized (out)
+ synchronized (this)
{
out.reset();
@@ -272,7 +279,7 @@
protected void _put(Fqn name, Map<Object, Object> attributes) throws Exception
{
- synchronized (out)
+ synchronized (this)
{
out.reset();
@@ -290,7 +297,7 @@
protected void _put(List<Modification> modifications) throws Exception
{
- synchronized (out)
+ synchronized (this)
{
out.reset();
@@ -312,7 +319,7 @@
protected Object _remove(Fqn fqn, Object key) throws Exception
{
- synchronized (out)
+ synchronized (this)
{
out.reset();
@@ -331,7 +338,7 @@
protected void _remove(Fqn fqn) throws Exception
{
- synchronized (out)
+ synchronized (this)
{
out.reset();
@@ -348,7 +355,7 @@
protected void _removeData(Fqn fqn) throws Exception
{
- synchronized (out)
+ synchronized (this)
{
out.reset();
Modified: core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java 2008-07-29 21:40:01 UTC (rev 6421)
+++ core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java 2008-07-29 22:55:16 UTC (rev 6422)
@@ -51,7 +51,8 @@
* whether or not to start the server thread as a daemon. Should be false if started from the command line, true if started as an MBean.
*/
boolean daemon = true;
- static final Log log = LogFactory.getLog(TcpCacheServer.class);
+ private static final Log log = LogFactory.getLog(TcpCacheServer.class);
+ private final static boolean trace = log.isTraceEnabled();
public String getBindAddress()
@@ -251,7 +252,7 @@
public void start()
{
- t = new Thread(this, "TcpCacheServer.Connection");
+ t = new Thread(this, "TcpCacheServer.Connection(" + sock.getPort() + ")");
t.setDaemon(true);
t.start();
}
@@ -296,10 +297,11 @@
NodeSPI n;
boolean flag;
- while (t != null && Thread.currentThread().equals(t))
+ while (t != null && Thread.currentThread().equals(t) && t.isAlive())
{
try
{
+ if (trace) log.trace("Reading next byte");
op = input.readByte();
}
catch (IOException e)
@@ -311,6 +313,7 @@
try
{
+ if (trace) log.trace("Resetting output");
output.reset();
switch (op)
{
@@ -328,7 +331,7 @@
break;
case TcpCacheOperations.GET:
fqn = (Fqn) input.readObject();
- n = (NodeSPI) c.getRoot().getChild(fqn);
+ n = c.getNode(fqn);
if (n == null)
{
// node doesn't exist - return null
@@ -428,6 +431,7 @@
log.error("Operation " + op + " unknown");
break;
}
+ if (trace) log.trace("Flushing stream");
output.flush();
}
catch (Exception e)
15 years, 8 months
JBoss Cache SVN: r6421 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-29 17:40:01 -0400 (Tue, 29 Jul 2008)
New Revision: 6421
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh
Log:
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh 2008-07-29 17:17:18 UTC (rev 6420)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh 2008-07-29 21:40:01 UTC (rev 6421)
@@ -15,4 +15,5 @@
#--classpath was set
#additional JVM options
-JVM_OPTIONS="$JVM_OPTIONS -Djava.net.preferIPv4Stack=true" JVM_OPTIONS="$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.JBossCache300Wrapper"
\ No newline at end of file
+JVM_OPTIONS="$JVM_OPTIONS -Djava.net.preferIPv4Stack=true -Djbosscache.config.validate=false"
+JVM_OPTIONS="$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.JBossCache300Wrapper"
15 years, 8 months
JBoss Cache SVN: r6420 - in core/trunk/src/main/java/org/jboss/cache: util and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-29 13:17:18 -0400 (Tue, 29 Jul 2008)
New Revision: 6420
Modified:
core/trunk/src/main/java/org/jboss/cache/PessimisticUnversionedNode.java
core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
core/trunk/src/main/java/org/jboss/cache/util/FastCopyHashMap.java
Log:
Added copy constructor to FCHM and updated UnversionedNode and PUN to use this instead of a JDK HM.
Modified: core/trunk/src/main/java/org/jboss/cache/PessimisticUnversionedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/PessimisticUnversionedNode.java 2008-07-29 10:21:39 UTC (rev 6419)
+++ core/trunk/src/main/java/org/jboss/cache/PessimisticUnversionedNode.java 2008-07-29 17:17:18 UTC (rev 6420)
@@ -7,10 +7,10 @@
import org.jboss.cache.lock.LockStrategyFactory;
import org.jboss.cache.marshall.MarshalledValue;
import org.jboss.cache.transaction.GlobalTransaction;
+import org.jboss.cache.util.FastCopyHashMap;
import org.jboss.cache.util.ImmutableSetCopy;
import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -42,7 +42,7 @@
if (data != null && !data.isEmpty())
setInternalState(data);
else
- this.data = new HashMap<K, V>();
+ this.data = new FastCopyHashMap<K, V>();
setLockForChildInsertRemove(cache != null && cache.getConfiguration() != null && cache.getConfiguration().isLockParentForChildInsertRemove());
Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-07-29 10:21:39 UTC (rev 6419)
+++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-07-29 17:17:18 UTC (rev 6420)
@@ -13,6 +13,7 @@
import org.jboss.cache.commands.write.CreateNodeCommand;
import org.jboss.cache.invocation.InvocationContext;
import org.jboss.cache.marshall.MarshalledValue;
+import org.jboss.cache.util.FastCopyHashMap;
import org.jboss.cache.util.ImmutableSetCopy;
import org.jboss.cache.util.concurrent.SelfInitializingConcurrentHashMap;
@@ -42,7 +43,7 @@
/**
* Map of general data keys to values.
*/
- protected HashMap<K, V> data;
+ protected FastCopyHashMap<K, V> data;
protected NodeSPI<K, V> delegate;
CommandsFactory commandsFactory;
protected NodeFactory<K, V> nodeFactory;
@@ -90,7 +91,7 @@
public UnversionedNode(Fqn fqn, CacheSPI<K, V> cache, boolean lockForChildInsertRemove, Map<K, V> data)
{
this(fqn, cache, lockForChildInsertRemove);
- if (data != null) this.data = new HashMap<K, V>(data);
+ if (data != null) this.data = new FastCopyHashMap<K, V>(data);
}
/**
@@ -135,7 +136,7 @@
// does not need to be synchronized since this will only be accessed by a single thread in MVCC thanks to the write lock.
private void initDataMap()
{
- if (data == null) data = new HashMap<K, V>();
+ if (data == null) data = new FastCopyHashMap<K, V>();
}
public CacheSPI<K, V> getCache()
@@ -612,7 +613,7 @@
public InternalNode<K, V> copy()
{
UnversionedNode<K, V> n = new UnversionedNode<K, V>(fqn, cache, isFlagSet(LOCK_FOR_CHILD_INSERT_REMOVE));
- if (data != null) n.data = (HashMap<K, V>) data.clone();
+ if (data != null) n.data = (FastCopyHashMap<K, V>) data.clone();
copyInternals(n);
return n;
}
@@ -631,7 +632,7 @@
{
if (data == null)
{
- data = state == null ? new HashMap<K, V>() : new HashMap<K, V>(state);
+ data = state == null ? new FastCopyHashMap<K, V>() : new FastCopyHashMap<K, V>(state);
}
else
{
Modified: core/trunk/src/main/java/org/jboss/cache/util/FastCopyHashMap.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/FastCopyHashMap.java 2008-07-29 10:21:39 UTC (rev 6419)
+++ core/trunk/src/main/java/org/jboss/cache/util/FastCopyHashMap.java 2008-07-29 17:17:18 UTC (rev 6420)
@@ -42,28 +42,44 @@
{
private static final long serialVersionUID = 10929568968762L;
- /** Same default as HashMap, must be a power of 2 */
+ /**
+ * Same default as HashMap, must be a power of 2
+ */
private static final int DEFAULT_CAPACITY = 16;
- /** MAX_INT - 1 */
+ /**
+ * MAX_INT - 1
+ */
private static final int MAXIMUM_CAPACITY = 1 << 30;
- /** 67%, just like IdentityHashMap */
+ /**
+ * 67%, just like IdentityHashMap
+ */
private static final float DEFAULT_LOAD_FACTOR = 0.67f;
- /** The open-addressed table */
- private transient Entry<K,V>[] table;
+ /**
+ * The open-addressed table
+ */
+ private transient Entry<K, V>[] table;
- /** The current number of key-value pairs */
+ /**
+ * The current number of key-value pairs
+ */
private transient int size;
- /** The next resize */
+ /**
+ * The next resize
+ */
private transient int threshold;
- /** The user defined load factor which defines when to resize */
+ /**
+ * The user defined load factor which defines when to resize
+ */
private final float loadFactor;
- /** Counter used to detech changes made outside of an iterator */
+ /**
+ * Counter used to detech changes made outside of an iterator
+ */
private transient int modCount;
// Cached views
@@ -79,23 +95,29 @@
if (initialCapacity > MAXIMUM_CAPACITY)
initialCapacity = MAXIMUM_CAPACITY;
- if (! (loadFactor > 0F && loadFactor <= 1F))
+ if (!(loadFactor > 0F && loadFactor <= 1F))
throw new IllegalArgumentException("Load factor must be greater than 0 and less than or equal to 1");
this.loadFactor = loadFactor;
init(initialCapacity, loadFactor);
}
+ public FastCopyHashMap(Map<K, V> data)
+ {
+ this();
+ putAll(data);
+ }
+
private void init(int initialCapacity, float loadFactor)
{
int c = 1;
- for (; c < initialCapacity; c <<= 1);
+ for (; c < initialCapacity; c <<= 1) ;
@SuppressWarnings("unchecked")
- Entry<K,V>[] table = (Entry<K,V>[]) new Entry[c];
+ Entry<K, V>[] table = (Entry<K, V>[]) new Entry[c];
this.table = table;
- threshold = (int)(c * loadFactor);
+ threshold = (int) (c * loadFactor);
}
public FastCopyHashMap(int initialCapacity)
@@ -113,7 +135,7 @@
{
int h = key.hashCode();
h ^= (h >>> 20) ^ (h >>> 12);
- return h ^ (h >>> 7) ^ (h >>> 4);
+ return h ^ (h >>> 7) ^ (h >>> 4);
}
private int nextIndex(int index, int length)
@@ -151,7 +173,7 @@
int length = table.length;
int index = index(hash, length);
- for (;;)
+ for (; ;)
{
Entry<K, V> e = table[index];
if (e == null)
@@ -173,7 +195,7 @@
int length = table.length;
int index = index(hash, length);
- for (;;)
+ for (; ;)
{
Entry<K, V> e = table[index];
if (e == null)
@@ -208,7 +230,7 @@
int index = start;
- for (;;)
+ for (; ;)
{
Entry<K, V> e = table[index];
if (e == null)
@@ -243,10 +265,10 @@
return;
@SuppressWarnings("unchecked")
- Entry<K,V>[] newTable = new Entry[newLength];
- Entry<K,V>[] old = table;
+ Entry<K, V>[] newTable = new Entry[newLength];
+ Entry<K, V>[] old = table;
- for (Entry<K,V> e : old)
+ for (Entry<K, V> e : old)
{
if (e == null)
continue;
@@ -258,7 +280,7 @@
newTable[index] = e;
}
- threshold = (int)(loadFactor * newLength);
+ threshold = (int) (loadFactor * newLength);
table = newTable;
}
@@ -274,7 +296,7 @@
size = MAXIMUM_CAPACITY;
int length = table.length;
- for (; length < size; length <<= 1);
+ for (; length < size; length <<= 1) ;
resize(length);
}
@@ -288,12 +310,12 @@
if (key == null)
throw new IllegalArgumentException("Null keys are not allowed");
- Entry<K,V>[] table = this.table;
+ Entry<K, V>[] table = this.table;
int length = table.length;
int hash = hash(key);
int start = index(hash, length);
- for (int index = start;;)
+ for (int index = start; ;)
{
Entry<K, V> e = table[index];
if (e == null)
@@ -322,7 +344,7 @@
int length = table.length;
int current = nextIndex(start, length);
- for(;;)
+ for (; ;)
{
Entry<K, V> e = table[current];
if (e == null)
@@ -333,7 +355,7 @@
// entries to their optimal positions once a gap is created.
int prefer = index(e.hash, length);
if ((current < prefer && (prefer <= start || start <= current))
- || (prefer <= start && start <= current))
+ || (prefer <= start && start <= current))
{
table[start] = e;
table[current] = null;
@@ -359,7 +381,7 @@
try
{
@SuppressWarnings("unchecked")
- FastCopyHashMap<K,V> clone = (FastCopyHashMap<K,V>) super.clone();
+ FastCopyHashMap<K, V> clone = (FastCopyHashMap<K, V>) super.clone();
clone.table = table.clone();
clone.entrySet = null;
clone.values = null;
@@ -379,9 +401,9 @@
int total = 0;
int totalSkew = 0;
int maxSkew = 0;
- for (int i = 0; i< table.length; i++)
+ for (int i = 0; i < table.length; i++)
{
- Entry<K,V> e = table[i];
+ Entry<K, V> e = table[i];
if (e != null)
{
@@ -401,13 +423,13 @@
System.out.println(" Size: " + size);
System.out.println(" Real Size: " + total);
- System.out.println(" Optimal: " + optimal + " (" + (float) optimal * 100 / total + "%)");
+ System.out.println(" Optimal: " + optimal + " (" + (float) optimal * 100 / total + "%)");
System.out.println(" Average Distnce: " + ((float) totalSkew / (total - optimal)));
System.out.println(" Max Distance: " + maxSkew);
}
- public Set<Map.Entry<K,V>> entrySet()
+ public Set<Map.Entry<K, V>> entrySet()
{
if (entrySet == null)
entrySet = new EntrySet();
@@ -489,7 +511,8 @@
final int hash;
final V value;
- Entry(K key, int hash, V value) {
+ Entry(K key, int hash, V value)
+ {
this.key = key;
this.hash = hash;
this.value = value;
@@ -509,7 +532,7 @@
if (hasNext == true)
return true;
- Entry<K,V> table[] = this.table;
+ Entry<K, V> table[] = this.table;
for (int i = next; i < table.length; i++)
{
if (table[i] != null)
@@ -523,7 +546,7 @@
return false;
}
- protected Entry<K,V> nextEntry()
+ protected Entry<K, V> nextEntry()
{
if (modCount != expectedCount)
throw new ConcurrentModificationException();
@@ -554,7 +577,7 @@
// Start were we relocate
next = delete;
- Entry<K,V>[] table = this.table;
+ Entry<K, V>[] table = this.table;
if (table != FastCopyHashMap.this.table)
{
FastCopyHashMap.this.remove(table[delete].key);
@@ -570,7 +593,7 @@
table[delete] = null;
size--;
- for (;;)
+ for (; ;)
{
i = nextIndex(i, length);
Entry<K, V> e = table[i];
@@ -579,7 +602,7 @@
int prefer = index(e.hash, length);
if ((i < prefer && (prefer <= delete || delete <= i))
- || (prefer <= delete && delete <= i))
+ || (prefer <= delete && delete <= i))
{
// Snapshot the unseen portion of the table if we have
// to relocate an entry that was already seen by this iterator
@@ -587,7 +610,7 @@
{
int remaining = length - current;
@SuppressWarnings("unchecked")
- Entry<K, V>[] newTable = (Entry<K, V>[])new Entry[remaining];
+ Entry<K, V>[] newTable = (Entry<K, V>[]) new Entry[remaining];
System.arraycopy(table, current, newTable, 0, remaining);
// Replace iterator's table.
@@ -622,7 +645,7 @@
}
}
- private class EntryIterator extends FasyCopyHashMapIterator<Map.Entry<K,V>>
+ private class EntryIterator extends FasyCopyHashMapIterator<Map.Entry<K, V>>
{
private class WriteThroughEntry extends SimpleEntry<K, V>
{
@@ -640,9 +663,9 @@
}
}
- public Map.Entry<K,V> next()
+ public Map.Entry<K, V> next()
{
- Entry<K,V> e = nextEntry();
+ Entry<K, V> e = nextEntry();
return new WriteThroughEntry(e.key, e.value);
}
@@ -696,9 +719,9 @@
}
}
- private class EntrySet extends AbstractSet<Map.Entry<K,V>>
+ private class EntrySet extends AbstractSet<Map.Entry<K, V>>
{
- public Iterator<Map.Entry<K,V>> iterator()
+ public Iterator<Map.Entry<K, V>> iterator()
{
return new EntryIterator();
}
@@ -708,7 +731,7 @@
if (!(o instanceof Map.Entry))
return false;
- Map.Entry<?,?> entry = (Map.Entry<?,?>)o;
+ Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
Object value = get(entry.getKey());
return eq(entry.getValue(), value);
}
@@ -729,7 +752,7 @@
}
}
- protected static class SimpleEntry<K,V> implements Map.Entry<K, V>
+ protected static class SimpleEntry<K, V> implements Map.Entry<K, V>
{
private K key;
private V value;
@@ -740,7 +763,7 @@
this.value = value;
}
- SimpleEntry(Map.Entry<K,V> entry)
+ SimpleEntry(Map.Entry<K, V> entry)
{
this.key = entry.getKey();
this.value = entry.getValue();
@@ -770,14 +793,14 @@
if (!(o instanceof Map.Entry))
return false;
- Map.Entry<?,?> e = (Map.Entry<?,?>) o;
+ Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
return eq(key, e.getKey()) && eq(value, e.getValue());
}
public int hashCode()
{
return hash(key) ^
- (value == null ? 0 : hash(value));
+ (value == null ? 0 : hash(value));
}
public String toString()
15 years, 8 months
Build failed in Hudson: jboss-cache-core-2.2.X-jdk1.6 » JBoss Cache - Core Edition #15
by jboss-qa-internal＠redhat.com
See http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-2.2.X-jdk1.6/org.j...
------------------------------------------
[...truncated 70808 lines...]
-------------------------------------------------------
GMS: address is 127.0.0.1:44145
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44146
-------------------------------------------------------
TransactionTable for cache1 after cache1.put():
LocalTransactions: 1
GlobalTransactions: 1
tx2gtxMap:
org.jboss.cache.transaction.DummyTransaction@12bc407: GlobalTransaction:<127.0.0.1:44145>:27
gtx2EntryMap:
GlobalTransaction:<127.0.0.1:44145>:27: TransactionEntry
modificationList: [CreateNodeCommand{fqn=/one, newlyCreated=[/one]}, CreateNodeCommand{fqn=/one/two, newlyCreated=[/one/two]}, CreateNodeCommand{fqn=/one/two/three, newlyCreated=[/one/two/three]}, PutKeyValueCommand{fqn=/one/two/three, dataVersion=null, globalTransaction=GlobalTransaction:<127.0.0.1:44145>:27, key=age, value=38, oldValue=null}]
locks: [read owners=[GlobalTransaction:<127.0.0.1:44145>:27], write owner=GlobalTransaction:<127.0.0.1:44145>:27, write owner=GlobalTransaction:<127.0.0.1:44145>:27, write owner=GlobalTransaction:<127.0.0.1:44145>:27]
TransactionTable for cache2 after cache2.put():
LocalTransactions: 1
GlobalTransactions: 1
tx2gtxMap:
org.jboss.cache.transaction.DummyTransaction@12bc407: GlobalTransaction:<127.0.0.1:44146>:28
gtx2EntryMap:
GlobalTransaction:<127.0.0.1:44146>:28: TransactionEntry
modificationList: [CreateNodeCommand{fqn=/one, newlyCreated=[/one]}, CreateNodeCommand{fqn=/one/two, newlyCreated=[/one/two]}, CreateNodeCommand{fqn=/one/two/three, newlyCreated=[/one/two/three]}, PutKeyValueCommand{fqn=/one/two/three, dataVersion=null, globalTransaction=GlobalTransaction:<127.0.0.1:44146>:28, key=age, value=39, oldValue=null}]
locks: [read owners=[GlobalTransaction:<127.0.0.1:44146>:28], write owner=GlobalTransaction:<127.0.0.1:44146>:28, write owner=GlobalTransaction:<127.0.0.1:44146>:28, write owner=GlobalTransaction:<127.0.0.1:44146>:28]
cache1 before commit:
/one (write owner=GlobalTransaction:<127.0.0.1:44145>:27)
/two (write owner=GlobalTransaction:<127.0.0.1:44145>:27)
/three (write owner=GlobalTransaction:<127.0.0.1:44145>:27)
cache2 before commit:
/one (write owner=GlobalTransaction:<127.0.0.1:44146>:28)
/two (write owner=GlobalTransaction:<127.0.0.1:44146>:28)
/three (write owner=GlobalTransaction:<127.0.0.1:44146>:28)
Transaction was rolled back, this is correct
cache1 after commit:
cache2 after commit:
-------------------------------------------------------
GMS: address is 127.0.0.1:44147
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44148
-------------------------------------------------------
[Thread2] ** LOCK INFO cache1:
/bela (write owner=GlobalTransaction:<127.0.0.1:44147>:29)
/ban (write owner=GlobalTransaction:<127.0.0.1:44147>:29)
[Thread2] ** LOCK INFO cache2:
[Thread1] ** LOCK INFO cache1:
/bela
/ban
[Thread1] ** LOCK INFO cache2:
/bela
/ban
[Thread2] ** LOCK INFO cache1:
/bela (read owners=[GlobalTransaction:<127.0.0.1:44147>:30])
/ban (write owner=GlobalTransaction:<127.0.0.1:44147>:30)
[Thread2] ** LOCK INFO cache2:
/bela
/ban
[Thread2] ** LOCK INFO cache1:
/bela
/ban
[Thread2] ** LOCK INFO cache2:
/bela
/ban
Tests run: 17, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 142.72 sec
Running org.jboss.cache.notifications.NotificationThreadTest (of unit,functional)
-------------------------------------------------------
GMS: address is 127.0.0.1:44116
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44117
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44118
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44119
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44120
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44121
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44122
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44123
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44124
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44125
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44126
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44127
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44128
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44129
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44130
-------------------------------------------------------
-------------------------------------------------------
GMS: address is 127.0.0.1:44131
-------------------------------------------------------
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 48.675 sec
Running org.jboss.cache.commands.read.ExistsCommandTest (of unit,functional)
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.15 sec
Results :
Failed tests:
Tests run: 2750, Failures: 7, Errors: 0, Skipped: 0
[ERROR] There are test failures.
[HUDSON] Recording test results
[INFO] Preparing surefire-report:report-only
[INFO] Reloading plugin container for: org.apache.maven.plugins:maven-project-info-reports-plugin. The plugin artifact has changed.
[INFO] [enforcer:enforce {execution: enforce-java}]
[INFO] Preparing findbugs:findbugs
[INFO] [enforcer:enforce {execution: enforce-java}]
[INFO] [resources:resources]
[INFO] Using default encoding to copy filtered resources.
[INFO] [compiler:compile]
[INFO] Nothing to compile - all classes are up to date
[INFO] [site:site]
[FATAL ERROR] org.apache.maven.plugins.site.SiteMojo#execute() caused a linkage error (java.lang.NoClassDefFoundError) and may be out-of-date. Check the realms:
[FATAL ERROR] Plugin realm = app0.child-container[org.apache.maven.plugins:maven-site-plugin]
urls[0] = file:/home/hudson/.m2/repository/org/apache/maven/plugins/maven-site-plugin/2.0-beta-6/maven-site-plugin-2.0-beta-6.jar
urls[1] = file:/home/hudson/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar
urls[2] = file:/home/hudson/.m2/repository/org/apache/maven/doxia/doxia-module-xhtml/1.0-alpha-10/doxia-module-xhtml-1.0-alpha-10.jar
urls[3] = file:/home/hudson/.m2/repository/org/apache/maven/doxia/doxia-core/1.0-alpha-10/doxia-core-1.0-alpha-10.jar
urls[4] = file:/home/hudson/.m2/repository/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-10/doxia-decoration-model-1.0-alpha-10.jar
urls[5] = file:/home/hudson/.m2/repository/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-10/doxia-site-renderer-1.0-alpha-10.jar
urls[6] = file:/home/hudson/.m2/repository/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar
urls[7] = file:/home/hudson/.m2/repository/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar
urls[8] = file:/home/hudson/.m2/repository/org/apache/velocity/velocity/1.5/velocity-1.5.jar
urls[9] = file:/home/hudson/.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar
urls[10] = file:/home/hudson/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.jar
urls[11] = file:/home/hudson/.m2/repository/oro/oro/2.0.8/oro-2.0.8.jar
urls[12] = file:/home/hudson/.m2/repository/org/apache/maven/doxia/doxia-module-apt/1.0-alpha-10/doxia-module-apt-1.0-alpha-10.jar
urls[13] = file:/home/hudson/.m2/repository/org/apache/maven/doxia/doxia-module-fml/1.0-alpha-10/doxia-module-fml-1.0-alpha-10.jar
urls[14] = file:/home/hudson/.m2/repository/org/apache/maven/doxia/doxia-module-xdoc/1.0-alpha-10/doxia-module-xdoc-1.0-alpha-10.jar
urls[15] = file:/home/hudson/.m2/repository/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar
urls[16] = file:/home/hudson/.m2/repository/org/mortbay/jetty/jetty/6.1.5/jetty-6.1.5.jar
urls[17] = file:/home/hudson/.m2/repository/org/mortbay/jetty/jetty-util/6.1.5/jetty-util-6.1.5.jar
urls[18] = file:/home/hudson/.m2/repository/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.jar
[FATAL ERROR] Container realm = plexus.core.maven
urls[0] = file:/home/hudson/.m2/repository/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar
urls[1] = file:/home/hudson/.m2/repository/slide/slide-webdavlib/2.1/slide-webdavlib-2.1.jar
urls[2] = file:/home/hudson/.m2/repository/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar
urls[3] = file:/home/hudson/.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar
urls[4] = file:/home/hudson/.m2/repository/jdom/jdom/1.0/jdom-1.0.jar
urls[5] = file:/home/hudson/.m2/repository/de/zeigermann/xml/xml-im-exporter/1.1/xml-im-exporter-1.1.jar
urls[6] = file:/home/hudson/.m2/repository/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar
[HUDSON] Archiving /home/hudson/hudson_workspace/workspace/jboss-cache-core-2.2.X-jdk1.6/./pom.xml
[INFO] ------------------------------------------------------------------------
[ERROR] FATAL ERROR
[INFO] ------------------------------------------------------------------------
[INFO] org/apache/maven/model/PluginManagement
[INFO] ------------------------------------------------------------------------
[INFO] Trace
java.lang.NoClassDefFoundError: org/apache/maven/model/PluginManagement
at org.apache.maven.report.projectinfo.PluginManagementReport.canGenerateReport(PluginManagementReport.java:106)
at org.apache.maven.plugins.site.AbstractSiteRenderingMojo.filterReports(AbstractSiteRenderingMojo.java:421)
at org.apache.maven.plugins.site.SiteMojo.execute(SiteMojo.java:77)
at org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:451)
at hudson.maven.agent.PluginManagerInterceptor.executeMojo(PluginManagerInterceptor.java:136)
at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:558)
at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:499)
at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:478)
at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:330)
at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:291)
at org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:142)
at org.apache.maven.lifecycle.LifecycleExecutorInterceptor.execute(LifecycleExecutorInterceptor.java:42)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:336)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:129)
at org.apache.maven.cli.MavenCli.main(MavenCli.java:287)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315)
at org.codehaus.classworlds.Launcher.launch(Launcher.java:255)
at hudson.maven.agent.Main.launch(Main.java:97)
at hudson.maven.MavenBuilder.call(MavenBuilder.java:129)
at hudson.maven.MavenBuilder.call(MavenBuilder.java:52)
at hudson.remoting.UserRequest.perform(UserRequest.java:69)
at hudson.remoting.UserRequest.perform(UserRequest.java:23)
at hudson.remoting.Request$2.run(Request.java:200)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:885)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:907)
at java.lang.Thread.run(Thread.java:619)
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 140 minutes 48 seconds
[INFO] Finished at: Mon Jul 28 15:23:40 EDT 2008
[INFO] Final Memory: 37M/102M
[INFO] ------------------------------------------------------------------------
Waiting for Hudson to finish collecting data
15 years, 8 months
JBoss Cache SVN: r6419 - core/trunk/src/main/java/org/jboss/cache/util.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-29 06:21:39 -0400 (Tue, 29 Jul 2008)
New Revision: 6419
Modified:
core/trunk/src/main/java/org/jboss/cache/util/ImmutableListCopy.java
core/trunk/src/main/java/org/jboss/cache/util/ImmutableMapCopy.java
Log:
Fixed range check and made externalizable
Modified: core/trunk/src/main/java/org/jboss/cache/util/ImmutableListCopy.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/ImmutableListCopy.java 2008-07-29 10:16:53 UTC (rev 6418)
+++ core/trunk/src/main/java/org/jboss/cache/util/ImmutableListCopy.java 2008-07-29 10:21:39 UTC (rev 6419)
@@ -157,7 +157,7 @@
public final E get(int index)
{
- assertIndexInRange(index);
+ if (index >= size || index < 0) throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
return elements[index];
}
@@ -219,11 +219,6 @@
return new ImmutableSubList<E>(fromIndex, toIndex);
}
- private void assertIndexInRange(int index)
- {
- if (index >= size || index < 0) throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
- }
-
private class ImmutableIterator implements ListIterator<E>
{
int cursor = 0;
@@ -314,15 +309,10 @@
@SuppressWarnings("unchecked")
public final E get(int index)
{
- rangeCheck(index);
+ if (index < 0 || index >= size) throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
return (E) ImmutableListCopy.this.get(index + offset);
}
- private void rangeCheck(int index)
- {
- if (index < 0 || index >= size) throw new IndexOutOfBoundsException("Index: " + index + ",Size: " + size);
- }
-
public final int size()
{
return size;
@@ -355,7 +345,8 @@
@Override
public final ListIterator<E> listIterator(final int index)
{
- rangeCheck(index);
+ if (index < 0 || (index != 0 && index >= size))
+ throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
return new ListIterator<E>()
{
Modified: core/trunk/src/main/java/org/jboss/cache/util/ImmutableMapCopy.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/ImmutableMapCopy.java 2008-07-29 10:16:53 UTC (rev 6418)
+++ core/trunk/src/main/java/org/jboss/cache/util/ImmutableMapCopy.java 2008-07-29 10:21:39 UTC (rev 6419)
@@ -2,6 +2,10 @@
import net.jcip.annotations.Immutable;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.AbstractMap;
import java.util.Map;
import java.util.Set;
@@ -20,11 +24,18 @@
* @since 3.0
*/
@Immutable
-public class ImmutableMapCopy<K, V> extends AbstractMap<K, V>
+public class ImmutableMapCopy<K, V> extends AbstractMap<K, V> implements Externalizable // externalizable for client code that may serialize this map
{
- private final Entry<K, V>[] table;
- private final int size;
+ private Entry<K, V>[] table;
+ private int size;
+ /**
+ * For Externalizable
+ */
+ public ImmutableMapCopy()
+ {
+ }
+
@SuppressWarnings("unchecked")
public ImmutableMapCopy(Map<K, V> map)
{
@@ -66,6 +77,42 @@
return new ImmutableSetCopy<Map.Entry<K, V>>(table);
}
+ /**
+ * Format:
+ * - entry array size (int)
+ * - entry key-value pairs (Object, Object)
+ *
+ * @param out stream to write to
+ * @throws IOException
+ */
+ public void writeExternal(ObjectOutput out) throws IOException
+ {
+ out.writeInt(size);
+ for (Entry e : table)
+ {
+ out.writeObject(e.getKey());
+ out.writeObject(e.getValue());
+ }
+ }
+
+ /**
+ * See {@link #writeExternal(java.io.ObjectOutput)} for serialization format
+ *
+ * @param in stream
+ * @throws IOException
+ * @throws ClassNotFoundException
+ */
+ @SuppressWarnings("unchecked")
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+ {
+ size = in.readInt();
+ table = new Entry[size];
+ for (int i = 0; i < size; i++)
+ {
+ table[i] = new ImmutableEntry(in.readObject(), in.readObject());
+ }
+ }
+
private static class ImmutableEntry<K, V> implements Map.Entry<K, V>
{
K k;
@@ -77,6 +124,12 @@
v = entry.getValue();
}
+ private ImmutableEntry(K k, V v)
+ {
+ this.k = k;
+ this.v = v;
+ }
+
public K getKey()
{
return k;
15 years, 8 months
JBoss Cache SVN: r6418 - core/branches/2.2.X/src/main/java/org/jboss/cache/util.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-29 06:16:53 -0400 (Tue, 29 Jul 2008)
New Revision: 6418
Modified:
core/branches/2.2.X/src/main/java/org/jboss/cache/util/ImmutableListCopy.java
Log:
Fixed bug in range check
Modified: core/branches/2.2.X/src/main/java/org/jboss/cache/util/ImmutableListCopy.java
===================================================================
--- core/branches/2.2.X/src/main/java/org/jboss/cache/util/ImmutableListCopy.java 2008-07-28 18:42:56 UTC (rev 6417)
+++ core/branches/2.2.X/src/main/java/org/jboss/cache/util/ImmutableListCopy.java 2008-07-29 10:16:53 UTC (rev 6418)
@@ -313,15 +313,10 @@
@SuppressWarnings("unchecked")
public final E get(int index)
{
- rangeCheck(index);
+ if (index < 0 || index >= size) throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
return (E) ImmutableListCopy.this.get(index + offset);
}
- private void rangeCheck(int index)
- {
- if (index < 0 || index >= size) throw new IndexOutOfBoundsException("Index: " + index + ",Size: " + size);
- }
-
public final int size()
{
return size;
@@ -354,7 +349,8 @@
@Override
public final ListIterator<E> listIterator(final int index)
{
- rangeCheck(index);
+ if (index < 0 || (index != 0 && index >= size))
+ throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
return new ListIterator<E>()
{
15 years, 8 months
JBoss Cache SVN: r6417 - core/trunk/src/test/java/org/jboss/cache/loader.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-28 14:42:56 -0400 (Mon, 28 Jul 2008)
New Revision: 6417
Modified:
core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java
Log:
Disabled hanging test
Modified: core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java 2008-07-28 18:21:21 UTC (rev 6416)
+++ core/trunk/src/test/java/org/jboss/cache/loader/TcpCacheLoaderTest.java 2008-07-28 18:42:56 UTC (rev 6417)
@@ -29,7 +29,8 @@
* @author Bela Ban
* @version $Id$
*/
-@Test(groups = "functional")
+@Test(groups = "functional", enabled = false)
+// TODO re-enable!!
public class TcpCacheLoaderTest extends CacheLoaderTestsBase
{
protected static final int CACHE_SERVER_RESTART_DELAY_MS = 1000;
15 years, 8 months
JBoss Cache SVN: r6416 - in core/trunk/src: main/java/org/jboss/cache/util and 1 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-28 14:21:21 -0400 (Mon, 28 Jul 2008)
New Revision: 6416
Removed:
core/trunk/src/main/java/org/jboss/cache/util/MapCopy.java
core/trunk/src/test/java/org/jboss/cache/util/MapCopyTest.java
Modified:
core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java
Log:
Removed MapCopy and marshaller now knows how to deal with ImmutableMapCopy
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java 2008-07-28 11:29:12 UTC (rev 6415)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java 2008-07-28 18:21:21 UTC (rev 6416)
@@ -15,7 +15,7 @@
import org.jboss.cache.factories.annotations.Inject;
import org.jboss.cache.optimistic.DefaultDataVersion;
import org.jboss.cache.transaction.GlobalTransaction;
-import org.jboss.cache.util.MapCopy;
+import org.jboss.cache.util.ImmutableMapCopy;
import org.jgroups.Address;
import org.jgroups.stack.IpAddress;
@@ -63,7 +63,7 @@
protected static final int MAGICNUMBER_NODEDATA = 18;
protected static final int MAGICNUMBER_GRAVITATERESULT = 19;
protected static final int MAGICNUMBER_SHORT = 20;
- protected static final int MAGICNUMBER_MAPCOPY = 21;
+ protected static final int MAGICNUMBER_IMMUTABLE_MAPCOPY = 21;
protected static final int MAGICNUMBER_MARSHALLEDVALUE = 22;
protected static final int MAGICNUMBER_NULL = 99;
protected static final int MAGICNUMBER_SERIALIZABLE = 100;
@@ -341,9 +341,9 @@
out.writeByte(MAGICNUMBER_TREE_MAP);
marshallMap((Map) o, out, refMap);
}
- else if (o.getClass().equals(MapCopy.class))
+ else if (o.getClass().equals(ImmutableMapCopy.class))
{
- out.writeByte(MAGICNUMBER_MAPCOPY);
+ out.writeByte(MAGICNUMBER_IMMUTABLE_MAPCOPY);
marshallMap((Map) o, out, refMap);
}
else if (o.getClass().equals(HashSet.class))
@@ -584,7 +584,7 @@
return unmarshallHashSet(in, refMap);
case MAGICNUMBER_TREE_SET:
return unmarshallTreeSet(in, refMap);
- case MAGICNUMBER_MAPCOPY:
+ case MAGICNUMBER_IMMUTABLE_MAPCOPY:
return unmarshallMapCopy(in, refMap);
case MAGICNUMBER_BOOLEAN:
return in.readBoolean() ? Boolean.TRUE : Boolean.FALSE;
@@ -727,7 +727,7 @@
{
// read in as a HashMap first
Map m = unmarshallHashMap(in, refMap);
- return new MapCopy(m);
+ return new ImmutableMapCopy(m);
}
private Map unmarshallTreeMap(ObjectInputStream in, UnmarshalledReferences refMap) throws Exception
Deleted: core/trunk/src/main/java/org/jboss/cache/util/MapCopy.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/MapCopy.java 2008-07-28 11:29:12 UTC (rev 6415)
+++ core/trunk/src/main/java/org/jboss/cache/util/MapCopy.java 2008-07-28 18:21:21 UTC (rev 6416)
@@ -1,122 +0,0 @@
-package org.jboss.cache.util;
-
-import net.jcip.annotations.Immutable;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.AbstractMap;
-import java.util.AbstractSet;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Contains a fixed array of read-only map entries, from a copy of an existing map.
- * This class is more lightweight for places where the copied map will just be iterated over.
- * <p/>
- * This map is strictly read-only, and map modification methods (as well as modifications over iterators) will throw
- * {@link UnsupportedOperationException}s.
- *
- * @author Elias Ross
- * @deprecated see ImmutableMapCopy instead.
- */
-@Immutable
-@Deprecated
-public class MapCopy<K, V> extends AbstractMap<K, V> implements Serializable
-{
-
- private static final long serialVersionUID = -958813082188242956L;
-
- private final List<Entry<K, V>> data;
-
- private transient Set<Map.Entry<K, V>> entrySet;
-
- /**
- * Copies the supplied map to an internal array.
- *
- * @param m map to copy
- */
- public MapCopy(Map<K, V> m)
- {
- data = new ArrayList<Entry<K, V>>(m.size());
- for (Map.Entry<K, V> me : m.entrySet())
- {
- if (me == null)
- throw new NullPointerException();
- data.add(new SimpleImmutableEntry<K, V>(me));
- }
- init();
- }
-
- public MapCopy()
- {
- this((Map<K, V>) Collections.emptyMap());
- }
-
- /**
- * Returns a copy of the given map.
- */
- public static <L, W> Map<L, W> copy(Map<L, W> m)
- {
- return new MapCopy<L, W>(m);
- }
-
- private void init()
- {
- this.entrySet = new AbstractSet<Map.Entry<K, V>>()
- {
- @Override
- public int size()
- {
- return data.size();
- }
-
- @Override
- public Iterator<Map.Entry<K, V>> iterator()
- {
- return new EntryIterator();
- }
- };
- }
-
- private class EntryIterator implements Iterator<Entry<K, V>>
- {
- private int index;
-
- public boolean hasNext()
- {
- return index < data.size();
- }
-
- public Entry<K, V> next()
- {
- return data.get(index++);
- }
-
- public void remove()
- {
- throw new UnsupportedOperationException();
- }
- }
-
- @Override
- public Set<Map.Entry<K, V>> entrySet()
- {
- return entrySet;
- }
-
- @Override
- public int size()
- {
- return data.size();
- }
-
- private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException
- {
- in.defaultReadObject();
- init();
- }
-}
Deleted: core/trunk/src/test/java/org/jboss/cache/util/MapCopyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/MapCopyTest.java 2008-07-28 11:29:12 UTC (rev 6415)
+++ core/trunk/src/test/java/org/jboss/cache/util/MapCopyTest.java 2008-07-28 18:21:21 UTC (rev 6416)
@@ -1,155 +0,0 @@
-package org.jboss.cache.util;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jboss.util.stream.MarshalledValueInputStream;
-import org.jboss.util.stream.MarshalledValueOutputStream;
-import org.testng.annotations.Test;
-
-@Test(groups={"functional", "transaction"})
-public class MapCopyTest
-{
- public void testSerializable() throws Exception
- {
- HashMap<String, String> hm = new HashMap<String, String>();
- hm.put(null, null);
- hm.put("y", "z");
- MapCopy<String, String> mc = new MapCopy<String, String>(hm);
- assertEquals(hm, mc);
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(os);
- oos.writeObject(mc);
- ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(is);
- Object o = ois.readObject();
- assertEquals(hm, o);
- }
-
- public void testSerializableWithMarshalledValueStream() throws Exception
- {
- HashMap<String, String> hm = new HashMap<String, String>();
- hm.put(null, null);
- hm.put("y", "z");
- MapCopy<String, String> mc = new MapCopy<String, String>(hm);
- assertEquals(hm, mc);
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- ObjectOutputStream oos = new MarshalledValueOutputStream(os);
- oos.writeObject(mc);
- ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
- ObjectInputStream ois = new MarshalledValueInputStream(is);
- Object o = ois.readObject();
- assertEquals(hm, o);
- }
-
- public void testNull()
- {
- HashMap<String, String> hm = new HashMap<String, String>();
- hm.put(null, null);
- MapCopy<String, String> mc = new MapCopy<String, String>(hm);
- assertEquals(hm, mc);
- assertEquals(hm.toString(), mc.toString());
-
- hm.put(null, "x");
- hm.put("y", null);
- mc = new MapCopy<String, String>(hm);
- mc.toString();
- assertEquals(true, mc.containsKey("y"));
- }
-
- public void testAll()
- {
- HashMap<String, String> hm = new HashMap<String, String>();
- hm.put("a", "b");
- hm.put("b", "c");
- MapCopy<String, String> mc = new MapCopy<String, String>(hm);
- assertEquals(hm, mc);
- assertEquals(hm.size(), mc.size());
- try
- {
- mc.clear();
- fail("read only");
- }
- catch (UnsupportedOperationException e)
- {
- }
- HashMap<String, String> bhm = new HashMap<String, String>(hm);
- hm.put("b", "d");
- assertEquals(bhm, mc);
- Map.Entry<String, String> me = mc.entrySet().iterator().next();
- try
- {
- me.setValue("arg");
- fail("read only");
- }
- catch (UnsupportedOperationException e)
- {
- }
- }
-
- public void testModifications()
- {
- Map<String, String> hm = new HashMap<String, String>();
- hm.put("a", "b");
- Map<String, String> mc = new MapCopy<String, String>(hm);
-
- try
- {
- mc.put("x", "y");
- fail("should fail");
- }
- catch (UnsupportedOperationException uoe)
- {
- // ok
- }
-
- try
- {
- mc.remove("a");
- fail("should fail");
- }
- catch (UnsupportedOperationException uoe)
- {
- // ok
- }
-
- try
- {
- mc.keySet().iterator().remove();
- fail("should fail");
- }
- catch (UnsupportedOperationException uoe)
- {
- // ok
- }
-
- try
- {
- mc.entrySet().iterator().remove();
- fail("should fail");
- }
- catch (UnsupportedOperationException uoe)
- {
- // ok
- }
-
- try
- {
- mc.values().iterator().remove();
- fail("should fail");
- }
- catch (UnsupportedOperationException uoe)
- {
- // ok
- }
-
-
- }
-}
15 years, 8 months
JBoss Cache SVN: r6415 - core/branches/2.2.X/src/test/resources.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-28 07:29:12 -0400 (Mon, 28 Jul 2008)
New Revision: 6415
Modified:
core/branches/2.2.X/src/test/resources/log4j.xml
Log:
UPdated log settings
Modified: core/branches/2.2.X/src/test/resources/log4j.xml
===================================================================
--- core/branches/2.2.X/src/test/resources/log4j.xml 2008-07-28 10:56:29 UTC (rev 6414)
+++ core/branches/2.2.X/src/test/resources/log4j.xml 2008-07-28 11:29:12 UTC (rev 6415)
@@ -66,8 +66,8 @@
<!-- ======================= -->
<root>
+ <appender-ref ref="FILE"/>
<!--<appender-ref ref="CONSOLE"/>-->
- <appender-ref ref="FILE"/>
</root>
</log4j:configuration>
15 years, 8 months