Author: edwardyoon
Date: Mon Jan 13 11:32:50 2014
New Revision: 1557680
URL: http://svn.apache.org/r1557680
Log:
HAMA-846: Renaming of HadoopMessageManager** classes
Added:
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HamaMessageManager.java
- copied, changed from r1556537,
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManager.java
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HamaMessageManagerImpl.java
- copied, changed from r1556537,
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java
hama/trunk/core/src/test/java/org/apache/hama/bsp/message/TestHamaMessageManager.java
- copied, changed from r1556537,
hama/trunk/core/src/test/java/org/apache/hama/bsp/message/TestHadoopMessageManager.java
Removed:
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManager.java
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java
hama/trunk/core/src/test/java/org/apache/hama/bsp/message/TestHadoopMessageManager.java
Modified:
hama/trunk/conf/hama-default.xml
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/MessageManagerFactory.java
Modified: hama/trunk/conf/hama-default.xml
URL:
http://svn.apache.org/viewvc/hama/trunk/conf/hama-default.xml?rev=1557680&r1=1557679&r2=1557680&view=diff
==============================================================================
--- hama/trunk/conf/hama-default.xml (original)
+++ hama/trunk/conf/hama-default.xml Mon Jan 13 11:32:50 2014
@@ -228,7 +228,7 @@
<property>
<name>hama.messenger.class</name>
- <value>org.apache.hama.bsp.message.HadoopMessageManagerImpl</value>
+ <value>org.apache.hama.bsp.message.HamaMessageManagerImpl</value>
</property>
<!-- The message compression is not recommended for a large production
environment -->
Copied:
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HamaMessageManager.java
(from r1556537,
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManager.java)
URL:
http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HamaMessageManager.java?p2=hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HamaMessageManager.java&p1=hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManager.java&r1=1556537&r2=1557680&rev=1557680&view=diff
==============================================================================
---
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManager.java
(original)
+++
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HamaMessageManager.java
Mon Jan 13 11:32:50 2014
@@ -25,10 +25,10 @@ import org.apache.hama.bsp.message.compr
import org.apache.hama.ipc.HamaRPCProtocolVersion;
/**
- * Hadoop RPC Interface for messaging.
+ * Hama RPC Interface for messaging.
*
*/
-public interface HadoopMessageManager<M extends Writable> extends
+public interface HamaMessageManager<M extends Writable> extends
HamaRPCProtocolVersion {
/**
Copied:
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HamaMessageManagerImpl.java
(from r1556537,
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java)
URL:
http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HamaMessageManagerImpl.java?p2=hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HamaMessageManagerImpl.java&p1=hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java&r1=1556537&r2=1557680&rev=1557680&view=diff
==============================================================================
---
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HadoopMessageManagerImpl.java
(original)
+++
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/HamaMessageManagerImpl.java
Mon Jan 13 11:32:50 2014
@@ -37,18 +37,18 @@ import org.apache.hama.ipc.RPC.Server;
import org.apache.hama.util.LRUCache;
/**
- * Implementation of the {@link HadoopMessageManager}.
+ * Implementation of the {@link HamaMessageManager}.
*
*/
-public final class HadoopMessageManagerImpl<M extends Writable> extends
- CompressableMessageManager<M> implements HadoopMessageManager<M> {
+public final class HamaMessageManagerImpl<M extends Writable> extends
+ CompressableMessageManager<M> implements HamaMessageManager<M> {
private static final Log LOG = LogFactory
- .getLog(HadoopMessageManagerImpl.class);
+ .getLog(HamaMessageManagerImpl.class);
private Server server;
- private LRUCache<InetSocketAddress, HadoopMessageManager<M>> peersLRUCache =
null;
+ private LRUCache<InetSocketAddress, HamaMessageManager<M>> peersLRUCache =
null;
@SuppressWarnings("serial")
@Override
@@ -57,13 +57,13 @@ public final class HadoopMessageManagerI
super.init(attemptId, peer, conf, peerAddress);
super.initCompression(conf);
startRPCServer(conf, peerAddress);
- peersLRUCache = new LRUCache<InetSocketAddress, HadoopMessageManager<M>>(
+ peersLRUCache = new LRUCache<InetSocketAddress, HamaMessageManager<M>>(
maxCachedConnections) {
@Override
protected final boolean removeEldestEntry(
- Map.Entry<InetSocketAddress, HadoopMessageManager<M>> eldest) {
+ Map.Entry<InetSocketAddress, HamaMessageManager<M>> eldest) {
if (size() > this.capacity) {
- HadoopMessageManager<M> proxy = eldest.getValue();
+ HamaMessageManager<M> proxy = eldest.getValue();
RPC.stopProxy(proxy);
return true;
}
@@ -103,7 +103,7 @@ public final class HadoopMessageManagerI
@Override
public final void transfer(InetSocketAddress addr, BSPMessageBundle<M>
bundle)
throws IOException {
- HadoopMessageManager<M> bspPeerConnection =
this.getBSPPeerConnection(addr);
+ HamaMessageManager<M> bspPeerConnection = this.getBSPPeerConnection(addr);
if (bspPeerConnection == null) {
throw new IllegalArgumentException("Can not find " + addr.toString()
+ " to transfer messages to!");
@@ -129,12 +129,12 @@ public final class HadoopMessageManagerI
* @throws IOException
*/
@SuppressWarnings("unchecked")
- protected final HadoopMessageManager<M> getBSPPeerConnection(
+ protected final HamaMessageManager<M> getBSPPeerConnection(
InetSocketAddress addr) throws IOException {
- HadoopMessageManager<M> bspPeerConnection;
+ HamaMessageManager<M> bspPeerConnection;
if (!peersLRUCache.containsKey(addr)) {
- bspPeerConnection = (HadoopMessageManager<M>) RPC.getProxy(
- HadoopMessageManager.class, HamaRPCProtocolVersion.versionID, addr,
+ bspPeerConnection = (HamaMessageManager<M>) RPC.getProxy(
+ HamaMessageManager.class, HamaRPCProtocolVersion.versionID, addr,
this.conf);
peersLRUCache.put(addr, bspPeerConnection);
} else {
Modified:
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/MessageManagerFactory.java
URL:
http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/bsp/message/MessageManagerFactory.java?rev=1557680&r1=1557679&r2=1557680&view=diff
==============================================================================
---
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/MessageManagerFactory.java
(original)
+++
hama/trunk/core/src/main/java/org/apache/hama/bsp/message/MessageManagerFactory.java
Mon Jan 13 11:32:50 2014
@@ -35,7 +35,7 @@ public class MessageManagerFactory {
Configuration conf) throws ClassNotFoundException {
return (MessageManager<M>) ReflectionUtils.newInstance(conf
.getClassByName(conf.get(MESSAGE_MANAGER_CLASS,
- org.apache.hama.bsp.message.HadoopMessageManagerImpl.class
+ org.apache.hama.bsp.message.HamaMessageManagerImpl.class
.getCanonicalName())), conf);
}
Copied:
hama/trunk/core/src/test/java/org/apache/hama/bsp/message/TestHamaMessageManager.java
(from r1556537,
hama/trunk/core/src/test/java/org/apache/hama/bsp/message/TestHadoopMessageManager.java)
URL:
http://svn.apache.org/viewvc/hama/trunk/core/src/test/java/org/apache/hama/bsp/message/TestHamaMessageManager.java?p2=hama/trunk/core/src/test/java/org/apache/hama/bsp/message/TestHamaMessageManager.java&p1=hama/trunk/core/src/test/java/org/apache/hama/bsp/message/TestHadoopMessageManager.java&r1=1556537&r2=1557680&rev=1557680&view=diff
==============================================================================
---
hama/trunk/core/src/test/java/org/apache/hama/bsp/message/TestHadoopMessageManager.java
(original)
+++
hama/trunk/core/src/test/java/org/apache/hama/bsp/message/TestHamaMessageManager.java
Mon Jan 13 11:32:50 2014
@@ -40,7 +40,7 @@ import org.apache.hama.bsp.message.queue
import org.apache.hama.bsp.message.queue.MessageTransferQueue;
import org.apache.hama.util.BSPNetUtils;
-public class TestHadoopMessageManager extends TestCase {
+public class TestHamaMessageManager extends TestCase {
public static final String TMP_OUTPUT_PATH = "/tmp/messageQueue";
// increment is here to solve race conditions in parallel execution to choose
@@ -69,7 +69,7 @@ public class TestHadoopMessageManager ex
MessageManager<IntWritable> messageManager = MessageManagerFactory
.getMessageManager(conf);
- assertTrue(messageManager instanceof HadoopMessageManagerImpl);
+ assertTrue(messageManager instanceof HamaMessageManagerImpl);
InetSocketAddress peer = new InetSocketAddress(
BSPNetUtils.getCanonicalHostname(), BSPNetUtils.getFreePort()
