*: rename java packages (#3)

pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.pingcap.tikv</groupId>
+    <groupId>org.tikv</groupId>
     <artifactId>tikv-client-java</artifactId>
     <version>2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -220,7 +220,7 @@
                          <outputDirectory>${proto.folder}</outputDirectory>
                          <resources>
                             <resource>
-                               <directory>${basedir}/kvproto/_vendor/src/github.com/gogo/protobuf</directory>
+                               <directory>${basedir}/kvproto/vendor/github.com/gogo/protobuf</directory>
                                <includes>
                                     <include>**/gogoproto/**</include>
                                </includes>

scripts/proto.sh

@@ -15,10 +15,9 @@
 #
 
 if [ -d "kvproto" ]; then
-    # cd kvproto; git pull origin master; cd ..
-    cd kvproto; git checkout 497dd34f807bccdb5bd01009c62c5fd5ced404f3; cd ..
+    cd kvproto; git pull origin master; cd ..
 else
-    git clone https://github.com/pingcap/kvproto; cd kvproto; git checkout 497dd34f807bccdb5bd01009c62c5fd5ced404f3; cd ..
+    git clone https://github.com/pingcap/kvproto
 fi
 
 if [ -d "raft-rs" ]; then

src/main/java/org/tikv/AbstractGRPCClient.java

@@ -13,22 +13,22 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv;
+package org.tikv;
 
 import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall;
 import static io.grpc.stub.ClientCalls.blockingServerStreamingCall;
 
-import com.pingcap.tikv.operation.ErrorHandler;
-import com.pingcap.tikv.policy.RetryMaxMs.Builder;
-import com.pingcap.tikv.policy.RetryPolicy;
-import com.pingcap.tikv.streaming.StreamingResponse;
-import com.pingcap.tikv.util.BackOffer;
 import io.grpc.MethodDescriptor;
 import io.grpc.stub.AbstractStub;
 import io.grpc.stub.ClientCalls;
 import io.grpc.stub.StreamObserver;
 import java.util.function.Supplier;
 import org.apache.log4j.Logger;
+import org.tikv.operation.ErrorHandler;
+import org.tikv.policy.RetryMaxMs.Builder;
+import org.tikv.policy.RetryPolicy;
+import org.tikv.streaming.StreamingResponse;
+import org.tikv.util.BackOffer;
 
 public abstract class AbstractGRPCClient<
         BlockingStubT extends AbstractStub<BlockingStubT>, StubT extends AbstractStub<StubT>>

src/main/java/org/tikv/Main.java

@@ -1,4 +1,4 @@
-package com.pingcap.tikv;
+package org.tikv;
 
 public class Main {
   public static void main(String args[]) throws Exception {}

src/main/java/org/tikv/PDClient.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv;
+package org.tikv;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -21,31 +21,6 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.net.HostAndPort;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.protobuf.ByteString;
-import com.pingcap.tikv.codec.Codec.BytesCodec;
-import com.pingcap.tikv.codec.CodecDataOutput;
-import com.pingcap.tikv.exception.GrpcException;
-import com.pingcap.tikv.exception.TiClientInternalException;
-import com.pingcap.tikv.kvproto.Kvrpcpb.IsolationLevel;
-import com.pingcap.tikv.kvproto.Metapb.Store;
-import com.pingcap.tikv.kvproto.PDGrpc;
-import com.pingcap.tikv.kvproto.PDGrpc.PDBlockingStub;
-import com.pingcap.tikv.kvproto.PDGrpc.PDStub;
-import com.pingcap.tikv.kvproto.Pdpb.GetMembersRequest;
-import com.pingcap.tikv.kvproto.Pdpb.GetMembersResponse;
-import com.pingcap.tikv.kvproto.Pdpb.GetRegionByIDRequest;
-import com.pingcap.tikv.kvproto.Pdpb.GetRegionRequest;
-import com.pingcap.tikv.kvproto.Pdpb.GetRegionResponse;
-import com.pingcap.tikv.kvproto.Pdpb.GetStoreRequest;
-import com.pingcap.tikv.kvproto.Pdpb.GetStoreResponse;
-import com.pingcap.tikv.kvproto.Pdpb.RequestHeader;
-import com.pingcap.tikv.kvproto.Pdpb.Timestamp;
-import com.pingcap.tikv.kvproto.Pdpb.TsoRequest;
-import com.pingcap.tikv.kvproto.Pdpb.TsoResponse;
-import com.pingcap.tikv.meta.TiTimestamp;
-import com.pingcap.tikv.operation.PDErrorHandler;
-import com.pingcap.tikv.region.TiRegion;
-import com.pingcap.tikv.util.BackOffer;
-import com.pingcap.tikv.util.FutureObserver;
 import io.grpc.ManagedChannel;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -55,6 +30,31 @@ import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
+import org.tikv.codec.Codec.BytesCodec;
+import org.tikv.codec.CodecDataOutput;
+import org.tikv.exception.GrpcException;
+import org.tikv.exception.TiClientInternalException;
+import org.tikv.kvproto.Kvrpcpb.IsolationLevel;
+import org.tikv.kvproto.Metapb.Store;
+import org.tikv.kvproto.PDGrpc;
+import org.tikv.kvproto.PDGrpc.PDBlockingStub;
+import org.tikv.kvproto.PDGrpc.PDStub;
+import org.tikv.kvproto.Pdpb.GetMembersRequest;
+import org.tikv.kvproto.Pdpb.GetMembersResponse;
+import org.tikv.kvproto.Pdpb.GetRegionByIDRequest;
+import org.tikv.kvproto.Pdpb.GetRegionRequest;
+import org.tikv.kvproto.Pdpb.GetRegionResponse;
+import org.tikv.kvproto.Pdpb.GetStoreRequest;
+import org.tikv.kvproto.Pdpb.GetStoreResponse;
+import org.tikv.kvproto.Pdpb.RequestHeader;
+import org.tikv.kvproto.Pdpb.Timestamp;
+import org.tikv.kvproto.Pdpb.TsoRequest;
+import org.tikv.kvproto.Pdpb.TsoResponse;
+import org.tikv.meta.TiTimestamp;
+import org.tikv.operation.PDErrorHandler;
+import org.tikv.region.TiRegion;
+import org.tikv.util.BackOffer;
+import org.tikv.util.FutureObserver;
 
 public class PDClient extends AbstractGRPCClient<PDBlockingStub, PDStub>
     implements ReadOnlyPDClient {

src/main/java/org/tikv/RawKVClient.java

@@ -1,18 +1,18 @@
-package com.pingcap.tikv;
+package org.tikv;
 
 import com.google.protobuf.ByteString;
-import com.pingcap.tikv.kvproto.Kvrpcpb;
-import com.pingcap.tikv.kvproto.Metapb;
-import com.pingcap.tikv.operation.iterator.RawScanIterator;
-import com.pingcap.tikv.region.RegionManager;
-import com.pingcap.tikv.region.RegionStoreClient;
-import com.pingcap.tikv.region.TiRegion;
-import com.pingcap.tikv.util.BackOffer;
-import com.pingcap.tikv.util.ConcreteBackOffer;
-import com.pingcap.tikv.util.Pair;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import org.tikv.kvproto.Kvrpcpb;
+import org.tikv.kvproto.Metapb;
+import org.tikv.operation.iterator.RawScanIterator;
+import org.tikv.region.RegionManager;
+import org.tikv.region.RegionStoreClient;
+import org.tikv.region.TiRegion;
+import org.tikv.util.BackOffer;
+import org.tikv.util.ConcreteBackOffer;
+import org.tikv.util.Pair;
 
 public class RawKVClient {
   private static final String DEFAULT_PD_ADDRESS = "127.0.0.1:2379";

src/main/java/org/tikv/ReadOnlyPDClient.java

@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv;
+package org.tikv;
 
 import com.google.protobuf.ByteString;
-import com.pingcap.tikv.kvproto.Metapb.Store;
-import com.pingcap.tikv.meta.TiTimestamp;
-import com.pingcap.tikv.region.TiRegion;
-import com.pingcap.tikv.util.BackOffer;
 import java.util.concurrent.Future;
+import org.tikv.kvproto.Metapb.Store;
+import org.tikv.meta.TiTimestamp;
+import org.tikv.region.TiRegion;
+import org.tikv.util.BackOffer;
 
 /** Readonly PD client including only reading related interface Supposed for TiDB-like use cases */
 public interface ReadOnlyPDClient {

src/main/java/org/tikv/Snapshot.java

@@ -13,33 +13,33 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv;
+package org.tikv;
 
-import static com.pingcap.tikv.operation.iterator.CoprocessIterator.getHandleIterator;
-import static com.pingcap.tikv.operation.iterator.CoprocessIterator.getRowIterator;
-import static com.pingcap.tikv.util.KeyRangeUtils.makeRange;
+import static org.tikv.operation.iterator.CoprocessIterator.getHandleIterator;
+import static org.tikv.operation.iterator.CoprocessIterator.getRowIterator;
+import static org.tikv.util.KeyRangeUtils.makeRange;
 
 import com.google.common.collect.Range;
 import com.google.protobuf.ByteString;
-import com.pingcap.tikv.exception.TiClientInternalException;
-import com.pingcap.tikv.key.Key;
-import com.pingcap.tikv.kvproto.Kvrpcpb.KvPair;
-import com.pingcap.tikv.kvproto.Metapb.Store;
-import com.pingcap.tikv.meta.TiDAGRequest;
-import com.pingcap.tikv.meta.TiTimestamp;
-import com.pingcap.tikv.operation.iterator.ConcreteScanIterator;
-import com.pingcap.tikv.operation.iterator.IndexScanIterator;
-import com.pingcap.tikv.region.RegionStoreClient;
-import com.pingcap.tikv.region.TiRegion;
-import com.pingcap.tikv.row.Row;
-import com.pingcap.tikv.util.BackOffer;
-import com.pingcap.tikv.util.ConcreteBackOffer;
-import com.pingcap.tikv.util.Pair;
-import com.pingcap.tikv.util.RangeSplitter;
-import com.pingcap.tikv.util.RangeSplitter.RegionTask;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import org.tikv.exception.TiClientInternalException;
+import org.tikv.key.Key;
+import org.tikv.kvproto.Kvrpcpb.KvPair;
+import org.tikv.kvproto.Metapb.Store;
+import org.tikv.meta.TiDAGRequest;
+import org.tikv.meta.TiTimestamp;
+import org.tikv.operation.iterator.ConcreteScanIterator;
+import org.tikv.operation.iterator.IndexScanIterator;
+import org.tikv.region.RegionStoreClient;
+import org.tikv.region.TiRegion;
+import org.tikv.row.Row;
+import org.tikv.util.BackOffer;
+import org.tikv.util.ConcreteBackOffer;
+import org.tikv.util.Pair;
+import org.tikv.util.RangeSplitter;
+import org.tikv.util.RangeSplitter.RegionTask;
 
 public class Snapshot {
   private final TiTimestamp timestamp;

src/main/java/org/tikv/TiConfiguration.java

@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv;
+package org.tikv;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.net.HostAndPort;
-import com.pingcap.tikv.kvproto.Kvrpcpb.CommandPri;
-import com.pingcap.tikv.kvproto.Kvrpcpb.IsolationLevel;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
+import org.tikv.kvproto.Kvrpcpb.CommandPri;
+import org.tikv.kvproto.Kvrpcpb.IsolationLevel;
 
 public class TiConfiguration implements Serializable {
   private static final int DEF_TIMEOUT = 10;

src/main/java/org/tikv/TiSession.java

@@ -13,15 +13,10 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv;
+package org.tikv;
 
 import com.google.common.net.HostAndPort;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.pingcap.tikv.catalog.Catalog;
-import com.pingcap.tikv.event.CacheInvalidateEvent;
-import com.pingcap.tikv.meta.TiTimestamp;
-import com.pingcap.tikv.region.RegionManager;
-import com.pingcap.tikv.util.ConcreteBackOffer;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import java.util.HashMap;
@@ -30,6 +25,11 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
+import org.tikv.catalog.Catalog;
+import org.tikv.event.CacheInvalidateEvent;
+import org.tikv.meta.TiTimestamp;
+import org.tikv.region.RegionManager;
+import org.tikv.util.ConcreteBackOffer;
 
 public class TiSession implements AutoCloseable {
   private static final Map<String, ManagedChannel> connPool = new HashMap<>();

src/main/java/org/tikv/catalog/Catalog.java

@@ -13,15 +13,12 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.catalog;
+package org.tikv.catalog;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.pingcap.tikv.Snapshot;
-import com.pingcap.tikv.meta.TiDBInfo;
-import com.pingcap.tikv.meta.TiTableInfo;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -34,6 +31,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import org.apache.log4j.Logger;
+import org.tikv.Snapshot;
+import org.tikv.meta.TiDBInfo;
+import org.tikv.meta.TiTableInfo;
 
 public class Catalog implements AutoCloseable {
   private Supplier<Snapshot> snapshotProvider;

src/main/java/org/tikv/catalog/CatalogTransaction.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.catalog;
+package org.tikv.catalog;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
@@ -22,23 +22,23 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.protobuf.ByteString;
-import com.pingcap.tikv.Snapshot;
-import com.pingcap.tikv.codec.Codec.BytesCodec;
-import com.pingcap.tikv.codec.Codec.IntegerCodec;
-import com.pingcap.tikv.codec.CodecDataInput;
-import com.pingcap.tikv.codec.CodecDataOutput;
-import com.pingcap.tikv.codec.KeyUtils;
-import com.pingcap.tikv.exception.TiClientInternalException;
-import com.pingcap.tikv.kvproto.Kvrpcpb;
-import com.pingcap.tikv.meta.TiDBInfo;
-import com.pingcap.tikv.meta.TiTableInfo;
-import com.pingcap.tikv.util.Pair;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import org.apache.log4j.Logger;
+import org.tikv.Snapshot;
+import org.tikv.codec.Codec.BytesCodec;
+import org.tikv.codec.Codec.IntegerCodec;
+import org.tikv.codec.CodecDataInput;
+import org.tikv.codec.CodecDataOutput;
+import org.tikv.codec.KeyUtils;
+import org.tikv.exception.TiClientInternalException;
+import org.tikv.kvproto.Kvrpcpb;
+import org.tikv.meta.TiDBInfo;
+import org.tikv.meta.TiTableInfo;
+import org.tikv.util.Pair;
 
 public class CatalogTransaction {
   protected static final Logger logger = Logger.getLogger(Catalog.class);

src/main/java/org/tikv/codec/Codec.java

@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.codec;
+package org.tikv.codec;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import com.pingcap.tikv.exception.InvalidCodecFormatException;
 import gnu.trove.list.array.TIntArrayList;
 import java.math.BigDecimal;
 import java.sql.Date;
 import java.util.Arrays;
 import org.joda.time.*;
+import org.tikv.exception.InvalidCodecFormatException;
 
 public class Codec {
 

src/main/java/org/tikv/codec/CodecDataInput.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.codec;
+package org.tikv.codec;
 
 import com.google.protobuf.ByteString;
 import java.io.*;

src/main/java/org/tikv/codec/CodecDataOutput.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.codec;
+package org.tikv.codec;
 
 import com.google.protobuf.ByteString;
 import java.io.ByteArrayOutputStream;

src/main/java/org/tikv/codec/KeyUtils.java

@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.codec;
+package org.tikv.codec;
 
 import com.google.common.primitives.UnsignedBytes;
 import com.google.protobuf.ByteString;
-import com.pingcap.tikv.kvproto.Coprocessor;
+import org.tikv.kvproto.Coprocessor;
 
 public class KeyUtils {
 

src/main/java/org/tikv/codec/MyDecimal.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.codec;
+package org.tikv.codec;
 
 import com.google.common.annotations.VisibleForTesting;
 import java.math.BigDecimal;

src/main/java/org/tikv/event/CacheInvalidateEvent.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.event;
+package org.tikv.event;
 
 import java.io.Serializable;
 

src/main/java/org/tikv/exception/CastingException.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.exception;
+package org.tikv.exception;
 
 public class CastingException extends RuntimeException {
   public CastingException(Exception e) {

src/main/java/org/tikv/exception/DAGRequestException.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.exception;
+package org.tikv.exception;
 
 public class DAGRequestException extends RuntimeException {
   public DAGRequestException(String msg) {

src/main/java/org/tikv/exception/GrpcException.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.exception;
+package org.tikv.exception;
 
 public class GrpcException extends RuntimeException {
   public GrpcException(Exception e) {

src/main/java/org/tikv/exception/IgnoreUnsupportedTypeException.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.exception;
+package org.tikv.exception;
 
 public class IgnoreUnsupportedTypeException extends RuntimeException {
   public IgnoreUnsupportedTypeException(String msg) {

src/main/java/org/tikv/exception/InvalidCodecFormatException.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.exception;
+package org.tikv.exception;
 
 public class InvalidCodecFormatException extends RuntimeException {
   public InvalidCodecFormatException(String msg) {

src/main/java/org/tikv/exception/KeyException.java

@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.exception;
+package org.tikv.exception;
 
-import com.pingcap.tikv.kvproto.Kvrpcpb;
+import org.tikv.kvproto.Kvrpcpb;
 
 public class KeyException extends RuntimeException {
   private final Kvrpcpb.KeyError keyErr;

src/main/java/org/tikv/exception/RegionException.java

@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.exception;
+package org.tikv.exception;
 
-import com.pingcap.tikv.kvproto.Errorpb.Error;
+import org.tikv.kvproto.Errorpb.Error;
 
 public class RegionException extends RuntimeException {
   private final Error regionErr;

src/main/java/org/tikv/exception/RegionTaskException.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.exception;
+package org.tikv.exception;
 
 public class RegionTaskException extends RuntimeException {
   public RegionTaskException(String msg, Throwable throwable) {

src/main/java/org/tikv/exception/SelectException.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.exception;
+package org.tikv.exception;
 
 import com.pingcap.tidb.tipb.Error;
 

src/main/java/org/tikv/exception/TiClientInternalException.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.exception;
+package org.tikv.exception;
 
 public class TiClientInternalException extends RuntimeException {
   public TiClientInternalException(String msg) {

src/main/java/org/tikv/exception/TiExpressionException.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.exception;
+package org.tikv.exception;
 
 public class TiExpressionException extends RuntimeException {
   public TiExpressionException(String msg) {

src/main/java/org/tikv/exception/TypeException.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.exception;
+package org.tikv.exception;
 
 public class TypeException extends RuntimeException {
   public TypeException(String msg) {

src/main/java/org/tikv/exception/UnsupportedTypeException.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.exception;
+package org.tikv.exception;
 
 public class UnsupportedTypeException extends RuntimeException {
   public UnsupportedTypeException(String msg) {

src/main/java/org/tikv/expression/AggregateFunction.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression;
+package org.tikv.expression;
 
 import static java.util.Objects.requireNonNull;
 

src/main/java/org/tikv/expression/ArithmeticBinaryExpression.java

@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression;
+package org.tikv.expression;
 
-import static com.pingcap.tikv.expression.ArithmeticBinaryExpression.Type.*;
 import static java.util.Objects.requireNonNull;
+import static org.tikv.expression.ArithmeticBinaryExpression.Type.*;
 
 import com.google.common.collect.ImmutableList;
 import java.util.List;

src/main/java/org/tikv/expression/Blacklist.java

@@ -15,7 +15,7 @@
  *
  */
 
-package com.pingcap.tikv.expression;
+package org.tikv.expression;
 
 import static java.util.Objects.requireNonNull;
 

src/main/java/org/tikv/expression/ByItem.java

@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression;
+package org.tikv.expression;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.pingcap.tikv.expression.visitor.ProtoConverter;
 import java.io.Serializable;
+import org.tikv.expression.visitor.ProtoConverter;
 
 public class ByItem implements Serializable {
   private Expression expr;

src/main/java/org/tikv/expression/ColumnRef.java

@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression;
+package org.tikv.expression;
 
 import com.google.common.collect.ImmutableList;
-import com.pingcap.tikv.exception.TiClientInternalException;
-import com.pingcap.tikv.exception.TiExpressionException;
-import com.pingcap.tikv.meta.TiColumnInfo;
-import com.pingcap.tikv.meta.TiTableInfo;
-import com.pingcap.tikv.types.DataType;
 import java.util.List;
 import java.util.Objects;
+import org.tikv.exception.TiClientInternalException;
+import org.tikv.exception.TiExpressionException;
+import org.tikv.meta.TiColumnInfo;
+import org.tikv.meta.TiTableInfo;
+import org.tikv.types.DataType;
 
 public class ColumnRef implements Expression {
   public static ColumnRef create(String name, TiTableInfo table) {

src/main/java/org/tikv/expression/ComparisonBinaryExpression.java

@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression;
+package org.tikv.expression;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.pingcap.tikv.expression.ComparisonBinaryExpression.Type.*;
 import static java.util.Objects.requireNonNull;
+import static org.tikv.expression.ComparisonBinaryExpression.Type.*;
 
 import com.google.common.collect.ImmutableList;
-import com.pingcap.tikv.exception.TiExpressionException;
-import com.pingcap.tikv.key.TypedKey;
-import com.pingcap.tikv.types.DataType;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import org.tikv.exception.TiExpressionException;
+import org.tikv.key.TypedKey;
+import org.tikv.types.DataType;
 
 public class ComparisonBinaryExpression implements Expression {
   public enum Type {

src/main/java/org/tikv/expression/Constant.java

@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression;
+package org.tikv.expression;
 
 import com.google.common.collect.ImmutableList;
-import com.pingcap.tikv.exception.TiExpressionException;
-import com.pingcap.tikv.types.*;
 import java.math.BigDecimal;
 import java.sql.Date;
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.Objects;
 import org.joda.time.DateTime;
+import org.tikv.exception.TiExpressionException;
+import org.tikv.types.*;
 
 // Refactor needed.
 // Refer to https://github.com/pingcap/tipb/blob/master/go-tipb/expression.pb.go

src/main/java/org/tikv/expression/Expression.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression;
+package org.tikv.expression;
 
 import java.io.Serializable;
 import java.util.List;

src/main/java/org/tikv/expression/ExpressionBlacklist.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression;
+package org.tikv.expression;
 
 public class ExpressionBlacklist extends Blacklist {
 

src/main/java/org/tikv/expression/IsNull.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression;
+package org.tikv.expression;
 
 import static java.util.Objects.requireNonNull;
 

src/main/java/org/tikv/expression/LogicalBinaryExpression.java

@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: expression.proto
 
-package com.pingcap.tikv.expression;
+package org.tikv.expression;
 
 import static java.util.Objects.requireNonNull;
 

src/main/java/org/tikv/expression/Not.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression;
+package org.tikv.expression;
 
 import static java.util.Objects.requireNonNull;
 

src/main/java/org/tikv/expression/StringRegExpression.java

@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression;
+package org.tikv.expression;
 
-import static com.pingcap.tikv.expression.StringRegExpression.Type.*;
 import static java.util.Objects.requireNonNull;
+import static org.tikv.expression.StringRegExpression.Type.*;
 
 import com.google.common.collect.ImmutableList;
-import com.pingcap.tikv.key.TypedKey;
-import com.pingcap.tikv.types.DataType;
-import com.pingcap.tikv.types.IntegerType;
 import java.util.List;
 import java.util.Objects;
+import org.tikv.key.TypedKey;
+import org.tikv.types.DataType;
+import org.tikv.types.IntegerType;
 
 public class StringRegExpression implements Expression {
   public enum Type {

src/main/java/org/tikv/expression/TypeBlacklist.java

@@ -15,13 +15,13 @@
  *
  */
 
-package com.pingcap.tikv.expression;
+package org.tikv.expression;
 
-import static com.pingcap.tikv.types.MySQLType.*;
+import static org.tikv.types.MySQLType.*;
 
-import com.pingcap.tikv.types.MySQLType;
 import java.util.HashMap;
 import java.util.Map;
+import org.tikv.types.MySQLType;
 
 public class TypeBlacklist extends Blacklist {
   private static final Map<MySQLType, String> typeToMySQLMap = initialTypeMap();

src/main/java/org/tikv/expression/Visitor.java

@@ -15,7 +15,7 @@
  *
  */
 
-package com.pingcap.tikv.expression;
+package org.tikv.expression;
 
 public abstract class Visitor<R, C> {
   protected abstract R visit(ColumnRef node, C context);

src/main/java/org/tikv/expression/visitor/ColumnMatcher.java

@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression.visitor;
+package org.tikv.expression.visitor;
 
-import com.pingcap.tikv.expression.ColumnRef;
-import com.pingcap.tikv.expression.Expression;
+import org.tikv.expression.ColumnRef;
+import org.tikv.expression.Expression;
 
 public class ColumnMatcher extends DefaultVisitor<Boolean, Void> {
   private final ColumnRef columnRef;

src/main/java/org/tikv/expression/visitor/DefaultVisitor.java

@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression.visitor;
+package org.tikv.expression.visitor;
 
-import com.pingcap.tikv.expression.*;
+import org.tikv.expression.*;
 
 public class DefaultVisitor<R, C> extends Visitor<R, C> {
   protected R process(Expression node, C context) {

src/main/java/org/tikv/expression/visitor/ExpressionTypeCoercer.java

@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression.visitor;
+package org.tikv.expression.visitor;
 
 import static java.util.Objects.requireNonNull;
 
-import com.pingcap.tikv.exception.TiExpressionException;
-import com.pingcap.tikv.expression.*;
-import com.pingcap.tikv.expression.AggregateFunction.FunctionType;
-import com.pingcap.tikv.types.DataType;
-import com.pingcap.tikv.types.DecimalType;
-import com.pingcap.tikv.types.IntegerType;
-import com.pingcap.tikv.types.RealType;
-import com.pingcap.tikv.util.Pair;
 import java.util.IdentityHashMap;
 import java.util.List;
+import org.tikv.exception.TiExpressionException;
+import org.tikv.expression.*;
+import org.tikv.expression.AggregateFunction.FunctionType;
+import org.tikv.types.DataType;
+import org.tikv.types.DecimalType;
+import org.tikv.types.IntegerType;
+import org.tikv.types.RealType;
+import org.tikv.util.Pair;
 
 /**
  * Validate and infer expression type Collected results are returned getTypeMap For now we don't do

src/main/java/org/tikv/expression/visitor/IndexMatcher.java

@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression.visitor;
+package org.tikv.expression.visitor;
 
 import static java.util.Objects.requireNonNull;
 
-import com.pingcap.tikv.expression.*;
-import com.pingcap.tikv.expression.ComparisonBinaryExpression.NormalizedPredicate;
-import com.pingcap.tikv.meta.TiIndexColumn;
+import org.tikv.expression.*;
+import org.tikv.expression.ComparisonBinaryExpression.NormalizedPredicate;
+import org.tikv.meta.TiIndexColumn;
 
 /**
  * Test if a predicate matches and index column entirely and can be convert to index related ranges

src/main/java/org/tikv/expression/visitor/IndexRangeBuilder.java

@@ -13,23 +13,23 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression.visitor;
+package org.tikv.expression.visitor;
 
 import com.google.common.collect.Range;
 import com.google.common.collect.RangeSet;
 import com.google.common.collect.TreeRangeSet;
-import com.pingcap.tikv.exception.TiExpressionException;
-import com.pingcap.tikv.expression.*;
-import com.pingcap.tikv.expression.ComparisonBinaryExpression.NormalizedPredicate;
-import com.pingcap.tikv.key.TypedKey;
-import com.pingcap.tikv.meta.TiIndexColumn;
-import com.pingcap.tikv.meta.TiIndexInfo;
-import com.pingcap.tikv.meta.TiTableInfo;
-import com.pingcap.tikv.types.DataType;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import org.tikv.exception.TiExpressionException;
+import org.tikv.expression.*;
+import org.tikv.expression.ComparisonBinaryExpression.NormalizedPredicate;
+import org.tikv.key.TypedKey;
+import org.tikv.meta.TiIndexColumn;
+import org.tikv.meta.TiIndexInfo;
+import org.tikv.meta.TiTableInfo;
+import org.tikv.types.DataType;
 
 public class IndexRangeBuilder extends DefaultVisitor<RangeSet<TypedKey>, Void> {
 

src/main/java/org/tikv/expression/visitor/MetaResolver.java

@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression.visitor;
+package org.tikv.expression.visitor;
 
-import com.pingcap.tikv.expression.ColumnRef;
-import com.pingcap.tikv.expression.Expression;
-import com.pingcap.tikv.meta.TiTableInfo;
 import java.util.List;
 import java.util.Objects;
+import org.tikv.expression.ColumnRef;
+import org.tikv.expression.Expression;
+import org.tikv.meta.TiTableInfo;
 
 public class MetaResolver extends DefaultVisitor<Void, Expression> {
   public static void resolve(Expression expression, TiTableInfo table) {

src/main/java/org/tikv/expression/visitor/ProtoConverter.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression.visitor;
+package org.tikv.expression.visitor;
 
 import static java.util.Objects.requireNonNull;
 
@@ -22,15 +22,15 @@ import com.pingcap.tidb.tipb.Expr;
 import com.pingcap.tidb.tipb.ExprType;
 import com.pingcap.tidb.tipb.FieldType;
 import com.pingcap.tidb.tipb.ScalarFuncSig;
-import com.pingcap.tikv.codec.Codec.IntegerCodec;
-import com.pingcap.tikv.codec.CodecDataOutput;
-import com.pingcap.tikv.exception.TiExpressionException;
-import com.pingcap.tikv.expression.*;
-import com.pingcap.tikv.expression.AggregateFunction.FunctionType;
-import com.pingcap.tikv.types.*;
-import com.pingcap.tikv.types.DataType.EncodeType;
 import java.util.IdentityHashMap;
 import java.util.Map;
+import org.tikv.codec.Codec.IntegerCodec;
+import org.tikv.codec.CodecDataOutput;
+import org.tikv.exception.TiExpressionException;
+import org.tikv.expression.*;
+import org.tikv.expression.AggregateFunction.FunctionType;
+import org.tikv.types.*;
+import org.tikv.types.DataType.EncodeType;
 
 public class ProtoConverter extends Visitor<Expr, Object> {
   // All concrete data type should be hooked to a type name

src/main/java/org/tikv/expression/visitor/PseudoCostCalculator.java

@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression.visitor;
+package org.tikv.expression.visitor;
 
-import com.pingcap.tikv.expression.ComparisonBinaryExpression;
-import com.pingcap.tikv.expression.Expression;
-import com.pingcap.tikv.expression.LogicalBinaryExpression;
+import org.tikv.expression.ComparisonBinaryExpression;
+import org.tikv.expression.Expression;
+import org.tikv.expression.LogicalBinaryExpression;
 
 public class PseudoCostCalculator extends DefaultVisitor<Double, Void> {
   public static double calculateCost(Expression expr) {

src/main/java/org/tikv/expression/visitor/SupportedExpressionValidator.java

@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.expression.visitor;
+package org.tikv.expression.visitor;
 
-import com.pingcap.tikv.expression.Expression;
-import com.pingcap.tikv.expression.ExpressionBlacklist;
+import org.tikv.expression.Expression;
+import org.tikv.expression.ExpressionBlacklist;
 
 public class SupportedExpressionValidator extends DefaultVisitor<Boolean, ExpressionBlacklist> {
   private static final SupportedExpressionValidator validator = new SupportedExpressionValidator();

src/main/java/org/tikv/key/CompoundKey.java

@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.key;
+package org.tikv.key;
 
 import com.google.common.base.Joiner;
-import com.pingcap.tikv.codec.CodecDataOutput;
 import java.util.ArrayList;
 import java.util.List;
+import org.tikv.codec.CodecDataOutput;
 
 public class CompoundKey extends Key {
 

src/main/java/org/tikv/key/IndexKey.java

@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.key;
+package org.tikv.key;
 
 import com.google.common.base.Joiner;
-import com.pingcap.tikv.codec.Codec.IntegerCodec;
-import com.pingcap.tikv.codec.CodecDataOutput;
-import com.pingcap.tikv.exception.TypeException;
+import org.tikv.codec.Codec.IntegerCodec;
+import org.tikv.codec.CodecDataOutput;
+import org.tikv.exception.TypeException;
 
 public class IndexKey extends Key {
   private static final byte[] IDX_PREFIX_SEP = new byte[] {'_', 'i'};

src/main/java/org/tikv/key/Key.java

@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.key;
+package org.tikv.key;
 
-import static com.pingcap.tikv.codec.KeyUtils.formatBytes;
 import static java.util.Objects.requireNonNull;
+import static org.tikv.codec.KeyUtils.formatBytes;
 
 import com.google.protobuf.ByteString;
-import com.pingcap.tikv.codec.CodecDataOutput;
-import com.pingcap.tikv.types.DataType;
-import com.pingcap.tikv.util.FastByteComparisons;
 import java.util.Arrays;
+import org.tikv.codec.CodecDataOutput;
+import org.tikv.types.DataType;
+import org.tikv.util.FastByteComparisons;
 
 public class Key implements Comparable<Key> {
   protected static final byte[] TBL_PREFIX = new byte[] {'t'};

src/main/java/org/tikv/key/RowKey.java

@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.key;
+package org.tikv.key;
 
-import static com.pingcap.tikv.codec.Codec.IntegerCodec.writeLong;
+import static org.tikv.codec.Codec.IntegerCodec.writeLong;
 
-import com.pingcap.tikv.codec.Codec.IntegerCodec;
-import com.pingcap.tikv.codec.CodecDataInput;
-import com.pingcap.tikv.codec.CodecDataOutput;
-import com.pingcap.tikv.exception.TiClientInternalException;
-import com.pingcap.tikv.exception.TiExpressionException;
-import com.pingcap.tikv.key.RowKey.DecodeResult.Status;
-import com.pingcap.tikv.util.FastByteComparisons;
 import java.util.Objects;
+import org.tikv.codec.Codec.IntegerCodec;
+import org.tikv.codec.CodecDataInput;
+import org.tikv.codec.CodecDataOutput;
+import org.tikv.exception.TiClientInternalException;
+import org.tikv.exception.TiExpressionException;
+import org.tikv.key.RowKey.DecodeResult.Status;
+import org.tikv.util.FastByteComparisons;
 
 public class RowKey extends Key {
   private static final byte[] REC_PREFIX_SEP = new byte[] {'_', 'r'};

src/main/java/org/tikv/key/TypedKey.java

@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.key;
+package org.tikv.key;
 
 import static java.util.Objects.requireNonNull;
 
-import com.pingcap.tikv.codec.CodecDataInput;
-import com.pingcap.tikv.codec.CodecDataOutput;
-import com.pingcap.tikv.exception.TypeException;
-import com.pingcap.tikv.types.DataType;
+import org.tikv.codec.CodecDataInput;
+import org.tikv.codec.CodecDataOutput;
+import org.tikv.exception.TypeException;
+import org.tikv.types.DataType;
 
 public class TypedKey extends Key {
   private final DataType type;

src/main/java/org/tikv/meta/CIStr.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.meta;
+package org.tikv.meta;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/org/tikv/meta/Collation.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.meta;
+package org.tikv.meta;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;

src/main/java/org/tikv/meta/IndexType.java

@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.meta;
+package org.tikv.meta;
 
-import com.pingcap.tikv.exception.TiClientInternalException;
+import org.tikv.exception.TiClientInternalException;
 
 // Actually we are not using either real btree or hash index
 // TiDB has its own way for indexing as key value pair.

src/main/java/org/tikv/meta/SchemaState.java

@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.meta;
+package org.tikv.meta;
 
-import com.pingcap.tikv.exception.TiClientInternalException;
+import org.tikv.exception.TiClientInternalException;
 
 public enum SchemaState {
   StateNone(0),

src/main/java/org/tikv/meta/TiColumnInfo.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.meta;
+package org.tikv.meta;
 
 import static java.util.Objects.requireNonNull;
 
@@ -23,14 +23,14 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.protobuf.ByteString;
 import com.pingcap.tidb.tipb.ColumnInfo;
-import com.pingcap.tikv.codec.CodecDataOutput;
-import com.pingcap.tikv.types.DataType;
-import com.pingcap.tikv.types.DataType.EncodeType;
-import com.pingcap.tikv.types.DataTypeFactory;
-import com.pingcap.tikv.types.IntegerType;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
+import org.tikv.codec.CodecDataOutput;
+import org.tikv.types.DataType;
+import org.tikv.types.DataType.EncodeType;
+import org.tikv.types.DataTypeFactory;
+import org.tikv.types.IntegerType;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class TiColumnInfo implements Serializable {

src/main/java/org/tikv/meta/TiDAGRequest.java

@@ -13,34 +13,34 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.meta;
+package org.tikv.meta;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.pingcap.tikv.predicates.PredicateUtils.mergeCNFExpressions;
 import static java.util.Objects.requireNonNull;
+import static org.tikv.predicates.PredicateUtils.mergeCNFExpressions;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.pingcap.tidb.tipb.*;
-import com.pingcap.tikv.codec.KeyUtils;
-import com.pingcap.tikv.exception.DAGRequestException;
-import com.pingcap.tikv.exception.TiClientInternalException;
-import com.pingcap.tikv.expression.ByItem;
-import com.pingcap.tikv.expression.ColumnRef;
-import com.pingcap.tikv.expression.Expression;
-import com.pingcap.tikv.expression.visitor.ExpressionTypeCoercer;
-import com.pingcap.tikv.expression.visitor.MetaResolver;
-import com.pingcap.tikv.expression.visitor.ProtoConverter;
-import com.pingcap.tikv.key.RowKey;
-import com.pingcap.tikv.kvproto.Coprocessor;
-import com.pingcap.tikv.types.DataType;
-import com.pingcap.tikv.util.KeyRangeUtils;
-import com.pingcap.tikv.util.Pair;
 import java.io.*;
 import java.util.*;
 import java.util.stream.Collectors;
+import org.tikv.codec.KeyUtils;
+import org.tikv.exception.DAGRequestException;
+import org.tikv.exception.TiClientInternalException;
+import org.tikv.expression.ByItem;
+import org.tikv.expression.ColumnRef;
+import org.tikv.expression.Expression;
+import org.tikv.expression.visitor.ExpressionTypeCoercer;
+import org.tikv.expression.visitor.MetaResolver;
+import org.tikv.expression.visitor.ProtoConverter;
+import org.tikv.key.RowKey;
+import org.tikv.kvproto.Coprocessor;
+import org.tikv.types.DataType;
+import org.tikv.util.KeyRangeUtils;
+import org.tikv.util.Pair;
 
 /**
  * Type TiDAGRequest.

src/main/java/org/tikv/meta/TiDBInfo.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.meta;
+package org.tikv.meta;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/org/tikv/meta/TiIndexColumn.java

@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.meta;
+package org.tikv.meta;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.pingcap.tikv.types.DataType;
 import java.io.Serializable;
+import org.tikv.types.DataType;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class TiIndexColumn implements Serializable {

src/main/java/org/tikv/meta/TiIndexInfo.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.meta;
+package org.tikv.meta;
 
 import static java.util.Objects.requireNonNull;
 

src/main/java/org/tikv/meta/TiPartitionDef.java

@@ -1,4 +1,4 @@
-package com.pingcap.tikv.meta;
+package org.tikv.meta;
 
 import com.google.common.annotations.VisibleForTesting;
 import java.io.Serializable;

src/main/java/org/tikv/meta/TiPartitionInfo.java

@@ -1,4 +1,4 @@
-package com.pingcap.tikv.meta;
+package org.tikv.meta;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.codehaus.jackson.annotate.JsonCreator;

src/main/java/org/tikv/meta/TiTableInfo.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.meta;
+package org.tikv.meta;
 
 import static java.util.Objects.requireNonNull;
 
@@ -22,13 +22,13 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableList;
 import com.pingcap.tidb.tipb.TableInfo;
-import com.pingcap.tikv.exception.TiClientInternalException;
-import com.pingcap.tikv.meta.TiColumnInfo.InternalTypeHolder;
-import com.pingcap.tikv.types.DataType;
-import com.pingcap.tikv.types.DataTypeFactory;
 import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
+import org.tikv.exception.TiClientInternalException;
+import org.tikv.meta.TiColumnInfo.InternalTypeHolder;
+import org.tikv.types.DataType;
+import org.tikv.types.DataTypeFactory;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class TiTableInfo implements Serializable {

src/main/java/org/tikv/meta/TiTimestamp.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.meta;
+package org.tikv.meta;
 
 import java.io.Serializable;
 

src/main/java/org/tikv/operation/ErrorHandler.java

@@ -15,9 +15,9 @@
  *
  */
 
-package com.pingcap.tikv.operation;
+package org.tikv.operation;
 
-import com.pingcap.tikv.util.BackOffer;
+import org.tikv.util.BackOffer;
 
 public interface ErrorHandler<RespT> {
   /**

src/main/java/org/tikv/operation/KVErrorHandler.java

@@ -15,22 +15,22 @@
  *
  */
 
-package com.pingcap.tikv.operation;
+package org.tikv.operation;
 
 import com.google.protobuf.ByteString;
-import com.pingcap.tikv.codec.KeyUtils;
-import com.pingcap.tikv.event.CacheInvalidateEvent;
-import com.pingcap.tikv.exception.GrpcException;
-import com.pingcap.tikv.kvproto.Errorpb;
-import com.pingcap.tikv.region.RegionErrorReceiver;
-import com.pingcap.tikv.region.RegionManager;
-import com.pingcap.tikv.region.TiRegion;
-import com.pingcap.tikv.util.BackOffFunction;
-import com.pingcap.tikv.util.BackOffer;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import java.util.function.Function;
 import org.apache.log4j.Logger;
+import org.tikv.codec.KeyUtils;
+import org.tikv.event.CacheInvalidateEvent;
+import org.tikv.exception.GrpcException;
+import org.tikv.kvproto.Errorpb;
+import org.tikv.region.RegionErrorReceiver;
+import org.tikv.region.RegionManager;
+import org.tikv.region.TiRegion;
+import org.tikv.util.BackOffFunction;
+import org.tikv.util.BackOffer;
 
 // TODO: consider refactor to Builder mode
 public class KVErrorHandler<RespT> implements ErrorHandler<RespT> {

src/main/java/org/tikv/operation/PDErrorHandler.java

@@ -15,14 +15,14 @@
  *
  */
 
-package com.pingcap.tikv.operation;
+package org.tikv.operation;
 
-import com.pingcap.tikv.PDClient;
-import com.pingcap.tikv.exception.GrpcException;
-import com.pingcap.tikv.kvproto.Pdpb;
-import com.pingcap.tikv.util.BackOffFunction;
-import com.pingcap.tikv.util.BackOffer;
 import java.util.function.Function;
+import org.tikv.PDClient;
+import org.tikv.exception.GrpcException;
+import org.tikv.kvproto.Pdpb;
+import org.tikv.util.BackOffFunction;
+import org.tikv.util.BackOffer;
 
 public class PDErrorHandler<RespT> implements ErrorHandler<RespT> {
   private final Function<RespT, Pdpb.Error> getError;

src/main/java/org/tikv/operation/SchemaInfer.java

@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.operation;
+package org.tikv.operation;
 
-import com.pingcap.tikv.expression.ByItem;
-import com.pingcap.tikv.expression.Expression;
-import com.pingcap.tikv.meta.TiDAGRequest;
-import com.pingcap.tikv.operation.transformer.Cast;
-import com.pingcap.tikv.operation.transformer.NoOp;
-import com.pingcap.tikv.operation.transformer.RowTransformer;
-import com.pingcap.tikv.types.DataType;
-import com.pingcap.tikv.types.IntegerType;
-import com.pingcap.tikv.util.Pair;
 import java.util.ArrayList;
 import java.util.List;
+import org.tikv.expression.ByItem;
+import org.tikv.expression.Expression;
+import org.tikv.meta.TiDAGRequest;
+import org.tikv.operation.transformer.Cast;
+import org.tikv.operation.transformer.NoOp;
+import org.tikv.operation.transformer.RowTransformer;
+import org.tikv.types.DataType;
+import org.tikv.types.IntegerType;
+import org.tikv.util.Pair;
 
 /**
  * SchemaInfer extract row's type after query is executed. It is pretty rough version. Optimization

src/main/java/org/tikv/operation/iterator/ChunkIterator.java

@@ -15,13 +15,13 @@
  *
  */
 
-package com.pingcap.tikv.operation.iterator;
+package org.tikv.operation.iterator;
 
 import com.google.protobuf.ByteString;
 import com.pingcap.tidb.tipb.Chunk;
-import com.pingcap.tikv.exception.TiClientInternalException;
 import java.util.Iterator;
 import java.util.List;
+import org.tikv.exception.TiClientInternalException;
 
 public abstract class ChunkIterator<T> implements Iterator<T> {
 

src/main/java/org/tikv/operation/iterator/ConcreteScanIterator.java

@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.operation.iterator;
+package org.tikv.operation.iterator;
 
 import com.google.protobuf.ByteString;
-import com.pingcap.tikv.TiSession;
-import com.pingcap.tikv.kvproto.Metapb;
-import com.pingcap.tikv.region.RegionStoreClient;
-import com.pingcap.tikv.region.TiRegion;
-import com.pingcap.tikv.util.BackOffer;
-import com.pingcap.tikv.util.ConcreteBackOffer;
-import com.pingcap.tikv.util.Pair;
+import org.tikv.TiSession;
+import org.tikv.kvproto.Metapb;
+import org.tikv.region.RegionStoreClient;
+import org.tikv.region.TiRegion;
+import org.tikv.util.BackOffer;
+import org.tikv.util.ConcreteBackOffer;
+import org.tikv.util.Pair;
 
 public class ConcreteScanIterator extends ScanIterator {
   private final long version;

src/main/java/org/tikv/operation/iterator/CoprocessIterator.java

@@ -13,25 +13,25 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.operation.iterator;
+package org.tikv.operation.iterator;
 
 import static java.util.Objects.requireNonNull;
 
 import com.pingcap.tidb.tipb.Chunk;
 import com.pingcap.tidb.tipb.DAGRequest;
-import com.pingcap.tikv.TiSession;
-import com.pingcap.tikv.codec.CodecDataInput;
-import com.pingcap.tikv.meta.TiDAGRequest;
-import com.pingcap.tikv.operation.SchemaInfer;
-import com.pingcap.tikv.row.Row;
-import com.pingcap.tikv.row.RowReader;
-import com.pingcap.tikv.row.RowReaderFactory;
-import com.pingcap.tikv.types.DataType;
-import com.pingcap.tikv.types.IntegerType;
-import com.pingcap.tikv.util.RangeSplitter.RegionTask;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
+import org.tikv.TiSession;
+import org.tikv.codec.CodecDataInput;
+import org.tikv.meta.TiDAGRequest;
+import org.tikv.operation.SchemaInfer;
+import org.tikv.row.Row;
+import org.tikv.row.RowReader;
+import org.tikv.row.RowReaderFactory;
+import org.tikv.types.DataType;
+import org.tikv.types.IntegerType;
+import org.tikv.util.RangeSplitter.RegionTask;
 
 public abstract class CoprocessIterator<T> implements Iterator<T> {
   protected final TiSession session;

src/main/java/org/tikv/operation/iterator/DAGIterator.java

@@ -1,22 +1,10 @@
-package com.pingcap.tikv.operation.iterator;
+package org.tikv.operation.iterator;
 
-import static com.pingcap.tikv.meta.TiDAGRequest.PushDownType.STREAMING;
+import static org.tikv.meta.TiDAGRequest.PushDownType.STREAMING;
 
 import com.pingcap.tidb.tipb.Chunk;
 import com.pingcap.tidb.tipb.DAGRequest;
 import com.pingcap.tidb.tipb.SelectResponse;
-import com.pingcap.tikv.TiSession;
-import com.pingcap.tikv.exception.RegionTaskException;
-import com.pingcap.tikv.exception.TiClientInternalException;
-import com.pingcap.tikv.kvproto.Coprocessor;
-import com.pingcap.tikv.kvproto.Metapb;
-import com.pingcap.tikv.meta.TiDAGRequest.PushDownType;
-import com.pingcap.tikv.operation.SchemaInfer;
-import com.pingcap.tikv.region.RegionStoreClient;
-import com.pingcap.tikv.region.TiRegion;
-import com.pingcap.tikv.util.BackOffer;
-import com.pingcap.tikv.util.ConcreteBackOffer;
-import com.pingcap.tikv.util.RangeSplitter;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,6 +14,18 @@ import java.util.Queue;
 import java.util.concurrent.ExecutorCompletionService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.tikv.TiSession;
+import org.tikv.exception.RegionTaskException;
+import org.tikv.exception.TiClientInternalException;
+import org.tikv.kvproto.Coprocessor;
+import org.tikv.kvproto.Metapb;
+import org.tikv.meta.TiDAGRequest.PushDownType;
+import org.tikv.operation.SchemaInfer;
+import org.tikv.region.RegionStoreClient;
+import org.tikv.region.TiRegion;
+import org.tikv.util.BackOffer;
+import org.tikv.util.ConcreteBackOffer;
+import org.tikv.util.RangeSplitter;
 
 public abstract class DAGIterator<T> extends CoprocessIterator<T> {
   private ExecutorCompletionService<Iterator<SelectResponse>> streamingService;

src/main/java/org/tikv/operation/iterator/IndexScanIterator.java

@@ -13,21 +13,21 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.operation.iterator;
+package org.tikv.operation.iterator;
 
-import com.pingcap.tikv.Snapshot;
-import com.pingcap.tikv.TiConfiguration;
-import com.pingcap.tikv.TiSession;
-import com.pingcap.tikv.exception.TiClientInternalException;
-import com.pingcap.tikv.meta.TiDAGRequest;
-import com.pingcap.tikv.row.Row;
-import com.pingcap.tikv.util.RangeSplitter;
-import com.pingcap.tikv.util.RangeSplitter.RegionTask;
 import gnu.trove.list.array.TLongArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.concurrent.ExecutorCompletionService;
+import org.tikv.Snapshot;
+import org.tikv.TiConfiguration;
+import org.tikv.TiSession;
+import org.tikv.exception.TiClientInternalException;
+import org.tikv.meta.TiDAGRequest;
+import org.tikv.row.Row;
+import org.tikv.util.RangeSplitter;
+import org.tikv.util.RangeSplitter.RegionTask;
 
 public class IndexScanIterator implements Iterator<Row> {
   private final Iterator<Long> handleIterator;

src/main/java/org/tikv/operation/iterator/RawScanIterator.java

@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.operation.iterator;
+package org.tikv.operation.iterator;
 
 import com.google.protobuf.ByteString;
-import com.pingcap.tikv.TiSession;
-import com.pingcap.tikv.key.Key;
-import com.pingcap.tikv.kvproto.Metapb;
-import com.pingcap.tikv.region.RegionStoreClient;
-import com.pingcap.tikv.region.TiRegion;
-import com.pingcap.tikv.util.BackOffer;
-import com.pingcap.tikv.util.ConcreteBackOffer;
-import com.pingcap.tikv.util.Pair;
+import org.tikv.TiSession;
+import org.tikv.key.Key;
+import org.tikv.kvproto.Metapb;
+import org.tikv.region.RegionStoreClient;
+import org.tikv.region.TiRegion;
+import org.tikv.util.BackOffer;
+import org.tikv.util.ConcreteBackOffer;
+import org.tikv.util.Pair;
 
 public class RawScanIterator extends ScanIterator {
 

src/main/java/org/tikv/operation/iterator/ScanIterator.java

@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.operation.iterator;
+package org.tikv.operation.iterator;
 
 import static java.util.Objects.requireNonNull;
 
 import com.google.protobuf.ByteString;
-import com.pingcap.tikv.TiSession;
-import com.pingcap.tikv.exception.TiClientInternalException;
-import com.pingcap.tikv.key.Key;
-import com.pingcap.tikv.kvproto.Kvrpcpb;
-import com.pingcap.tikv.region.RegionManager;
-import com.pingcap.tikv.region.TiRegion;
 import java.util.Iterator;
 import java.util.List;
+import org.tikv.TiSession;
+import org.tikv.exception.TiClientInternalException;
+import org.tikv.key.Key;
+import org.tikv.kvproto.Kvrpcpb;
+import org.tikv.region.RegionManager;
+import org.tikv.region.TiRegion;
 
 public abstract class ScanIterator implements Iterator<Kvrpcpb.KvPair> {
   protected final TiSession session;

src/main/java/org/tikv/operation/transformer/Cast.java

@@ -15,12 +15,12 @@
  *
  */
 
-package com.pingcap.tikv.operation.transformer;
+package org.tikv.operation.transformer;
 
-import com.pingcap.tikv.row.Row;
-import com.pingcap.tikv.types.*;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
+import org.tikv.row.Row;
+import org.tikv.types.*;
 
 public class Cast extends NoOp {
   public Cast(DataType type) {

src/main/java/org/tikv/operation/transformer/MultiKeyDecoder.java

@@ -15,15 +15,15 @@
  *
  */
 
-package com.pingcap.tikv.operation.transformer;
+package org.tikv.operation.transformer;
 
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ImmutableList;
-import com.pingcap.tikv.codec.CodecDataInput;
-import com.pingcap.tikv.row.Row;
-import com.pingcap.tikv.types.DataType;
 import java.util.List;
+import org.tikv.codec.CodecDataInput;
+import org.tikv.row.Row;
+import org.tikv.types.DataType;
 
 public class MultiKeyDecoder implements Projection {
   public MultiKeyDecoder(List<DataType> dataTypes) {

src/main/java/org/tikv/operation/transformer/NoOp.java

@@ -15,12 +15,12 @@
  *
  */
 
-package com.pingcap.tikv.operation.transformer;
+package org.tikv.operation.transformer;
 
 import com.google.common.collect.ImmutableList;
-import com.pingcap.tikv.row.Row;
-import com.pingcap.tikv.types.DataType;
 import java.util.List;
+import org.tikv.row.Row;
+import org.tikv.types.DataType;
 
 /** Noop is a base type projection, it basically do nothing but copy. */
 public class NoOp implements Projection {

src/main/java/org/tikv/operation/transformer/Projection.java

@@ -15,11 +15,11 @@
  *
  */
 
-package com.pingcap.tikv.operation.transformer;
+package org.tikv.operation.transformer;
 
-import com.pingcap.tikv.row.Row;
-import com.pingcap.tikv.types.DataType;
 import java.util.List;
+import org.tikv.row.Row;
+import org.tikv.types.DataType;
 
 public interface Projection {
   void set(Object value, Row row, int pos);

src/main/java/org/tikv/operation/transformer/RowTransformer.java

@@ -15,18 +15,18 @@
  *
  */
 
-package com.pingcap.tikv.operation.transformer;
+package org.tikv.operation.transformer;
 
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ImmutableList;
-import com.pingcap.tikv.row.ObjectRowImpl;
-import com.pingcap.tikv.row.Row;
-import com.pingcap.tikv.types.DataType;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
+import org.tikv.row.ObjectRowImpl;
+import org.tikv.row.Row;
+import org.tikv.types.DataType;
 
 /**
  * RowTransformer is used along with SchemaInfer and row and provide some operation. If you do not

src/main/java/org/tikv/operation/transformer/Skip.java

@@ -15,12 +15,12 @@
  *
  */
 
-package com.pingcap.tikv.operation.transformer;
+package org.tikv.operation.transformer;
 
 import com.google.common.collect.ImmutableList;
-import com.pingcap.tikv.row.Row;
-import com.pingcap.tikv.types.DataType;
 import java.util.List;
+import org.tikv.row.Row;
+import org.tikv.types.DataType;
 
 public class Skip implements Projection {
   public static final Skip SKIP_OP = new Skip();

src/main/java/org/tikv/policy/RetryMaxMs.java

@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.policy;
+package org.tikv.policy;
 
-import com.pingcap.tikv.operation.ErrorHandler;
-import com.pingcap.tikv.util.BackOffer;
+import org.tikv.operation.ErrorHandler;
+import org.tikv.util.BackOffer;
 
 public class RetryMaxMs<T> extends RetryPolicy<T> {
   private RetryMaxMs(ErrorHandler<T> handler, BackOffer backOffer) {

src/main/java/org/tikv/policy/RetryPolicy.java

@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.policy;
+package org.tikv.policy;
 
 import com.google.common.collect.ImmutableSet;
-import com.pingcap.tikv.exception.GrpcException;
-import com.pingcap.tikv.operation.ErrorHandler;
-import com.pingcap.tikv.util.BackOffer;
-import com.pingcap.tikv.util.ConcreteBackOffer;
 import io.grpc.Status;
 import java.util.concurrent.Callable;
+import org.tikv.exception.GrpcException;
+import org.tikv.operation.ErrorHandler;
+import org.tikv.util.BackOffer;
+import org.tikv.util.ConcreteBackOffer;
 
 public abstract class RetryPolicy<RespT> {
   BackOffer backOffer = ConcreteBackOffer.newCopNextMaxBackOff();

src/main/java/org/tikv/predicates/IndexRange.java

@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.predicates;
+package org.tikv.predicates;
 
 import com.google.common.collect.Range;
-import com.pingcap.tikv.key.Key;
-import com.pingcap.tikv.key.TypedKey;
+import org.tikv.key.Key;
+import org.tikv.key.TypedKey;
 
 public class IndexRange {
   private Key accessKey;

src/main/java/org/tikv/predicates/PredicateUtils.java

@@ -13,25 +13,25 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.predicates;
+package org.tikv.predicates;
 
-import static com.pingcap.tikv.expression.LogicalBinaryExpression.and;
 import static java.util.Objects.requireNonNull;
+import static org.tikv.expression.LogicalBinaryExpression.and;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Range;
-import com.pingcap.tikv.exception.TiExpressionException;
-import com.pingcap.tikv.expression.ColumnRef;
-import com.pingcap.tikv.expression.Expression;
-import com.pingcap.tikv.expression.Visitor;
-import com.pingcap.tikv.expression.visitor.DefaultVisitor;
-import com.pingcap.tikv.expression.visitor.IndexRangeBuilder;
-import com.pingcap.tikv.key.CompoundKey;
-import com.pingcap.tikv.key.Key;
-import com.pingcap.tikv.key.TypedKey;
-import com.pingcap.tikv.meta.TiIndexInfo;
-import com.pingcap.tikv.meta.TiTableInfo;
 import java.util.*;
+import org.tikv.exception.TiExpressionException;
+import org.tikv.expression.ColumnRef;
+import org.tikv.expression.Expression;
+import org.tikv.expression.Visitor;
+import org.tikv.expression.visitor.DefaultVisitor;
+import org.tikv.expression.visitor.IndexRangeBuilder;
+import org.tikv.key.CompoundKey;
+import org.tikv.key.Key;
+import org.tikv.key.TypedKey;
+import org.tikv.meta.TiIndexInfo;
+import org.tikv.meta.TiTableInfo;
 
 public class PredicateUtils {
   public static Expression mergeCNFExpressions(List<Expression> exprs) {

src/main/java/org/tikv/predicates/ScanAnalyzer.java

@@ -13,36 +13,36 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.predicates;
+package org.tikv.predicates;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.pingcap.tikv.predicates.PredicateUtils.expressionToIndexRanges;
-import static com.pingcap.tikv.util.KeyRangeUtils.makeCoprocRange;
 import static java.util.Objects.requireNonNull;
+import static org.tikv.predicates.PredicateUtils.expressionToIndexRanges;
+import static org.tikv.util.KeyRangeUtils.makeCoprocRange;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.BoundType;
 import com.google.common.collect.Range;
-import com.pingcap.tikv.exception.TiClientInternalException;
-import com.pingcap.tikv.expression.Expression;
-import com.pingcap.tikv.expression.visitor.IndexMatcher;
-import com.pingcap.tikv.expression.visitor.MetaResolver;
-import com.pingcap.tikv.key.IndexKey;
-import com.pingcap.tikv.key.Key;
-import com.pingcap.tikv.key.RowKey;
-import com.pingcap.tikv.key.TypedKey;
-import com.pingcap.tikv.kvproto.Coprocessor.KeyRange;
-import com.pingcap.tikv.meta.TiColumnInfo;
-import com.pingcap.tikv.meta.TiIndexColumn;
-import com.pingcap.tikv.meta.TiIndexInfo;
-import com.pingcap.tikv.meta.TiTableInfo;
-import com.pingcap.tikv.statistics.IndexStatistics;
-import com.pingcap.tikv.statistics.TableStatistics;
-import com.pingcap.tikv.types.DataType;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import org.tikv.exception.TiClientInternalException;
+import org.tikv.expression.Expression;
+import org.tikv.expression.visitor.IndexMatcher;
+import org.tikv.expression.visitor.MetaResolver;
+import org.tikv.key.IndexKey;
+import org.tikv.key.Key;
+import org.tikv.key.RowKey;
+import org.tikv.key.TypedKey;
+import org.tikv.kvproto.Coprocessor.KeyRange;
+import org.tikv.meta.TiColumnInfo;
+import org.tikv.meta.TiIndexColumn;
+import org.tikv.meta.TiIndexInfo;
+import org.tikv.meta.TiTableInfo;
+import org.tikv.statistics.IndexStatistics;
+import org.tikv.statistics.TableStatistics;
+import org.tikv.types.DataType;
 
 public class ScanAnalyzer {
   private static final double INDEX_SCAN_COST_FACTOR = 1.2;

src/main/java/org/tikv/predicates/ScanSpec.java

@@ -13,20 +13,20 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.predicates;
+package org.tikv.predicates;
 
-import static com.pingcap.tikv.predicates.PredicateUtils.mergeCNFExpressions;
 import static java.util.Objects.requireNonNull;
+import static org.tikv.predicates.PredicateUtils.mergeCNFExpressions;
 
 import com.google.common.collect.ImmutableList;
-import com.pingcap.tikv.exception.TiExpressionException;
-import com.pingcap.tikv.expression.Expression;
-import com.pingcap.tikv.meta.TiColumnInfo;
-import com.pingcap.tikv.meta.TiIndexColumn;
-import com.pingcap.tikv.meta.TiIndexInfo;
-import com.pingcap.tikv.meta.TiTableInfo;
-import com.pingcap.tikv.types.DataType;
 import java.util.*;
+import org.tikv.exception.TiExpressionException;
+import org.tikv.expression.Expression;
+import org.tikv.meta.TiColumnInfo;
+import org.tikv.meta.TiIndexColumn;
+import org.tikv.meta.TiIndexInfo;
+import org.tikv.meta.TiTableInfo;
+import org.tikv.types.DataType;
 
 public class ScanSpec {
   public static class Builder {

src/main/java/org/tikv/predicates/SelectivityCalculator.java

@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package com.pingcap.tikv.predicates;
+package org.tikv.predicates;
 
-import com.pingcap.tikv.expression.Expression;
-import com.pingcap.tikv.expression.visitor.DefaultVisitor;
-import com.pingcap.tikv.expression.visitor.PseudoCostCalculator;
 import java.util.Optional;
+import org.tikv.expression.Expression;
+import org.tikv.expression.visitor.DefaultVisitor;
+import org.tikv.expression.visitor.PseudoCostCalculator;
 
 public class SelectivityCalculator extends DefaultVisitor<Double, Void> {
   public static double calcPseudoSelectivity(ScanSpec spec) {

src/main/java/org/tikv/region/RegionErrorReceiver.java

@@ -15,9 +15,9 @@
  *
  */
 
-package com.pingcap.tikv.region;
+package org.tikv.region;
 
-import com.pingcap.tikv.kvproto.Metapb.Store;
+import org.tikv.kvproto.Metapb.Store;
 
 public interface RegionErrorReceiver {
   boolean onNotLeader(Store store);

src/main/java/org/tikv/region/RegionManager.java

@@ -15,31 +15,31 @@
  *
  */
 
-package com.pingcap.tikv.region;
+package org.tikv.region;
 
-import static com.pingcap.tikv.codec.KeyUtils.formatBytes;
-import static com.pingcap.tikv.util.KeyRangeUtils.makeRange;
+import static org.tikv.codec.KeyUtils.formatBytes;
+import static org.tikv.util.KeyRangeUtils.makeRange;
 
 import com.google.common.collect.RangeMap;
 import com.google.common.collect.TreeRangeMap;
 import com.google.protobuf.ByteString;
-import com.pingcap.tikv.ReadOnlyPDClient;
-import com.pingcap.tikv.TiSession;
-import com.pingcap.tikv.codec.Codec;
-import com.pingcap.tikv.codec.CodecDataOutput;
-import com.pingcap.tikv.exception.GrpcException;
-import com.pingcap.tikv.exception.TiClientInternalException;
-import com.pingcap.tikv.key.Key;
-import com.pingcap.tikv.kvproto.Metapb.Peer;
-import com.pingcap.tikv.kvproto.Metapb.Store;
-import com.pingcap.tikv.kvproto.Metapb.StoreState;
-import com.pingcap.tikv.util.ConcreteBackOffer;
-import com.pingcap.tikv.util.Pair;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.log4j.Logger;
+import org.tikv.ReadOnlyPDClient;
+import org.tikv.TiSession;
+import org.tikv.codec.Codec;
+import org.tikv.codec.CodecDataOutput;
+import org.tikv.exception.GrpcException;
+import org.tikv.exception.TiClientInternalException;
+import org.tikv.key.Key;
+import org.tikv.kvproto.Metapb.Peer;
+import org.tikv.kvproto.Metapb.Store;
+import org.tikv.kvproto.Metapb.StoreState;
+import org.tikv.util.ConcreteBackOffer;
+import org.tikv.util.Pair;
 
 public class RegionManager {
   private static final Logger logger = Logger.getLogger(RegionManager.class);