Merge remote-tracking branch 'origin/master' into release-2.3

pingcap · Sep 2, 2020 · e6435a1 · e6435a1
2 parents 60c89d3 + 7f57acd
commit e6435a1
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/core/src/main/scala/com/pingcap/tispark/write/TiBatchWrite.scala b/core/src/main/scala/com/pingcap/tispark/write/TiBatchWrite.scala
@@ -215,11 +215,6 @@ class TiBatchWrite(
 
     logger.info(s"primary key: $primaryKey")
 
-    // filter primary key
-    val secondaryKeysRDD = shuffledRDD.filter { keyValue =>
-      !keyValue._1.equals(primaryKey)
-    }
-
     // split region
     if (options.enableRegionSplit && "v2".equals(options.regionSplitMethod)) {
       val insertRDD = shuffledRDD.filter(kv => kv._2.length > 0)
@@ -239,6 +234,11 @@ class TiBatchWrite(
       shuffledRDD = shuffledRDD.partitionBy(new TiReginSplitPartitioner(orderedSplitPoints))
     }
 
+    // filter primary key
+    val secondaryKeysRDD = shuffledRDD.filter { keyValue =>
+      !keyValue._1.equals(primaryKey)
+    }
+
     // driver primary pre-write
     val ti2PCClient =
       new TwoPhaseCommitter(