Refactor module structure to separate transport layer into separate p…

…roject.
atomix · Jul 16, 2015 · 58d6eca · 58d6eca
1 parent f3bb531
commit 58d6eca
Show file tree

Hide file tree

Showing 142 changed files with 407 additions and 272 deletions.
diff --git a/all/pom.xml b/all/pom.xml
@@ -32,11 +32,6 @@
       <artifactId>copycat-netty</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>net.kuujo.copycat</groupId>
-      <artifactId>copycat-raft</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>net.kuujo.copycat</groupId>
       <artifactId>copycat</artifactId>

diff --git a/atomic/src/main/java/net/kuujo/copycat/atomic/AsyncReference.java b/atomic/src/main/java/net/kuujo/copycat/atomic/AsyncReference.java
@@ -23,8 +23,8 @@
 import net.kuujo.copycat.AbstractResource;
 import net.kuujo.copycat.Mode;
 import net.kuujo.copycat.Stateful;
+import net.kuujo.copycat.log.Compaction;
 import net.kuujo.copycat.raft.*;
-import net.kuujo.copycat.raft.log.Compaction;
 
 import java.util.HashSet;
 import java.util.concurrent.CompletableFuture;

diff --git a/raft/server/pom.xml → client/pom.xml b/raft/server/pom.xml → client/pom.xml
@@ -19,17 +19,17 @@
 
   <parent>
     <groupId>net.kuujo.copycat</groupId>
-    <artifactId>copycat-raft-parent</artifactId>
+    <artifactId>copycat-parent</artifactId>
     <version>0.6.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>copycat-raft-server</artifactId>
-  <name>Copycat Raft Server</name>
+  <artifactId>copycat-client</artifactId>
+  <name>Copycat Client</name>
 
   <dependencies>
     <dependency>
       <groupId>net.kuujo.copycat</groupId>
-      <artifactId>copycat-raft-client</artifactId>
+      <artifactId>copycat-protocol</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>

diff --git a/...va/net/kuujo/copycat/raft/RaftClient.java → ...va/net/kuujo/copycat/raft/RaftClient.java b/...va/net/kuujo/copycat/raft/RaftClient.java → ...va/net/kuujo/copycat/raft/RaftClient.java
@@ -16,7 +16,7 @@
 package net.kuujo.copycat.raft;
 
 import net.kuujo.alleycat.Alleycat;
-import net.kuujo.copycat.raft.protocol.Protocol;
+import net.kuujo.copycat.transport.Transport;
 import net.kuujo.copycat.raft.state.RaftClientState;
 
 import java.util.Random;
@@ -144,7 +144,7 @@ public CompletableFuture<Void> delete() {
    */
   public static class Builder implements Raft.Builder<Builder, RaftClient> {
     private static final Random RANDOM = new Random();
-    private Protocol protocol;
+    private Transport transport;
     private Alleycat serializer;
     private long keepAliveInterval = 1000;
     private Members members;
@@ -153,8 +153,8 @@ private Builder() {
     }
 
     @Override
-    public Builder withProtocol(Protocol protocol) {
-      this.protocol = protocol;
+    public Builder withTransport(Transport transport) {
+      this.transport = transport;
       return this;
     }
 
@@ -206,7 +206,7 @@ public Builder withMembers(Members members) {
 
     @Override
     public RaftClient build() {
-      return new RaftClient(new RaftClientState(nextClientId(), protocol, members, serializer).setKeepAliveInterval(keepAliveInterval));
+      return new RaftClient(new RaftClientState(nextClientId(), transport, members, serializer).setKeepAliveInterval(keepAliveInterval));
     }
 
     /**

diff --git a/...o/copycat/raft/state/RaftClientState.java → ...o/copycat/raft/state/RaftClientState.java b/...o/copycat/raft/state/RaftClientState.java → ...o/copycat/raft/state/RaftClientState.java
@@ -21,14 +21,21 @@
 import net.kuujo.copycat.Listeners;
 import net.kuujo.copycat.raft.*;
 import net.kuujo.copycat.raft.protocol.*;
-import net.kuujo.copycat.raft.protocol.ProtocolException;
+import net.kuujo.copycat.transport.Client;
+import net.kuujo.copycat.transport.Connection;
+import net.kuujo.copycat.transport.Transport;
+import net.kuujo.copycat.transport.TransportException;
 import net.kuujo.copycat.util.Managed;
 import net.kuujo.copycat.util.concurrent.ComposableFuture;
 import net.kuujo.copycat.util.concurrent.Context;
+import net.kuujo.copycat.util.concurrent.Futures;
 import net.kuujo.copycat.util.concurrent.SingleThreadContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
@@ -48,7 +55,7 @@ public class RaftClientState implements Managed<Void> {
   private static final Logger LOGGER = LoggerFactory.getLogger(RaftClientState.class);
   private static final long REQUEST_TIMEOUT = TimeUnit.SECONDS.toMillis(10);
   private final Members members;
-  private final Protocol protocol;
+  private final Transport transport;
   private final Client client;
   private Connection connection;
   private final Context context;
@@ -69,14 +76,14 @@ public class RaftClientState implements Managed<Void> {
   private volatile long response;
   private volatile long version;
 
-  public RaftClientState(int clientId, Protocol protocol, Members members, Alleycat serializer) {
+  public RaftClientState(int clientId, Transport transport, Members members, Alleycat serializer) {
     if (members == null)
       throw new NullPointerException("members cannot be null");
 
     this.context = new SingleThreadContext("copycat-client-" + clientId, serializer.clone());
     this.members = members;
-    this.protocol = protocol;
-    this.client = protocol.client(clientId);
+    this.transport = transport;
+    this.client = transport.client(clientId);
     this.session = new ClientSession(client.id());
     this.session.close();
   }
@@ -268,10 +275,17 @@ private CompletableFuture<Connection> getConnection(Member member) {
       return CompletableFuture.completedFuture(connection);
     }
 
+    final InetSocketAddress address;
+    try {
+      address = new InetSocketAddress(InetAddress.getByName(member.host()), member.port());
+    } catch (UnknownHostException e) {
+      return Futures.exceptionalFuture(e);
+    }
+
     if (connection != null) {
       CompletableFuture<Connection> future = new ComposableFuture<>();
       connection.close().whenComplete((result, error) -> {
-        client.connect(member).whenComplete((connection, connectError) -> {
+        client.connect(address).whenComplete((connection, connectError) -> {
           if (connectError == null) {
             this.connection = connection;
             future.complete(connection);
@@ -283,7 +297,7 @@ private CompletableFuture<Connection> getConnection(Member member) {
       return future;
     }
 
-    return client.connect(member).thenApply(connection -> {
+    return client.connect(address).thenApply(connection -> {
       this.connection = connection;
       return connection;
     });
@@ -359,7 +373,7 @@ private <T> CompletableFuture<T> submit(CommandRequest request, CompletableFutur
         submit(request, future);
       } else if (error instanceof NoLeaderException) {
         submit(request, future);
-      } else if (error instanceof ProtocolException) {
+      } else if (error instanceof TransportException) {
         LOGGER.warn("Failed to communicate with {}: {}", member, error);
         submit(request, future);
       } else if (error instanceof UnknownSessionException) {
@@ -485,7 +499,7 @@ private <T> CompletableFuture<T> submit(QueryRequest request, CompletableFuture<
         submit(request, future);
       } else if (error instanceof NoLeaderException) {
         submit(request, future);
-      } else if (error instanceof ProtocolException) {
+      } else if (error instanceof TransportException) {
         LOGGER.warn("Failed to communicate with {}: {}", member, error);
         submit(request, future);
       } else if (error instanceof UnknownSessionException) {
@@ -741,7 +755,7 @@ public CompletableFuture<Void> close() {
       cancelRegisterTimer();
       cancelKeepAliveTimer();
       open = false;
-      protocol.close().whenCompleteAsync((result, error) -> {
+      transport.close().whenCompleteAsync((result, error) -> {
         if (error == null) {
           future.complete(null);
         } else {

diff --git a/collections/src/main/java/net/kuujo/copycat/collections/AsyncMap.java b/collections/src/main/java/net/kuujo/copycat/collections/AsyncMap.java
@@ -23,8 +23,8 @@
 import net.kuujo.copycat.AbstractResource;
 import net.kuujo.copycat.Mode;
 import net.kuujo.copycat.Stateful;
+import net.kuujo.copycat.log.Compaction;
 import net.kuujo.copycat.raft.*;
-import net.kuujo.copycat.raft.log.Compaction;
 
 import java.util.HashMap;
 import java.util.HashSet;

diff --git a/collections/src/main/java/net/kuujo/copycat/collections/AsyncSet.java b/collections/src/main/java/net/kuujo/copycat/collections/AsyncSet.java
@@ -23,8 +23,8 @@
 import net.kuujo.copycat.AbstractResource;
 import net.kuujo.copycat.Mode;
 import net.kuujo.copycat.Stateful;
+import net.kuujo.copycat.log.Compaction;
 import net.kuujo.copycat.raft.*;
-import net.kuujo.copycat.raft.log.Compaction;
 
 import java.util.HashMap;
 import java.util.HashSet;

diff --git a/core/pom.xml b/core/pom.xml
@@ -14,12 +14,12 @@
   <dependencies>
     <dependency>
       <groupId>net.kuujo.copycat</groupId>
-      <artifactId>copycat-raft-client</artifactId>
+      <artifactId>copycat-client</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>net.kuujo.copycat</groupId>
-      <artifactId>copycat-raft-server</artifactId>
+      <artifactId>copycat-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/core/src/main/java/net/kuujo/copycat/CopycatClient.java b/core/src/main/java/net/kuujo/copycat/CopycatClient.java
@@ -18,6 +18,7 @@
 import net.kuujo.alleycat.Alleycat;
 import net.kuujo.copycat.raft.Members;
 import net.kuujo.copycat.raft.RaftClient;
+import net.kuujo.copycat.transport.Transport;
 
 import java.util.concurrent.TimeUnit;
 
@@ -50,6 +51,17 @@ public static class Builder implements Copycat.Builder<CopycatClient> {
     private Builder() {
     }
 
+    /**
+     * Sets the client transport.
+     *
+     * @param transport The client transport.
+     * @return The client builder.
+     */
+    public Builder withTransport(Transport transport) {
+      builder.withTransport(transport);
+      return this;
+    }
+
     /**
      * Sets the client serializer.
      *

diff --git a/core/src/main/java/net/kuujo/copycat/CopycatServer.java b/core/src/main/java/net/kuujo/copycat/CopycatServer.java
@@ -16,10 +16,11 @@
 package net.kuujo.copycat;
 
 import net.kuujo.alleycat.Alleycat;
+import net.kuujo.copycat.log.Log;
 import net.kuujo.copycat.manager.ResourceManager;
 import net.kuujo.copycat.raft.Members;
 import net.kuujo.copycat.raft.RaftServer;
-import net.kuujo.copycat.raft.log.Log;
+import net.kuujo.copycat.transport.Transport;
 
 import java.util.concurrent.TimeUnit;
 
@@ -52,6 +53,17 @@ public static class Builder implements Copycat.Builder<CopycatServer> {
     private Builder() {
     }
 
+    /**
+     * Sets the server transport.
+     *
+     * @param transport The client server.
+     * @return The client builder.
+     */
+    public Builder withTransport(Transport transport) {
+      builder.withTransport(transport);
+      return this;
+    }
+
     /**
      * Sets the server member ID.
      *

diff --git a/core/src/main/java/net/kuujo/copycat/manager/ResourceManager.java b/core/src/main/java/net/kuujo/copycat/manager/ResourceManager.java
@@ -18,8 +18,8 @@
 import net.kuujo.copycat.ResourceCommand;
 import net.kuujo.copycat.ResourceOperation;
 import net.kuujo.copycat.ResourceQuery;
+import net.kuujo.copycat.log.Compaction;
 import net.kuujo.copycat.raft.*;
-import net.kuujo.copycat.raft.log.Compaction;
 
 import java.util.*;
 

diff --git a/raft/client/pom.xml → log/pom.xml b/raft/client/pom.xml → log/pom.xml
@@ -19,17 +19,17 @@
 
   <parent>
     <groupId>net.kuujo.copycat</groupId>
-    <artifactId>copycat-raft-parent</artifactId>
+    <artifactId>copycat-parent</artifactId>
     <version>0.6.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>copycat-raft-client</artifactId>
-  <name>Copycat Raft Client</name>
+  <artifactId>copycat-log</artifactId>
+  <name>Copycat Log</name>
 
   <dependencies>
     <dependency>
       <groupId>net.kuujo.copycat</groupId>
-      <artifactId>copycat-raft-protocol</artifactId>
+      <artifactId>copycat-common</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>

diff --git a/...et/kuujo/copycat/raft/log/Compaction.java → ...ava/net/kuujo/copycat/log/Compaction.java b/...et/kuujo/copycat/raft/log/Compaction.java → ...ava/net/kuujo/copycat/log/Compaction.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.kuujo.copycat.raft.log;
+package net.kuujo.copycat.log;
 
 import java.util.concurrent.CompletableFuture;
 

diff --git a/...net/kuujo/copycat/raft/log/Compactor.java → ...java/net/kuujo/copycat/log/Compactor.java b/...net/kuujo/copycat/raft/log/Compactor.java → ...java/net/kuujo/copycat/log/Compactor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.kuujo.copycat.raft.log;
+package net.kuujo.copycat.log;
 
 import net.kuujo.copycat.util.concurrent.Context;
 import org.slf4j.Logger;

diff --git a/...copycat/raft/log/DescriptorException.java → ...uujo/copycat/log/DescriptorException.java b/...copycat/raft/log/DescriptorException.java → ...uujo/copycat/log/DescriptorException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.kuujo.copycat.raft.log;
+package net.kuujo.copycat.log;
 
 /**
  * Segment descriptor exception.

diff --git a/...ava/net/kuujo/copycat/raft/log/Entry.java → ...ain/java/net/kuujo/copycat/log/Entry.java b/...ava/net/kuujo/copycat/raft/log/Entry.java → ...ain/java/net/kuujo/copycat/log/Entry.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.kuujo.copycat.raft.log;
+package net.kuujo.copycat.log;
 
 import net.kuujo.alleycat.AlleycatSerializable;
 import net.kuujo.alleycat.util.ReferenceCounted;

diff --git a/...t/kuujo/copycat/raft/log/EntryFilter.java → ...va/net/kuujo/copycat/log/EntryFilter.java b/...t/kuujo/copycat/raft/log/EntryFilter.java → ...va/net/kuujo/copycat/log/EntryFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.kuujo.copycat.raft.log;
+package net.kuujo.copycat.log;
 
 import java.util.concurrent.CompletableFuture;
 

diff --git a/.../java/net/kuujo/copycat/raft/log/Log.java → .../main/java/net/kuujo/copycat/log/Log.java b/.../java/net/kuujo/copycat/raft/log/Log.java → .../main/java/net/kuujo/copycat/log/Log.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.kuujo.copycat.raft.log;
+package net.kuujo.copycat.log;
 
 import net.kuujo.copycat.util.concurrent.Context;
 

diff --git a/...net/kuujo/copycat/raft/log/LogConfig.java → ...java/net/kuujo/copycat/log/LogConfig.java b/...net/kuujo/copycat/raft/log/LogConfig.java → ...java/net/kuujo/copycat/log/LogConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.kuujo.copycat.raft.log;
+package net.kuujo.copycat.log;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;

diff --git a/.../kuujo/copycat/raft/log/LogException.java → ...a/net/kuujo/copycat/log/LogException.java b/.../kuujo/copycat/raft/log/LogException.java → ...a/net/kuujo/copycat/log/LogException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.kuujo.copycat.raft.log;
+package net.kuujo.copycat.log;
 
 import net.kuujo.copycat.CopycatException;
 

diff --git a/...ujo/copycat/raft/log/MajorCompaction.java → ...et/kuujo/copycat/log/MajorCompaction.java b/...ujo/copycat/raft/log/MajorCompaction.java → ...et/kuujo/copycat/log/MajorCompaction.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.kuujo.copycat.raft.log;
+package net.kuujo.copycat.log;
 
 import net.kuujo.copycat.util.concurrent.Context;
 import org.slf4j.Logger;