fix grpc conflicts by updating pom (pingcap#1439)

pom.xml

@@ -134,7 +134,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M2</version>
+                <version>3.0.0-M3</version>
                 <executions>
                     <execution>
                         <goals>

tikv-client/pom.xml

@@ -17,10 +17,10 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <protobuf.version>3.1.0</protobuf.version>
+        <protobuf.version>3.5.1</protobuf.version>
         <junit.version>4.12</junit.version>
         <slf4j.version>1.7.16</slf4j.version>
-        <grpc.version>1.17.0</grpc.version>
+        <grpc.version>1.24.0</grpc.version>
         <powermock.version>1.6.6</powermock.version>
         <jackson.version>2.10.0</jackson.version>
         <trove4j.version>3.0.1</trove4j.version>
@@ -73,7 +73,7 @@
         <!-- grpc dependencies -->
         <dependency>
             <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty</artifactId>
+            <artifactId>grpc-netty-shaded</artifactId>
             <version>${grpc.version}</version>
         </dependency>
         <dependency>
@@ -114,12 +114,12 @@
             <version>${grpc.version}</version>
             <scope>test</scope>
         </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-lang3</artifactId>
-        <version>3.8.1</version>
-        <scope>compile</scope>
-      </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.8.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
@@ -146,15 +146,15 @@
                         </goals>
                     </execution>
                 </executions>
-              <configuration>
-                <arguments>
-                  <argument>-package</argument>
-                  <argument>com.pingcap.tikv.parser</argument>
-                </arguments>
-                <visitor>true</visitor>
-                <sourceDirectory>./src/main/java/com/pingcap/tikv/parser</sourceDirectory>
-                <outputDirectory>./target/generated-sources/antlr4/java/com/pingcap/tikv/parser</outputDirectory>
-              </configuration>
+                <configuration>
+                    <arguments>
+                        <argument>-package</argument>
+                        <argument>com.pingcap.tikv.parser</argument>
+                    </arguments>
+                    <visitor>true</visitor>
+                    <sourceDirectory>./src/main/java/com/pingcap/tikv/parser</sourceDirectory>
+                    <outputDirectory>./target/generated-sources/antlr4/java/com/pingcap/tikv/parser</outputDirectory>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -193,7 +193,6 @@
                                     <directory>${basedir}/kvproto/include</directory>
                                     <includes>
                                         <include>**/gogoproto/**</include>
-                                        <include>**/google/**</include>
                                     </includes>
                                 </resource>
                                 <resource>
@@ -223,15 +222,15 @@
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.5.0</version>
+                <version>0.6.1</version>
                 <configuration>
                     <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
                     <protoSourceRoot>${proto.folder}</protoSourceRoot>
                     <includes>
                         <param>**/*.proto</param>
                     </includes>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
                 </configuration>
                 <executions>
                     <execution>

tikv-client/src/main/java/com/pingcap/tikv/PDClient.java

@@ -67,7 +67,7 @@ public TiTimestamp getTimestamp(BackOffer backOffer) {
             r -> r.getHeader().hasError() ? buildFromPdpbError(r.getHeader().getError()) : null,
             this);
 
-    TsoResponse resp = callWithRetry(backOffer, PDGrpc.METHOD_TSO, request, handler);
+    TsoResponse resp = callWithRetry(backOffer, PDGrpc.getTsoMethod(), request, handler);
     Timestamp timestamp = resp.getTimestamp();
     return new TiTimestamp(timestamp.getPhysical(), timestamp.getLogical());
   }
@@ -84,7 +84,8 @@ public TiRegion getRegionByKey(BackOffer backOffer, ByteString key) {
     PDErrorHandler<GetRegionResponse> handler =
         new PDErrorHandler<>(getRegionResponseErrorExtractor, this);
 
-    GetRegionResponse resp = callWithRetry(backOffer, PDGrpc.METHOD_GET_REGION, request, handler);
+    GetRegionResponse resp =
+        callWithRetry(backOffer, PDGrpc.getGetRegionMethod(), request, handler);
     return new TiRegion(
         resp.getRegion(), resp.getLeader(), conf.getIsolationLevel(), conf.getCommandPriority());
   }
@@ -105,7 +106,7 @@ public Future<TiRegion> getRegionByKeyAsync(BackOffer backOffer, ByteString key)
     PDErrorHandler<GetRegionResponse> handler =
         new PDErrorHandler<>(getRegionResponseErrorExtractor, this);
 
-    callAsyncWithRetry(backOffer, PDGrpc.METHOD_GET_REGION, request, responseObserver, handler);
+    callAsyncWithRetry(backOffer, PDGrpc.getGetRegionMethod(), request, responseObserver, handler);
     return responseObserver.getFuture();
   }
 
@@ -117,7 +118,7 @@ public TiRegion getRegionByID(BackOffer backOffer, long id) {
         new PDErrorHandler<>(getRegionResponseErrorExtractor, this);
 
     GetRegionResponse resp =
-        callWithRetry(backOffer, PDGrpc.METHOD_GET_REGION_BY_ID, request, handler);
+        callWithRetry(backOffer, PDGrpc.getGetRegionByIDMethod(), request, handler);
     // Instead of using default leader instance, explicitly set no leader to null
     return new TiRegion(
         resp.getRegion(), resp.getLeader(), conf.getIsolationLevel(), conf.getCommandPriority());
@@ -140,7 +141,7 @@ public Future<TiRegion> getRegionByIDAsync(BackOffer backOffer, long id) {
         new PDErrorHandler<>(getRegionResponseErrorExtractor, this);
 
     callAsyncWithRetry(
-        backOffer, PDGrpc.METHOD_GET_REGION_BY_ID, request, responseObserver, handler);
+        backOffer, PDGrpc.getGetRegionByIDMethod(), request, responseObserver, handler);
     return responseObserver.getFuture();
   }
 
@@ -160,7 +161,7 @@ private <T> PDErrorHandler<GetStoreResponse> buildPDErrorHandler() {
   @Override
   public Store getStore(BackOffer backOffer, long storeId) {
     return callWithRetry(
-            backOffer, PDGrpc.METHOD_GET_STORE, buildGetStoreReq(storeId), buildPDErrorHandler())
+            backOffer, PDGrpc.getGetStoreMethod(), buildGetStoreReq(storeId), buildPDErrorHandler())
         .getStore();
   }
 
@@ -171,7 +172,7 @@ public Future<Store> getStoreAsync(BackOffer backOffer, long storeId) {
 
     callAsyncWithRetry(
         backOffer,
-        PDGrpc.METHOD_GET_STORE,
+        PDGrpc.getGetStoreMethod(),
         buildGetStoreReq(storeId),
         responseObserver,
         buildPDErrorHandler());
@@ -182,7 +183,7 @@ public Future<Store> getStoreAsync(BackOffer backOffer, long storeId) {
   public List<Store> getAllStores(BackOffer backOffer) {
     return callWithRetry(
             backOffer,
-            PDGrpc.METHOD_GET_ALL_STORES,
+            PDGrpc.getGetAllStoresMethod(),
             buildGetAllStoresReq(),
             new PDErrorHandler<>(
                 r -> r.getHeader().hasError() ? buildFromPdpbError(r.getHeader().getError()) : null,

tikv-client/src/main/java/com/pingcap/tikv/region/RegionStoreClient.java

@@ -143,7 +143,7 @@ public ByteString get(BackOffer backOffer, ByteString key, long version)
             resp -> resp.hasRegionError() ? resp.getRegionError() : null,
             resp -> resp.hasError() ? resp.getError() : null);
 
-    GetResponse resp = callWithRetry(backOffer, TikvGrpc.METHOD_KV_GET, factory, handler);
+    GetResponse resp = callWithRetry(backOffer, TikvGrpc.getKvGetMethod(), factory, handler);
 
     handleGetResponse(resp);
     return resp.getValue();
@@ -184,7 +184,7 @@ public List<KvPair> batchGet(BackOffer backOffer, Iterable<ByteString> keys, lon
             resp -> resp.hasRegionError() ? resp.getRegionError() : null,
             resp -> null);
     BatchGetResponse resp =
-        callWithRetry(backOffer, TikvGrpc.METHOD_KV_BATCH_GET, request, handler);
+        callWithRetry(backOffer, TikvGrpc.getKvBatchGetMethod(), request, handler);
     return handleBatchGetResponse(backOffer, resp);
   }
 
@@ -245,7 +245,7 @@ public List<KvPair> scan(
               region,
               resp -> resp.hasRegionError() ? resp.getRegionError() : null,
               resp -> null);
-      ScanResponse resp = callWithRetry(backOffer, TikvGrpc.METHOD_KV_SCAN, request, handler);
+      ScanResponse resp = callWithRetry(backOffer, TikvGrpc.getKvScanMethod(), request, handler);
       if (isScanSuccess(backOffer, resp)) {
         return doScan(resp);
       }
@@ -343,7 +343,7 @@ public void prewrite(
               region,
               resp -> resp.hasRegionError() ? resp.getRegionError() : null,
               resp -> null);
-      PrewriteResponse resp = callWithRetry(bo, TikvGrpc.METHOD_KV_PREWRITE, factory, handler);
+      PrewriteResponse resp = callWithRetry(bo, TikvGrpc.getKvPrewriteMethod(), factory, handler);
       if (isPrewriteSuccess(bo, resp)) {
         return;
       }
@@ -413,7 +413,7 @@ public void txnHeartBeat(BackOffer bo, ByteString primaryLock, long startTs, lon
               resp -> resp.hasRegionError() ? resp.getRegionError() : null,
               resp -> resp.hasError() ? resp.getError() : null);
       TxnHeartBeatResponse resp =
-          callWithRetry(bo, TikvGrpc.METHOD_KV_TXN_HEART_BEAT, factory, handler);
+          callWithRetry(bo, TikvGrpc.getKvTxnHeartBeatMethod(), factory, handler);
       if (isTxnHeartBeatSuccess(resp)) {
         return;
       }
@@ -464,7 +464,7 @@ public void commit(BackOffer backOffer, Iterable<ByteString> keys, long startTs,
             region,
             resp -> resp.hasRegionError() ? resp.getRegionError() : null,
             resp -> resp.hasError() ? resp.getError() : null);
-    CommitResponse resp = callWithRetry(backOffer, TikvGrpc.METHOD_KV_COMMIT, factory, handler);
+    CommitResponse resp = callWithRetry(backOffer, TikvGrpc.getKvCommitMethod(), factory, handler);
     handleCommitResponse(resp);
   }
 
@@ -529,7 +529,7 @@ public List<RangeSplitter.RegionTask> coprocess(
             resp -> resp.hasRegionError() ? resp.getRegionError() : null,
             resp -> null);
     Coprocessor.Response resp =
-        callWithRetry(backOffer, TikvGrpc.METHOD_COPROCESSOR, reqToSend, handler);
+        callWithRetry(backOffer, TikvGrpc.getCoprocessorMethod(), reqToSend, handler);
     return handleCopResponse(backOffer, resp, ranges, responseQueue);
   }
 
@@ -646,7 +646,7 @@ public Iterator<SelectResponse> coprocessStreaming(DAGRequest req, List<KeyRange
     StreamingResponse responseIterator =
         this.callServerStreamingWithRetry(
             ConcreteBackOffer.newCopNextMaxBackOff(),
-            TikvGrpc.METHOD_COPROCESSOR_STREAM,
+            TikvGrpc.getCoprocessorStreamMethod(),
             reqToSend,
             handler);
     return doCoprocessor(responseIterator);

tikv-client/src/main/java/com/pingcap/tikv/txn/LockResolverClientV2.java

@@ -131,7 +131,7 @@ private Long getTxnStatus(BackOffer bo, Long txnID, ByteString primary) {
               region,
               resp -> resp.hasRegionError() ? resp.getRegionError() : null,
               resp -> resp.hasError() ? resp.getError() : null);
-      CleanupResponse resp = callWithRetry(bo, TikvGrpc.METHOD_KV_CLEANUP, factory, handler);
+      CleanupResponse resp = callWithRetry(bo, TikvGrpc.getKvCleanupMethod(), factory, handler);
 
       status = 0L;
       if (resp.hasRegionError()) {
@@ -235,7 +235,7 @@ private void resolveLock(BackOffer bo, Lock lock, long txnStatus, Set<RegionVerI
               resp -> resp.hasRegionError() ? resp.getRegionError() : null,
               resp -> resp.hasError() ? resp.getError() : null);
       ResolveLockResponse resp =
-          callWithRetry(bo, TikvGrpc.METHOD_KV_RESOLVE_LOCK, factory, handler);
+          callWithRetry(bo, TikvGrpc.getKvResolveLockMethod(), factory, handler);
 
       if (resp.hasError()) {
         logger.error(

tikv-client/src/main/java/com/pingcap/tikv/txn/LockResolverClientV3.java

@@ -167,7 +167,7 @@ private void resolveLock(
               resp -> resp.hasRegionError() ? resp.getRegionError() : null,
               resp -> resp.hasError() ? resp.getError() : null);
       Kvrpcpb.ResolveLockResponse resp =
-          callWithRetry(bo, TikvGrpc.METHOD_KV_RESOLVE_LOCK, factory, handler);
+          callWithRetry(bo, TikvGrpc.getKvResolveLockMethod(), factory, handler);
 
       if (resp.hasError()) {
         logger.error(
@@ -228,7 +228,7 @@ private TxnStatus getTxnStatus(BackOffer bo, Long txnID, ByteString primary, Lon
               region,
               resp -> resp.hasRegionError() ? resp.getRegionError() : null,
               resp -> resp.hasError() ? resp.getError() : null);
-      CleanupResponse resp = callWithRetry(bo, TikvGrpc.METHOD_KV_CLEANUP, factory, handler);
+      CleanupResponse resp = callWithRetry(bo, TikvGrpc.getKvCleanupMethod(), factory, handler);
 
       if (resp.hasRegionError()) {
         bo.doBackOff(BoRegionMiss, new RegionException(resp.getRegionError()));