From c486c1b4fbf5f3f3b5562ed5bb231d5ffef17545 Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 24 Dec 2008 16:18:09 +0000 Subject: [PATCH] Generics for o.a.c.tribes.tipis - Note that there may be more to come but AbstractReplicatedMap is a tricky beast for generics so these are just the 'easy' ones Fix various Eclipse warnings (unused code etc) git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@729330 13f79535-47bb-0310-9956-ffa450edef68 --- .../tribes/tipis/AbstractReplicatedMap.java | 50 ++++++++++------------ .../catalina/tribes/tipis/LazyReplicatedMap.java | 1 - .../catalina/tribes/tipis/ReplicatedMap.java | 1 - 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java index 08187c274..c75f90a1c 100644 --- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java +++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java @@ -105,7 +105,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements /** * A list of members in our map */ - protected transient HashMap mapMembers = new HashMap(); + protected transient HashMap mapMembers = new HashMap(); /** * Our default send options */ @@ -251,7 +251,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements if ( channel.getMembers().length > 0 ) { //send a ping, wait for all nodes to reply Response[] resp = rpcChannel.send(channel.getMembers(), - msg, rpcChannel.ALL_REPLY, + msg, RpcChannel.ALL_REPLY, (channelSendOptions), (int) accessTimeout); for (int i = 0; i < resp.length; i++) { @@ -297,7 +297,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements MapMessage msg = new MapMessage(this.mapContextName, msgtype, false, null, null, null, channel.getLocalMember(false), null); if ( rpc) { - Response[] resp = rpcChannel.send(channel.getMembers(), msg, rpcChannel.FIRST_REPLY, (channelSendOptions),rpcTimeout); + Response[] resp = rpcChannel.send(channel.getMembers(), msg, RpcChannel.FIRST_REPLY, (channelSendOptions),rpcTimeout); for (int i = 0; i < resp.length; i++) { mapMemberAdded(resp[i].getSource()); messageReceived(resp[i].getMessage(), resp[i].getSource()); @@ -344,7 +344,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements //------------------------------------------------------------------------------ // GROUP COM INTERFACES //------------------------------------------------------------------------------ - public Member[] getMapMembers(HashMap members) { + public Member[] getMapMembers(HashMap members) { synchronized (members) { Member[] result = new Member[members.size()]; members.keySet().toArray(result); @@ -357,7 +357,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements public Member[] getMapMembersExcl(Member[] exclude) { synchronized (mapMembers) { - HashMap list = (HashMap)mapMembers.clone(); + HashMap list = (HashMap)mapMembers.clone(); for (int i=0; i 0) { synchronized (stateMutex) { msg = (MapMessage) resp[0].getMessage(); @@ -483,20 +483,20 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements MapMessage mapmsg = (MapMessage) msg; //map init request - if (mapmsg.getMsgType() == mapmsg.MSG_INIT) { + if (mapmsg.getMsgType() == MapMessage.MSG_INIT) { mapmsg.setPrimary(channel.getLocalMember(false)); return mapmsg; } //map start request - if (mapmsg.getMsgType() == mapmsg.MSG_START) { + if (mapmsg.getMsgType() == MapMessage.MSG_START) { mapmsg.setPrimary(channel.getLocalMember(false)); mapMemberAdded(sender); return mapmsg; } //backup request - if (mapmsg.getMsgType() == mapmsg.MSG_RETRIEVE_BACKUP) { + if (mapmsg.getMsgType() == MapMessage.MSG_RETRIEVE_BACKUP) { MapEntry entry = (MapEntry)super.get(mapmsg.getKey()); if (entry == null || (!entry.isSerializable()) )return null; mapmsg.setValue( (Serializable) entry.getValue()); @@ -504,15 +504,15 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements } //state transfer request - if (mapmsg.getMsgType() == mapmsg.MSG_STATE || mapmsg.getMsgType() == mapmsg.MSG_STATE_COPY) { + if (mapmsg.getMsgType() == MapMessage.MSG_STATE || mapmsg.getMsgType() == MapMessage.MSG_STATE_COPY) { synchronized (stateMutex) { //make sure we dont do two things at the same time - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList(); Iterator i = super.entrySet().iterator(); while (i.hasNext()) { Map.Entry e = (Map.Entry) i.next(); MapEntry entry = (MapEntry) super.get(e.getKey()); if ( entry != null && entry.isSerializable() ) { - boolean copy = (mapmsg.getMsgType() == mapmsg.MSG_STATE_COPY); + boolean copy = (mapmsg.getMsgType() == MapMessage.MSG_STATE_COPY); MapMessage me = new MapMessage(mapContextName, copy?MapMessage.MSG_COPY:MapMessage.MSG_PROXY, false, (Serializable) entry.getKey(), copy?(Serializable) entry.getValue():null, null, entry.getPrimary(),entry.getBackupNodes()); @@ -695,14 +695,14 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements } public Member[] excludeFromSet(Member[] mbrs, Member[] set) { - ArrayList result = new ArrayList(); + ArrayList result = new ArrayList(); for (int i=0; i keys = keySet().iterator(); while (keys.hasNext()) remove(keys.next()); } else { @@ -1010,8 +1010,8 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements return super.size(); } - public Set entrySet() { - LinkedHashSet set = new LinkedHashSet(super.size()); + public Set entrySet() { + LinkedHashSet set = new LinkedHashSet(super.size()); Iterator i = super.entrySet().iterator(); while ( i.hasNext() ) { Map.Entry e = (Map.Entry)i.next(); @@ -1024,10 +1024,10 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements return Collections.unmodifiableSet(set); } - public Set keySet() { + public Set keySet() { //todo implement //should only return keys where this is active. - LinkedHashSet set = new LinkedHashSet(super.size()); + LinkedHashSet set = new LinkedHashSet(super.size()); Iterator i = super.entrySet().iterator(); while ( i.hasNext() ) { Map.Entry e = (Map.Entry)i.next(); @@ -1063,8 +1063,8 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements return size()==0; } - public Collection values() { - ArrayList values = new ArrayList(); + public Collection values() { + ArrayList values = new ArrayList(); Iterator i = super.entrySet().iterator(); while ( i.hasNext() ) { Map.Entry e = (Map.Entry)i.next(); @@ -1330,7 +1330,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements if ( value!=null ) return value; if ( valuedata == null || valuedata.length == 0 ) return null; value = XByteBuffer.deserialize(valuedata,0,valuedata.length,cls); - valuedata = null;; + valuedata = null; return value; } @@ -1346,10 +1346,6 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements return nodes; } - private void setBackUpNodes(Member[] nodes) { - this.nodes = nodes; - } - public Member getPrimary() { return primary; } diff --git a/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java index 4b8296cd0..78b4c1259 100644 --- a/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java +++ b/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java @@ -26,7 +26,6 @@ import org.apache.catalina.tribes.MembershipListener; import org.apache.catalina.tribes.group.RpcCallback; import org.apache.catalina.tribes.util.Arrays; import org.apache.catalina.tribes.UniqueId; -import org.apache.catalina.tribes.tipis.AbstractReplicatedMap.MapOwner; /** * A smart implementation of a stateful replicated map. uses primary/secondary backup strategy. diff --git a/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java index ce6357423..701887e63 100644 --- a/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java +++ b/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java @@ -24,7 +24,6 @@ import org.apache.catalina.tribes.ChannelListener; import org.apache.catalina.tribes.Member; import org.apache.catalina.tribes.MembershipListener; import org.apache.catalina.tribes.group.RpcCallback; -import org.apache.catalina.tribes.tipis.AbstractReplicatedMap.MapOwner; /** * All-to-all replication for a hash map implementation. Each node in the cluster will carry an identical -- 2.11.0