Add end_keys for RawBatchScanRequest

pingcap · Mar 26, 2018 · 78dff81 · 78dff81
1 parent 5ee163b
commit 78dff81
Show file tree

Hide file tree

Showing 8 changed files with 608 additions and 500 deletions.
diff --git a/pkg/kvrpcpb/kvrpcpb.pb.go b/pkg/kvrpcpb/kvrpcpb.pb.go
diff --git a/proto/kvrpcpb.proto b/proto/kvrpcpb.proto
@@ -327,9 +327,10 @@ message RawScanResponse {
 
 message RawBatchScanRequest {
     Context context = 1;
-    repeated bytes start_keys = 2;
-    uint32 each_limit = 3;
-    bool key_only = 4;
+    repeated bytes start_keys = 2; // start keys for each scanning range
+    repeated bytes end_keys = 3; // optional end keys for each scaning range
+    uint32 each_limit = 4; // max number of returning kv pairs for each scanning range
+    bool key_only = 5;
 }
 
 message RawBatchScanResponse {

diff --git a/src/coprocessor.rs b/src/coprocessor.rs
@@ -1089,7 +1089,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     \x1f\n\x0bother_error\x18\x04\x20\x01(\tR\notherError\x12+\n\x05range\
     \x18\x05\x20\x01(\x0b2\x15.coprocessor.KeyRangeR\x05range\x127\n\x0cexec\
     _details\x18\x06\x20\x01(\x0b2\x14.kvrpcpb.ExecDetailsR\x0bexecDetailsB&\
-    \n\x18com.pingcap.tikv.kvproto\xe0\xe2\x1e\x01\xd0\xe2\x1e\x01\xc8\xe2\
+    \n\x18com.pingcap.tikv.kvproto\xc8\xe2\x1e\x01\xd0\xe2\x1e\x01\xe0\xe2\
     \x1e\x01J\xea\x0b\n\x06\x12\x04\0\0!\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\
     \n\x08\n\x01\x02\x12\x03\x01\x08\x13\n\t\n\x02\x03\0\x12\x03\x03\x07\x16\
     \n\t\n\x02\x03\x01\x12\x03\x04\x07\x16\n\t\n\x02\x03\x02\x12\x03\x05\x07\

diff --git a/src/debugpb.rs b/src/debugpb.rs
@@ -5510,7 +5510,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     onsistency\x12&.debugpb.RegionConsistencyCheckRequest\x1a'.debugpb.Regio\
     nConsistencyCheckResponse\"\0\x12Y\n\x10ModifyTikvConfig\x12\x20.debugpb\
     .ModifyTikvConfigRequest\x1a!.debugpb.ModifyTikvConfigResponse\"\0B&\n\
-    \x18com.pingcap.tikv.kvproto\xc8\xe2\x1e\x01\xd0\xe2\x1e\x01\xe0\xe2\x1e\
+    \x18com.pingcap.tikv.kvproto\xe0\xe2\x1e\x01\xc8\xe2\x1e\x01\xd0\xe2\x1e\
     \x01J\x812\n\x07\x12\x05\0\0\xc7\x01\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\
     \n\x08\n\x01\x02\x12\x03\x01\x08\x0f\n\t\n\x02\x03\0\x12\x03\x03\x07\x16\
     \n\t\n\x02\x03\x01\x12\x03\x04\x07\x16\n\t\n\x02\x03\x02\x12\x03\x05\x07\

diff --git a/src/errorpb.rs b/src/errorpb.rs
@@ -2328,7 +2328,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     dR\x0cstaleCommand\x12>\n\x0fstore_not_match\x18\x08\x20\x01(\x0b2\x16.e\
     rrorpb.StoreNotMatchR\rstoreNotMatch\x12K\n\x14raft_entry_too_large\x18\
     \t\x20\x01(\x0b2\x1a.errorpb.RaftEntryTooLargeR\x11raftEntryTooLargeB&\n\
-    \x18com.pingcap.tikv.kvproto\xc8\xe2\x1e\x01\xe0\xe2\x1e\x01\xd0\xe2\x1e\
+    \x18com.pingcap.tikv.kvproto\xe0\xe2\x1e\x01\xc8\xe2\x1e\x01\xd0\xe2\x1e\
     \x01J\x8f\x10\n\x06\x12\x04\0\0:\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\n\
     \x08\n\x01\x02\x12\x03\x01\x08\x0f\n\t\n\x02\x03\0\x12\x03\x03\x07\x15\n\
     \t\n\x02\x03\x01\x12\x03\x04\x07\x1d\n\x08\n\x01\x08\x12\x03\x06\0(\n\

diff --git a/src/importpb.rs b/src/importpb.rs
@@ -1564,7 +1564,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     \x8b\x01\n\tImportSST\x12?\n\x06Upload\x12\x17.importpb.UploadRequest\
     \x1a\x18.importpb.UploadResponse\"\0(\x01\x12=\n\x06Ingest\x12\x17.impor\
     tpb.IngestRequest\x1a\x18.importpb.IngestResponse\"\0B&\n\x18com.pingcap\
-    .tikv.kvproto\xc8\xe2\x1e\x01\xe0\xe2\x1e\x01\xd0\xe2\x1e\x01J\x97\x15\n\
+    .tikv.kvproto\xd0\xe2\x1e\x01\xe0\xe2\x1e\x01\xc8\xe2\x1e\x01J\x97\x15\n\
     \x06\x12\x04\0\0C\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\n\x08\n\x01\x02\
     \x12\x03\x02\x08\x10\n\t\n\x02\x03\0\x12\x03\x04\x07\x15\n\t\n\x02\x03\
     \x01\x12\x03\x05\x07\x16\n\t\n\x02\x03\x02\x12\x03\x06\x07\x16\n\t\n\x02\

diff --git a/src/kvrpcpb.rs b/src/kvrpcpb.rs
diff --git a/src/metapb.rs b/src/metapb.rs
@@ -1669,7 +1669,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     1\n\x04Peer\x12\x0e\n\x02id\x18\x01\x20\x01(\x04R\x02id\x12\x19\n\x08sto\
     re_id\x18\x02\x20\x01(\x04R\x07storeId*0\n\nStoreState\x12\x06\n\x02Up\
     \x10\0\x12\x0b\n\x07Offline\x10\x01\x12\r\n\tTombstone\x10\x02B&\n\x18co\
-    m.pingcap.tikv.kvproto\xc8\xe2\x1e\x01\xe0\xe2\x1e\x01\xd0\xe2\x1e\x01J\
+    m.pingcap.tikv.kvproto\xe0\xe2\x1e\x01\xc8\xe2\x1e\x01\xd0\xe2\x1e\x01J\
     \x9d\x11\n\x06\x12\x04\0\0:\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\n\x08\n\
     \x01\x02\x12\x03\x01\x08\x0e\n\t\n\x02\x03\0\x12\x03\x03\x07\x1d\n\x08\n\
     \x01\x08\x12\x03\x05\0(\n\x0b\n\x04\x08\xe7\x07\0\x12\x03\x05\0(\n\x0c\n\