Reworked DatabaseService API.
Initial implementation of LockManager.
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseClient.java b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseClient.java
index c749197..77ff062 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseClient.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseClient.java
@@ -8,9 +8,11 @@
import net.kuujo.copycat.Copycat;
+import org.onlab.onos.store.service.BatchReadRequest;
+import org.onlab.onos.store.service.BatchWriteRequest;
import org.onlab.onos.store.service.DatabaseException;
-import org.onlab.onos.store.service.ReadRequest;
-import org.onlab.onos.store.service.WriteRequest;
+import org.onlab.onos.store.service.ReadResult;
+import org.onlab.onos.store.service.WriteResult;
/**
* Client for interacting with the Copycat Raft cluster.
@@ -63,9 +65,9 @@
}
}
- public List<InternalReadResult> batchRead(List<ReadRequest> requests) {
+ public List<ReadResult> batchRead(BatchReadRequest batchRequest) {
- CompletableFuture<List<InternalReadResult>> future = copycat.submit("read", requests);
+ CompletableFuture<List<ReadResult>> future = copycat.submit("read", batchRequest);
try {
return future.get();
} catch (InterruptedException | ExecutionException e) {
@@ -73,9 +75,9 @@
}
}
- public List<InternalWriteResult> batchWrite(List<WriteRequest> requests) {
+ public List<WriteResult> batchWrite(BatchWriteRequest batchRequest) {
- CompletableFuture<List<InternalWriteResult>> future = copycat.submit("write", requests);
+ CompletableFuture<List<WriteResult>> future = copycat.submit("write", batchRequest);
try {
return future.get();
} catch (InterruptedException | ExecutionException e) {