RC2

pingcap · Mar 25, 2024 · 1e38743 · 1e38743
1 parent 46c5bd3
commit 1e38743
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 15 deletions.
diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pingcap.tispark</groupId>
         <artifactId>tispark-parent</artifactId>
-        <version>3.2.2-RC1</version>
+        <version>3.2.2-RC2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/core-test/pom.xml b/core-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pingcap.tispark</groupId>
         <artifactId>tispark-parent</artifactId>
-        <version>3.2.2-RC1</version>
+        <version>3.2.2-RC2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pingcap.tispark</groupId>
         <artifactId>tispark-parent</artifactId>
-        <version>3.2.2-RC1</version>
+        <version>3.2.2-RC2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pingcap.tispark</groupId>
         <artifactId>tispark-parent</artifactId>
-        <version>3.2.2-RC1</version>
+        <version>3.2.2-RC2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>com.pingcap.tispark</groupId>
     <artifactId>tispark-parent</artifactId>
-    <version>3.2.2-RC1</version>
+    <version>3.2.2-RC2</version>
     <packaging>pom</packaging>
     <name>TiSpark Project Parent POM</name>
     <url>http://github.copm/pingcap/tispark</url>

diff --git a/spark-wrapper/spark-3.0/pom.xml b/spark-wrapper/spark-3.0/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pingcap.tispark</groupId>
         <artifactId>tispark-parent</artifactId>
-        <version>3.2.2-RC1</version>
+        <version>3.2.2-RC2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/spark-wrapper/spark-3.1/pom.xml b/spark-wrapper/spark-3.1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pingcap.tispark</groupId>
         <artifactId>tispark-parent</artifactId>
-        <version>3.2.2-RC1</version>
+        <version>3.2.2-RC2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/spark-wrapper/spark-3.2/pom.xml b/spark-wrapper/spark-3.2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pingcap.tispark</groupId>
         <artifactId>tispark-parent</artifactId>
-        <version>3.2.2-RC1</version>
+        <version>3.2.2-RC2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/spark-wrapper/spark-3.3/pom.xml b/spark-wrapper/spark-3.3/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.pingcap.tispark</groupId>
     <artifactId>tispark-parent</artifactId>
-    <version>3.2.2-RC1</version>
+    <version>3.2.2-RC2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/tikv-client/pom.xml b/tikv-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pingcap.tispark</groupId>
         <artifactId>tispark-parent</artifactId>
-        <version>3.2.2-RC1</version>
+        <version>3.2.2-RC2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git 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
@@ -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<Row> {