geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [2/2] geode git commit: GEODE-2580: Amended some protobuf message definitions
Date Wed, 07 Jun 2017 20:54:39 GMT
GEODE-2580: Amended some protobuf message definitions


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/228aa3c9
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/228aa3c9
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/228aa3c9

Branch: refs/heads/feature/GEODE-2580
Commit: 228aa3c9ca4ec8bfa812396fe7ccd83c550ace62
Parents: 90b1010
Author: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Authored: Wed Jun 7 13:54:25 2017 -0700
Committer: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Committed: Wed Jun 7 13:54:25 2017 -0700

----------------------------------------------------------------------
 .../src/main/proto/basicTypes.proto             |  2 +-
 .../src/main/proto/clientProtocol.proto         | 46 ++++++++---------
 .../src/main/proto/region_API.proto             | 52 +++++++-------------
 3 files changed, 44 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/228aa3c9/geode-client-protobuf/src/main/proto/basicTypes.proto
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/main/proto/basicTypes.proto b/geode-client-protobuf/src/main/proto/basicTypes.proto
index 96dbaaf..f159f89 100644
--- a/geode-client-protobuf/src/main/proto/basicTypes.proto
+++ b/geode-client-protobuf/src/main/proto/basicTypes.proto
@@ -56,5 +56,5 @@ message Region {
 }
 
 message Server {
-    string URL = 1;
+    string url = 1;
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/228aa3c9/geode-client-protobuf/src/main/proto/clientProtocol.proto
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/main/proto/clientProtocol.proto b/geode-client-protobuf/src/main/proto/clientProtocol.proto
index 6542e99..9dc0efb 100644
--- a/geode-client-protobuf/src/main/proto/clientProtocol.proto
+++ b/geode-client-protobuf/src/main/proto/clientProtocol.proto
@@ -39,17 +39,18 @@ message Request {
     oneof requestAPI {
         PutRequest putRequest = 2;
         GetRequest getRequest = 3;
-        PutManyRequest putManyRequest = 4;
-        GetManyRequest getManyRequest = 5;
-        GetRegionsRequest getRegionsRequest = 6;
-        ListKeysRequest listKeysRequest = 7;
-        RemoveRequest removeRequest = 8;
-        RemoveManyRequest removeManyRequest = 9;
-        RemoveAllRequest removeAllRequest = 10;
-        CreateRegionRequest createRegionRequest = 11;
-        DestroyRegionRequest destroyRegionRequest = 12;
-        PingRequest pingRequest = 13;
-        GetServersRequest getServersRequest = 14;
+        PutAllRequest putAllRequest = 4;
+        GetAllRequest getAllRequest = 5;
+        RemoveRequest removeRequest = 6;
+        RemoveAllRequest removeAllRequest = 7;
+        ListKeysRequest listKeysRequest = 8;
+
+        CreateRegionRequest createRegionRequest = 9;
+        DestroyRegionRequest destroyRegionRequest = 10;
+
+        PingRequest pingRequest = 11;
+        GetServersRequest getServersRequest = 12;
+        GetRegionsRequest getRegionsRequest = 13;
     }
 }
 
@@ -58,17 +59,18 @@ message Response {
     oneof responseAPI {
         PutResponse putResponse = 2;
         GetResponse getResponse = 3;
-        PutManyResponse putManyResponse = 4;
-        GetManyResponse getManyResponse = 5;
-        GetRegionsResponse getRegionsResponse = 6;
-        ListKeysResponse listKeysResponse = 7;
-        RemoveResponse removeResponse = 8;
-        RemoveManyResponse removeManyResponse = 9;
-        RemoveAllResponse removeAllResponse = 10;
-        CreateRegionResponse createRegionResponse = 11;
-        DestroyRegionResponse destroyRegionResponse = 12;
-        PingResponse pingResponse = 13;
-        GetServersResponse getServersResponse = 14;
+        PutAllResponse putAllResponse = 4;
+        GetAllResponse getAllResponse = 5;
+        RemoveResponse removeResponse = 6;
+        RemoveAllResponse removeAllResponse = 7;
+        ListKeysResponse listKeysResponse = 8;
+
+        CreateRegionResponse createRegionResponse = 20;
+        DestroyRegionResponse destroyRegionResponse = 21;
+
+        PingResponse pingResponse = 31;
+        GetServersResponse getServersResponse = 32;
+        GetRegionsResponse getRegionsResponse = 33;
     }
 }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/228aa3c9/geode-client-protobuf/src/main/proto/region_API.proto
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/main/proto/region_API.proto b/geode-client-protobuf/src/main/proto/region_API.proto
index 239ea1c..2a5b6d2 100644
--- a/geode-client-protobuf/src/main/proto/region_API.proto
+++ b/geode-client-protobuf/src/main/proto/region_API.proto
@@ -36,36 +36,23 @@ message GetResponse {
     EncodedValue result = 1;
 }
 
-message PutManyRequest {
+message PutAllRequest {
     string regionName = 1;
-    int32 numberOfEntries = 2;
-    repeated Entry entry = 3;
+    repeated Entry entry = 2;
 }
 
-message PutManyResponse {
-    int32 numberOfKeysFailed = 1;
-    repeated EncodedValue key = 2;
+message PutAllResponse {
+    repeated EncodedValue failedKeys = 1;
 }
 
-message GetManyRequest {
+message GetAllRequest {
     string regionName = 1;
-    int32 numberOfKeys = 2;
-    repeated EncodedValue key = 3;
-    EncodedValue callbackArg = 4;
-}
-
-message GetManyResponse {
-    int32 numberOfEntries = 1;
-    repeated Entry entries = 2;
-}
-
-message GetRegionsRequest {
-
+    repeated EncodedValue key = 2;
+    EncodedValue callbackArg = 3;
 }
 
-message GetRegionsResponse {
-    int32 numberOfRegions = 1;
-    repeated Region regions = 2;
+message GetAllResponse {
+    repeated Entry entries = 1;
 }
 
 message ListKeysRequest {
@@ -73,8 +60,7 @@ message ListKeysRequest {
 }
 
 message ListKeysResponse {
-    int32 numberOfKeys = 1;
-    repeated EncodedValue key = 2;
+    repeated EncodedValue key = 1;
 }
 
 message RemoveRequest {
@@ -86,17 +72,9 @@ message RemoveResponse {
     bool success = 1;
 }
 
-message RemoveManyRequest {
-    string regionName = 1;
-    repeated EncodedValue key = 2;
-}
-
-message RemoveManyResponse {
-    bool success = 1;
-}
-
 message RemoveAllRequest {
     string regionName = 1;
+    repeated EncodedValue key = 2;
 }
 
 message RemoveAllResponse {
@@ -118,3 +96,11 @@ message DestroyRegionRequest {
 message DestroyRegionResponse {
     bool success = 1;
 }
+
+message GetRegionsRequest {
+
+}
+
+message GetRegionsResponse {
+    repeated Region regions = 1;
+}


Mime
View raw message