Skip to content

Commit

Permalink
Reorganize Raft related classes into raft package.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kuujo
kuujo committed Jul 28, 2015
1 parent d1829fd commit 46047c7
Show file tree
Hide file tree
Showing 181 changed files with 548 additions and 498 deletions.
2 changes: 1 addition & 1 deletion atomic/src/main/java/net/kuujo/copycat/atomic/AsyncReference.java
View file
Expand Up @@ -18,7 +18,7 @@
import net.kuujo.copycat.Listener;
import net.kuujo.copycat.ListenerContext;
import net.kuujo.copycat.PersistenceLevel;
import net.kuujo.copycat.ConsistencyLevel;
import net.kuujo.copycat.raft.ConsistencyLevel;

import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
Expand Down
4 changes: 2 additions & 2 deletions atomic/src/main/java/net/kuujo/copycat/atomic/DistributedReference.java
View file
Expand Up @@ -18,8 +18,8 @@
import net.kuujo.copycat.*;
import net.kuujo.copycat.atomic.state.ReferenceCommands;
import net.kuujo.copycat.atomic.state.ReferenceState;
import net.kuujo.copycat.ConsistencyLevel;
import net.kuujo.copycat.Raft;
import net.kuujo.copycat.raft.ConsistencyLevel;
import net.kuujo.copycat.raft.Raft;

import java.util.Collections;
import java.util.concurrent.CompletableFuture;
Expand Down
4 changes: 4 additions & 0 deletions atomic/src/main/java/net/kuujo/copycat/atomic/state/ReferenceCommands.java
View file
Expand Up @@ -21,6 +21,10 @@
import net.kuujo.copycat.io.serializer.CopycatSerializable;
import net.kuujo.copycat.io.serializer.SerializeWith;
import net.kuujo.copycat.io.serializer.Serializer;
import net.kuujo.copycat.raft.Command;
import net.kuujo.copycat.raft.ConsistencyLevel;
import net.kuujo.copycat.raft.Operation;
import net.kuujo.copycat.raft.Query;

import java.util.concurrent.TimeUnit;

Expand Down
12 changes: 6 additions & 6 deletions atomic/src/main/java/net/kuujo/copycat/atomic/state/ReferenceState.java
View file
Expand Up @@ -16,12 +16,12 @@
package net.kuujo.copycat.atomic.state;

import net.kuujo.copycat.PersistenceLevel;
import net.kuujo.copycat.log.Compaction;
import net.kuujo.copycat.Session;
import net.kuujo.copycat.server.Apply;
import net.kuujo.copycat.server.Commit;
import net.kuujo.copycat.server.Filter;
import net.kuujo.copycat.server.StateMachine;
import net.kuujo.copycat.raft.log.Compaction;
import net.kuujo.copycat.raft.Session;
import net.kuujo.copycat.raft.server.Apply;
import net.kuujo.copycat.raft.server.Commit;
import net.kuujo.copycat.raft.server.Filter;
import net.kuujo.copycat.raft.server.StateMachine;

import java.util.HashSet;
import java.util.concurrent.atomic.AtomicReference;
Expand Down
12 changes: 6 additions & 6 deletions atomic/src/test/java/net/kuujo/copycat/atomic/DistributedReferenceTest.java
View file
Expand Up @@ -19,12 +19,12 @@
import net.kuujo.copycat.Copycat;
import net.kuujo.copycat.CopycatServer;
import net.kuujo.copycat.Node;
import net.kuujo.copycat.log.Log;
import net.kuujo.copycat.log.StorageLevel;
import net.kuujo.copycat.Member;
import net.kuujo.copycat.Members;
import net.kuujo.copycat.transport.LocalServerRegistry;
import net.kuujo.copycat.transport.LocalTransport;
import net.kuujo.copycat.raft.log.Log;
import net.kuujo.copycat.raft.log.StorageLevel;
import net.kuujo.copycat.raft.Member;
import net.kuujo.copycat.raft.Members;
import net.kuujo.copycat.raft.transport.LocalServerRegistry;
import net.kuujo.copycat.raft.transport.LocalTransport;
import org.testng.annotations.Test;

import java.util.ArrayList;
Expand Down
8 changes: 4 additions & 4 deletions .../net/kuujo/copycat/client/RaftClient.java → ...kuujo/copycat/raft/client/RaftClient.java
View file
Expand Up @@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.kuujo.copycat.client;
package net.kuujo.copycat.raft.client;

import net.kuujo.copycat.*;
import net.kuujo.copycat.client.state.ClientContext;
import net.kuujo.copycat.raft.client.state.ClientContext;
import net.kuujo.copycat.io.serializer.Serializer;
import net.kuujo.copycat.io.serializer.ServiceLoaderResolver;
import net.kuujo.copycat.transport.Transport;
import net.kuujo.copycat.raft.*;
import net.kuujo.copycat.raft.transport.Transport;
import net.kuujo.copycat.util.Managed;
import net.kuujo.copycat.util.concurrent.Context;

Expand Down
2 changes: 1 addition & 1 deletion ...et/kuujo/copycat/client/package-info.java → ...ujo/copycat/raft/client/package-info.java
View file
Expand Up @@ -19,4 +19,4 @@
*
* @author <a href="http://github.com/kuujo">Jordan Halterman</a>
*/
package net.kuujo.copycat.client;
package net.kuujo.copycat.raft.client;
14 changes: 7 additions & 7 deletions ...o/copycat/client/state/ClientContext.java → ...ycat/raft/client/state/ClientContext.java
View file
Expand Up @@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.kuujo.copycat.client.state;
package net.kuujo.copycat.raft.client.state;

import net.kuujo.copycat.*;
import net.kuujo.copycat.io.serializer.Serializer;
import net.kuujo.copycat.protocol.*;
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.raft.*;
import net.kuujo.copycat.raft.protocol.*;
import net.kuujo.copycat.raft.transport.Client;
import net.kuujo.copycat.raft.transport.Connection;
import net.kuujo.copycat.raft.transport.Transport;
import net.kuujo.copycat.raft.transport.TransportException;
import net.kuujo.copycat.util.Managed;
import net.kuujo.copycat.util.concurrent.Context;
import net.kuujo.copycat.util.concurrent.Futures;
Expand Down
12 changes: 6 additions & 6 deletions ...o/copycat/client/state/ClientSession.java → ...ycat/raft/client/state/ClientSession.java
View file
Expand Up @@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.kuujo.copycat.client.state;
package net.kuujo.copycat.raft.client.state;

import net.kuujo.copycat.Listener;
import net.kuujo.copycat.ListenerContext;
import net.kuujo.copycat.Listeners;
import net.kuujo.copycat.Session;
import net.kuujo.copycat.protocol.PublishRequest;
import net.kuujo.copycat.protocol.PublishResponse;
import net.kuujo.copycat.protocol.Response;
import net.kuujo.copycat.transport.Connection;
import net.kuujo.copycat.raft.Session;
import net.kuujo.copycat.raft.protocol.PublishRequest;
import net.kuujo.copycat.raft.protocol.PublishResponse;
import net.kuujo.copycat.raft.protocol.Response;
import net.kuujo.copycat.raft.transport.Connection;
import net.kuujo.copycat.util.concurrent.Context;

import java.util.UUID;
Expand Down
2 changes: 1 addition & 1 deletion collections/src/main/java/net/kuujo/copycat/collections/AsyncMap.java
View file
Expand Up @@ -16,7 +16,7 @@
package net.kuujo.copycat.collections;

import net.kuujo.copycat.PersistenceLevel;
import net.kuujo.copycat.ConsistencyLevel;
import net.kuujo.copycat.raft.ConsistencyLevel;

import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
Expand Down
2 changes: 1 addition & 1 deletion collections/src/main/java/net/kuujo/copycat/collections/AsyncSet.java
View file
Expand Up @@ -16,7 +16,7 @@
package net.kuujo.copycat.collections;

import net.kuujo.copycat.PersistenceLevel;
import net.kuujo.copycat.ConsistencyLevel;
import net.kuujo.copycat.raft.ConsistencyLevel;

import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
Expand Down
4 changes: 2 additions & 2 deletions collections/src/main/java/net/kuujo/copycat/collections/DistributedMap.java
View file
Expand Up @@ -20,8 +20,8 @@
import net.kuujo.copycat.Stateful;
import net.kuujo.copycat.collections.state.MapCommands;
import net.kuujo.copycat.collections.state.MapState;
import net.kuujo.copycat.ConsistencyLevel;
import net.kuujo.copycat.Raft;
import net.kuujo.copycat.raft.ConsistencyLevel;
import net.kuujo.copycat.raft.Raft;

import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
Expand Down
4 changes: 2 additions & 2 deletions collections/src/main/java/net/kuujo/copycat/collections/DistributedSet.java
View file
Expand Up @@ -20,8 +20,8 @@
import net.kuujo.copycat.Stateful;
import net.kuujo.copycat.collections.state.SetCommands;
import net.kuujo.copycat.collections.state.SetState;
import net.kuujo.copycat.ConsistencyLevel;
import net.kuujo.copycat.Raft;
import net.kuujo.copycat.raft.ConsistencyLevel;
import net.kuujo.copycat.raft.Raft;

import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
Expand Down
4 changes: 4 additions & 0 deletions collections/src/main/java/net/kuujo/copycat/collections/state/MapCommands.java
View file
Expand Up @@ -21,6 +21,10 @@
import net.kuujo.copycat.io.serializer.CopycatSerializable;
import net.kuujo.copycat.io.serializer.SerializeWith;
import net.kuujo.copycat.io.serializer.Serializer;
import net.kuujo.copycat.raft.Command;
import net.kuujo.copycat.raft.ConsistencyLevel;
import net.kuujo.copycat.raft.Operation;
import net.kuujo.copycat.raft.Query;

import java.util.concurrent.TimeUnit;

Expand Down
12 changes: 6 additions & 6 deletions collections/src/main/java/net/kuujo/copycat/collections/state/MapState.java
View file
Expand Up @@ -16,12 +16,12 @@
package net.kuujo.copycat.collections.state;

import net.kuujo.copycat.PersistenceLevel;
import net.kuujo.copycat.log.Compaction;
import net.kuujo.copycat.Session;
import net.kuujo.copycat.server.Apply;
import net.kuujo.copycat.server.Commit;
import net.kuujo.copycat.server.Filter;
import net.kuujo.copycat.server.StateMachine;
import net.kuujo.copycat.raft.log.Compaction;
import net.kuujo.copycat.raft.Session;
import net.kuujo.copycat.raft.server.Apply;
import net.kuujo.copycat.raft.server.Commit;
import net.kuujo.copycat.raft.server.Filter;
import net.kuujo.copycat.raft.server.StateMachine;

import java.util.HashMap;
import java.util.HashSet;
Expand Down
4 changes: 4 additions & 0 deletions collections/src/main/java/net/kuujo/copycat/collections/state/SetCommands.java
View file
Expand Up @@ -21,6 +21,10 @@
import net.kuujo.copycat.io.serializer.CopycatSerializable;
import net.kuujo.copycat.io.serializer.SerializeWith;
import net.kuujo.copycat.io.serializer.Serializer;
import net.kuujo.copycat.raft.Command;
import net.kuujo.copycat.raft.ConsistencyLevel;
import net.kuujo.copycat.raft.Operation;
import net.kuujo.copycat.raft.Query;

import java.util.concurrent.TimeUnit;

Expand Down
12 changes: 6 additions & 6 deletions collections/src/main/java/net/kuujo/copycat/collections/state/SetState.java
View file
Expand Up @@ -16,12 +16,12 @@
package net.kuujo.copycat.collections.state;

import net.kuujo.copycat.PersistenceLevel;
import net.kuujo.copycat.log.Compaction;
import net.kuujo.copycat.Session;
import net.kuujo.copycat.server.Apply;
import net.kuujo.copycat.server.Commit;
import net.kuujo.copycat.server.Filter;
import net.kuujo.copycat.server.StateMachine;
import net.kuujo.copycat.raft.log.Compaction;
import net.kuujo.copycat.raft.Session;
import net.kuujo.copycat.raft.server.Apply;
import net.kuujo.copycat.raft.server.Commit;
import net.kuujo.copycat.raft.server.Filter;
import net.kuujo.copycat.raft.server.StateMachine;

import java.util.HashMap;
import java.util.HashSet;
Expand Down
12 changes: 6 additions & 6 deletions collections/src/test/java/net/kuujo/copycat/collections/DistributedMapTest.java
View file
Expand Up @@ -19,12 +19,12 @@
import net.kuujo.copycat.Copycat;
import net.kuujo.copycat.CopycatServer;
import net.kuujo.copycat.Node;
import net.kuujo.copycat.log.Log;
import net.kuujo.copycat.log.StorageLevel;
import net.kuujo.copycat.Member;
import net.kuujo.copycat.Members;
import net.kuujo.copycat.transport.LocalServerRegistry;
import net.kuujo.copycat.transport.LocalTransport;
import net.kuujo.copycat.raft.log.Log;
import net.kuujo.copycat.raft.log.StorageLevel;
import net.kuujo.copycat.raft.Member;
import net.kuujo.copycat.raft.Members;
import net.kuujo.copycat.raft.transport.LocalServerRegistry;
import net.kuujo.copycat.raft.transport.LocalTransport;
import org.testng.annotations.Test;

import java.util.ArrayList;
Expand Down
12 changes: 6 additions & 6 deletions collections/src/test/java/net/kuujo/copycat/collections/DistributedSetTest.java
View file
Expand Up @@ -19,12 +19,12 @@
import net.kuujo.copycat.Copycat;
import net.kuujo.copycat.CopycatServer;
import net.kuujo.copycat.Node;
import net.kuujo.copycat.log.Log;
import net.kuujo.copycat.log.StorageLevel;
import net.kuujo.copycat.Member;
import net.kuujo.copycat.Members;
import net.kuujo.copycat.transport.LocalServerRegistry;
import net.kuujo.copycat.transport.LocalTransport;
import net.kuujo.copycat.raft.log.Log;
import net.kuujo.copycat.raft.log.StorageLevel;
import net.kuujo.copycat.raft.Member;
import net.kuujo.copycat.raft.Members;
import net.kuujo.copycat.raft.transport.LocalServerRegistry;
import net.kuujo.copycat.raft.transport.LocalTransport;
import org.testng.annotations.Test;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion coordination/src/main/java/net/kuujo/copycat/coordination/DistributedLeaderElection.java
View file
Expand Up @@ -21,7 +21,7 @@
import net.kuujo.copycat.Stateful;
import net.kuujo.copycat.coordination.state.LeaderElectionCommands;
import net.kuujo.copycat.coordination.state.LeaderElectionState;
import net.kuujo.copycat.Raft;
import net.kuujo.copycat.raft.Raft;

import java.util.Collections;
import java.util.Set;
Expand Down
2 changes: 1 addition & 1 deletion coordination/src/main/java/net/kuujo/copycat/coordination/DistributedLock.java
View file
Expand Up @@ -19,7 +19,7 @@
import net.kuujo.copycat.Stateful;
import net.kuujo.copycat.coordination.state.LockCommands;
import net.kuujo.copycat.coordination.state.LockState;
import net.kuujo.copycat.Raft;
import net.kuujo.copycat.raft.Raft;

import java.util.Queue;
import java.util.concurrent.CompletableFuture;
Expand Down
2 changes: 1 addition & 1 deletion coordination/src/main/java/net/kuujo/copycat/coordination/DistributedTopic.java
View file
Expand Up @@ -21,7 +21,7 @@
import net.kuujo.copycat.Stateful;
import net.kuujo.copycat.coordination.state.TopicCommands;
import net.kuujo.copycat.coordination.state.TopicState;
import net.kuujo.copycat.Raft;
import net.kuujo.copycat.raft.Raft;

import java.util.List;
import java.util.concurrent.CompletableFuture;
Expand Down
4 changes: 2 additions & 2 deletions coordination/src/main/java/net/kuujo/copycat/coordination/state/LeaderElectionCommands.java
View file
Expand Up @@ -16,8 +16,8 @@
package net.kuujo.copycat.coordination.state;

import net.kuujo.copycat.BuilderPool;
import net.kuujo.copycat.Command;
import net.kuujo.copycat.Operation;
import net.kuujo.copycat.raft.Command;
import net.kuujo.copycat.raft.Operation;
import net.kuujo.copycat.io.BufferInput;
import net.kuujo.copycat.io.BufferOutput;
import net.kuujo.copycat.io.serializer.CopycatSerializable;
Expand Down
14 changes: 7 additions & 7 deletions coordination/src/main/java/net/kuujo/copycat/coordination/state/LeaderElectionState.java
View file
Expand Up @@ -15,13 +15,13 @@
*/
package net.kuujo.copycat.coordination.state;

import net.kuujo.copycat.log.Compaction;
import net.kuujo.copycat.Operation;
import net.kuujo.copycat.Session;
import net.kuujo.copycat.server.Apply;
import net.kuujo.copycat.server.Commit;
import net.kuujo.copycat.server.Filter;
import net.kuujo.copycat.server.StateMachine;
import net.kuujo.copycat.raft.log.Compaction;
import net.kuujo.copycat.raft.Operation;
import net.kuujo.copycat.raft.Session;
import net.kuujo.copycat.raft.server.Apply;
import net.kuujo.copycat.raft.server.Commit;
import net.kuujo.copycat.raft.server.Filter;
import net.kuujo.copycat.raft.server.StateMachine;

import java.util.ArrayList;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions coordination/src/main/java/net/kuujo/copycat/coordination/state/LockCommands.java
View file
Expand Up @@ -16,8 +16,8 @@
package net.kuujo.copycat.coordination.state;

import net.kuujo.copycat.BuilderPool;
import net.kuujo.copycat.Command;
import net.kuujo.copycat.Operation;
import net.kuujo.copycat.raft.Command;
import net.kuujo.copycat.raft.Operation;
import net.kuujo.copycat.io.BufferInput;
import net.kuujo.copycat.io.BufferOutput;
import net.kuujo.copycat.io.serializer.CopycatSerializable;
Expand Down
10 changes: 5 additions & 5 deletions coordination/src/main/java/net/kuujo/copycat/coordination/state/LockState.java
View file
Expand Up @@ -15,11 +15,11 @@
*/
package net.kuujo.copycat.coordination.state;

import net.kuujo.copycat.log.Compaction;
import net.kuujo.copycat.server.Apply;
import net.kuujo.copycat.server.Commit;
import net.kuujo.copycat.server.Filter;
import net.kuujo.copycat.server.StateMachine;
import net.kuujo.copycat.raft.log.Compaction;
import net.kuujo.copycat.raft.server.Apply;
import net.kuujo.copycat.raft.server.Commit;
import net.kuujo.copycat.raft.server.Filter;
import net.kuujo.copycat.raft.server.StateMachine;

import java.util.ArrayDeque;
import java.util.Queue;
Expand Down
4 changes: 2 additions & 2 deletions coordination/src/main/java/net/kuujo/copycat/coordination/state/TopicCommands.java
View file
Expand Up @@ -16,8 +16,8 @@
package net.kuujo.copycat.coordination.state;

import net.kuujo.copycat.BuilderPool;
import net.kuujo.copycat.Command;
import net.kuujo.copycat.Operation;
import net.kuujo.copycat.raft.Command;
import net.kuujo.copycat.raft.Operation;
import net.kuujo.copycat.io.BufferInput;
import net.kuujo.copycat.io.BufferOutput;
import net.kuujo.copycat.io.serializer.CopycatSerializable;
Expand Down
10 changes: 5 additions & 5 deletions coordination/src/main/java/net/kuujo/copycat/coordination/state/TopicState.java
View file
Expand Up @@ -15,11 +15,11 @@
*/
package net.kuujo.copycat.coordination.state;

import net.kuujo.copycat.Session;
import net.kuujo.copycat.server.Apply;
import net.kuujo.copycat.server.Commit;
import net.kuujo.copycat.server.Filter;
import net.kuujo.copycat.server.StateMachine;
import net.kuujo.copycat.raft.Session;
import net.kuujo.copycat.raft.server.Apply;
import net.kuujo.copycat.raft.server.Commit;
import net.kuujo.copycat.raft.server.Filter;
import net.kuujo.copycat.raft.server.StateMachine;

import java.util.HashSet;
import java.util.Set;
Expand Down

0 comments on commit 46047c7

Please sign in to comment.