Madan Jampani

Moving to the latest stable copycat SNAPSHOT version.

Change-Id: Ibc0f2a4f0e09d887f96cd83bc67d29072b9764d2
...@@ -28,17 +28,19 @@ import org.onosproject.store.service.Transaction; ...@@ -28,17 +28,19 @@ import org.onosproject.store.service.Transaction;
28 import org.onosproject.store.service.Versioned; 28 import org.onosproject.store.service.Versioned;
29 29
30 import net.kuujo.copycat.cluster.internal.MemberInfo; 30 import net.kuujo.copycat.cluster.internal.MemberInfo;
31 -import net.kuujo.copycat.protocol.rpc.AppendRequest; 31 +import net.kuujo.copycat.raft.protocol.AppendRequest;
32 -import net.kuujo.copycat.protocol.rpc.AppendResponse; 32 +import net.kuujo.copycat.raft.protocol.AppendResponse;
33 -import net.kuujo.copycat.protocol.rpc.CommitRequest; 33 +import net.kuujo.copycat.raft.protocol.CommitRequest;
34 -import net.kuujo.copycat.protocol.rpc.CommitResponse; 34 +import net.kuujo.copycat.raft.protocol.CommitResponse;
35 -import net.kuujo.copycat.protocol.rpc.PollRequest; 35 +import net.kuujo.copycat.raft.protocol.PollRequest;
36 -import net.kuujo.copycat.protocol.rpc.PollResponse; 36 +import net.kuujo.copycat.raft.protocol.PollResponse;
37 -import net.kuujo.copycat.protocol.rpc.QueryRequest; 37 +import net.kuujo.copycat.raft.protocol.QueryRequest;
38 -import net.kuujo.copycat.protocol.rpc.QueryResponse; 38 +import net.kuujo.copycat.raft.protocol.QueryResponse;
39 -import net.kuujo.copycat.protocol.rpc.ReplicaInfo; 39 +import net.kuujo.copycat.raft.protocol.ReplicaInfo;
40 -import net.kuujo.copycat.protocol.rpc.SyncRequest; 40 +import net.kuujo.copycat.raft.protocol.SyncRequest;
41 -import net.kuujo.copycat.protocol.rpc.SyncResponse; 41 +import net.kuujo.copycat.raft.protocol.SyncResponse;
42 +import net.kuujo.copycat.raft.protocol.VoteRequest;
43 +import net.kuujo.copycat.raft.protocol.VoteResponse;
42 import net.kuujo.copycat.util.serializer.SerializerConfig; 44 import net.kuujo.copycat.util.serializer.SerializerConfig;
43 45
44 /** 46 /**
...@@ -52,6 +54,8 @@ public class DatabaseSerializer extends SerializerConfig { ...@@ -52,6 +54,8 @@ public class DatabaseSerializer extends SerializerConfig {
52 .register(AppendResponse.class) 54 .register(AppendResponse.class)
53 .register(SyncRequest.class) 55 .register(SyncRequest.class)
54 .register(SyncResponse.class) 56 .register(SyncResponse.class)
57 + .register(VoteRequest.class)
58 + .register(VoteResponse.class)
55 .register(PollRequest.class) 59 .register(PollRequest.class)
56 .register(PollResponse.class) 60 .register(PollResponse.class)
57 .register(QueryRequest.class) 61 .register(QueryRequest.class)
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
16 16
17 package org.onosproject.store.consistent.impl; 17 package org.onosproject.store.consistent.impl;
18 18
19 -import net.kuujo.copycat.resource.internal.ResourceContext;
20 import net.kuujo.copycat.state.StateMachine; 19 import net.kuujo.copycat.state.StateMachine;
21 import net.kuujo.copycat.resource.internal.AbstractResource; 20 import net.kuujo.copycat.resource.internal.AbstractResource;
21 +import net.kuujo.copycat.resource.internal.ResourceManager;
22 import net.kuujo.copycat.state.internal.DefaultStateMachine; 22 import net.kuujo.copycat.state.internal.DefaultStateMachine;
23 import net.kuujo.copycat.util.concurrent.Futures; 23 import net.kuujo.copycat.util.concurrent.Futures;
24 24
...@@ -39,7 +39,7 @@ public class DefaultDatabase extends AbstractResource<Database> implements Datab ...@@ -39,7 +39,7 @@ public class DefaultDatabase extends AbstractResource<Database> implements Datab
39 private DatabaseProxy<String, byte[]> proxy; 39 private DatabaseProxy<String, byte[]> proxy;
40 40
41 @SuppressWarnings({ "unchecked", "rawtypes" }) 41 @SuppressWarnings({ "unchecked", "rawtypes" })
42 - public DefaultDatabase(ResourceContext context) { 42 + public DefaultDatabase(ResourceManager context) {
43 super(context); 43 super(context);
44 this.stateMachine = new DefaultStateMachine(context, DatabaseState.class, DefaultDatabaseState.class); 44 this.stateMachine = new DefaultStateMachine(context, DatabaseState.class, DefaultDatabaseState.class);
45 } 45 }
......
...@@ -37,6 +37,7 @@ import com.google.common.collect.Sets; ...@@ -37,6 +37,7 @@ import com.google.common.collect.Sets;
37 37
38 import net.kuujo.copycat.Task; 38 import net.kuujo.copycat.Task;
39 import net.kuujo.copycat.cluster.Cluster; 39 import net.kuujo.copycat.cluster.Cluster;
40 +import net.kuujo.copycat.resource.ResourceState;
40 import static com.google.common.base.Preconditions.checkState; 41 import static com.google.common.base.Preconditions.checkState;
41 42
42 /** 43 /**
...@@ -339,6 +340,11 @@ public class PartitionedDatabase implements Database { ...@@ -339,6 +340,11 @@ public class PartitionedDatabase implements Database {
339 throw new UnsupportedOperationException(); 340 throw new UnsupportedOperationException();
340 } 341 }
341 342
343 + @Override
344 + public ResourceState state() {
345 + throw new UnsupportedOperationException();
346 + }
347 +
342 private Map<Database, Transaction> createSubTransactions( 348 private Map<Database, Transaction> createSubTransactions(
343 Transaction transaction) { 349 Transaction transaction) {
344 Map<Database, List<DatabaseUpdate>> perPartitionUpdates = Maps.newHashMap(); 350 Map<Database, List<DatabaseUpdate>> perPartitionUpdates = Maps.newHashMap();
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
72 <properties> 72 <properties>
73 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 73 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
74 <netty4.version>4.0.23.Final</netty4.version> 74 <netty4.version>4.0.23.Final</netty4.version>
75 - <copycat.version>0.5.0.onos-SNAPSHOT</copycat.version> 75 + <copycat.version>0.5.0.onos12-SNAPSHOT</copycat.version>
76 <openflowj.version>0.3.9.oe</openflowj.version> 76 <openflowj.version>0.3.9.oe</openflowj.version>
77 <karaf.version>3.0.3</karaf.version> 77 <karaf.version>3.0.3</karaf.version>
78 <jersey.version>1.19</jersey.version> 78 <jersey.version>1.19</jersey.version>
......