diff --git a/assembly/pom.xml b/assembly/pom.xml index 79f3ad5077..b9c5cbfa20 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.2.2-RC1 + 3.2.2-RC2 ../pom.xml diff --git a/core-test/pom.xml b/core-test/pom.xml index 7c8f41a946..71a95a950d 100644 --- a/core-test/pom.xml +++ b/core-test/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.2.2-RC1 + 3.2.2-RC2 ../pom.xml diff --git a/core/pom.xml b/core/pom.xml index ec1d4c2bdd..3fa8bcb4b9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.2.2-RC1 + 3.2.2-RC2 ../pom.xml diff --git a/core/src/main/scala/org/apache/spark/sql/execution/CoprocessorRDD.scala b/core/src/main/scala/org/apache/spark/sql/execution/CoprocessorRDD.scala index 57fcc84e40..b905b43baa 100644 --- a/core/src/main/scala/org/apache/spark/sql/execution/CoprocessorRDD.scala +++ b/core/src/main/scala/org/apache/spark/sql/execution/CoprocessorRDD.scala @@ -20,7 +20,7 @@ import com.pingcap.tikv.columnar.{TiChunk, TiColumnarBatchHelper} import com.pingcap.tikv.handle.Handle import com.pingcap.tikv.meta.TiDAGRequest import com.pingcap.tikv.operation.iterator.CoprocessorIterator -import com.pingcap.tikv.util.RangeSplitter +import org.tikv.common.util.RangeSplitter import com.pingcap.tikv.{ClientSession, TiConfiguration} import com.pingcap.tispark.listener.CacheInvalidateListener import com.pingcap.tispark.utils.TiUtil diff --git a/core/src/main/scala/org/apache/spark/sql/tispark/TiHandleRDD.scala b/core/src/main/scala/org/apache/spark/sql/tispark/TiHandleRDD.scala index aa876aaee2..2c6843e8cf 100644 --- a/core/src/main/scala/org/apache/spark/sql/tispark/TiHandleRDD.scala +++ b/core/src/main/scala/org/apache/spark/sql/tispark/TiHandleRDD.scala @@ -18,7 +18,7 @@ package org.apache.spark.sql.tispark import com.pingcap.tikv.handle.Handle import com.pingcap.tikv.meta.TiDAGRequest -import com.pingcap.tikv.util.RangeSplitter +import org.tikv.common.util.RangeSplitter import com.pingcap.tikv.{ClientSession, TiConfiguration} import com.pingcap.tispark.utils.TiUtil import com.pingcap.tispark.{TiPartition, TiTableReference} diff --git a/core/src/main/scala/org/apache/spark/sql/tispark/TiRDD.scala b/core/src/main/scala/org/apache/spark/sql/tispark/TiRDD.scala index b2d997b6df..40c01c80f3 100644 --- a/core/src/main/scala/org/apache/spark/sql/tispark/TiRDD.scala +++ b/core/src/main/scala/org/apache/spark/sql/tispark/TiRDD.scala @@ -19,7 +19,7 @@ package org.apache.spark.sql.tispark import com.pingcap.tikv._ import com.pingcap.tikv.meta.TiDAGRequest import com.pingcap.tikv.types.Converter -import com.pingcap.tikv.util.RangeSplitter +import org.tikv.common.util.RangeSplitter import com.pingcap.tispark.{TiPartition, TiTableReference} import org.apache.spark.Partition import org.apache.spark.rdd.RDD diff --git a/db-random-test/pom.xml b/db-random-test/pom.xml index fff421e7a1..cc679bf609 100644 --- a/db-random-test/pom.xml +++ b/db-random-test/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.2.2-RC1 + 3.2.2-RC2 ../pom.xml diff --git a/pom.xml b/pom.xml index 56caa2b632..12be0c0fb5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.pingcap.tispark tispark-parent - 3.2.2-RC1 + 3.2.2-RC2 pom TiSpark Project Parent POM http://github.copm/pingcap/tispark diff --git a/spark-wrapper/spark-3.0/pom.xml b/spark-wrapper/spark-3.0/pom.xml index 61bb3364b2..04aee8cf9d 100644 --- a/spark-wrapper/spark-3.0/pom.xml +++ b/spark-wrapper/spark-3.0/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.2.2-RC1 + 3.2.2-RC2 ../../pom.xml diff --git a/spark-wrapper/spark-3.1/pom.xml b/spark-wrapper/spark-3.1/pom.xml index 7926a30c56..0809746c8d 100644 --- a/spark-wrapper/spark-3.1/pom.xml +++ b/spark-wrapper/spark-3.1/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.2.2-RC1 + 3.2.2-RC2 ../../pom.xml diff --git a/spark-wrapper/spark-3.2/pom.xml b/spark-wrapper/spark-3.2/pom.xml index 255d1d3385..531d8d2def 100644 --- a/spark-wrapper/spark-3.2/pom.xml +++ b/spark-wrapper/spark-3.2/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.2.2-RC1 + 3.2.2-RC2 ../../pom.xml diff --git a/spark-wrapper/spark-3.3/pom.xml b/spark-wrapper/spark-3.3/pom.xml index 6c5468d719..d1c3111768 100644 --- a/spark-wrapper/spark-3.3/pom.xml +++ b/spark-wrapper/spark-3.3/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.2.2-RC1 + 3.2.2-RC2 ../../pom.xml diff --git a/tikv-client/pom.xml b/tikv-client/pom.xml index 2d74076654..43e58b10ff 100644 --- a/tikv-client/pom.xml +++ b/tikv-client/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.2.2-RC1 + 3.2.2-RC2 ../pom.xml diff --git a/tikv-client/src/main/java/com/pingcap/tikv/Snapshot.java b/tikv-client/src/main/java/com/pingcap/tikv/Snapshot.java index 2c614fcd07..f3d9fe17eb 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/Snapshot.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/Snapshot.java @@ -27,7 +27,6 @@ import com.pingcap.tikv.operation.iterator.ConcreteScanIterator; import com.pingcap.tikv.operation.iterator.IndexScanIterator; import com.pingcap.tikv.row.Row; -import com.pingcap.tikv.util.RangeSplitter; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -37,6 +36,7 @@ import org.tikv.common.TiSession; import org.tikv.common.meta.TiTimestamp; import org.tikv.common.util.ConcreteBackOffer; +import org.tikv.common.util.RangeSplitter; import org.tikv.common.util.RangeSplitter.RegionTask; import org.tikv.kvproto.Kvrpcpb.KvPair; import org.tikv.shade.com.google.protobuf.ByteString; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/operation/iterator/IndexScanIterator.java b/tikv-client/src/main/java/com/pingcap/tikv/operation/iterator/IndexScanIterator.java index 0bd625c9a0..02c3afba0e 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/operation/iterator/IndexScanIterator.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/operation/iterator/IndexScanIterator.java @@ -22,13 +22,13 @@ import com.pingcap.tikv.handle.Handle; import com.pingcap.tikv.meta.TiDAGRequest; import com.pingcap.tikv.row.Row; -import com.pingcap.tikv.util.RangeSplitter; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; import java.util.concurrent.ExecutorCompletionService; import org.tikv.common.exception.TiClientInternalException; +import org.tikv.common.util.RangeSplitter; import org.tikv.common.util.RangeSplitter.RegionTask; public class IndexScanIterator implements Iterator {