Merge branch 'master' into rustin-patch-fix

Author: nrc

tikv-client-proto/proto/coprocessor_v2.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 package tikvpb;
 
 import "coprocessor.proto";
-import "coprocessor_v2.proto";
 import "kvrpcpb.proto";
 import "mpp.proto";
 import "raft_serverpb.proto";
@@ -70,9 +69,6 @@ service Tikv {
     rpc CoprocessorStream(coprocessor.Request)  returns (stream coprocessor.Response) {}
     rpc BatchCoprocessor(coprocessor.BatchRequest) returns (stream coprocessor.BatchResponse) {}
 
-    // Command for executing custom user requests in TiKV coprocessor_v2.
-    rpc CoprocessorV2(coprocessor_v2.RawCoprocessorRequest) returns (coprocessor_v2.RawCoprocessorResponse) {}
-
     // Raft commands (sent between TiKV nodes).
     rpc Raft(stream raft_serverpb.RaftMessage) returns (raft_serverpb.Done) {}
     rpc BatchRaft(stream BatchRaftMessage) returns (raft_serverpb.Done) {}
@@ -148,8 +144,6 @@ message BatchCommandsRequest {
 
             kvrpcpb.CheckSecondaryLocksRequest CheckSecondaryLocks = 33;
 
-            coprocessor_v2.RawCoprocessorRequest CoprocessorV2 = 34;
-
             // For some test cases.
             BatchCommandsEmptyRequest Empty = 255;
         }
@@ -203,8 +197,6 @@ message BatchCommandsResponse {
 
             kvrpcpb.CheckSecondaryLocksResponse CheckSecondaryLocks = 33;
 
-            coprocessor_v2.RawCoprocessorResponse CoprocessorV2 = 34;
-
             // For some test cases.
             BatchCommandsEmptyResponse Empty = 255;
         }