From ebe6f6bece7753db966e7a6913cc8c37f9d51a03 Mon Sep 17 00:00:00 2001
From: chenjing <huny.king@163.com>
Date: Mon, 21 Jan 2019 17:45:23 +0800
Subject: [PATCH] Fix gradle build bugs and remove hadoop dependencies (#26)

Signed-off-by: jackycchen <120505816@qq.com>
---
 build.gradle                                  | 23 ++++++++++---------
 .../tikv/common/util/ConcreteBackOffer.java   | 13 +++++++----
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index 46d99fdee3..4073b69a09 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,12 +25,12 @@ buildscript {
 sourceSets {
     main {
         proto {
-            srcDir './proto'
+            srcDir 'src/main/proto'
 			include '**/*.proto'
         }
         java {
             // include self written and generated code
-            srcDirs 'src/main/java', 'target/generated-sources/main/java'            
+            srcDirs 'src/main/java', 'target/generated-sources/main/java' , 'target/generated-sources/main/grpc-java'
         }
     }
 	test {
@@ -76,7 +76,6 @@ protobuf {
 
         // (Java only) returns tasks for a sourceSet
         ofSourceSet('main')
-
     }   
 }
 
@@ -103,14 +102,16 @@ dependencies {
     compile group: 'joda-time', name: 'joda-time', version:'2.9.9'
     compile group: 'org.joda', name: 'joda-convert', version:'1.9.2'
     testCompile group: 'io.grpc', name: 'grpc-testing', version:'1.7.0'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version:'2.8.1'
+    //remove unused hadoop dependencies
+    /*compile group: 'org.apache.logging.log4j', name: 'log4j-api', version:'2.8.1'
     compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.8.1'
     compile group: 'org.apache.spark', name: 'spark-core_2.11', version:'2.3.2'
     compile group: 'org.apache.spark', name: 'spark-catalyst_2.11', version:'2.3.2'
     compile group: 'org.apache.spark', name: 'spark-sql_2.11', version:'2.3.2'
     compile group: 'org.apache.spark', name: 'spark-hive_2.11', version:'2.3.2'
     compile group: 'org.apache.spark', name: 'spark-hive-thriftserver_2.11', version:'2.3.2'
-    compile group: 'org.apache.spark', name: 'spark-unsafe_2.11', version:'2.3.2'
+    compile group: 'org.apache.spark', name: 'spark-unsafe_2.11', version:'2.3.2'*/
+    compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.5'
     compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.16'
     compile group: 'org.slf4j', name: 'slf4j-log4j12', version:'1.7.16'
     compile group: 'org.slf4j', name: 'jul-to-slf4j', version:'1.7.16'
@@ -120,7 +121,7 @@ dependencies {
 
 task updateProtoModule(type: Exec) {
     if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) {
-        commandLine 'cmd', '/c', './scripts/proto.sh'
+        commandLine 'cmd', './scripts/proto.sh'
     } else {
         commandLine 'sh', '-c', './scripts/proto.sh'
     }
@@ -133,13 +134,13 @@ compileJava << {
 task copyResources(type: Copy) {
 	includeEmptyDirs = false
 	copy {
-		from "./kvproto/vendor/github.com/gogo/protobuf/"
-		include "**/gogoproto/**"
-		into "./proto/"
+		from "./scripts/kvproto/include/"
+	    include "**/gogoproto/**"
+		into "src/main/proto"
 	}
 	copy {
-		from "./kvproto/proto/", "./raft-rs/proto/", "./tipb/proto"
-		into "./proto/"
+		from "./scripts/kvproto/proto/", "./scripts/raft-rs/proto/", "./scripts/tipb/proto"
+		into "src/main/proto"
 	}
 }
 
diff --git a/src/main/java/org/tikv/common/util/ConcreteBackOffer.java b/src/main/java/org/tikv/common/util/ConcreteBackOffer.java
index e4aab3855c..b60a654aaa 100644
--- a/src/main/java/org/tikv/common/util/ConcreteBackOffer.java
+++ b/src/main/java/org/tikv/common/util/ConcreteBackOffer.java
@@ -86,7 +86,8 @@ public class ConcreteBackOffer implements BackOffer {
     BackOffFunction backOffFunction = null;
     switch (funcType) {
       case BoUpdateLeader:
-        backOffFunction = BackOffFunction.create(1, 100, BackOffStrategy.NoJitter);
+        //fix: reference from go client
+        backOffFunction = BackOffFunction.create(1, 10, BackOffStrategy.NoJitter);
         break;
       case BoTxnLockFast:
         backOffFunction = BackOffFunction.create(100, 3000, BackOffStrategy.EqualJitter);
@@ -95,16 +96,20 @@ public class ConcreteBackOffer implements BackOffer {
         backOffFunction = BackOffFunction.create(2000, 10000, BackOffStrategy.EqualJitter);
         break;
       case BoRegionMiss:
-        backOffFunction = BackOffFunction.create(500, 1000, BackOffStrategy.NoJitter);
+        //fix: reference from go client
+        // change base time to 2ms, because it may recover soon.
+        backOffFunction = BackOffFunction.create(2, 500, BackOffStrategy.NoJitter);
         break;
       case BoTxnLock:
         backOffFunction = BackOffFunction.create(200, 3000, BackOffStrategy.EqualJitter);
         break;
       case BoPDRPC:
-        backOffFunction = BackOffFunction.create(500, 5000, BackOffStrategy.EqualJitter);
+        //
+        backOffFunction = BackOffFunction.create(500, 3000, BackOffStrategy.EqualJitter);
         break;
       case BoTiKVRPC:
-        backOffFunction = BackOffFunction.create(500, 5000, BackOffStrategy.EqualJitter);
+        //fix: reference from go client
+        backOffFunction = BackOffFunction.create(100, 2000, BackOffStrategy.EqualJitter);
         break;
       case BoStoreNotMatch:
         backOffFunction = BackOffFunction.create(100, 3000, BackOffStrategy.EqualJitter);