You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by er...@apache.org on 2012/08/30 00:53:02 UTC
svn commit: r1378761 - in /giraph/trunk: ./
src/main/java/org/apache/giraph/comm/
src/main/java/org/apache/giraph/comm/messages/
src/main/java/org/apache/giraph/comm/netty/
src/main/java/org/apache/giraph/comm/netty/handler/
src/main/java/org/apache/gi...
Author: ereisman
Date: Wed Aug 29 22:53:00 2012
New Revision: 1378761
URL: http://svn.apache.org/viewvc?rev=1378761&view=rev
Log:
GIRAPH-317: Add subpackages to comm (Maja Kabiljo via ereisman)
Added:
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/ByteCounter.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/ByteCounter.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/ChannelRotater.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/ChannelRotater.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyClient.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/NettyClient.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyMasterClient.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/NettyMasterClient.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyMasterClientServer.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/NettyMasterClientServer.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyMasterServer.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/NettyMasterServer.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyServer.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/NettyServer.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyWorkerClient.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/NettyWorkerClient.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyWorkerClientServer.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/NettyWorkerClientServer.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyWorkerServer.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/NettyWorkerServer.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/AddressRequestIdGenerator.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/AddressRequestIdGenerator.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/ClientRequestId.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/ClientRequestId.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/MasterRequestServerHandler.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/MasterRequestServerHandler.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestDecoder.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/RequestDecoder.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestEncoder.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/RequestEncoder.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestInfo.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/RequestInfo.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestServerHandler.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/RequestServerHandler.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/ResponseClientHandler.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/ResponseClientHandler.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/WorkerRequestReservedMap.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/WorkerRequestReservedMap.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/WorkerRequestServerHandler.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/WorkerRequestServerHandler.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/package-info.java
giraph/trunk/src/main/java/org/apache/giraph/comm/netty/package-info.java
giraph/trunk/src/main/java/org/apache/giraph/comm/requests/
giraph/trunk/src/main/java/org/apache/giraph/comm/requests/MasterRequest.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/MasterRequest.java
giraph/trunk/src/main/java/org/apache/giraph/comm/requests/RequestType.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/RequestType.java
giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendPartitionCurrentMessagesRequest.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/messages/SendPartitionCurrentMessagesRequest.java
giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendPartitionMessagesRequest.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMessagesRequest.java
giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendPartitionMutationsRequest.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMutationsRequest.java
giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendVertexRequest.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/SendVertexRequest.java
giraph/trunk/src/main/java/org/apache/giraph/comm/requests/WorkerRequest.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/WorkerRequest.java
giraph/trunk/src/main/java/org/apache/giraph/comm/requests/WritableRequest.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/WritableRequest.java
giraph/trunk/src/main/java/org/apache/giraph/comm/requests/package-info.java
giraph/trunk/src/main/java/org/apache/giraph/utils/ArrayListWritable.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/ArrayListWritable.java
giraph/trunk/src/main/java/org/apache/giraph/utils/IncreasingBitSet.java
- copied, changed from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/IncreasingBitSet.java
Removed:
giraph/trunk/src/main/java/org/apache/giraph/comm/AddressRequestIdGenerator.java
giraph/trunk/src/main/java/org/apache/giraph/comm/ArrayListWritable.java
giraph/trunk/src/main/java/org/apache/giraph/comm/ByteCounter.java
giraph/trunk/src/main/java/org/apache/giraph/comm/ChannelRotater.java
giraph/trunk/src/main/java/org/apache/giraph/comm/ClientRequestId.java
giraph/trunk/src/main/java/org/apache/giraph/comm/IncreasingBitSet.java
giraph/trunk/src/main/java/org/apache/giraph/comm/MasterRequest.java
giraph/trunk/src/main/java/org/apache/giraph/comm/MasterRequestServerHandler.java
giraph/trunk/src/main/java/org/apache/giraph/comm/NettyClient.java
giraph/trunk/src/main/java/org/apache/giraph/comm/NettyMasterClient.java
giraph/trunk/src/main/java/org/apache/giraph/comm/NettyMasterClientServer.java
giraph/trunk/src/main/java/org/apache/giraph/comm/NettyMasterServer.java
giraph/trunk/src/main/java/org/apache/giraph/comm/NettyServer.java
giraph/trunk/src/main/java/org/apache/giraph/comm/NettyWorkerClient.java
giraph/trunk/src/main/java/org/apache/giraph/comm/NettyWorkerClientServer.java
giraph/trunk/src/main/java/org/apache/giraph/comm/NettyWorkerServer.java
giraph/trunk/src/main/java/org/apache/giraph/comm/RequestDecoder.java
giraph/trunk/src/main/java/org/apache/giraph/comm/RequestEncoder.java
giraph/trunk/src/main/java/org/apache/giraph/comm/RequestInfo.java
giraph/trunk/src/main/java/org/apache/giraph/comm/RequestServerHandler.java
giraph/trunk/src/main/java/org/apache/giraph/comm/RequestType.java
giraph/trunk/src/main/java/org/apache/giraph/comm/ResponseClientHandler.java
giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMessagesRequest.java
giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMutationsRequest.java
giraph/trunk/src/main/java/org/apache/giraph/comm/SendVertexRequest.java
giraph/trunk/src/main/java/org/apache/giraph/comm/WorkerRequest.java
giraph/trunk/src/main/java/org/apache/giraph/comm/WorkerRequestReservedMap.java
giraph/trunk/src/main/java/org/apache/giraph/comm/WorkerRequestServerHandler.java
giraph/trunk/src/main/java/org/apache/giraph/comm/WritableRequest.java
giraph/trunk/src/main/java/org/apache/giraph/comm/messages/SendPartitionCurrentMessagesRequest.java
Modified:
giraph/trunk/CHANGELOG
giraph/trunk/src/main/java/org/apache/giraph/comm/MsgList.java
giraph/trunk/src/main/java/org/apache/giraph/comm/VertexIdMessagesList.java
giraph/trunk/src/main/java/org/apache/giraph/comm/VertexList.java
giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleTriangleClosingVertex.java
giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceMaster.java
giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceWorker.java
giraph/trunk/src/test/java/org/apache/giraph/comm/ConnectionTest.java
giraph/trunk/src/test/java/org/apache/giraph/comm/IncreasingBitSetTest.java
giraph/trunk/src/test/java/org/apache/giraph/comm/RequestFailureTest.java
giraph/trunk/src/test/java/org/apache/giraph/comm/RequestTest.java
Modified: giraph/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1378761&r1=1378760&r2=1378761&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Wed Aug 29 22:53:00 2012
@@ -2,6 +2,8 @@ Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-317: Add subpackages to comm (Maja Kabiljo via ereisman)
+
GIRAPH-301: InputSplit Reservations are clumping, leaving many workers
asleep while other process too many splits and get overloaded.
(Eli Reisman via apresta)
Modified: giraph/trunk/src/main/java/org/apache/giraph/comm/MsgList.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/MsgList.java?rev=1378761&r1=1378760&r2=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/MsgList.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/MsgList.java Wed Aug 29 22:53:00 2012
@@ -19,6 +19,7 @@
package org.apache.giraph.comm;
import org.apache.giraph.graph.BspUtils;
+import org.apache.giraph.utils.ArrayListWritable;
import org.apache.hadoop.io.Writable;
/**
Modified: giraph/trunk/src/main/java/org/apache/giraph/comm/VertexIdMessagesList.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/VertexIdMessagesList.java?rev=1378761&r1=1378760&r2=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/VertexIdMessagesList.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/VertexIdMessagesList.java Wed Aug 29 22:53:00 2012
@@ -18,6 +18,7 @@
package org.apache.giraph.comm;
+import org.apache.giraph.utils.ArrayListWritable;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
Modified: giraph/trunk/src/main/java/org/apache/giraph/comm/VertexList.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/VertexList.java?rev=1378761&r1=1378760&r2=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/VertexList.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/VertexList.java Wed Aug 29 22:53:00 2012
@@ -20,6 +20,7 @@ package org.apache.giraph.comm;
import org.apache.giraph.graph.Vertex;
import org.apache.giraph.graph.BspUtils;
+import org.apache.giraph.utils.ArrayListWritable;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/ByteCounter.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/ByteCounter.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/ByteCounter.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/ByteCounter.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/ByteCounter.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/ByteCounter.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/ByteCounter.java Wed Aug 29 22:53:00 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty;
import java.text.DecimalFormat;
import java.util.concurrent.atomic.AtomicLong;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/ChannelRotater.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/ChannelRotater.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/ChannelRotater.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/ChannelRotater.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/ChannelRotater.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/ChannelRotater.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/ChannelRotater.java Wed Aug 29 22:53:00 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty;
import java.util.Collection;
import java.util.List;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyClient.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/NettyClient.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyClient.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyClient.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/NettyClient.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/NettyClient.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyClient.java Wed Aug 29 22:53:00 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty;
import com.google.common.collect.Lists;
import com.google.common.collect.MapMaker;
@@ -31,6 +31,13 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.giraph.comm.netty.handler.AddressRequestIdGenerator;
+import org.apache.giraph.comm.netty.handler.ClientRequestId;
+import org.apache.giraph.comm.netty.handler.RequestServerHandler;
+import org.apache.giraph.comm.netty.handler.ResponseClientHandler;
+import org.apache.giraph.comm.netty.handler.RequestEncoder;
+import org.apache.giraph.comm.netty.handler.RequestInfo;
+import org.apache.giraph.comm.requests.WritableRequest;
import org.apache.giraph.graph.GiraphJob;
import org.apache.giraph.utils.TimedLogger;
import org.apache.hadoop.conf.Configuration;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyMasterClient.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/NettyMasterClient.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyMasterClient.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyMasterClient.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/NettyMasterClient.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/NettyMasterClient.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyMasterClient.java Wed Aug 29 22:53:00 2012
@@ -16,8 +16,9 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty;
+import org.apache.giraph.comm.MasterClient;
import org.apache.giraph.graph.WorkerInfo;
import org.apache.hadoop.mapreduce.Mapper;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyMasterClientServer.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/NettyMasterClientServer.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyMasterClientServer.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyMasterClientServer.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/NettyMasterClientServer.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/NettyMasterClientServer.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyMasterClientServer.java Wed Aug 29 22:53:00 2012
@@ -16,8 +16,11 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty;
+import org.apache.giraph.comm.MasterClient;
+import org.apache.giraph.comm.MasterClientServer;
+import org.apache.giraph.comm.MasterServer;
import org.apache.giraph.graph.WorkerInfo;
import org.apache.hadoop.mapreduce.Mapper;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyMasterServer.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/NettyMasterServer.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyMasterServer.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyMasterServer.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/NettyMasterServer.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/NettyMasterServer.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyMasterServer.java Wed Aug 29 22:53:00 2012
@@ -16,8 +16,10 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty;
+import org.apache.giraph.comm.netty.handler.MasterRequestServerHandler;
+import org.apache.giraph.comm.MasterServer;
import org.apache.hadoop.conf.Configuration;
import java.net.InetSocketAddress;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyServer.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/NettyServer.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyServer.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyServer.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/NettyServer.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/NettyServer.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyServer.java Wed Aug 29 22:53:00 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@@ -24,8 +24,10 @@ import java.net.UnknownHostException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import org.apache.giraph.comm.netty.handler.WorkerRequestReservedMap;
+import org.apache.giraph.comm.netty.handler.RequestDecoder;
import org.apache.giraph.graph.GiraphJob;
-import org.apache.giraph.comm.RequestServerHandler.RequestServerHandlerFactory;
+import org.apache.giraph.comm.netty.handler.RequestServerHandler;
import org.apache.hadoop.conf.Configuration;
import org.apache.log4j.Logger;
import org.jboss.netty.bootstrap.ServerBootstrap;
@@ -65,7 +67,7 @@ public class NettyServer {
/** TCP backlog */
private final int tcpBacklog;
/** Factory for {@link RequestServerHandler} */
- private final RequestServerHandlerFactory requestServerHandlerFactory;
+ private final RequestServerHandler.Factory requestServerHandlerFactory;
/** Server bootstrap */
private ServerBootstrap bootstrap;
/** Byte counter for this client */
@@ -88,7 +90,7 @@ public class NettyServer {
* @param requestServerHandlerFactory Factory for request handlers
*/
public NettyServer(Configuration conf,
- RequestServerHandlerFactory requestServerHandlerFactory) {
+ RequestServerHandler.Factory requestServerHandlerFactory) {
this.conf = conf;
this.requestServerHandlerFactory = requestServerHandlerFactory;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyWorkerClient.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/NettyWorkerClient.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyWorkerClient.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyWorkerClient.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/NettyWorkerClient.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/NettyWorkerClient.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyWorkerClient.java Wed Aug 29 22:53:00 2012
@@ -16,13 +16,22 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty;
import com.google.common.collect.Sets;
import java.util.Set;
import org.apache.giraph.bsp.CentralizedServiceWorker;
+import org.apache.giraph.comm.SendMessageCache;
+import org.apache.giraph.comm.SendMutationsCache;
+import org.apache.giraph.comm.ServerData;
+import org.apache.giraph.comm.WorkerClient;
import org.apache.giraph.comm.messages.MessageStoreByPartition;
-import org.apache.giraph.comm.messages.SendPartitionCurrentMessagesRequest;
+import org.apache.giraph.comm.requests.SendPartitionCurrentMessagesRequest;
+import org.apache.giraph.comm.requests.SendPartitionMessagesRequest;
+import org.apache.giraph.comm.requests.SendPartitionMutationsRequest;
+import org.apache.giraph.comm.requests.SendVertexRequest;
+import org.apache.giraph.comm.requests.WorkerRequest;
+import org.apache.giraph.comm.requests.WritableRequest;
import org.apache.giraph.graph.Edge;
import org.apache.giraph.graph.GiraphJob;
import org.apache.giraph.graph.Vertex;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyWorkerClientServer.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/NettyWorkerClientServer.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyWorkerClientServer.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyWorkerClientServer.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/NettyWorkerClientServer.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/NettyWorkerClientServer.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyWorkerClientServer.java Wed Aug 29 22:53:00 2012
@@ -16,9 +16,13 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty;
import org.apache.giraph.bsp.CentralizedServiceWorker;
+import org.apache.giraph.comm.ServerData;
+import org.apache.giraph.comm.WorkerClient;
+import org.apache.giraph.comm.WorkerClientServer;
+import org.apache.giraph.comm.WorkerServer;
import org.apache.giraph.graph.Edge;
import org.apache.giraph.graph.Vertex;
import org.apache.giraph.graph.WorkerInfo;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyWorkerServer.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/NettyWorkerServer.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyWorkerServer.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyWorkerServer.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/NettyWorkerServer.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/NettyWorkerServer.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyWorkerServer.java Wed Aug 29 22:53:00 2012
@@ -16,9 +16,12 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty;
import org.apache.giraph.bsp.CentralizedServiceWorker;
+import org.apache.giraph.comm.ServerData;
+import org.apache.giraph.comm.netty.handler.WorkerRequestServerHandler;
+import org.apache.giraph.comm.WorkerServer;
import org.apache.giraph.comm.messages.BasicMessageStore;
import org.apache.giraph.comm.messages.DiskBackedMessageStore;
import org.apache.giraph.comm.messages.DiskBackedMessageStoreByPartition;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/AddressRequestIdGenerator.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/AddressRequestIdGenerator.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/AddressRequestIdGenerator.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/AddressRequestIdGenerator.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/AddressRequestIdGenerator.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/AddressRequestIdGenerator.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/AddressRequestIdGenerator.java Wed Aug 29 22:53:00 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty.handler;
import com.google.common.collect.Maps;
import java.net.InetSocketAddress;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/ClientRequestId.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/ClientRequestId.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/ClientRequestId.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/ClientRequestId.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/ClientRequestId.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/ClientRequestId.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/ClientRequestId.java Wed Aug 29 22:53:00 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty.handler;
/**
* Simple immutable object to use for tracking requests uniquely. This
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/MasterRequestServerHandler.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/MasterRequestServerHandler.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/MasterRequestServerHandler.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/MasterRequestServerHandler.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/MasterRequestServerHandler.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/MasterRequestServerHandler.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/MasterRequestServerHandler.java Wed Aug 29 22:53:00 2012
@@ -16,8 +16,9 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty.handler;
+import org.apache.giraph.comm.requests.MasterRequest;
import org.apache.hadoop.conf.Configuration;
/** Handler for requests on master */
@@ -42,7 +43,7 @@ public class MasterRequestServerHandler
/**
* Factory for {@link MasterRequestServerHandler}
*/
- public static class Factory implements RequestServerHandlerFactory {
+ public static class Factory implements RequestServerHandler.Factory {
@Override
public RequestServerHandler newHandler(
WorkerRequestReservedMap workerRequestReservedMap,
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestDecoder.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/RequestDecoder.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestDecoder.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestDecoder.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/RequestDecoder.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/RequestDecoder.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestDecoder.java Wed Aug 29 22:53:00 2012
@@ -16,8 +16,11 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty.handler;
+import org.apache.giraph.comm.netty.ByteCounter;
+import org.apache.giraph.comm.requests.RequestType;
+import org.apache.giraph.comm.requests.WritableRequest;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.util.ReflectionUtils;
import org.apache.log4j.Logger;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestEncoder.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/RequestEncoder.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestEncoder.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestEncoder.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/RequestEncoder.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/RequestEncoder.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestEncoder.java Wed Aug 29 22:53:00 2012
@@ -16,8 +16,9 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty.handler;
+import org.apache.giraph.comm.requests.WritableRequest;
import org.apache.log4j.Logger;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBufferOutputStream;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestInfo.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/RequestInfo.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestInfo.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestInfo.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/RequestInfo.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/RequestInfo.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestInfo.java Wed Aug 29 22:53:00 2012
@@ -16,10 +16,12 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty.handler;
import java.net.InetSocketAddress;
import java.util.Date;
+
+import org.apache.giraph.comm.requests.WritableRequest;
import org.jboss.netty.channel.ChannelFuture;
/**
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestServerHandler.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/RequestServerHandler.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestServerHandler.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestServerHandler.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/RequestServerHandler.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/RequestServerHandler.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/RequestServerHandler.java Wed Aug 29 22:53:00 2012
@@ -16,8 +16,9 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty.handler;
+import org.apache.giraph.comm.requests.WritableRequest;
import org.apache.giraph.graph.GiraphJob;
import org.apache.hadoop.conf.Configuration;
import org.apache.log4j.Logger;
@@ -143,7 +144,7 @@ public abstract class RequestServerHandl
/**
* Factory for {@link RequestServerHandler}
*/
- public interface RequestServerHandlerFactory {
+ public interface Factory {
/**
* Create new {@link RequestServerHandler}
*
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/ResponseClientHandler.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/ResponseClientHandler.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/ResponseClientHandler.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/ResponseClientHandler.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/ResponseClientHandler.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/ResponseClientHandler.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/ResponseClientHandler.java Wed Aug 29 22:53:00 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty.handler;
import java.io.IOException;
import java.util.concurrent.ConcurrentMap;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/WorkerRequestReservedMap.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/WorkerRequestReservedMap.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/WorkerRequestReservedMap.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/WorkerRequestReservedMap.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/WorkerRequestReservedMap.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/WorkerRequestReservedMap.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/WorkerRequestReservedMap.java Wed Aug 29 22:53:00 2012
@@ -16,10 +16,13 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty.handler;
import com.google.common.collect.MapMaker;
import java.util.concurrent.ConcurrentMap;
+
+import org.apache.giraph.utils.IncreasingBitSet;
+import org.apache.giraph.comm.netty.NettyServer;
import org.apache.giraph.graph.GiraphJob;
import org.apache.hadoop.conf.Configuration;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/WorkerRequestServerHandler.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/WorkerRequestServerHandler.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/WorkerRequestServerHandler.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/WorkerRequestServerHandler.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/WorkerRequestServerHandler.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/WorkerRequestServerHandler.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/WorkerRequestServerHandler.java Wed Aug 29 22:53:00 2012
@@ -16,8 +16,10 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.netty.handler;
+import org.apache.giraph.comm.ServerData;
+import org.apache.giraph.comm.requests.WorkerRequest;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
@@ -58,7 +60,7 @@ public class WorkerRequestServerHandler<
/** Factory for {@link WorkerRequestServerHandler} */
public static class Factory<I extends WritableComparable,
V extends Writable, E extends Writable, M extends Writable> implements
- RequestServerHandlerFactory {
+ RequestServerHandler.Factory {
/** Data that can be accessed for handling requests */
private final ServerData<I, V, E, M> serverData;
Added: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/package-info.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/package-info.java?rev=1378761&view=auto
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/package-info.java (added)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/handler/package-info.java Wed Aug 29 22:53:00 2012
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Package for classes which handle requests and responses.
+ */
+package org.apache.giraph.comm.netty.handler;
Added: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/package-info.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/package-info.java?rev=1378761&view=auto
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/netty/package-info.java (added)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/package-info.java Wed Aug 29 22:53:00 2012
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Package for netty implementations.
+ */
+package org.apache.giraph.comm.netty;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/requests/MasterRequest.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/MasterRequest.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/requests/MasterRequest.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/requests/MasterRequest.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/MasterRequest.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/MasterRequest.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/requests/MasterRequest.java Wed Aug 29 22:53:00 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.requests;
/**
* Interface for requests sent to master to extend
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/requests/RequestType.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/RequestType.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/requests/RequestType.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/requests/RequestType.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/RequestType.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/RequestType.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/requests/RequestType.java Wed Aug 29 22:53:00 2012
@@ -16,9 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
-
-import org.apache.giraph.comm.messages.SendPartitionCurrentMessagesRequest;
+package org.apache.giraph.comm.requests;
/**
* Type of the request
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendPartitionCurrentMessagesRequest.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/messages/SendPartitionCurrentMessagesRequest.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendPartitionCurrentMessagesRequest.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendPartitionCurrentMessagesRequest.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/messages/SendPartitionCurrentMessagesRequest.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/messages/SendPartitionCurrentMessagesRequest.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendPartitionCurrentMessagesRequest.java Wed Aug 29 22:53:00 2012
@@ -16,10 +16,8 @@
* limitations under the License.
*/
-package org.apache.giraph.comm.messages;
+package org.apache.giraph.comm.requests;
-import org.apache.giraph.comm.RequestType;
-import org.apache.giraph.comm.SendPartitionMessagesRequest;
import org.apache.giraph.comm.ServerData;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendPartitionMessagesRequest.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMessagesRequest.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendPartitionMessagesRequest.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendPartitionMessagesRequest.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMessagesRequest.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMessagesRequest.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendPartitionMessagesRequest.java Wed Aug 29 22:53:00 2012
@@ -16,8 +16,9 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.requests;
+import org.apache.giraph.comm.ServerData;
import org.apache.giraph.graph.BspUtils;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendPartitionMutationsRequest.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMutationsRequest.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendPartitionMutationsRequest.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendPartitionMutationsRequest.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMutationsRequest.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMutationsRequest.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendPartitionMutationsRequest.java Wed Aug 29 22:53:00 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.requests;
import java.io.DataInput;
import java.io.DataOutput;
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.giraph.comm.ServerData;
import org.apache.giraph.graph.BspUtils;
import org.apache.giraph.graph.VertexMutations;
import org.apache.hadoop.io.Writable;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendVertexRequest.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/SendVertexRequest.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendVertexRequest.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendVertexRequest.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/SendVertexRequest.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/SendVertexRequest.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/requests/SendVertexRequest.java Wed Aug 29 22:53:00 2012
@@ -16,8 +16,9 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.requests;
+import org.apache.giraph.comm.ServerData;
import org.apache.giraph.graph.BspUtils;
import org.apache.giraph.graph.Vertex;
import org.apache.hadoop.io.Writable;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/requests/WorkerRequest.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/WorkerRequest.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/requests/WorkerRequest.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/requests/WorkerRequest.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/WorkerRequest.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/WorkerRequest.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/requests/WorkerRequest.java Wed Aug 29 22:53:00 2012
@@ -16,8 +16,9 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.requests;
+import org.apache.giraph.comm.ServerData;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
Copied: giraph/trunk/src/main/java/org/apache/giraph/comm/requests/WritableRequest.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/WritableRequest.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/requests/WritableRequest.java?p2=giraph/trunk/src/main/java/org/apache/giraph/comm/requests/WritableRequest.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/WritableRequest.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/WritableRequest.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/requests/WritableRequest.java Wed Aug 29 22:53:00 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.comm.requests;
import java.io.DataInput;
import java.io.DataOutput;
Added: giraph/trunk/src/main/java/org/apache/giraph/comm/requests/package-info.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/requests/package-info.java?rev=1378761&view=auto
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/requests/package-info.java (added)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/requests/package-info.java Wed Aug 29 22:53:00 2012
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Package for requests.
+ */
+package org.apache.giraph.comm.requests;
Modified: giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleTriangleClosingVertex.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleTriangleClosingVertex.java?rev=1378761&r1=1378760&r2=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleTriangleClosingVertex.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleTriangleClosingVertex.java Wed Aug 29 22:53:00 2012
@@ -18,10 +18,9 @@
package org.apache.giraph.examples;
-import org.apache.giraph.examples.SimpleTriangleClosingVertex.Pair;
import org.apache.giraph.graph.Edge;
import org.apache.giraph.graph.EdgeListVertex;
-import org.apache.giraph.comm.ArrayListWritable;
+import org.apache.giraph.utils.ArrayListWritable;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.NullWritable;
Modified: giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceMaster.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceMaster.java?rev=1378761&r1=1378760&r2=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceMaster.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceMaster.java Wed Aug 29 22:53:00 2012
@@ -24,7 +24,7 @@ import org.apache.giraph.bsp.BspInputFor
import org.apache.giraph.bsp.CentralizedServiceMaster;
import org.apache.giraph.bsp.SuperstepState;
import org.apache.giraph.comm.MasterClientServer;
-import org.apache.giraph.comm.NettyMasterClientServer;
+import org.apache.giraph.comm.netty.NettyMasterClientServer;
import org.apache.giraph.graph.GraphMapper.MapFunctions;
import org.apache.giraph.graph.partition.MasterGraphPartitioner;
import org.apache.giraph.graph.partition.PartitionOwner;
Modified: giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceWorker.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceWorker.java?rev=1378761&r1=1378760&r2=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceWorker.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceWorker.java Wed Aug 29 22:53:00 2012
@@ -20,10 +20,10 @@ package org.apache.giraph.graph;
import org.apache.giraph.bsp.ApplicationState;
import org.apache.giraph.bsp.CentralizedServiceWorker;
-import org.apache.giraph.comm.NettyWorkerClientServer;
import org.apache.giraph.comm.RPCCommunications;
import org.apache.giraph.comm.ServerData;
import org.apache.giraph.comm.WorkerClientServer;
+import org.apache.giraph.comm.netty.NettyWorkerClientServer;
import org.apache.giraph.graph.partition.Partition;
import org.apache.giraph.graph.partition.PartitionExchange;
import org.apache.giraph.graph.partition.PartitionOwner;
Copied: giraph/trunk/src/main/java/org/apache/giraph/utils/ArrayListWritable.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/ArrayListWritable.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/utils/ArrayListWritable.java?p2=giraph/trunk/src/main/java/org/apache/giraph/utils/ArrayListWritable.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/ArrayListWritable.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/ArrayListWritable.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/utils/ArrayListWritable.java Wed Aug 29 22:53:00 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.utils;
import java.io.DataInput;
import java.io.DataOutput;
Copied: giraph/trunk/src/main/java/org/apache/giraph/utils/IncreasingBitSet.java (from r1378751, giraph/trunk/src/main/java/org/apache/giraph/comm/IncreasingBitSet.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/utils/IncreasingBitSet.java?p2=giraph/trunk/src/main/java/org/apache/giraph/utils/IncreasingBitSet.java&p1=giraph/trunk/src/main/java/org/apache/giraph/comm/IncreasingBitSet.java&r1=1378751&r2=1378761&rev=1378761&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/IncreasingBitSet.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/utils/IncreasingBitSet.java Wed Aug 29 22:53:00 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.comm;
+package org.apache.giraph.utils;
import java.util.BitSet;
Modified: giraph/trunk/src/test/java/org/apache/giraph/comm/ConnectionTest.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/comm/ConnectionTest.java?rev=1378761&r1=1378760&r2=1378761&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/comm/ConnectionTest.java (original)
+++ giraph/trunk/src/test/java/org/apache/giraph/comm/ConnectionTest.java Wed Aug 29 22:53:00 2012
@@ -21,7 +21,10 @@ package org.apache.giraph.comm;
import com.google.common.collect.Sets;
import java.util.Set;
import org.apache.giraph.comm.messages.SimpleMessageStore;
-import org.apache.giraph.comm.RequestServerHandler.RequestServerHandlerFactory;
+import org.apache.giraph.comm.netty.handler.RequestServerHandler;
+import org.apache.giraph.comm.netty.NettyClient;
+import org.apache.giraph.comm.netty.NettyServer;
+import org.apache.giraph.comm.netty.handler.WorkerRequestServerHandler;
import org.apache.giraph.utils.MockUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.IntWritable;
@@ -83,7 +86,7 @@ public class ConnectionTest {
new ServerData<IntWritable, IntWritable, IntWritable, IntWritable>
(conf, SimpleMessageStore.newFactory(
MockUtils.mockServiceGetVertexPartitionOwner(1), conf));
- RequestServerHandlerFactory requestServerHandlerFactory =
+ RequestServerHandler.Factory requestServerHandlerFactory =
new WorkerRequestServerHandler.Factory(serverData);
NettyServer server1 = new NettyServer(conf, requestServerHandlerFactory);
Modified: giraph/trunk/src/test/java/org/apache/giraph/comm/IncreasingBitSetTest.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/comm/IncreasingBitSetTest.java?rev=1378761&r1=1378760&r2=1378761&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/comm/IncreasingBitSetTest.java (original)
+++ giraph/trunk/src/test/java/org/apache/giraph/comm/IncreasingBitSetTest.java Wed Aug 29 22:53:00 2012
@@ -18,6 +18,7 @@
package org.apache.giraph.comm;
+import org.apache.giraph.utils.IncreasingBitSet;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
Modified: giraph/trunk/src/test/java/org/apache/giraph/comm/RequestFailureTest.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/comm/RequestFailureTest.java?rev=1378761&r1=1378760&r2=1378761&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/comm/RequestFailureTest.java (original)
+++ giraph/trunk/src/test/java/org/apache/giraph/comm/RequestFailureTest.java Wed Aug 29 22:53:00 2012
@@ -19,6 +19,11 @@
package org.apache.giraph.comm;
import org.apache.giraph.comm.messages.SimpleMessageStore;
+import org.apache.giraph.comm.netty.NettyClient;
+import org.apache.giraph.comm.netty.NettyServer;
+import org.apache.giraph.comm.netty.handler.WorkerRequestServerHandler;
+import org.apache.giraph.comm.requests.SendPartitionMessagesRequest;
+import org.apache.giraph.comm.requests.WritableRequest;
import org.apache.giraph.graph.EdgeListVertex;
import org.apache.giraph.graph.GiraphJob;
import org.apache.giraph.graph.Vertex;
Modified: giraph/trunk/src/test/java/org/apache/giraph/comm/RequestTest.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/comm/RequestTest.java?rev=1378761&r1=1378760&r2=1378761&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/comm/RequestTest.java (original)
+++ giraph/trunk/src/test/java/org/apache/giraph/comm/RequestTest.java Wed Aug 29 22:53:00 2012
@@ -19,6 +19,12 @@
package org.apache.giraph.comm;
import org.apache.giraph.comm.messages.SimpleMessageStore;
+import org.apache.giraph.comm.netty.NettyClient;
+import org.apache.giraph.comm.netty.NettyServer;
+import org.apache.giraph.comm.netty.handler.WorkerRequestServerHandler;
+import org.apache.giraph.comm.requests.SendPartitionMessagesRequest;
+import org.apache.giraph.comm.requests.SendPartitionMutationsRequest;
+import org.apache.giraph.comm.requests.SendVertexRequest;
import org.apache.giraph.graph.Edge;
import org.apache.giraph.graph.EdgeListVertex;
import org.apache.giraph.graph.GiraphJob;