diff --git a/pom.xml b/pom.xml index f3fbf9803d..3bb331df8a 100644 --- a/pom.xml +++ b/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"> 4.0.0 - com.pingcap.tikv + org.tikv tikv-client-java 2.0-SNAPSHOT jar @@ -220,7 +220,7 @@ ${proto.folder} - ${basedir}/kvproto/_vendor/src/github.com/gogo/protobuf + ${basedir}/kvproto/vendor/github.com/gogo/protobuf **/gogoproto/** diff --git a/scripts/proto.sh b/scripts/proto.sh index 8aca3a2222..f03000835f 100755 --- a/scripts/proto.sh +++ b/scripts/proto.sh @@ -15,20 +15,19 @@ # if [ -d "kvproto" ]; then - # cd kvproto; git pull origin master; cd .. - cd kvproto; git checkout 497dd34f807bccdb5bd01009c62c5fd5ced404f3; cd .. + cd kvproto; git fetch -p; git pull origin rename_java_package; cd .. else - git clone https://github.com/pingcap/kvproto; cd kvproto; git checkout 497dd34f807bccdb5bd01009c62c5fd5ced404f3; cd .. + git clone https://github.com/birdstorm/kvproto; cd kvproto; git checkout rename_java_package; cd .. fi if [ -d "raft-rs" ]; then - cd raft-rs; git pull origin master; cd .. + cd raft-rs; git fetch -p; git pull origin master; cd .. else git clone https://github.com/pingcap/raft-rs fi if [ -d "tipb" ]; then - cd tipb; git pull origin master; cd .. + cd tipb; git fetch -p; git pull origin master; cd .. else git clone https://github.com/pingcap/tipb fi diff --git a/src/main/java/com/pingcap/tikv/AbstractGRPCClient.java b/src/main/java/org/tikv/AbstractGRPCClient.java similarity index 95% rename from src/main/java/com/pingcap/tikv/AbstractGRPCClient.java rename to src/main/java/org/tikv/AbstractGRPCClient.java index 2c0c63fad7..c352b8b4ed 100644 --- a/src/main/java/com/pingcap/tikv/AbstractGRPCClient.java +++ b/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, StubT extends AbstractStub> diff --git a/src/main/java/com/pingcap/tikv/BUILD b/src/main/java/org/tikv/BUILD similarity index 100% rename from src/main/java/com/pingcap/tikv/BUILD rename to src/main/java/org/tikv/BUILD diff --git a/src/main/java/com/pingcap/tikv/Main.java b/src/main/java/org/tikv/Main.java similarity index 76% rename from src/main/java/com/pingcap/tikv/Main.java rename to src/main/java/org/tikv/Main.java index 07f6b19f4f..82e18d9a6a 100644 --- a/src/main/java/com/pingcap/tikv/Main.java +++ b/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 {} diff --git a/src/main/java/com/pingcap/tikv/PDClient.java b/src/main/java/org/tikv/PDClient.java similarity index 90% rename from src/main/java/com/pingcap/tikv/PDClient.java rename to src/main/java/org/tikv/PDClient.java index 21b856dd7b..57311a93b4 100644 --- a/src/main/java/com/pingcap/tikv/PDClient.java +++ b/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 implements ReadOnlyPDClient { diff --git a/src/main/java/com/pingcap/tikv/RawKVClient.java b/src/main/java/org/tikv/RawKVClient.java similarity index 89% rename from src/main/java/com/pingcap/tikv/RawKVClient.java rename to src/main/java/org/tikv/RawKVClient.java index 21795fa443..f2ea759a3c 100644 --- a/src/main/java/com/pingcap/tikv/RawKVClient.java +++ b/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"; diff --git a/src/main/java/com/pingcap/tikv/ReadOnlyPDClient.java b/src/main/java/org/tikv/ReadOnlyPDClient.java similarity index 90% rename from src/main/java/com/pingcap/tikv/ReadOnlyPDClient.java rename to src/main/java/org/tikv/ReadOnlyPDClient.java index f4b276b6e6..1c4cae9946 100644 --- a/src/main/java/com/pingcap/tikv/ReadOnlyPDClient.java +++ b/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 { diff --git a/src/main/java/com/pingcap/tikv/Snapshot.java b/src/main/java/org/tikv/Snapshot.java similarity index 83% rename from src/main/java/com/pingcap/tikv/Snapshot.java rename to src/main/java/org/tikv/Snapshot.java index a4e212156e..cd4d1dd9ed 100644 --- a/src/main/java/com/pingcap/tikv/Snapshot.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/TiConfiguration.java b/src/main/java/org/tikv/TiConfiguration.java similarity index 98% rename from src/main/java/com/pingcap/tikv/TiConfiguration.java rename to src/main/java/org/tikv/TiConfiguration.java index d00378dd55..4b0be3c3c1 100644 --- a/src/main/java/com/pingcap/tikv/TiConfiguration.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/TiSession.java b/src/main/java/org/tikv/TiSession.java similarity index 95% rename from src/main/java/com/pingcap/tikv/TiSession.java rename to src/main/java/org/tikv/TiSession.java index 55843fe7f5..2c977c25ff 100644 --- a/src/main/java/com/pingcap/tikv/TiSession.java +++ b/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 connPool = new HashMap<>(); diff --git a/src/main/java/com/pingcap/tikv/catalog/Catalog.java b/src/main/java/org/tikv/catalog/Catalog.java similarity index 97% rename from src/main/java/com/pingcap/tikv/catalog/Catalog.java rename to src/main/java/org/tikv/catalog/Catalog.java index 9b3d27d5b1..80f3bf8198 100644 --- a/src/main/java/com/pingcap/tikv/catalog/Catalog.java +++ b/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 snapshotProvider; diff --git a/src/main/java/com/pingcap/tikv/catalog/CatalogTransaction.java b/src/main/java/org/tikv/catalog/CatalogTransaction.java similarity index 92% rename from src/main/java/com/pingcap/tikv/catalog/CatalogTransaction.java rename to src/main/java/org/tikv/catalog/CatalogTransaction.java index ad93e7b20f..5dbaa9e88b 100644 --- a/src/main/java/com/pingcap/tikv/catalog/CatalogTransaction.java +++ b/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); diff --git a/src/main/java/com/pingcap/tikv/codec/Codec.java b/src/main/java/org/tikv/codec/Codec.java similarity index 99% rename from src/main/java/com/pingcap/tikv/codec/Codec.java rename to src/main/java/org/tikv/codec/Codec.java index 40bee69b9b..8bd473b7e2 100644 --- a/src/main/java/com/pingcap/tikv/codec/Codec.java +++ b/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 { diff --git a/src/main/java/com/pingcap/tikv/codec/CodecDataInput.java b/src/main/java/org/tikv/codec/CodecDataInput.java similarity index 99% rename from src/main/java/com/pingcap/tikv/codec/CodecDataInput.java rename to src/main/java/org/tikv/codec/CodecDataInput.java index 61ba694e9d..f1daa95c16 100644 --- a/src/main/java/com/pingcap/tikv/codec/CodecDataInput.java +++ b/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.*; diff --git a/src/main/java/com/pingcap/tikv/codec/CodecDataOutput.java b/src/main/java/org/tikv/codec/CodecDataOutput.java similarity index 99% rename from src/main/java/com/pingcap/tikv/codec/CodecDataOutput.java rename to src/main/java/org/tikv/codec/CodecDataOutput.java index 5eafa10199..984bdb1650 100644 --- a/src/main/java/com/pingcap/tikv/codec/CodecDataOutput.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/codec/KeyUtils.java b/src/main/java/org/tikv/codec/KeyUtils.java similarity index 95% rename from src/main/java/com/pingcap/tikv/codec/KeyUtils.java rename to src/main/java/org/tikv/codec/KeyUtils.java index 0f1214fb23..8677cd604a 100644 --- a/src/main/java/com/pingcap/tikv/codec/KeyUtils.java +++ b/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 { diff --git a/src/main/java/com/pingcap/tikv/codec/MyDecimal.java b/src/main/java/org/tikv/codec/MyDecimal.java similarity index 99% rename from src/main/java/com/pingcap/tikv/codec/MyDecimal.java rename to src/main/java/org/tikv/codec/MyDecimal.java index 7f819f53a9..3c339600a2 100644 --- a/src/main/java/com/pingcap/tikv/codec/MyDecimal.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/event/CacheInvalidateEvent.java b/src/main/java/org/tikv/event/CacheInvalidateEvent.java similarity index 98% rename from src/main/java/com/pingcap/tikv/event/CacheInvalidateEvent.java rename to src/main/java/org/tikv/event/CacheInvalidateEvent.java index 26af048d75..7d9a35d196 100644 --- a/src/main/java/com/pingcap/tikv/event/CacheInvalidateEvent.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/exception/CastingException.java b/src/main/java/org/tikv/exception/CastingException.java similarity index 95% rename from src/main/java/com/pingcap/tikv/exception/CastingException.java rename to src/main/java/org/tikv/exception/CastingException.java index 329dd192d5..80c59a9f08 100644 --- a/src/main/java/com/pingcap/tikv/exception/CastingException.java +++ b/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) { diff --git a/src/main/java/com/pingcap/tikv/exception/DAGRequestException.java b/src/main/java/org/tikv/exception/DAGRequestException.java similarity index 94% rename from src/main/java/com/pingcap/tikv/exception/DAGRequestException.java rename to src/main/java/org/tikv/exception/DAGRequestException.java index 9d3bf7c0c6..6e26aa682d 100644 --- a/src/main/java/com/pingcap/tikv/exception/DAGRequestException.java +++ b/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) { diff --git a/src/main/java/com/pingcap/tikv/exception/GrpcException.java b/src/main/java/org/tikv/exception/GrpcException.java similarity index 95% rename from src/main/java/com/pingcap/tikv/exception/GrpcException.java rename to src/main/java/org/tikv/exception/GrpcException.java index 67e1a3cce6..e4011d8757 100644 --- a/src/main/java/com/pingcap/tikv/exception/GrpcException.java +++ b/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) { diff --git a/src/main/java/com/pingcap/tikv/exception/IgnoreUnsupportedTypeException.java b/src/main/java/org/tikv/exception/IgnoreUnsupportedTypeException.java similarity index 94% rename from src/main/java/com/pingcap/tikv/exception/IgnoreUnsupportedTypeException.java rename to src/main/java/org/tikv/exception/IgnoreUnsupportedTypeException.java index 366869a1cb..db3e62a942 100644 --- a/src/main/java/com/pingcap/tikv/exception/IgnoreUnsupportedTypeException.java +++ b/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) { diff --git a/src/main/java/com/pingcap/tikv/exception/InvalidCodecFormatException.java b/src/main/java/org/tikv/exception/InvalidCodecFormatException.java similarity index 94% rename from src/main/java/com/pingcap/tikv/exception/InvalidCodecFormatException.java rename to src/main/java/org/tikv/exception/InvalidCodecFormatException.java index 718da12675..b9d030783a 100644 --- a/src/main/java/com/pingcap/tikv/exception/InvalidCodecFormatException.java +++ b/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) { diff --git a/src/main/java/com/pingcap/tikv/exception/KeyException.java b/src/main/java/org/tikv/exception/KeyException.java similarity index 91% rename from src/main/java/com/pingcap/tikv/exception/KeyException.java rename to src/main/java/org/tikv/exception/KeyException.java index 376b777c54..b2c4130b21 100644 --- a/src/main/java/com/pingcap/tikv/exception/KeyException.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/exception/RegionException.java b/src/main/java/org/tikv/exception/RegionException.java similarity index 90% rename from src/main/java/com/pingcap/tikv/exception/RegionException.java rename to src/main/java/org/tikv/exception/RegionException.java index 841dd426cd..18a7289af1 100644 --- a/src/main/java/com/pingcap/tikv/exception/RegionException.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/exception/RegionTaskException.java b/src/main/java/org/tikv/exception/RegionTaskException.java similarity index 94% rename from src/main/java/com/pingcap/tikv/exception/RegionTaskException.java rename to src/main/java/org/tikv/exception/RegionTaskException.java index 4047b3f5a5..0994edcddd 100644 --- a/src/main/java/com/pingcap/tikv/exception/RegionTaskException.java +++ b/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) { diff --git a/src/main/java/com/pingcap/tikv/exception/SelectException.java b/src/main/java/org/tikv/exception/SelectException.java similarity index 96% rename from src/main/java/com/pingcap/tikv/exception/SelectException.java rename to src/main/java/org/tikv/exception/SelectException.java index 0b5758bf4e..f74a654045 100644 --- a/src/main/java/com/pingcap/tikv/exception/SelectException.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/exception/TiClientInternalException.java b/src/main/java/org/tikv/exception/TiClientInternalException.java similarity index 95% rename from src/main/java/com/pingcap/tikv/exception/TiClientInternalException.java rename to src/main/java/org/tikv/exception/TiClientInternalException.java index 1c3b1e836c..ba89548135 100644 --- a/src/main/java/com/pingcap/tikv/exception/TiClientInternalException.java +++ b/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) { diff --git a/src/main/java/com/pingcap/tikv/exception/TiExpressionException.java b/src/main/java/org/tikv/exception/TiExpressionException.java similarity index 95% rename from src/main/java/com/pingcap/tikv/exception/TiExpressionException.java rename to src/main/java/org/tikv/exception/TiExpressionException.java index c9f7d9353c..a15bfb20f2 100644 --- a/src/main/java/com/pingcap/tikv/exception/TiExpressionException.java +++ b/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) { diff --git a/src/main/java/com/pingcap/tikv/exception/TypeException.java b/src/main/java/org/tikv/exception/TypeException.java similarity index 95% rename from src/main/java/com/pingcap/tikv/exception/TypeException.java rename to src/main/java/org/tikv/exception/TypeException.java index 8c4ecee700..6aeb786186 100644 --- a/src/main/java/com/pingcap/tikv/exception/TypeException.java +++ b/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) { diff --git a/src/main/java/com/pingcap/tikv/exception/UnsupportedTypeException.java b/src/main/java/org/tikv/exception/UnsupportedTypeException.java similarity index 94% rename from src/main/java/com/pingcap/tikv/exception/UnsupportedTypeException.java rename to src/main/java/org/tikv/exception/UnsupportedTypeException.java index 92a9a05c14..a293f1bfb1 100644 --- a/src/main/java/com/pingcap/tikv/exception/UnsupportedTypeException.java +++ b/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) { diff --git a/src/main/java/com/pingcap/tikv/expression/AggregateFunction.java b/src/main/java/org/tikv/expression/AggregateFunction.java similarity index 98% rename from src/main/java/com/pingcap/tikv/expression/AggregateFunction.java rename to src/main/java/org/tikv/expression/AggregateFunction.java index b897495467..19e78d1fe9 100644 --- a/src/main/java/com/pingcap/tikv/expression/AggregateFunction.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/expression/ArithmeticBinaryExpression.java b/src/main/java/org/tikv/expression/ArithmeticBinaryExpression.java similarity index 96% rename from src/main/java/com/pingcap/tikv/expression/ArithmeticBinaryExpression.java rename to src/main/java/org/tikv/expression/ArithmeticBinaryExpression.java index e36e60f148..2bda9ba9ba 100644 --- a/src/main/java/com/pingcap/tikv/expression/ArithmeticBinaryExpression.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/expression/Blacklist.java b/src/main/java/org/tikv/expression/Blacklist.java similarity index 97% rename from src/main/java/com/pingcap/tikv/expression/Blacklist.java rename to src/main/java/org/tikv/expression/Blacklist.java index a2728766ea..516c552b89 100644 --- a/src/main/java/com/pingcap/tikv/expression/Blacklist.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/expression/ByItem.java b/src/main/java/org/tikv/expression/ByItem.java similarity index 93% rename from src/main/java/com/pingcap/tikv/expression/ByItem.java rename to src/main/java/org/tikv/expression/ByItem.java index 4dad5d9cc1..196f80fc69 100644 --- a/src/main/java/com/pingcap/tikv/expression/ByItem.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/expression/ColumnRef.java b/src/main/java/org/tikv/expression/ColumnRef.java similarity index 92% rename from src/main/java/com/pingcap/tikv/expression/ColumnRef.java rename to src/main/java/org/tikv/expression/ColumnRef.java index 15a63efbab..fe267e9198 100644 --- a/src/main/java/com/pingcap/tikv/expression/ColumnRef.java +++ b/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) { diff --git a/src/main/java/com/pingcap/tikv/expression/ComparisonBinaryExpression.java b/src/main/java/org/tikv/expression/ComparisonBinaryExpression.java similarity index 95% rename from src/main/java/com/pingcap/tikv/expression/ComparisonBinaryExpression.java rename to src/main/java/org/tikv/expression/ComparisonBinaryExpression.java index 6123d318c1..58245f8183 100644 --- a/src/main/java/com/pingcap/tikv/expression/ComparisonBinaryExpression.java +++ b/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 { diff --git a/src/main/java/com/pingcap/tikv/expression/Constant.java b/src/main/java/org/tikv/expression/Constant.java similarity index 96% rename from src/main/java/com/pingcap/tikv/expression/Constant.java rename to src/main/java/org/tikv/expression/Constant.java index 5dfd8ba173..f1fd810b24 100644 --- a/src/main/java/com/pingcap/tikv/expression/Constant.java +++ b/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 diff --git a/src/main/java/com/pingcap/tikv/expression/Expression.java b/src/main/java/org/tikv/expression/Expression.java similarity index 95% rename from src/main/java/com/pingcap/tikv/expression/Expression.java rename to src/main/java/org/tikv/expression/Expression.java index 1df26ba3c1..12d0f3021c 100644 --- a/src/main/java/com/pingcap/tikv/expression/Expression.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/expression/ExpressionBlacklist.java b/src/main/java/org/tikv/expression/ExpressionBlacklist.java similarity index 95% rename from src/main/java/com/pingcap/tikv/expression/ExpressionBlacklist.java rename to src/main/java/org/tikv/expression/ExpressionBlacklist.java index e532de33dc..fa54254948 100644 --- a/src/main/java/com/pingcap/tikv/expression/ExpressionBlacklist.java +++ b/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 { diff --git a/src/main/java/com/pingcap/tikv/expression/IsNull.java b/src/main/java/org/tikv/expression/IsNull.java similarity index 97% rename from src/main/java/com/pingcap/tikv/expression/IsNull.java rename to src/main/java/org/tikv/expression/IsNull.java index 4e00a32960..f407244a4c 100644 --- a/src/main/java/com/pingcap/tikv/expression/IsNull.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/expression/LogicalBinaryExpression.java b/src/main/java/org/tikv/expression/LogicalBinaryExpression.java similarity index 98% rename from src/main/java/com/pingcap/tikv/expression/LogicalBinaryExpression.java rename to src/main/java/org/tikv/expression/LogicalBinaryExpression.java index 3ad0c45830..79c8b7d108 100644 --- a/src/main/java/com/pingcap/tikv/expression/LogicalBinaryExpression.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/expression/Not.java b/src/main/java/org/tikv/expression/Not.java similarity index 97% rename from src/main/java/com/pingcap/tikv/expression/Not.java rename to src/main/java/org/tikv/expression/Not.java index b3d522ce00..cab66a204a 100644 --- a/src/main/java/com/pingcap/tikv/expression/Not.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/expression/StringRegExpression.java b/src/main/java/org/tikv/expression/StringRegExpression.java similarity index 94% rename from src/main/java/com/pingcap/tikv/expression/StringRegExpression.java rename to src/main/java/org/tikv/expression/StringRegExpression.java index e2925169b5..dac5cc09bb 100644 --- a/src/main/java/com/pingcap/tikv/expression/StringRegExpression.java +++ b/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 { diff --git a/src/main/java/com/pingcap/tikv/expression/TypeBlacklist.java b/src/main/java/org/tikv/expression/TypeBlacklist.java similarity index 93% rename from src/main/java/com/pingcap/tikv/expression/TypeBlacklist.java rename to src/main/java/org/tikv/expression/TypeBlacklist.java index d3dda8c4ed..9bac9a3d0f 100644 --- a/src/main/java/com/pingcap/tikv/expression/TypeBlacklist.java +++ b/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 typeToMySQLMap = initialTypeMap(); diff --git a/src/main/java/com/pingcap/tikv/expression/Visitor.java b/src/main/java/org/tikv/expression/Visitor.java similarity index 96% rename from src/main/java/com/pingcap/tikv/expression/Visitor.java rename to src/main/java/org/tikv/expression/Visitor.java index 2c57db3b12..cc98219b33 100644 --- a/src/main/java/com/pingcap/tikv/expression/Visitor.java +++ b/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 { protected abstract R visit(ColumnRef node, C context); diff --git a/src/main/java/com/pingcap/tikv/expression/visitor/ColumnMatcher.java b/src/main/java/org/tikv/expression/visitor/ColumnMatcher.java similarity index 88% rename from src/main/java/com/pingcap/tikv/expression/visitor/ColumnMatcher.java rename to src/main/java/org/tikv/expression/visitor/ColumnMatcher.java index b6ca8b3764..5894c1d60e 100644 --- a/src/main/java/com/pingcap/tikv/expression/visitor/ColumnMatcher.java +++ b/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 { private final ColumnRef columnRef; diff --git a/src/main/java/com/pingcap/tikv/expression/visitor/DefaultVisitor.java b/src/main/java/org/tikv/expression/visitor/DefaultVisitor.java similarity index 95% rename from src/main/java/com/pingcap/tikv/expression/visitor/DefaultVisitor.java rename to src/main/java/org/tikv/expression/visitor/DefaultVisitor.java index bc1f7cc0c9..516f34d734 100644 --- a/src/main/java/com/pingcap/tikv/expression/visitor/DefaultVisitor.java +++ b/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 extends Visitor { protected R process(Expression node, C context) { diff --git a/src/main/java/com/pingcap/tikv/expression/visitor/ExpressionTypeCoercer.java b/src/main/java/org/tikv/expression/visitor/ExpressionTypeCoercer.java similarity index 95% rename from src/main/java/com/pingcap/tikv/expression/visitor/ExpressionTypeCoercer.java rename to src/main/java/org/tikv/expression/visitor/ExpressionTypeCoercer.java index 284f97ca9b..82c7789355 100644 --- a/src/main/java/com/pingcap/tikv/expression/visitor/ExpressionTypeCoercer.java +++ b/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 diff --git a/src/main/java/com/pingcap/tikv/expression/visitor/IndexMatcher.java b/src/main/java/org/tikv/expression/visitor/IndexMatcher.java similarity index 93% rename from src/main/java/com/pingcap/tikv/expression/visitor/IndexMatcher.java rename to src/main/java/org/tikv/expression/visitor/IndexMatcher.java index bb7ad1f378..d97362379a 100644 --- a/src/main/java/com/pingcap/tikv/expression/visitor/IndexMatcher.java +++ b/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 diff --git a/src/main/java/com/pingcap/tikv/expression/visitor/IndexRangeBuilder.java b/src/main/java/org/tikv/expression/visitor/IndexRangeBuilder.java similarity index 93% rename from src/main/java/com/pingcap/tikv/expression/visitor/IndexRangeBuilder.java rename to src/main/java/org/tikv/expression/visitor/IndexRangeBuilder.java index 04dd13c42a..1c509a1819 100644 --- a/src/main/java/com/pingcap/tikv/expression/visitor/IndexRangeBuilder.java +++ b/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, Void> { diff --git a/src/main/java/com/pingcap/tikv/expression/visitor/MetaResolver.java b/src/main/java/org/tikv/expression/visitor/MetaResolver.java similarity index 89% rename from src/main/java/com/pingcap/tikv/expression/visitor/MetaResolver.java rename to src/main/java/org/tikv/expression/visitor/MetaResolver.java index 8d147587c8..854d612883 100644 --- a/src/main/java/com/pingcap/tikv/expression/visitor/MetaResolver.java +++ b/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 { public static void resolve(Expression expression, TiTableInfo table) { diff --git a/src/main/java/com/pingcap/tikv/expression/visitor/ProtoConverter.java b/src/main/java/org/tikv/expression/visitor/ProtoConverter.java similarity index 96% rename from src/main/java/com/pingcap/tikv/expression/visitor/ProtoConverter.java rename to src/main/java/org/tikv/expression/visitor/ProtoConverter.java index 22ecdbc177..8b10906f46 100644 --- a/src/main/java/com/pingcap/tikv/expression/visitor/ProtoConverter.java +++ b/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 { // All concrete data type should be hooked to a type name diff --git a/src/main/java/com/pingcap/tikv/expression/visitor/PseudoCostCalculator.java b/src/main/java/org/tikv/expression/visitor/PseudoCostCalculator.java similarity index 88% rename from src/main/java/com/pingcap/tikv/expression/visitor/PseudoCostCalculator.java rename to src/main/java/org/tikv/expression/visitor/PseudoCostCalculator.java index eaaa6b5218..9db9a476e6 100644 --- a/src/main/java/com/pingcap/tikv/expression/visitor/PseudoCostCalculator.java +++ b/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 { public static double calculateCost(Expression expr) { diff --git a/src/main/java/com/pingcap/tikv/expression/visitor/SupportedExpressionValidator.java b/src/main/java/org/tikv/expression/visitor/SupportedExpressionValidator.java similarity index 91% rename from src/main/java/com/pingcap/tikv/expression/visitor/SupportedExpressionValidator.java rename to src/main/java/org/tikv/expression/visitor/SupportedExpressionValidator.java index 1562f8bfd0..dcfaa4ddc2 100644 --- a/src/main/java/com/pingcap/tikv/expression/visitor/SupportedExpressionValidator.java +++ b/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 { private static final SupportedExpressionValidator validator = new SupportedExpressionValidator(); diff --git a/src/main/java/com/pingcap/tikv/key/CompoundKey.java b/src/main/java/org/tikv/key/CompoundKey.java similarity index 96% rename from src/main/java/com/pingcap/tikv/key/CompoundKey.java rename to src/main/java/org/tikv/key/CompoundKey.java index b1333671d2..d55e8429aa 100644 --- a/src/main/java/com/pingcap/tikv/key/CompoundKey.java +++ b/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 { diff --git a/src/main/java/com/pingcap/tikv/key/IndexKey.java b/src/main/java/org/tikv/key/IndexKey.java similarity index 91% rename from src/main/java/com/pingcap/tikv/key/IndexKey.java rename to src/main/java/org/tikv/key/IndexKey.java index 38da16cc46..8e98cc7639 100644 --- a/src/main/java/com/pingcap/tikv/key/IndexKey.java +++ b/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'}; diff --git a/src/main/java/com/pingcap/tikv/key/Key.java b/src/main/java/org/tikv/key/Key.java similarity index 94% rename from src/main/java/com/pingcap/tikv/key/Key.java rename to src/main/java/org/tikv/key/Key.java index fc7672929e..d540f75a23 100644 --- a/src/main/java/com/pingcap/tikv/key/Key.java +++ b/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 { protected static final byte[] TBL_PREFIX = new byte[] {'t'}; diff --git a/src/main/java/com/pingcap/tikv/key/RowKey.java b/src/main/java/org/tikv/key/RowKey.java similarity index 90% rename from src/main/java/com/pingcap/tikv/key/RowKey.java rename to src/main/java/org/tikv/key/RowKey.java index 5cab12c86b..62e56a7635 100644 --- a/src/main/java/com/pingcap/tikv/key/RowKey.java +++ b/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'}; diff --git a/src/main/java/com/pingcap/tikv/key/TypedKey.java b/src/main/java/org/tikv/key/TypedKey.java similarity index 91% rename from src/main/java/com/pingcap/tikv/key/TypedKey.java rename to src/main/java/org/tikv/key/TypedKey.java index c9b691132b..88a0dca444 100644 --- a/src/main/java/com/pingcap/tikv/key/TypedKey.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/meta/CIStr.java b/src/main/java/org/tikv/meta/CIStr.java similarity index 97% rename from src/main/java/com/pingcap/tikv/meta/CIStr.java rename to src/main/java/org/tikv/meta/CIStr.java index b93af6e491..ae7267dd7e 100644 --- a/src/main/java/com/pingcap/tikv/meta/CIStr.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/meta/Collation.java b/src/main/java/org/tikv/meta/Collation.java similarity index 99% rename from src/main/java/com/pingcap/tikv/meta/Collation.java rename to src/main/java/org/tikv/meta/Collation.java index a363b10796..aff066f35c 100644 --- a/src/main/java/com/pingcap/tikv/meta/Collation.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/meta/IndexType.java b/src/main/java/org/tikv/meta/IndexType.java similarity index 93% rename from src/main/java/com/pingcap/tikv/meta/IndexType.java rename to src/main/java/org/tikv/meta/IndexType.java index 4587faad52..e7353f20ab 100644 --- a/src/main/java/com/pingcap/tikv/meta/IndexType.java +++ b/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. diff --git a/src/main/java/com/pingcap/tikv/meta/SchemaState.java b/src/main/java/org/tikv/meta/SchemaState.java similarity index 92% rename from src/main/java/com/pingcap/tikv/meta/SchemaState.java rename to src/main/java/org/tikv/meta/SchemaState.java index dbd0dfaa09..37448d5c9e 100644 --- a/src/main/java/com/pingcap/tikv/meta/SchemaState.java +++ b/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), diff --git a/src/main/java/com/pingcap/tikv/meta/TiColumnInfo.java b/src/main/java/org/tikv/meta/TiColumnInfo.java similarity index 97% rename from src/main/java/com/pingcap/tikv/meta/TiColumnInfo.java rename to src/main/java/org/tikv/meta/TiColumnInfo.java index de62901b2a..b28e65c24a 100644 --- a/src/main/java/com/pingcap/tikv/meta/TiColumnInfo.java +++ b/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 { diff --git a/src/main/java/com/pingcap/tikv/meta/TiDAGRequest.java b/src/main/java/org/tikv/meta/TiDAGRequest.java similarity index 96% rename from src/main/java/com/pingcap/tikv/meta/TiDAGRequest.java rename to src/main/java/org/tikv/meta/TiDAGRequest.java index edcc657bd6..a793ad8230 100644 --- a/src/main/java/com/pingcap/tikv/meta/TiDAGRequest.java +++ b/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. diff --git a/src/main/java/com/pingcap/tikv/meta/TiDBInfo.java b/src/main/java/org/tikv/meta/TiDBInfo.java similarity index 98% rename from src/main/java/com/pingcap/tikv/meta/TiDBInfo.java rename to src/main/java/org/tikv/meta/TiDBInfo.java index 03ae90c14c..d0fa9b2c2d 100644 --- a/src/main/java/com/pingcap/tikv/meta/TiDBInfo.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/meta/TiIndexColumn.java b/src/main/java/org/tikv/meta/TiIndexColumn.java similarity index 95% rename from src/main/java/com/pingcap/tikv/meta/TiIndexColumn.java rename to src/main/java/org/tikv/meta/TiIndexColumn.java index 7e4d2465cc..ffb8c0ba32 100644 --- a/src/main/java/com/pingcap/tikv/meta/TiIndexColumn.java +++ b/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 { diff --git a/src/main/java/com/pingcap/tikv/meta/TiIndexInfo.java b/src/main/java/org/tikv/meta/TiIndexInfo.java similarity index 99% rename from src/main/java/com/pingcap/tikv/meta/TiIndexInfo.java rename to src/main/java/org/tikv/meta/TiIndexInfo.java index d0adea70d8..7c65cf0ee2 100644 --- a/src/main/java/com/pingcap/tikv/meta/TiIndexInfo.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/meta/TiPartitionDef.java b/src/main/java/org/tikv/meta/TiPartitionDef.java similarity index 96% rename from src/main/java/com/pingcap/tikv/meta/TiPartitionDef.java rename to src/main/java/org/tikv/meta/TiPartitionDef.java index 04efb698ec..125eae89e8 100644 --- a/src/main/java/com/pingcap/tikv/meta/TiPartitionDef.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/meta/TiPartitionInfo.java b/src/main/java/org/tikv/meta/TiPartitionInfo.java similarity index 96% rename from src/main/java/com/pingcap/tikv/meta/TiPartitionInfo.java rename to src/main/java/org/tikv/meta/TiPartitionInfo.java index aa2c1e4d6e..0994095e0e 100644 --- a/src/main/java/com/pingcap/tikv/meta/TiPartitionInfo.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/meta/TiTableInfo.java b/src/main/java/org/tikv/meta/TiTableInfo.java similarity index 95% rename from src/main/java/com/pingcap/tikv/meta/TiTableInfo.java rename to src/main/java/org/tikv/meta/TiTableInfo.java index e5d16fd285..56502b305e 100644 --- a/src/main/java/com/pingcap/tikv/meta/TiTableInfo.java +++ b/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 { diff --git a/src/main/java/com/pingcap/tikv/meta/TiTimestamp.java b/src/main/java/org/tikv/meta/TiTimestamp.java similarity index 97% rename from src/main/java/com/pingcap/tikv/meta/TiTimestamp.java rename to src/main/java/org/tikv/meta/TiTimestamp.java index bba522af7c..ed9c521a56 100644 --- a/src/main/java/com/pingcap/tikv/meta/TiTimestamp.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/operation/ErrorHandler.java b/src/main/java/org/tikv/operation/ErrorHandler.java similarity index 94% rename from src/main/java/com/pingcap/tikv/operation/ErrorHandler.java rename to src/main/java/org/tikv/operation/ErrorHandler.java index 835451935a..49a9d15bdf 100644 --- a/src/main/java/com/pingcap/tikv/operation/ErrorHandler.java +++ b/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 { /** diff --git a/src/main/java/com/pingcap/tikv/operation/KVErrorHandler.java b/src/main/java/org/tikv/operation/KVErrorHandler.java similarity index 95% rename from src/main/java/com/pingcap/tikv/operation/KVErrorHandler.java rename to src/main/java/org/tikv/operation/KVErrorHandler.java index 457ac33add..5e4a6566b3 100644 --- a/src/main/java/com/pingcap/tikv/operation/KVErrorHandler.java +++ b/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 implements ErrorHandler { diff --git a/src/main/java/com/pingcap/tikv/operation/PDErrorHandler.java b/src/main/java/org/tikv/operation/PDErrorHandler.java similarity index 85% rename from src/main/java/com/pingcap/tikv/operation/PDErrorHandler.java rename to src/main/java/org/tikv/operation/PDErrorHandler.java index 506adc0e5f..3a71167a8c 100644 --- a/src/main/java/com/pingcap/tikv/operation/PDErrorHandler.java +++ b/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 implements ErrorHandler { private final Function getError; diff --git a/src/main/java/com/pingcap/tikv/operation/SchemaInfer.java b/src/main/java/org/tikv/operation/SchemaInfer.java similarity index 89% rename from src/main/java/com/pingcap/tikv/operation/SchemaInfer.java rename to src/main/java/org/tikv/operation/SchemaInfer.java index b87d641737..10f66629c4 100644 --- a/src/main/java/com/pingcap/tikv/operation/SchemaInfer.java +++ b/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 diff --git a/src/main/java/com/pingcap/tikv/operation/iterator/ChunkIterator.java b/src/main/java/org/tikv/operation/iterator/ChunkIterator.java similarity index 96% rename from src/main/java/com/pingcap/tikv/operation/iterator/ChunkIterator.java rename to src/main/java/org/tikv/operation/iterator/ChunkIterator.java index e69fb3419d..2dae7f6a97 100644 --- a/src/main/java/com/pingcap/tikv/operation/iterator/ChunkIterator.java +++ b/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 implements Iterator { diff --git a/src/main/java/com/pingcap/tikv/operation/iterator/ConcreteScanIterator.java b/src/main/java/org/tikv/operation/iterator/ConcreteScanIterator.java similarity index 80% rename from src/main/java/com/pingcap/tikv/operation/iterator/ConcreteScanIterator.java rename to src/main/java/org/tikv/operation/iterator/ConcreteScanIterator.java index ba56a3c0fa..6966faa26c 100644 --- a/src/main/java/com/pingcap/tikv/operation/iterator/ConcreteScanIterator.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/operation/iterator/CoprocessIterator.java b/src/main/java/org/tikv/operation/iterator/CoprocessIterator.java similarity index 87% rename from src/main/java/com/pingcap/tikv/operation/iterator/CoprocessIterator.java rename to src/main/java/org/tikv/operation/iterator/CoprocessIterator.java index 94b0be06f1..7bec7bef51 100644 --- a/src/main/java/com/pingcap/tikv/operation/iterator/CoprocessIterator.java +++ b/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 implements Iterator { protected final TiSession session; diff --git a/src/main/java/com/pingcap/tikv/operation/iterator/DAGIterator.java b/src/main/java/org/tikv/operation/iterator/DAGIterator.java similarity index 90% rename from src/main/java/com/pingcap/tikv/operation/iterator/DAGIterator.java rename to src/main/java/org/tikv/operation/iterator/DAGIterator.java index a6be81a016..e83085d1a5 100644 --- a/src/main/java/com/pingcap/tikv/operation/iterator/DAGIterator.java +++ b/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 extends CoprocessIterator { private ExecutorCompletionService> streamingService; diff --git a/src/main/java/com/pingcap/tikv/operation/iterator/IndexScanIterator.java b/src/main/java/org/tikv/operation/iterator/IndexScanIterator.java similarity index 88% rename from src/main/java/com/pingcap/tikv/operation/iterator/IndexScanIterator.java rename to src/main/java/org/tikv/operation/iterator/IndexScanIterator.java index b9cbf45e12..c31ec2a2c9 100644 --- a/src/main/java/com/pingcap/tikv/operation/iterator/IndexScanIterator.java +++ b/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 { private final Iterator handleIterator; diff --git a/src/main/java/com/pingcap/tikv/operation/iterator/RawScanIterator.java b/src/main/java/org/tikv/operation/iterator/RawScanIterator.java similarity index 82% rename from src/main/java/com/pingcap/tikv/operation/iterator/RawScanIterator.java rename to src/main/java/org/tikv/operation/iterator/RawScanIterator.java index 76dd4686de..0bcaf407ac 100644 --- a/src/main/java/com/pingcap/tikv/operation/iterator/RawScanIterator.java +++ b/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 { diff --git a/src/main/java/com/pingcap/tikv/operation/iterator/ScanIterator.java b/src/main/java/org/tikv/operation/iterator/ScanIterator.java similarity index 93% rename from src/main/java/com/pingcap/tikv/operation/iterator/ScanIterator.java rename to src/main/java/org/tikv/operation/iterator/ScanIterator.java index 14942c75c8..bb9edf4360 100644 --- a/src/main/java/com/pingcap/tikv/operation/iterator/ScanIterator.java +++ b/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 { protected final TiSession session; diff --git a/src/main/java/com/pingcap/tikv/operation/transformer/Cast.java b/src/main/java/org/tikv/operation/transformer/Cast.java similarity index 95% rename from src/main/java/com/pingcap/tikv/operation/transformer/Cast.java rename to src/main/java/org/tikv/operation/transformer/Cast.java index 2cdc5e9388..c405f647cc 100644 --- a/src/main/java/com/pingcap/tikv/operation/transformer/Cast.java +++ b/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) { diff --git a/src/main/java/com/pingcap/tikv/operation/transformer/MultiKeyDecoder.java b/src/main/java/org/tikv/operation/transformer/MultiKeyDecoder.java similarity index 89% rename from src/main/java/com/pingcap/tikv/operation/transformer/MultiKeyDecoder.java rename to src/main/java/org/tikv/operation/transformer/MultiKeyDecoder.java index eabfcede1e..9e35c1e466 100644 --- a/src/main/java/com/pingcap/tikv/operation/transformer/MultiKeyDecoder.java +++ b/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 dataTypes) { diff --git a/src/main/java/com/pingcap/tikv/operation/transformer/NoOp.java b/src/main/java/org/tikv/operation/transformer/NoOp.java similarity index 90% rename from src/main/java/com/pingcap/tikv/operation/transformer/NoOp.java rename to src/main/java/org/tikv/operation/transformer/NoOp.java index 5caf3c10c2..089f215419 100644 --- a/src/main/java/com/pingcap/tikv/operation/transformer/NoOp.java +++ b/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 { diff --git a/src/main/java/com/pingcap/tikv/operation/transformer/Projection.java b/src/main/java/org/tikv/operation/transformer/Projection.java similarity index 84% rename from src/main/java/com/pingcap/tikv/operation/transformer/Projection.java rename to src/main/java/org/tikv/operation/transformer/Projection.java index 3992434558..4b80774e18 100644 --- a/src/main/java/com/pingcap/tikv/operation/transformer/Projection.java +++ b/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); diff --git a/src/main/java/com/pingcap/tikv/operation/transformer/RowTransformer.java b/src/main/java/org/tikv/operation/transformer/RowTransformer.java similarity index 96% rename from src/main/java/com/pingcap/tikv/operation/transformer/RowTransformer.java rename to src/main/java/org/tikv/operation/transformer/RowTransformer.java index 4f3e5c0e6a..c3f3de16ab 100644 --- a/src/main/java/com/pingcap/tikv/operation/transformer/RowTransformer.java +++ b/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 diff --git a/src/main/java/com/pingcap/tikv/operation/transformer/Skip.java b/src/main/java/org/tikv/operation/transformer/Skip.java similarity index 88% rename from src/main/java/com/pingcap/tikv/operation/transformer/Skip.java rename to src/main/java/org/tikv/operation/transformer/Skip.java index 6ce2b30e34..9960889d43 100644 --- a/src/main/java/com/pingcap/tikv/operation/transformer/Skip.java +++ b/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(); diff --git a/src/main/java/com/pingcap/tikv/policy/RetryMaxMs.java b/src/main/java/org/tikv/policy/RetryMaxMs.java similarity index 89% rename from src/main/java/com/pingcap/tikv/policy/RetryMaxMs.java rename to src/main/java/org/tikv/policy/RetryMaxMs.java index c58c23f18d..af7589a6df 100644 --- a/src/main/java/com/pingcap/tikv/policy/RetryMaxMs.java +++ b/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 extends RetryPolicy { private RetryMaxMs(ErrorHandler handler, BackOffer backOffer) { diff --git a/src/main/java/com/pingcap/tikv/policy/RetryPolicy.java b/src/main/java/org/tikv/policy/RetryPolicy.java similarity index 90% rename from src/main/java/com/pingcap/tikv/policy/RetryPolicy.java rename to src/main/java/org/tikv/policy/RetryPolicy.java index 119d5d2130..18c7c09427 100644 --- a/src/main/java/com/pingcap/tikv/policy/RetryPolicy.java +++ b/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 { BackOffer backOffer = ConcreteBackOffer.newCopNextMaxBackOff(); diff --git a/src/main/java/com/pingcap/tikv/predicates/IndexRange.java b/src/main/java/org/tikv/predicates/IndexRange.java similarity index 90% rename from src/main/java/com/pingcap/tikv/predicates/IndexRange.java rename to src/main/java/org/tikv/predicates/IndexRange.java index 88952af301..d946a5bd99 100644 --- a/src/main/java/com/pingcap/tikv/predicates/IndexRange.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/predicates/PredicateUtils.java b/src/main/java/org/tikv/predicates/PredicateUtils.java similarity index 89% rename from src/main/java/com/pingcap/tikv/predicates/PredicateUtils.java rename to src/main/java/org/tikv/predicates/PredicateUtils.java index e5dfe77f30..91b8d106a7 100644 --- a/src/main/java/com/pingcap/tikv/predicates/PredicateUtils.java +++ b/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 exprs) { diff --git a/src/main/java/com/pingcap/tikv/predicates/ScanAnalyzer.java b/src/main/java/org/tikv/predicates/ScanAnalyzer.java similarity index 93% rename from src/main/java/com/pingcap/tikv/predicates/ScanAnalyzer.java rename to src/main/java/org/tikv/predicates/ScanAnalyzer.java index c6b24c0548..125decea8a 100644 --- a/src/main/java/com/pingcap/tikv/predicates/ScanAnalyzer.java +++ b/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; diff --git a/src/main/java/com/pingcap/tikv/predicates/ScanSpec.java b/src/main/java/org/tikv/predicates/ScanSpec.java similarity index 91% rename from src/main/java/com/pingcap/tikv/predicates/ScanSpec.java rename to src/main/java/org/tikv/predicates/ScanSpec.java index aeaebfc485..00ce7d0cf5 100644 --- a/src/main/java/com/pingcap/tikv/predicates/ScanSpec.java +++ b/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 { diff --git a/src/main/java/com/pingcap/tikv/predicates/SelectivityCalculator.java b/src/main/java/org/tikv/predicates/SelectivityCalculator.java similarity index 84% rename from src/main/java/com/pingcap/tikv/predicates/SelectivityCalculator.java rename to src/main/java/org/tikv/predicates/SelectivityCalculator.java index 790e092dba..076d93bbf0 100644 --- a/src/main/java/com/pingcap/tikv/predicates/SelectivityCalculator.java +++ b/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 { public static double calcPseudoSelectivity(ScanSpec spec) { diff --git a/src/main/java/com/pingcap/tikv/region/RegionErrorReceiver.java b/src/main/java/org/tikv/region/RegionErrorReceiver.java similarity index 89% rename from src/main/java/com/pingcap/tikv/region/RegionErrorReceiver.java rename to src/main/java/org/tikv/region/RegionErrorReceiver.java index ed47c36c5d..6471cf1aba 100644 --- a/src/main/java/com/pingcap/tikv/region/RegionErrorReceiver.java +++ b/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); diff --git a/src/main/java/com/pingcap/tikv/region/RegionManager.java b/src/main/java/org/tikv/region/RegionManager.java similarity index 92% rename from src/main/java/com/pingcap/tikv/region/RegionManager.java rename to src/main/java/org/tikv/region/RegionManager.java index d4e6a2d9fa..7eae9259f9 100644 --- a/src/main/java/com/pingcap/tikv/region/RegionManager.java +++ b/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); diff --git a/src/main/java/com/pingcap/tikv/region/RegionStoreClient.java b/src/main/java/org/tikv/region/RegionStoreClient.java similarity index 90% rename from src/main/java/com/pingcap/tikv/region/RegionStoreClient.java rename to src/main/java/org/tikv/region/RegionStoreClient.java index a2437eb861..dee649b10a 100644 --- a/src/main/java/com/pingcap/tikv/region/RegionStoreClient.java +++ b/src/main/java/org/tikv/region/RegionStoreClient.java @@ -15,58 +15,58 @@ * */ -package com.pingcap.tikv.region; +package org.tikv.region; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import static com.pingcap.tikv.region.RegionStoreClient.RequestTypes.REQ_TYPE_DAG; -import static com.pingcap.tikv.util.BackOffFunction.BackOffFuncType.BoRegionMiss; -import static com.pingcap.tikv.util.BackOffFunction.BackOffFuncType.BoTxnLockFast; +import static org.tikv.region.RegionStoreClient.RequestTypes.REQ_TYPE_DAG; +import static org.tikv.util.BackOffFunction.BackOffFuncType.BoRegionMiss; +import static org.tikv.util.BackOffFunction.BackOffFuncType.BoTxnLockFast; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; import com.pingcap.tidb.tipb.DAGRequest; import com.pingcap.tidb.tipb.SelectResponse; -import com.pingcap.tikv.AbstractGRPCClient; -import com.pingcap.tikv.TiSession; -import com.pingcap.tikv.exception.*; -import com.pingcap.tikv.kvproto.Coprocessor; -import com.pingcap.tikv.kvproto.Coprocessor.KeyRange; -import com.pingcap.tikv.kvproto.Errorpb; -import com.pingcap.tikv.kvproto.Kvrpcpb.BatchGetRequest; -import com.pingcap.tikv.kvproto.Kvrpcpb.BatchGetResponse; -import com.pingcap.tikv.kvproto.Kvrpcpb.Context; -import com.pingcap.tikv.kvproto.Kvrpcpb.GetRequest; -import com.pingcap.tikv.kvproto.Kvrpcpb.GetResponse; -import com.pingcap.tikv.kvproto.Kvrpcpb.KvPair; -import com.pingcap.tikv.kvproto.Kvrpcpb.RawDeleteRequest; -import com.pingcap.tikv.kvproto.Kvrpcpb.RawDeleteResponse; -import com.pingcap.tikv.kvproto.Kvrpcpb.RawGetRequest; -import com.pingcap.tikv.kvproto.Kvrpcpb.RawGetResponse; -import com.pingcap.tikv.kvproto.Kvrpcpb.RawPutRequest; -import com.pingcap.tikv.kvproto.Kvrpcpb.RawPutResponse; -import com.pingcap.tikv.kvproto.Kvrpcpb.RawScanRequest; -import com.pingcap.tikv.kvproto.Kvrpcpb.RawScanResponse; -import com.pingcap.tikv.kvproto.Kvrpcpb.ScanRequest; -import com.pingcap.tikv.kvproto.Kvrpcpb.ScanResponse; -import com.pingcap.tikv.kvproto.Metapb.Store; -import com.pingcap.tikv.kvproto.TikvGrpc; -import com.pingcap.tikv.kvproto.TikvGrpc.TikvBlockingStub; -import com.pingcap.tikv.kvproto.TikvGrpc.TikvStub; -import com.pingcap.tikv.operation.KVErrorHandler; -import com.pingcap.tikv.streaming.StreamingResponse; -import com.pingcap.tikv.txn.Lock; -import com.pingcap.tikv.txn.LockResolverClient; -import com.pingcap.tikv.util.BackOffFunction; -import com.pingcap.tikv.util.BackOffer; -import com.pingcap.tikv.util.ConcreteBackOffer; -import com.pingcap.tikv.util.RangeSplitter; import io.grpc.ManagedChannel; import java.util.*; import java.util.function.Supplier; import jline.internal.TestAccessible; import org.apache.hadoop.hive.ql.lockmgr.LockException; import org.apache.log4j.Logger; +import org.tikv.AbstractGRPCClient; +import org.tikv.TiSession; +import org.tikv.exception.*; +import org.tikv.kvproto.Coprocessor; +import org.tikv.kvproto.Coprocessor.KeyRange; +import org.tikv.kvproto.Errorpb; +import org.tikv.kvproto.Kvrpcpb.BatchGetRequest; +import org.tikv.kvproto.Kvrpcpb.BatchGetResponse; +import org.tikv.kvproto.Kvrpcpb.Context; +import org.tikv.kvproto.Kvrpcpb.GetRequest; +import org.tikv.kvproto.Kvrpcpb.GetResponse; +import org.tikv.kvproto.Kvrpcpb.KvPair; +import org.tikv.kvproto.Kvrpcpb.RawDeleteRequest; +import org.tikv.kvproto.Kvrpcpb.RawDeleteResponse; +import org.tikv.kvproto.Kvrpcpb.RawGetRequest; +import org.tikv.kvproto.Kvrpcpb.RawGetResponse; +import org.tikv.kvproto.Kvrpcpb.RawPutRequest; +import org.tikv.kvproto.Kvrpcpb.RawPutResponse; +import org.tikv.kvproto.Kvrpcpb.RawScanRequest; +import org.tikv.kvproto.Kvrpcpb.RawScanResponse; +import org.tikv.kvproto.Kvrpcpb.ScanRequest; +import org.tikv.kvproto.Kvrpcpb.ScanResponse; +import org.tikv.kvproto.Metapb.Store; +import org.tikv.kvproto.TikvGrpc; +import org.tikv.kvproto.TikvGrpc.TikvBlockingStub; +import org.tikv.kvproto.TikvGrpc.TikvStub; +import org.tikv.operation.KVErrorHandler; +import org.tikv.streaming.StreamingResponse; +import org.tikv.txn.Lock; +import org.tikv.txn.LockResolverClient; +import org.tikv.util.BackOffFunction; +import org.tikv.util.BackOffer; +import org.tikv.util.ConcreteBackOffer; +import org.tikv.util.RangeSplitter; // RegionStore itself is not thread-safe public class RegionStoreClient extends AbstractGRPCClient diff --git a/src/main/java/com/pingcap/tikv/region/TiRegion.java b/src/main/java/org/tikv/region/TiRegion.java similarity index 90% rename from src/main/java/com/pingcap/tikv/region/TiRegion.java rename to src/main/java/org/tikv/region/TiRegion.java index bc759d5a87..acaddf0aec 100644 --- a/src/main/java/com/pingcap/tikv/region/TiRegion.java +++ b/src/main/java/org/tikv/region/TiRegion.java @@ -15,24 +15,24 @@ * */ -package com.pingcap.tikv.region; +package org.tikv.region; import com.google.protobuf.ByteString; -import com.pingcap.tikv.codec.Codec.BytesCodec; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.codec.KeyUtils; -import com.pingcap.tikv.exception.TiClientInternalException; -import com.pingcap.tikv.kvproto.Kvrpcpb; -import com.pingcap.tikv.kvproto.Kvrpcpb.IsolationLevel; -import com.pingcap.tikv.kvproto.Metapb; -import com.pingcap.tikv.kvproto.Metapb.Peer; -import com.pingcap.tikv.kvproto.Metapb.Region; -import com.pingcap.tikv.util.FastByteComparisons; import java.io.Serializable; import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Set; +import org.tikv.codec.Codec.BytesCodec; +import org.tikv.codec.CodecDataInput; +import org.tikv.codec.KeyUtils; +import org.tikv.exception.TiClientInternalException; +import org.tikv.kvproto.Kvrpcpb; +import org.tikv.kvproto.Kvrpcpb.IsolationLevel; +import org.tikv.kvproto.Metapb; +import org.tikv.kvproto.Metapb.Peer; +import org.tikv.kvproto.Metapb.Region; +import org.tikv.util.FastByteComparisons; public class TiRegion implements Serializable { private final Region meta; diff --git a/src/main/java/com/pingcap/tikv/row/DefaultRowReader.java b/src/main/java/org/tikv/row/DefaultRowReader.java similarity index 91% rename from src/main/java/com/pingcap/tikv/row/DefaultRowReader.java rename to src/main/java/org/tikv/row/DefaultRowReader.java index c65f25e3e6..f1f5880a1e 100644 --- a/src/main/java/com/pingcap/tikv/row/DefaultRowReader.java +++ b/src/main/java/org/tikv/row/DefaultRowReader.java @@ -15,10 +15,10 @@ * */ -package com.pingcap.tikv.row; +package org.tikv.row; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.types.DataType; +import org.tikv.codec.CodecDataInput; +import org.tikv.types.DataType; public class DefaultRowReader implements RowReader { private final CodecDataInput cdi; diff --git a/src/main/java/com/pingcap/tikv/row/ObjectRowImpl.java b/src/main/java/org/tikv/row/ObjectRowImpl.java similarity index 98% rename from src/main/java/com/pingcap/tikv/row/ObjectRowImpl.java rename to src/main/java/org/tikv/row/ObjectRowImpl.java index 7c08401d54..30bc9434e3 100644 --- a/src/main/java/com/pingcap/tikv/row/ObjectRowImpl.java +++ b/src/main/java/org/tikv/row/ObjectRowImpl.java @@ -15,13 +15,13 @@ * */ -package com.pingcap.tikv.row; +package org.tikv.row; -import com.pingcap.tikv.types.DataType; import java.math.BigDecimal; import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; +import org.tikv.types.DataType; // A dummy implementation of Row interface // Using non-memory compact format diff --git a/src/main/java/com/pingcap/tikv/row/Row.java b/src/main/java/org/tikv/row/Row.java similarity index 95% rename from src/main/java/com/pingcap/tikv/row/Row.java rename to src/main/java/org/tikv/row/Row.java index 9bd9506672..5a4c1c9330 100644 --- a/src/main/java/com/pingcap/tikv/row/Row.java +++ b/src/main/java/org/tikv/row/Row.java @@ -15,12 +15,12 @@ * */ -package com.pingcap.tikv.row; +package org.tikv.row; -import com.pingcap.tikv.types.DataType; import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; +import org.tikv.types.DataType; /** * Even in case of mem-buffer-based row we can ignore field types when en/decoding if we put some diff --git a/src/main/java/com/pingcap/tikv/row/RowReader.java b/src/main/java/org/tikv/row/RowReader.java similarity index 89% rename from src/main/java/com/pingcap/tikv/row/RowReader.java rename to src/main/java/org/tikv/row/RowReader.java index 6c37e37f18..d417e080e5 100644 --- a/src/main/java/com/pingcap/tikv/row/RowReader.java +++ b/src/main/java/org/tikv/row/RowReader.java @@ -15,9 +15,9 @@ * */ -package com.pingcap.tikv.row; +package org.tikv.row; -import com.pingcap.tikv.types.DataType; +import org.tikv.types.DataType; public interface RowReader { Row readRow(DataType[] dataTypes); diff --git a/src/main/java/com/pingcap/tikv/row/RowReaderFactory.java b/src/main/java/org/tikv/row/RowReaderFactory.java similarity index 89% rename from src/main/java/com/pingcap/tikv/row/RowReaderFactory.java rename to src/main/java/org/tikv/row/RowReaderFactory.java index bbf8b9af3e..af77b89865 100644 --- a/src/main/java/com/pingcap/tikv/row/RowReaderFactory.java +++ b/src/main/java/org/tikv/row/RowReaderFactory.java @@ -15,9 +15,9 @@ * */ -package com.pingcap.tikv.row; +package org.tikv.row; -import com.pingcap.tikv.codec.CodecDataInput; +import org.tikv.codec.CodecDataInput; public class RowReaderFactory { public static RowReader createRowReader(CodecDataInput cdi) { diff --git a/src/main/java/com/pingcap/tikv/statistics/Bucket.java b/src/main/java/org/tikv/statistics/Bucket.java similarity index 97% rename from src/main/java/com/pingcap/tikv/statistics/Bucket.java rename to src/main/java/org/tikv/statistics/Bucket.java index f8b747f5c8..9b72448010 100644 --- a/src/main/java/com/pingcap/tikv/statistics/Bucket.java +++ b/src/main/java/org/tikv/statistics/Bucket.java @@ -15,10 +15,10 @@ * */ -package com.pingcap.tikv.statistics; +package org.tikv.statistics; import com.google.protobuf.ByteString; -import com.pingcap.tikv.key.Key; +import org.tikv.key.Key; /** * Bucket is histogram element. diff --git a/src/main/java/com/pingcap/tikv/statistics/CMSketch.java b/src/main/java/org/tikv/statistics/CMSketch.java similarity index 98% rename from src/main/java/com/pingcap/tikv/statistics/CMSketch.java rename to src/main/java/org/tikv/statistics/CMSketch.java index c5f97ee302..4a833f16c2 100644 --- a/src/main/java/com/pingcap/tikv/statistics/CMSketch.java +++ b/src/main/java/org/tikv/statistics/CMSketch.java @@ -14,7 +14,7 @@ * */ -package com.pingcap.tikv.statistics; +package org.tikv.statistics; import com.sangupta.murmur.Murmur3; import java.util.Arrays; diff --git a/src/main/java/com/pingcap/tikv/statistics/ColumnStatistics.java b/src/main/java/org/tikv/statistics/ColumnStatistics.java similarity index 95% rename from src/main/java/com/pingcap/tikv/statistics/ColumnStatistics.java rename to src/main/java/org/tikv/statistics/ColumnStatistics.java index fb96ec5aa1..b7ae5669ad 100644 --- a/src/main/java/com/pingcap/tikv/statistics/ColumnStatistics.java +++ b/src/main/java/org/tikv/statistics/ColumnStatistics.java @@ -15,9 +15,9 @@ * */ -package com.pingcap.tikv.statistics; +package org.tikv.statistics; -import com.pingcap.tikv.meta.TiColumnInfo; +import org.tikv.meta.TiColumnInfo; /** * Each Column will have a single {@link ColumnStatistics} to store {@link Histogram} info and diff --git a/src/main/java/com/pingcap/tikv/statistics/Histogram.java b/src/main/java/org/tikv/statistics/Histogram.java similarity index 99% rename from src/main/java/com/pingcap/tikv/statistics/Histogram.java rename to src/main/java/org/tikv/statistics/Histogram.java index d3a19d902d..bc76df9548 100644 --- a/src/main/java/com/pingcap/tikv/statistics/Histogram.java +++ b/src/main/java/org/tikv/statistics/Histogram.java @@ -14,13 +14,13 @@ * */ -package com.pingcap.tikv.statistics; +package org.tikv.statistics; -import com.pingcap.tikv.key.Key; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Objects; +import org.tikv.key.Key; /** * Histogram represents core statistics for a column or index. diff --git a/src/main/java/com/pingcap/tikv/statistics/IndexStatistics.java b/src/main/java/org/tikv/statistics/IndexStatistics.java similarity index 91% rename from src/main/java/com/pingcap/tikv/statistics/IndexStatistics.java rename to src/main/java/org/tikv/statistics/IndexStatistics.java index 8a2c303b59..f7a95d8244 100644 --- a/src/main/java/com/pingcap/tikv/statistics/IndexStatistics.java +++ b/src/main/java/org/tikv/statistics/IndexStatistics.java @@ -14,18 +14,18 @@ * */ -package com.pingcap.tikv.statistics; +package org.tikv.statistics; import com.google.common.collect.BoundType; import com.google.common.collect.Range; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.key.Key; -import com.pingcap.tikv.key.TypedKey; -import com.pingcap.tikv.meta.TiIndexInfo; -import com.pingcap.tikv.predicates.IndexRange; -import com.pingcap.tikv.types.DataTypeFactory; -import com.pingcap.tikv.types.MySQLType; import java.util.List; +import org.tikv.codec.CodecDataOutput; +import org.tikv.key.Key; +import org.tikv.key.TypedKey; +import org.tikv.meta.TiIndexInfo; +import org.tikv.predicates.IndexRange; +import org.tikv.types.DataTypeFactory; +import org.tikv.types.MySQLType; /** * Each Index will have a single {@link IndexStatistics} to store {@link Histogram} info and {@link diff --git a/src/main/java/com/pingcap/tikv/statistics/TableStatistics.java b/src/main/java/org/tikv/statistics/TableStatistics.java similarity index 98% rename from src/main/java/com/pingcap/tikv/statistics/TableStatistics.java rename to src/main/java/org/tikv/statistics/TableStatistics.java index 130b6927cc..270813bb92 100644 --- a/src/main/java/com/pingcap/tikv/statistics/TableStatistics.java +++ b/src/main/java/org/tikv/statistics/TableStatistics.java @@ -15,7 +15,7 @@ * */ -package com.pingcap.tikv.statistics; +package org.tikv.statistics; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/pingcap/tikv/streaming/StreamingResponse.java b/src/main/java/org/tikv/streaming/StreamingResponse.java similarity index 94% rename from src/main/java/com/pingcap/tikv/streaming/StreamingResponse.java rename to src/main/java/org/tikv/streaming/StreamingResponse.java index 45496320cc..11b81765c2 100644 --- a/src/main/java/com/pingcap/tikv/streaming/StreamingResponse.java +++ b/src/main/java/org/tikv/streaming/StreamingResponse.java @@ -13,16 +13,16 @@ * limitations under the License. */ -package com.pingcap.tikv.streaming; +package org.tikv.streaming; import static java.util.Objects.requireNonNull; -import com.pingcap.tikv.kvproto.Coprocessor; -import com.pingcap.tikv.kvproto.Errorpb; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import javax.annotation.Nonnull; +import org.tikv.kvproto.Coprocessor; +import org.tikv.kvproto.Errorpb; public class StreamingResponse implements Iterable { private Iterator resultIterator; diff --git a/src/main/java/com/pingcap/tikv/tools/RegionUtils.java b/src/main/java/org/tikv/tools/RegionUtils.java similarity index 90% rename from src/main/java/com/pingcap/tikv/tools/RegionUtils.java rename to src/main/java/org/tikv/tools/RegionUtils.java index 950a7e4b70..79a614ace6 100644 --- a/src/main/java/com/pingcap/tikv/tools/RegionUtils.java +++ b/src/main/java/org/tikv/tools/RegionUtils.java @@ -13,20 +13,20 @@ * limitations under the License. */ -package com.pingcap.tikv.tools; +package org.tikv.tools; import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableList; -import com.pingcap.tikv.TiSession; -import com.pingcap.tikv.meta.TiTableInfo; -import com.pingcap.tikv.predicates.ScanAnalyzer; -import com.pingcap.tikv.util.RangeSplitter; -import com.pingcap.tikv.util.RangeSplitter.RegionTask; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.tikv.TiSession; +import org.tikv.meta.TiTableInfo; +import org.tikv.predicates.ScanAnalyzer; +import org.tikv.util.RangeSplitter; +import org.tikv.util.RangeSplitter.RegionTask; public class RegionUtils { public static Map getRegionDistribution( diff --git a/src/main/java/com/pingcap/tikv/txn/Lock.java b/src/main/java/org/tikv/txn/Lock.java similarity index 94% rename from src/main/java/com/pingcap/tikv/txn/Lock.java rename to src/main/java/org/tikv/txn/Lock.java index bda5913a6e..ce860a8a26 100644 --- a/src/main/java/com/pingcap/tikv/txn/Lock.java +++ b/src/main/java/org/tikv/txn/Lock.java @@ -15,10 +15,10 @@ * */ -package com.pingcap.tikv.txn; +package org.tikv.txn; import com.google.protobuf.ByteString; -import com.pingcap.tikv.kvproto.Kvrpcpb; +import org.tikv.kvproto.Kvrpcpb; public class Lock { private final long txnID; diff --git a/src/main/java/com/pingcap/tikv/txn/LockResolverClient.java b/src/main/java/org/tikv/txn/LockResolverClient.java similarity index 90% rename from src/main/java/com/pingcap/tikv/txn/LockResolverClient.java rename to src/main/java/org/tikv/txn/LockResolverClient.java index 794c1d71a8..293e51b1fa 100644 --- a/src/main/java/com/pingcap/tikv/txn/LockResolverClient.java +++ b/src/main/java/org/tikv/txn/LockResolverClient.java @@ -15,35 +15,35 @@ * */ -package com.pingcap.tikv.txn; +package org.tikv.txn; -import static com.pingcap.tikv.util.BackOffFunction.BackOffFuncType.BoRegionMiss; +import static org.tikv.util.BackOffFunction.BackOffFuncType.BoRegionMiss; import com.google.protobuf.ByteString; -import com.pingcap.tikv.AbstractGRPCClient; -import com.pingcap.tikv.TiSession; -import com.pingcap.tikv.exception.KeyException; -import com.pingcap.tikv.exception.RegionException; -import com.pingcap.tikv.kvproto.Kvrpcpb.CleanupRequest; -import com.pingcap.tikv.kvproto.Kvrpcpb.CleanupResponse; -import com.pingcap.tikv.kvproto.Kvrpcpb.ResolveLockRequest; -import com.pingcap.tikv.kvproto.Kvrpcpb.ResolveLockResponse; -import com.pingcap.tikv.kvproto.Metapb.Store; -import com.pingcap.tikv.kvproto.TikvGrpc; -import com.pingcap.tikv.kvproto.TikvGrpc.TikvBlockingStub; -import com.pingcap.tikv.kvproto.TikvGrpc.TikvStub; -import com.pingcap.tikv.operation.KVErrorHandler; -import com.pingcap.tikv.region.RegionErrorReceiver; -import com.pingcap.tikv.region.TiRegion; -import com.pingcap.tikv.region.TiRegion.RegionVerID; -import com.pingcap.tikv.util.BackOffer; -import com.pingcap.tikv.util.TsoUtils; import io.grpc.ManagedChannel; import java.util.*; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Supplier; import org.apache.log4j.Logger; +import org.tikv.AbstractGRPCClient; +import org.tikv.TiSession; +import org.tikv.exception.KeyException; +import org.tikv.exception.RegionException; +import org.tikv.kvproto.Kvrpcpb.CleanupRequest; +import org.tikv.kvproto.Kvrpcpb.CleanupResponse; +import org.tikv.kvproto.Kvrpcpb.ResolveLockRequest; +import org.tikv.kvproto.Kvrpcpb.ResolveLockResponse; +import org.tikv.kvproto.Metapb.Store; +import org.tikv.kvproto.TikvGrpc; +import org.tikv.kvproto.TikvGrpc.TikvBlockingStub; +import org.tikv.kvproto.TikvGrpc.TikvStub; +import org.tikv.operation.KVErrorHandler; +import org.tikv.region.RegionErrorReceiver; +import org.tikv.region.TiRegion; +import org.tikv.region.TiRegion.RegionVerID; +import org.tikv.util.BackOffer; +import org.tikv.util.TsoUtils; // LockResolver resolves locks and also caches resolved txn status. public class LockResolverClient extends AbstractGRPCClient diff --git a/src/main/java/com/pingcap/tikv/types/AbstractDateTimeType.java b/src/main/java/org/tikv/types/AbstractDateTimeType.java similarity index 84% rename from src/main/java/com/pingcap/tikv/types/AbstractDateTimeType.java rename to src/main/java/org/tikv/types/AbstractDateTimeType.java index aaaebafeb8..1e86fada0d 100644 --- a/src/main/java/com/pingcap/tikv/types/AbstractDateTimeType.java +++ b/src/main/java/org/tikv/types/AbstractDateTimeType.java @@ -1,16 +1,16 @@ -package com.pingcap.tikv.types; +package org.tikv.types; import com.pingcap.tidb.tipb.ExprType; -import com.pingcap.tikv.codec.Codec; -import com.pingcap.tikv.codec.Codec.DateCodec; -import com.pingcap.tikv.codec.Codec.DateTimeCodec; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.exception.InvalidCodecFormatException; -import com.pingcap.tikv.meta.TiColumnInfo.InternalTypeHolder; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.LocalDate; +import org.tikv.codec.Codec; +import org.tikv.codec.Codec.DateCodec; +import org.tikv.codec.Codec.DateTimeCodec; +import org.tikv.codec.CodecDataInput; +import org.tikv.codec.CodecDataOutput; +import org.tikv.exception.InvalidCodecFormatException; +import org.tikv.meta.TiColumnInfo.InternalTypeHolder; public abstract class AbstractDateTimeType extends DataType { AbstractDateTimeType(InternalTypeHolder holder) { diff --git a/src/main/java/com/pingcap/tikv/types/BitType.java b/src/main/java/org/tikv/types/BitType.java similarity index 83% rename from src/main/java/com/pingcap/tikv/types/BitType.java rename to src/main/java/org/tikv/types/BitType.java index 64f2c8c9ab..bdbf6c8624 100644 --- a/src/main/java/com/pingcap/tikv/types/BitType.java +++ b/src/main/java/org/tikv/types/BitType.java @@ -15,13 +15,13 @@ * */ -package com.pingcap.tikv.types; +package org.tikv.types; -import com.pingcap.tikv.codec.Codec; -import com.pingcap.tikv.codec.Codec.IntegerCodec; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.exception.TypeException; -import com.pingcap.tikv.meta.TiColumnInfo; +import org.tikv.codec.Codec; +import org.tikv.codec.Codec.IntegerCodec; +import org.tikv.codec.CodecDataInput; +import org.tikv.exception.TypeException; +import org.tikv.meta.TiColumnInfo; public class BitType extends IntegerType { public static final BitType BIT = new BitType(MySQLType.TypeBit); diff --git a/src/main/java/com/pingcap/tikv/types/BytesType.java b/src/main/java/org/tikv/types/BytesType.java similarity index 90% rename from src/main/java/com/pingcap/tikv/types/BytesType.java rename to src/main/java/org/tikv/types/BytesType.java index b998d54cdb..3315ea78f6 100644 --- a/src/main/java/com/pingcap/tikv/types/BytesType.java +++ b/src/main/java/org/tikv/types/BytesType.java @@ -15,15 +15,15 @@ * */ -package com.pingcap.tikv.types; +package org.tikv.types; import com.pingcap.tidb.tipb.ExprType; -import com.pingcap.tikv.codec.Codec; -import com.pingcap.tikv.codec.Codec.BytesCodec; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.exception.InvalidCodecFormatException; -import com.pingcap.tikv.meta.TiColumnInfo; +import org.tikv.codec.Codec; +import org.tikv.codec.Codec.BytesCodec; +import org.tikv.codec.CodecDataInput; +import org.tikv.codec.CodecDataOutput; +import org.tikv.exception.InvalidCodecFormatException; +import org.tikv.meta.TiColumnInfo; /** * TODO: if we need to unify string type and binary types? Indeed they are encoded as the same diff --git a/src/main/java/com/pingcap/tikv/types/Charset.java b/src/main/java/org/tikv/types/Charset.java similarity index 98% rename from src/main/java/com/pingcap/tikv/types/Charset.java rename to src/main/java/org/tikv/types/Charset.java index e9b8301217..bb770401b1 100644 --- a/src/main/java/com/pingcap/tikv/types/Charset.java +++ b/src/main/java/org/tikv/types/Charset.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.pingcap.tikv.types; +package org.tikv.types; public class Charset { // CharsetBin is used for marking binary charset. diff --git a/src/main/java/com/pingcap/tikv/types/Converter.java b/src/main/java/org/tikv/types/Converter.java similarity index 98% rename from src/main/java/com/pingcap/tikv/types/Converter.java rename to src/main/java/org/tikv/types/Converter.java index b9c1000feb..d40e48b086 100644 --- a/src/main/java/com/pingcap/tikv/types/Converter.java +++ b/src/main/java/org/tikv/types/Converter.java @@ -15,11 +15,10 @@ * */ -package com.pingcap.tikv.types; +package org.tikv.types; import static java.util.Objects.requireNonNull; -import com.pingcap.tikv.exception.TypeException; import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Date; @@ -30,6 +29,7 @@ import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; +import org.tikv.exception.TypeException; public class Converter { public static long convertToLong(Object val) { diff --git a/src/main/java/com/pingcap/tikv/types/DataType.java b/src/main/java/org/tikv/types/DataType.java similarity index 95% rename from src/main/java/com/pingcap/tikv/types/DataType.java rename to src/main/java/org/tikv/types/DataType.java index 0e4f575c84..1feddb2007 100644 --- a/src/main/java/com/pingcap/tikv/types/DataType.java +++ b/src/main/java/org/tikv/types/DataType.java @@ -13,22 +13,22 @@ * limitations under the License. */ -package com.pingcap.tikv.types; +package org.tikv.types; -import static com.pingcap.tikv.codec.Codec.isNullFlag; import static java.util.Objects.requireNonNull; +import static org.tikv.codec.Codec.isNullFlag; import com.google.common.collect.ImmutableList; import com.pingcap.tidb.tipb.ExprType; -import com.pingcap.tikv.codec.Codec; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.exception.TypeException; -import com.pingcap.tikv.meta.Collation; -import com.pingcap.tikv.meta.TiColumnInfo; -import com.pingcap.tikv.meta.TiColumnInfo.InternalTypeHolder; import java.io.Serializable; import java.util.List; +import org.tikv.codec.Codec; +import org.tikv.codec.CodecDataInput; +import org.tikv.codec.CodecDataOutput; +import org.tikv.exception.TypeException; +import org.tikv.meta.Collation; +import org.tikv.meta.TiColumnInfo; +import org.tikv.meta.TiColumnInfo.InternalTypeHolder; /** Base Type for encoding and decoding TiDB row information. */ public abstract class DataType implements Serializable { diff --git a/src/main/java/com/pingcap/tikv/types/DataTypeFactory.java b/src/main/java/org/tikv/types/DataTypeFactory.java similarity index 96% rename from src/main/java/com/pingcap/tikv/types/DataTypeFactory.java rename to src/main/java/org/tikv/types/DataTypeFactory.java index c041761d52..332772e5a6 100644 --- a/src/main/java/com/pingcap/tikv/types/DataTypeFactory.java +++ b/src/main/java/org/tikv/types/DataTypeFactory.java @@ -15,14 +15,14 @@ * */ -package com.pingcap.tikv.types; +package org.tikv.types; import com.google.common.collect.ImmutableMap; -import com.pingcap.tikv.exception.TypeException; -import com.pingcap.tikv.meta.TiColumnInfo.InternalTypeHolder; import java.lang.reflect.Constructor; import java.util.Arrays; import java.util.Map; +import org.tikv.exception.TypeException; +import org.tikv.meta.TiColumnInfo.InternalTypeHolder; public class DataTypeFactory { private static final Map> dataTypeCreatorMap; diff --git a/src/main/java/com/pingcap/tikv/types/DateTimeType.java b/src/main/java/org/tikv/types/DateTimeType.java similarity index 94% rename from src/main/java/com/pingcap/tikv/types/DateTimeType.java rename to src/main/java/org/tikv/types/DateTimeType.java index f3dfa7e9b8..b56bc6b02f 100644 --- a/src/main/java/com/pingcap/tikv/types/DateTimeType.java +++ b/src/main/java/org/tikv/types/DateTimeType.java @@ -15,13 +15,13 @@ * */ -package com.pingcap.tikv.types; +package org.tikv.types; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.meta.TiColumnInfo; import java.sql.Timestamp; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; +import org.tikv.codec.CodecDataInput; +import org.tikv.meta.TiColumnInfo; /** * Datetime is a timezone neutral version of timestamp While most of decoding logic is the same it diff --git a/src/main/java/com/pingcap/tikv/types/DateType.java b/src/main/java/org/tikv/types/DateType.java similarity index 89% rename from src/main/java/com/pingcap/tikv/types/DateType.java rename to src/main/java/org/tikv/types/DateType.java index 8da4e1df40..f9a0c058e0 100644 --- a/src/main/java/com/pingcap/tikv/types/DateType.java +++ b/src/main/java/org/tikv/types/DateType.java @@ -15,15 +15,15 @@ * */ -package com.pingcap.tikv.types; +package org.tikv.types; -import com.pingcap.tikv.codec.Codec; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.meta.TiColumnInfo; import java.sql.Date; import org.joda.time.DateTimeZone; import org.joda.time.LocalDate; +import org.tikv.codec.Codec; +import org.tikv.codec.CodecDataInput; +import org.tikv.codec.CodecDataOutput; +import org.tikv.meta.TiColumnInfo; public class DateType extends AbstractDateTimeType { public static final DateType DATE = new DateType(MySQLType.TypeDate); diff --git a/src/main/java/com/pingcap/tikv/types/DecimalType.java b/src/main/java/org/tikv/types/DecimalType.java similarity index 86% rename from src/main/java/com/pingcap/tikv/types/DecimalType.java rename to src/main/java/org/tikv/types/DecimalType.java index 015adfc2f2..888014223c 100644 --- a/src/main/java/com/pingcap/tikv/types/DecimalType.java +++ b/src/main/java/org/tikv/types/DecimalType.java @@ -15,16 +15,16 @@ * */ -package com.pingcap.tikv.types; +package org.tikv.types; import com.pingcap.tidb.tipb.ExprType; -import com.pingcap.tikv.codec.Codec; -import com.pingcap.tikv.codec.Codec.DecimalCodec; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.exception.InvalidCodecFormatException; -import com.pingcap.tikv.meta.TiColumnInfo; import java.math.BigDecimal; +import org.tikv.codec.Codec; +import org.tikv.codec.Codec.DecimalCodec; +import org.tikv.codec.CodecDataInput; +import org.tikv.codec.CodecDataOutput; +import org.tikv.exception.InvalidCodecFormatException; +import org.tikv.meta.TiColumnInfo; public class DecimalType extends DataType { public static final DecimalType DECIMAL = new DecimalType(MySQLType.TypeNewDecimal); diff --git a/src/main/java/com/pingcap/tikv/types/EnumType.java b/src/main/java/org/tikv/types/EnumType.java similarity index 90% rename from src/main/java/com/pingcap/tikv/types/EnumType.java rename to src/main/java/org/tikv/types/EnumType.java index 7a38ec3775..86fe3f249b 100644 --- a/src/main/java/com/pingcap/tikv/types/EnumType.java +++ b/src/main/java/org/tikv/types/EnumType.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.pingcap.tikv.types; +package org.tikv.types; import com.pingcap.tidb.tipb.ExprType; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.exception.UnsupportedTypeException; -import com.pingcap.tikv.meta.TiColumnInfo; +import org.tikv.codec.CodecDataInput; +import org.tikv.codec.CodecDataOutput; +import org.tikv.exception.UnsupportedTypeException; +import org.tikv.meta.TiColumnInfo; /** * TODO: Support Enum Type EnumType class is set now only to indicate this type exists, so that we diff --git a/src/main/java/com/pingcap/tikv/types/IntegerType.java b/src/main/java/org/tikv/types/IntegerType.java similarity index 91% rename from src/main/java/com/pingcap/tikv/types/IntegerType.java rename to src/main/java/org/tikv/types/IntegerType.java index 519006fad4..31a78ba13b 100644 --- a/src/main/java/com/pingcap/tikv/types/IntegerType.java +++ b/src/main/java/org/tikv/types/IntegerType.java @@ -15,18 +15,18 @@ * */ -package com.pingcap.tikv.types; +package org.tikv.types; import com.google.common.primitives.UnsignedLong; import com.pingcap.tidb.tipb.ExprType; -import com.pingcap.tikv.codec.Codec; -import com.pingcap.tikv.codec.Codec.IntegerCodec; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.exception.TypeException; -import com.pingcap.tikv.meta.Collation; -import com.pingcap.tikv.meta.TiColumnInfo; import java.math.BigDecimal; +import org.tikv.codec.Codec; +import org.tikv.codec.Codec.IntegerCodec; +import org.tikv.codec.CodecDataInput; +import org.tikv.codec.CodecDataOutput; +import org.tikv.exception.TypeException; +import org.tikv.meta.Collation; +import org.tikv.meta.TiColumnInfo; public class IntegerType extends DataType { public static final IntegerType TINYINT = new IntegerType(MySQLType.TypeTiny); diff --git a/src/main/java/com/pingcap/tikv/types/JsonType.java b/src/main/java/org/tikv/types/JsonType.java similarity index 98% rename from src/main/java/com/pingcap/tikv/types/JsonType.java rename to src/main/java/org/tikv/types/JsonType.java index 6416834977..7175d0306a 100644 --- a/src/main/java/com/pingcap/tikv/types/JsonType.java +++ b/src/main/java/org/tikv/types/JsonType.java @@ -1,17 +1,17 @@ -package com.pingcap.tikv.types; +package org.tikv.types; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; import com.google.gson.*; import com.pingcap.tidb.tipb.ExprType; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.meta.TiColumnInfo; import java.io.DataInput; import java.io.IOException; import java.io.UncheckedIOException; import javax.annotation.Nullable; import org.apache.commons.io.Charsets; +import org.tikv.codec.CodecDataInput; +import org.tikv.codec.CodecDataOutput; +import org.tikv.meta.TiColumnInfo; public class JsonType extends DataType { diff --git a/src/main/java/com/pingcap/tikv/types/MySQLType.java b/src/main/java/org/tikv/types/MySQLType.java similarity index 98% rename from src/main/java/com/pingcap/tikv/types/MySQLType.java rename to src/main/java/org/tikv/types/MySQLType.java index 919c5cdfeb..e0563064ee 100644 --- a/src/main/java/com/pingcap/tikv/types/MySQLType.java +++ b/src/main/java/org/tikv/types/MySQLType.java @@ -15,7 +15,7 @@ * */ -package com.pingcap.tikv.types; +package org.tikv.types; import static java.util.Objects.requireNonNull; diff --git a/src/main/java/com/pingcap/tikv/types/RealType.java b/src/main/java/org/tikv/types/RealType.java similarity index 85% rename from src/main/java/com/pingcap/tikv/types/RealType.java rename to src/main/java/org/tikv/types/RealType.java index b8fa1607f5..83d304a65d 100644 --- a/src/main/java/com/pingcap/tikv/types/RealType.java +++ b/src/main/java/org/tikv/types/RealType.java @@ -15,17 +15,17 @@ * */ -package com.pingcap.tikv.types; +package org.tikv.types; import com.pingcap.tidb.tipb.ExprType; -import com.pingcap.tikv.codec.Codec; -import com.pingcap.tikv.codec.Codec.DecimalCodec; -import com.pingcap.tikv.codec.Codec.RealCodec; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.exception.InvalidCodecFormatException; -import com.pingcap.tikv.exception.TypeException; -import com.pingcap.tikv.meta.TiColumnInfo; +import org.tikv.codec.Codec; +import org.tikv.codec.Codec.DecimalCodec; +import org.tikv.codec.Codec.RealCodec; +import org.tikv.codec.CodecDataInput; +import org.tikv.codec.CodecDataOutput; +import org.tikv.exception.InvalidCodecFormatException; +import org.tikv.exception.TypeException; +import org.tikv.meta.TiColumnInfo; public class RealType extends DataType { public static final RealType DOUBLE = new RealType(MySQLType.TypeDouble); diff --git a/src/main/java/com/pingcap/tikv/types/SetType.java b/src/main/java/org/tikv/types/SetType.java similarity index 89% rename from src/main/java/com/pingcap/tikv/types/SetType.java rename to src/main/java/org/tikv/types/SetType.java index 720574a98b..63ee91b5af 100644 --- a/src/main/java/com/pingcap/tikv/types/SetType.java +++ b/src/main/java/org/tikv/types/SetType.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.pingcap.tikv.types; +package org.tikv.types; import com.pingcap.tidb.tipb.ExprType; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.exception.UnsupportedTypeException; -import com.pingcap.tikv.meta.TiColumnInfo; +import org.tikv.codec.CodecDataInput; +import org.tikv.codec.CodecDataOutput; +import org.tikv.exception.UnsupportedTypeException; +import org.tikv.meta.TiColumnInfo; /** * TODO: Support Set Type SetType class is set now only to indicate this type exists, so that we diff --git a/src/main/java/com/pingcap/tikv/types/StringType.java b/src/main/java/org/tikv/types/StringType.java similarity index 91% rename from src/main/java/com/pingcap/tikv/types/StringType.java rename to src/main/java/org/tikv/types/StringType.java index 4e3a4fd592..322dcb5483 100644 --- a/src/main/java/com/pingcap/tikv/types/StringType.java +++ b/src/main/java/org/tikv/types/StringType.java @@ -15,11 +15,11 @@ * */ -package com.pingcap.tikv.types; +package org.tikv.types; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.meta.TiColumnInfo; import java.nio.charset.StandardCharsets; +import org.tikv.codec.CodecDataInput; +import org.tikv.meta.TiColumnInfo; public class StringType extends BytesType { public static final StringType VARCHAR = new StringType(MySQLType.TypeVarchar); diff --git a/src/main/java/com/pingcap/tikv/types/TimestampType.java b/src/main/java/org/tikv/types/TimestampType.java similarity index 92% rename from src/main/java/com/pingcap/tikv/types/TimestampType.java rename to src/main/java/org/tikv/types/TimestampType.java index 1a81b26768..0fe9773ec2 100644 --- a/src/main/java/com/pingcap/tikv/types/TimestampType.java +++ b/src/main/java/org/tikv/types/TimestampType.java @@ -15,15 +15,15 @@ * */ -package com.pingcap.tikv.types; +package org.tikv.types; -import com.pingcap.tikv.codec.Codec.DateTimeCodec; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.meta.TiColumnInfo; import java.sql.Timestamp; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; +import org.tikv.codec.Codec.DateTimeCodec; +import org.tikv.codec.CodecDataInput; +import org.tikv.codec.CodecDataOutput; +import org.tikv.meta.TiColumnInfo; /** * Timestamp in TiDB is represented as packed long including year/month and etc. When stored, it is diff --git a/src/main/java/com/pingcap/tikv/types/YearType.java b/src/main/java/org/tikv/types/YearType.java similarity index 90% rename from src/main/java/com/pingcap/tikv/types/YearType.java rename to src/main/java/org/tikv/types/YearType.java index eccfafc824..098bb911a7 100644 --- a/src/main/java/com/pingcap/tikv/types/YearType.java +++ b/src/main/java/org/tikv/types/YearType.java @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.pingcap.tikv.types; +package org.tikv.types; import com.pingcap.tidb.tipb.ExprType; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.exception.UnsupportedTypeException; -import com.pingcap.tikv.meta.TiColumnInfo; +import org.tikv.codec.CodecDataInput; +import org.tikv.codec.CodecDataOutput; +import org.tikv.exception.UnsupportedTypeException; +import org.tikv.meta.TiColumnInfo; /** * TODO: Support Year Type YearType class is set now only to indicate this type exists, so that we diff --git a/src/main/java/com/pingcap/tikv/util/BackOffFunction.java b/src/main/java/org/tikv/util/BackOffFunction.java similarity index 95% rename from src/main/java/com/pingcap/tikv/util/BackOffFunction.java rename to src/main/java/org/tikv/util/BackOffFunction.java index e0a12c8ce5..e10cfdf9eb 100644 --- a/src/main/java/com/pingcap/tikv/util/BackOffFunction.java +++ b/src/main/java/org/tikv/util/BackOffFunction.java @@ -1,7 +1,7 @@ -package com.pingcap.tikv.util; +package org.tikv.util; -import com.pingcap.tikv.exception.GrpcException; import java.util.concurrent.ThreadLocalRandom; +import org.tikv.exception.GrpcException; public class BackOffFunction { private int base; diff --git a/src/main/java/com/pingcap/tikv/util/BackOffer.java b/src/main/java/org/tikv/util/BackOffer.java similarity index 98% rename from src/main/java/com/pingcap/tikv/util/BackOffer.java rename to src/main/java/org/tikv/util/BackOffer.java index 96b5f5cf25..c7744c9a5c 100644 --- a/src/main/java/com/pingcap/tikv/util/BackOffer.java +++ b/src/main/java/org/tikv/util/BackOffer.java @@ -15,7 +15,7 @@ * */ -package com.pingcap.tikv.util; +package org.tikv.util; public interface BackOffer { // Back off strategies diff --git a/src/main/java/com/pingcap/tikv/util/ConcreteBackOffer.java b/src/main/java/org/tikv/util/ConcreteBackOffer.java similarity index 98% rename from src/main/java/com/pingcap/tikv/util/ConcreteBackOffer.java rename to src/main/java/org/tikv/util/ConcreteBackOffer.java index de8a176c81..fa70a0e052 100644 --- a/src/main/java/com/pingcap/tikv/util/ConcreteBackOffer.java +++ b/src/main/java/org/tikv/util/ConcreteBackOffer.java @@ -15,15 +15,15 @@ * */ -package com.pingcap.tikv.util; +package org.tikv.util; import com.google.common.base.Preconditions; -import com.pingcap.tikv.exception.GrpcException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.log4j.Logger; +import org.tikv.exception.GrpcException; public class ConcreteBackOffer implements BackOffer { private int maxSleep; diff --git a/src/main/java/com/pingcap/tikv/util/FastByteComparisons.java b/src/main/java/org/tikv/util/FastByteComparisons.java similarity index 99% rename from src/main/java/com/pingcap/tikv/util/FastByteComparisons.java rename to src/main/java/org/tikv/util/FastByteComparisons.java index d2b41ffc32..644f23ffed 100644 --- a/src/main/java/com/pingcap/tikv/util/FastByteComparisons.java +++ b/src/main/java/org/tikv/util/FastByteComparisons.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing permissions and * limitations under the License. */ -package com.pingcap.tikv.util; +package org.tikv.util; import com.google.common.primitives.Longs; import com.google.common.primitives.UnsignedBytes; diff --git a/src/main/java/com/pingcap/tikv/util/FutureObserver.java b/src/main/java/org/tikv/util/FutureObserver.java similarity index 97% rename from src/main/java/com/pingcap/tikv/util/FutureObserver.java rename to src/main/java/org/tikv/util/FutureObserver.java index 86997096c6..f758aec7ec 100644 --- a/src/main/java/com/pingcap/tikv/util/FutureObserver.java +++ b/src/main/java/org/tikv/util/FutureObserver.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.pingcap.tikv.util; +package org.tikv.util; import com.google.common.util.concurrent.SettableFuture; import io.grpc.stub.StreamObserver; diff --git a/src/main/java/com/pingcap/tikv/util/KeyRangeUtils.java b/src/main/java/org/tikv/util/KeyRangeUtils.java similarity index 95% rename from src/main/java/com/pingcap/tikv/util/KeyRangeUtils.java rename to src/main/java/org/tikv/util/KeyRangeUtils.java index 4a8cd66397..821f6b37be 100644 --- a/src/main/java/com/pingcap/tikv/util/KeyRangeUtils.java +++ b/src/main/java/org/tikv/util/KeyRangeUtils.java @@ -13,18 +13,18 @@ * limitations under the License. */ -package com.pingcap.tikv.util; +package org.tikv.util; -import static com.pingcap.tikv.key.Key.toRawKey; +import static org.tikv.key.Key.toRawKey; import com.google.common.collect.BoundType; import com.google.common.collect.ImmutableList; 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.Coprocessor.KeyRange; import java.util.List; +import org.tikv.exception.TiClientInternalException; +import org.tikv.key.Key; +import org.tikv.kvproto.Coprocessor.KeyRange; public class KeyRangeUtils { public static Range makeRange(ByteString startKey, ByteString endKey) { diff --git a/src/main/java/com/pingcap/tikv/util/Pair.java b/src/main/java/org/tikv/util/Pair.java similarity index 96% rename from src/main/java/com/pingcap/tikv/util/Pair.java rename to src/main/java/org/tikv/util/Pair.java index 96777c3a52..d5761a11f7 100644 --- a/src/main/java/com/pingcap/tikv/util/Pair.java +++ b/src/main/java/org/tikv/util/Pair.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.pingcap.tikv.util; +package org.tikv.util; import java.io.Serializable; diff --git a/src/main/java/com/pingcap/tikv/util/RangeSplitter.java b/src/main/java/org/tikv/util/RangeSplitter.java similarity index 95% rename from src/main/java/com/pingcap/tikv/util/RangeSplitter.java rename to src/main/java/org/tikv/util/RangeSplitter.java index fc2b365112..83e9f65b94 100644 --- a/src/main/java/com/pingcap/tikv/util/RangeSplitter.java +++ b/src/main/java/org/tikv/util/RangeSplitter.java @@ -13,24 +13,15 @@ * limitations under the License. */ -package com.pingcap.tikv.util; +package org.tikv.util; -import static com.pingcap.tikv.key.Key.toRawKey; -import static com.pingcap.tikv.util.KeyRangeUtils.formatByteString; -import static com.pingcap.tikv.util.KeyRangeUtils.makeCoprocRange; +import static org.tikv.key.Key.toRawKey; +import static org.tikv.util.KeyRangeUtils.formatByteString; +import static org.tikv.util.KeyRangeUtils.makeCoprocRange; import com.google.common.collect.ImmutableList; import com.google.common.net.HostAndPort; import com.google.protobuf.ByteString; -import com.pingcap.tikv.exception.TiExpressionException; -import com.pingcap.tikv.key.Key; -import com.pingcap.tikv.key.RowKey; -import com.pingcap.tikv.key.RowKey.DecodeResult; -import com.pingcap.tikv.key.RowKey.DecodeResult.Status; -import com.pingcap.tikv.kvproto.Coprocessor.KeyRange; -import com.pingcap.tikv.kvproto.Metapb; -import com.pingcap.tikv.region.RegionManager; -import com.pingcap.tikv.region.TiRegion; import gnu.trove.list.array.TLongArrayList; import gnu.trove.map.hash.TLongObjectHashMap; import java.io.Serializable; @@ -38,6 +29,15 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.tikv.exception.TiExpressionException; +import org.tikv.key.Key; +import org.tikv.key.RowKey; +import org.tikv.key.RowKey.DecodeResult; +import org.tikv.key.RowKey.DecodeResult.Status; +import org.tikv.kvproto.Coprocessor.KeyRange; +import org.tikv.kvproto.Metapb; +import org.tikv.region.RegionManager; +import org.tikv.region.TiRegion; public class RangeSplitter { public static class RegionTask implements Serializable { diff --git a/src/main/java/com/pingcap/tikv/util/Timer.java b/src/main/java/org/tikv/util/Timer.java similarity index 96% rename from src/main/java/com/pingcap/tikv/util/Timer.java rename to src/main/java/org/tikv/util/Timer.java index 5e97dda268..9da4a418be 100644 --- a/src/main/java/com/pingcap/tikv/util/Timer.java +++ b/src/main/java/org/tikv/util/Timer.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.pingcap.tikv.util; +package org.tikv.util; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/pingcap/tikv/util/TsoUtils.java b/src/main/java/org/tikv/util/TsoUtils.java similarity index 93% rename from src/main/java/com/pingcap/tikv/util/TsoUtils.java rename to src/main/java/org/tikv/util/TsoUtils.java index 8a5948f187..d4603a8a05 100644 --- a/src/main/java/com/pingcap/tikv/util/TsoUtils.java +++ b/src/main/java/org/tikv/util/TsoUtils.java @@ -1,4 +1,4 @@ -package com.pingcap.tikv.util; +package org.tikv.util; public final class TsoUtils { private static final long physicalShiftBits = 18; diff --git a/src/test/java/com/pingcap/tikv/BUILD b/src/test/java/org/tikv/BUILD similarity index 100% rename from src/test/java/com/pingcap/tikv/BUILD rename to src/test/java/org/tikv/BUILD diff --git a/src/test/java/com/pingcap/tikv/GrpcUtils.java b/src/test/java/org/tikv/GrpcUtils.java similarity index 94% rename from src/test/java/com/pingcap/tikv/GrpcUtils.java rename to src/test/java/org/tikv/GrpcUtils.java index f52b0f2b01..28041cd17c 100644 --- a/src/test/java/com/pingcap/tikv/GrpcUtils.java +++ b/src/test/java/org/tikv/GrpcUtils.java @@ -13,15 +13,15 @@ * limitations under the License. */ -package com.pingcap.tikv; +package org.tikv; import com.google.common.collect.Lists; import com.google.protobuf.ByteString; -import com.pingcap.tikv.codec.Codec.BytesCodec; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.kvproto.Metapb.*; -import com.pingcap.tikv.kvproto.Pdpb.*; import java.util.Arrays; +import org.tikv.codec.Codec.BytesCodec; +import org.tikv.codec.CodecDataOutput; +import org.tikv.kvproto.Metapb.*; +import org.tikv.kvproto.Pdpb.*; public class GrpcUtils { private static ResponseHeader makeDefaultHeader(long clusterId) { diff --git a/src/test/java/com/pingcap/tikv/KVMockServer.java b/src/test/java/org/tikv/KVMockServer.java similarity index 86% rename from src/test/java/com/pingcap/tikv/KVMockServer.java rename to src/test/java/org/tikv/KVMockServer.java index a4a5138c55..e3eb7cdf3b 100644 --- a/src/test/java/com/pingcap/tikv/KVMockServer.java +++ b/src/test/java/org/tikv/KVMockServer.java @@ -13,26 +13,15 @@ * limitations under the License. */ -package com.pingcap.tikv; +package org.tikv; -import static com.pingcap.tikv.key.Key.toRawKey; +import static org.tikv.key.Key.toRawKey; import com.google.common.collect.ImmutableList; import com.google.protobuf.ByteString; import com.pingcap.tidb.tipb.Chunk; import com.pingcap.tidb.tipb.DAGRequest; import com.pingcap.tidb.tipb.SelectResponse; -import com.pingcap.tikv.key.Key; -import com.pingcap.tikv.kvproto.Coprocessor; -import com.pingcap.tikv.kvproto.Errorpb; -import com.pingcap.tikv.kvproto.Errorpb.Error; -import com.pingcap.tikv.kvproto.Errorpb.NotLeader; -import com.pingcap.tikv.kvproto.Errorpb.ServerIsBusy; -import com.pingcap.tikv.kvproto.Errorpb.StaleEpoch; -import com.pingcap.tikv.kvproto.Kvrpcpb; -import com.pingcap.tikv.kvproto.Kvrpcpb.Context; -import com.pingcap.tikv.kvproto.TikvGrpc; -import com.pingcap.tikv.region.TiRegion; import io.grpc.Server; import io.grpc.ServerBuilder; import io.grpc.Status; @@ -45,6 +34,17 @@ import java.util.Objects; import java.util.SortedMap; import java.util.TreeMap; import java.util.stream.Collectors; +import org.tikv.key.Key; +import org.tikv.kvproto.Coprocessor; +import org.tikv.kvproto.Errorpb; +import org.tikv.kvproto.Errorpb.Error; +import org.tikv.kvproto.Errorpb.NotLeader; +import org.tikv.kvproto.Errorpb.ServerIsBusy; +import org.tikv.kvproto.Errorpb.StaleEpoch; +import org.tikv.kvproto.Kvrpcpb; +import org.tikv.kvproto.Kvrpcpb.Context; +import org.tikv.kvproto.TikvGrpc; +import org.tikv.region.TiRegion; public class KVMockServer extends TikvGrpc.TikvImplBase { @@ -106,9 +106,8 @@ public class KVMockServer extends TikvGrpc.TikvImplBase { @Override public void rawGet( - com.pingcap.tikv.kvproto.Kvrpcpb.RawGetRequest request, - io.grpc.stub.StreamObserver - responseObserver) { + org.tikv.kvproto.Kvrpcpb.RawGetRequest request, + io.grpc.stub.StreamObserver responseObserver) { try { verifyContext(request.getContext()); ByteString key = request.getKey(); @@ -131,9 +130,8 @@ public class KVMockServer extends TikvGrpc.TikvImplBase { /** */ public void rawPut( - com.pingcap.tikv.kvproto.Kvrpcpb.RawPutRequest request, - io.grpc.stub.StreamObserver - responseObserver) { + org.tikv.kvproto.Kvrpcpb.RawPutRequest request, + io.grpc.stub.StreamObserver responseObserver) { try { verifyContext(request.getContext()); ByteString key = request.getKey(); @@ -175,9 +173,8 @@ public class KVMockServer extends TikvGrpc.TikvImplBase { /** */ public void rawDelete( - com.pingcap.tikv.kvproto.Kvrpcpb.RawDeleteRequest request, - io.grpc.stub.StreamObserver - responseObserver) { + org.tikv.kvproto.Kvrpcpb.RawDeleteRequest request, + io.grpc.stub.StreamObserver responseObserver) { try { verifyContext(request.getContext()); ByteString key = request.getKey(); @@ -198,8 +195,8 @@ public class KVMockServer extends TikvGrpc.TikvImplBase { @Override public void kvGet( - com.pingcap.tikv.kvproto.Kvrpcpb.GetRequest request, - io.grpc.stub.StreamObserver responseObserver) { + org.tikv.kvproto.Kvrpcpb.GetRequest request, + io.grpc.stub.StreamObserver responseObserver) { try { verifyContext(request.getContext()); if (request.getVersion() == 0) { @@ -230,8 +227,8 @@ public class KVMockServer extends TikvGrpc.TikvImplBase { @Override public void kvScan( - com.pingcap.tikv.kvproto.Kvrpcpb.ScanRequest request, - io.grpc.stub.StreamObserver responseObserver) { + org.tikv.kvproto.Kvrpcpb.ScanRequest request, + io.grpc.stub.StreamObserver responseObserver) { try { verifyContext(request.getContext()); if (request.getVersion() == 0) { @@ -270,9 +267,8 @@ public class KVMockServer extends TikvGrpc.TikvImplBase { @Override public void kvBatchGet( - com.pingcap.tikv.kvproto.Kvrpcpb.BatchGetRequest request, - io.grpc.stub.StreamObserver - responseObserver) { + org.tikv.kvproto.Kvrpcpb.BatchGetRequest request, + io.grpc.stub.StreamObserver responseObserver) { try { verifyContext(request.getContext()); if (request.getVersion() == 0) { @@ -306,8 +302,8 @@ public class KVMockServer extends TikvGrpc.TikvImplBase { @Override public void coprocessor( - com.pingcap.tikv.kvproto.Coprocessor.Request requestWrap, - io.grpc.stub.StreamObserver responseObserver) { + org.tikv.kvproto.Coprocessor.Request requestWrap, + io.grpc.stub.StreamObserver responseObserver) { try { verifyContext(requestWrap.getContext()); @@ -320,8 +316,8 @@ public class KVMockServer extends TikvGrpc.TikvImplBase { Coprocessor.Response.Builder builderWrap = Coprocessor.Response.newBuilder(); SelectResponse.Builder builder = SelectResponse.newBuilder(); - com.pingcap.tikv.kvproto.Errorpb.Error.Builder errBuilder = - com.pingcap.tikv.kvproto.Errorpb.Error.newBuilder(); + org.tikv.kvproto.Errorpb.Error.Builder errBuilder = + org.tikv.kvproto.Errorpb.Error.newBuilder(); for (Coprocessor.KeyRange keyRange : keyRanges) { Integer errorCode = errorMap.remove(keyRange.getStart()); diff --git a/src/test/java/com/pingcap/tikv/MockServerTest.java b/src/test/java/org/tikv/MockServerTest.java similarity index 89% rename from src/test/java/com/pingcap/tikv/MockServerTest.java rename to src/test/java/org/tikv/MockServerTest.java index b3a92556a7..4b1a57a8a6 100644 --- a/src/test/java/com/pingcap/tikv/MockServerTest.java +++ b/src/test/java/org/tikv/MockServerTest.java @@ -1,14 +1,14 @@ -package com.pingcap.tikv; +package org.tikv; import com.google.common.annotations.VisibleForTesting; import com.google.protobuf.ByteString; -import com.pingcap.tikv.kvproto.Coprocessor; -import com.pingcap.tikv.kvproto.Kvrpcpb; -import com.pingcap.tikv.kvproto.Metapb; -import com.pingcap.tikv.kvproto.Pdpb; -import com.pingcap.tikv.region.TiRegion; import org.junit.After; import org.junit.Before; +import org.tikv.kvproto.Coprocessor; +import org.tikv.kvproto.Kvrpcpb; +import org.tikv.kvproto.Metapb; +import org.tikv.kvproto.Pdpb; +import org.tikv.region.TiRegion; public class MockServerTest { public KVMockServer server; diff --git a/src/test/java/com/pingcap/tikv/PDClientTest.java b/src/test/java/org/tikv/PDClientTest.java similarity index 96% rename from src/test/java/com/pingcap/tikv/PDClientTest.java rename to src/test/java/org/tikv/PDClientTest.java index c4564b5b8b..dce72cf6b2 100644 --- a/src/test/java/com/pingcap/tikv/PDClientTest.java +++ b/src/test/java/org/tikv/PDClientTest.java @@ -13,27 +13,27 @@ * limitations under the License. */ -package com.pingcap.tikv; +package org.tikv; -import static com.pingcap.tikv.GrpcUtils.encodeKey; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.tikv.GrpcUtils.encodeKey; import com.google.protobuf.ByteString; -import com.pingcap.tikv.exception.GrpcException; -import com.pingcap.tikv.kvproto.Metapb; -import com.pingcap.tikv.kvproto.Metapb.Store; -import com.pingcap.tikv.kvproto.Metapb.StoreState; -import com.pingcap.tikv.meta.TiTimestamp; -import com.pingcap.tikv.region.TiRegion; -import com.pingcap.tikv.util.BackOffer; -import com.pingcap.tikv.util.ConcreteBackOffer; import java.io.IOException; import java.util.concurrent.*; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.tikv.exception.GrpcException; +import org.tikv.kvproto.Metapb; +import org.tikv.kvproto.Metapb.Store; +import org.tikv.kvproto.Metapb.StoreState; +import org.tikv.meta.TiTimestamp; +import org.tikv.region.TiRegion; +import org.tikv.util.BackOffer; +import org.tikv.util.ConcreteBackOffer; public class PDClientTest { diff --git a/src/test/java/com/pingcap/tikv/PDMockServer.java b/src/test/java/org/tikv/PDMockServer.java similarity index 97% rename from src/test/java/com/pingcap/tikv/PDMockServer.java rename to src/test/java/org/tikv/PDMockServer.java index 303fb00f00..6aa5d4acdf 100644 --- a/src/test/java/com/pingcap/tikv/PDMockServer.java +++ b/src/test/java/org/tikv/PDMockServer.java @@ -13,10 +13,8 @@ * limitations under the License. */ -package com.pingcap.tikv; +package org.tikv; -import com.pingcap.tikv.kvproto.PDGrpc; -import com.pingcap.tikv.kvproto.Pdpb.*; import io.grpc.Server; import io.grpc.ServerBuilder; import io.grpc.Status; @@ -26,6 +24,8 @@ import java.net.ServerSocket; import java.util.Deque; import java.util.Optional; import java.util.concurrent.LinkedBlockingDeque; +import org.tikv.kvproto.PDGrpc; +import org.tikv.kvproto.Pdpb.*; public class PDMockServer extends PDGrpc.PDImplBase { public int port; diff --git a/src/test/java/com/pingcap/tikv/RawKVClientTest.java b/src/test/java/org/tikv/RawKVClientTest.java similarity index 98% rename from src/test/java/com/pingcap/tikv/RawKVClientTest.java rename to src/test/java/org/tikv/RawKVClientTest.java index 516bdd1562..00de6b2256 100644 --- a/src/test/java/com/pingcap/tikv/RawKVClientTest.java +++ b/src/test/java/org/tikv/RawKVClientTest.java @@ -1,15 +1,15 @@ -package com.pingcap.tikv; +package org.tikv; import com.google.protobuf.ByteString; -import com.pingcap.tikv.key.Key; -import com.pingcap.tikv.kvproto.Kvrpcpb; -import com.pingcap.tikv.util.FastByteComparisons; import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; import org.apache.commons.lang3.RandomStringUtils; import org.junit.Before; import org.junit.Test; +import org.tikv.key.Key; +import org.tikv.kvproto.Kvrpcpb; +import org.tikv.util.FastByteComparisons; public class RawKVClientTest { private static final String RAW_PREFIX = "raw_"; diff --git a/src/test/java/com/pingcap/tikv/RegionManagerTest.java b/src/test/java/org/tikv/RegionManagerTest.java similarity index 95% rename from src/test/java/com/pingcap/tikv/RegionManagerTest.java rename to src/test/java/org/tikv/RegionManagerTest.java index 10bc5398aa..380d526994 100644 --- a/src/test/java/com/pingcap/tikv/RegionManagerTest.java +++ b/src/test/java/org/tikv/RegionManagerTest.java @@ -13,21 +13,21 @@ * limitations under the License. */ -package com.pingcap.tikv; +package org.tikv; import static org.junit.Assert.*; import com.google.protobuf.ByteString; -import com.pingcap.tikv.kvproto.Metapb; -import com.pingcap.tikv.kvproto.Metapb.Store; -import com.pingcap.tikv.kvproto.Metapb.StoreState; -import com.pingcap.tikv.region.RegionManager; -import com.pingcap.tikv.region.TiRegion; -import com.pingcap.tikv.util.Pair; import java.io.IOException; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.tikv.kvproto.Metapb; +import org.tikv.kvproto.Metapb.Store; +import org.tikv.kvproto.Metapb.StoreState; +import org.tikv.region.RegionManager; +import org.tikv.region.TiRegion; +import org.tikv.util.Pair; public class RegionManagerTest { private PDMockServer server; diff --git a/src/test/java/com/pingcap/tikv/RegionStoreClientTest.java b/src/test/java/org/tikv/RegionStoreClientTest.java similarity index 95% rename from src/test/java/com/pingcap/tikv/RegionStoreClientTest.java rename to src/test/java/org/tikv/RegionStoreClientTest.java index 0db7fb0200..adedbdc155 100644 --- a/src/test/java/com/pingcap/tikv/RegionStoreClientTest.java +++ b/src/test/java/org/tikv/RegionStoreClientTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.pingcap.tikv; +package org.tikv; import static org.junit.Assert.*; @@ -21,16 +21,16 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.protobuf.ByteString; import com.pingcap.tidb.tipb.*; -import com.pingcap.tikv.kvproto.Coprocessor; -import com.pingcap.tikv.kvproto.Coprocessor.KeyRange; -import com.pingcap.tikv.kvproto.Kvrpcpb; -import com.pingcap.tikv.kvproto.Metapb; -import com.pingcap.tikv.region.RegionStoreClient; -import com.pingcap.tikv.util.BackOffer; -import com.pingcap.tikv.util.ConcreteBackOffer; import java.util.*; import java.util.stream.Collectors; import org.junit.Test; +import org.tikv.kvproto.Coprocessor; +import org.tikv.kvproto.Coprocessor.KeyRange; +import org.tikv.kvproto.Kvrpcpb; +import org.tikv.kvproto.Metapb; +import org.tikv.region.RegionStoreClient; +import org.tikv.util.BackOffer; +import org.tikv.util.ConcreteBackOffer; public class RegionStoreClientTest extends MockServerTest { diff --git a/src/test/java/com/pingcap/tikv/catalog/CatalogTest.java b/src/test/java/org/tikv/catalog/CatalogTest.java similarity index 88% rename from src/test/java/com/pingcap/tikv/catalog/CatalogTest.java rename to src/test/java/org/tikv/catalog/CatalogTest.java index dd6eec8521..c4a51532d3 100644 --- a/src/test/java/com/pingcap/tikv/catalog/CatalogTest.java +++ b/src/test/java/org/tikv/catalog/CatalogTest.java @@ -1,23 +1,23 @@ -package com.pingcap.tikv.catalog; +package org.tikv.catalog; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import com.pingcap.tikv.KVMockServer; -import com.pingcap.tikv.PDMockServer; -import com.pingcap.tikv.TiConfiguration; -import com.pingcap.tikv.TiSession; -import com.pingcap.tikv.kvproto.Kvrpcpb.CommandPri; -import com.pingcap.tikv.kvproto.Kvrpcpb.IsolationLevel; -import com.pingcap.tikv.meta.MetaUtils.MetaMockHelper; -import com.pingcap.tikv.meta.TiDBInfo; -import com.pingcap.tikv.meta.TiTableInfo; -import com.pingcap.tikv.region.TiRegion; -import com.pingcap.tikv.util.ReflectionWrapper; import java.util.List; import java.util.stream.Collectors; import org.junit.Before; import org.junit.Test; +import org.tikv.KVMockServer; +import org.tikv.PDMockServer; +import org.tikv.TiConfiguration; +import org.tikv.TiSession; +import org.tikv.kvproto.Kvrpcpb.CommandPri; +import org.tikv.kvproto.Kvrpcpb.IsolationLevel; +import org.tikv.meta.MetaUtils.MetaMockHelper; +import org.tikv.meta.TiDBInfo; +import org.tikv.meta.TiTableInfo; +import org.tikv.region.TiRegion; +import org.tikv.util.ReflectionWrapper; public class CatalogTest { private KVMockServer kvServer; diff --git a/src/test/java/com/pingcap/tikv/catalog/CatalogTransactionTest.java b/src/test/java/org/tikv/catalog/CatalogTransactionTest.java similarity index 86% rename from src/test/java/com/pingcap/tikv/catalog/CatalogTransactionTest.java rename to src/test/java/org/tikv/catalog/CatalogTransactionTest.java index d1e0ed88ae..75e1623fba 100644 --- a/src/test/java/com/pingcap/tikv/catalog/CatalogTransactionTest.java +++ b/src/test/java/org/tikv/catalog/CatalogTransactionTest.java @@ -13,23 +13,23 @@ * limitations under the License. */ -package com.pingcap.tikv.catalog; +package org.tikv.catalog; import static org.junit.Assert.assertEquals; -import com.pingcap.tikv.KVMockServer; -import com.pingcap.tikv.PDMockServer; -import com.pingcap.tikv.TiConfiguration; -import com.pingcap.tikv.TiSession; -import com.pingcap.tikv.kvproto.Kvrpcpb.CommandPri; -import com.pingcap.tikv.kvproto.Kvrpcpb.IsolationLevel; -import com.pingcap.tikv.meta.MetaUtils.MetaMockHelper; -import com.pingcap.tikv.meta.TiDBInfo; -import com.pingcap.tikv.meta.TiTableInfo; -import com.pingcap.tikv.region.TiRegion; import java.util.List; import org.junit.Before; import org.junit.Test; +import org.tikv.KVMockServer; +import org.tikv.PDMockServer; +import org.tikv.TiConfiguration; +import org.tikv.TiSession; +import org.tikv.kvproto.Kvrpcpb.CommandPri; +import org.tikv.kvproto.Kvrpcpb.IsolationLevel; +import org.tikv.meta.MetaUtils.MetaMockHelper; +import org.tikv.meta.TiDBInfo; +import org.tikv.meta.TiTableInfo; +import org.tikv.region.TiRegion; public class CatalogTransactionTest { private KVMockServer kvServer; diff --git a/src/test/java/com/pingcap/tikv/codec/CodecTest.java b/src/test/java/org/tikv/codec/CodecTest.java similarity index 99% rename from src/test/java/com/pingcap/tikv/codec/CodecTest.java rename to src/test/java/org/tikv/codec/CodecTest.java index 9d103d03a7..b7d84fb517 100644 --- a/src/test/java/com/pingcap/tikv/codec/CodecTest.java +++ b/src/test/java/org/tikv/codec/CodecTest.java @@ -13,14 +13,13 @@ * limitations under the License. */ -package com.pingcap.tikv.codec; +package org.tikv.codec; -import static com.pingcap.tikv.codec.Codec.*; import static java.util.Objects.requireNonNull; import static org.junit.Assert.*; +import static org.tikv.codec.Codec.*; import com.google.common.primitives.UnsignedLong; -import com.pingcap.tikv.codec.Codec.*; import java.math.BigDecimal; import java.util.Calendar; import java.util.TimeZone; @@ -29,6 +28,7 @@ import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; import org.junit.Test; +import org.tikv.codec.Codec.*; public class CodecTest { @Test diff --git a/src/test/java/com/pingcap/tikv/codec/MyDecimalTest.java b/src/test/java/org/tikv/codec/MyDecimalTest.java similarity index 99% rename from src/test/java/com/pingcap/tikv/codec/MyDecimalTest.java rename to src/test/java/org/tikv/codec/MyDecimalTest.java index 2e53e12837..d55866ca15 100644 --- a/src/test/java/com/pingcap/tikv/codec/MyDecimalTest.java +++ b/src/test/java/org/tikv/codec/MyDecimalTest.java @@ -15,7 +15,7 @@ * */ -package com.pingcap.tikv.codec; +package org.tikv.codec; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/pingcap/tikv/expression/ComparisonBinaryExpressionTest.java b/src/test/java/org/tikv/expression/ComparisonBinaryExpressionTest.java similarity index 72% rename from src/test/java/com/pingcap/tikv/expression/ComparisonBinaryExpressionTest.java rename to src/test/java/org/tikv/expression/ComparisonBinaryExpressionTest.java index 438c12df1f..7a8d60e30f 100644 --- a/src/test/java/com/pingcap/tikv/expression/ComparisonBinaryExpressionTest.java +++ b/src/test/java/org/tikv/expression/ComparisonBinaryExpressionTest.java @@ -13,27 +13,27 @@ * limitations under the License. */ -package com.pingcap.tikv.expression; +package org.tikv.expression; -import static com.pingcap.tikv.expression.ArithmeticBinaryExpression.divide; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.NormalizedPredicate; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.Type; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.equal; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.greaterEqual; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.greaterThan; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.lessEqual; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.lessThan; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.notEqual; import static org.junit.Assert.assertEquals; +import static org.tikv.expression.ArithmeticBinaryExpression.divide; +import static org.tikv.expression.ComparisonBinaryExpression.NormalizedPredicate; +import static org.tikv.expression.ComparisonBinaryExpression.Type; +import static org.tikv.expression.ComparisonBinaryExpression.equal; +import static org.tikv.expression.ComparisonBinaryExpression.greaterEqual; +import static org.tikv.expression.ComparisonBinaryExpression.greaterThan; +import static org.tikv.expression.ComparisonBinaryExpression.lessEqual; +import static org.tikv.expression.ComparisonBinaryExpression.lessThan; +import static org.tikv.expression.ComparisonBinaryExpression.notEqual; import com.google.common.collect.ImmutableList; -import com.pingcap.tikv.key.TypedKey; -import com.pingcap.tikv.meta.MetaUtils; -import com.pingcap.tikv.meta.TiTableInfo; -import com.pingcap.tikv.types.DataType; -import com.pingcap.tikv.types.IntegerType; -import com.pingcap.tikv.types.StringType; import org.junit.Test; +import org.tikv.key.TypedKey; +import org.tikv.meta.MetaUtils; +import org.tikv.meta.TiTableInfo; +import org.tikv.types.DataType; +import org.tikv.types.IntegerType; +import org.tikv.types.StringType; public class ComparisonBinaryExpressionTest { private static TiTableInfo createTable() { diff --git a/src/test/java/com/pingcap/tikv/expression/visitor/ExpressionTypeCoercerTest.java b/src/test/java/org/tikv/expression/visitor/ExpressionTypeCoercerTest.java similarity index 79% rename from src/test/java/com/pingcap/tikv/expression/visitor/ExpressionTypeCoercerTest.java rename to src/test/java/org/tikv/expression/visitor/ExpressionTypeCoercerTest.java index d6e159bc07..ac1d462a7d 100644 --- a/src/test/java/com/pingcap/tikv/expression/visitor/ExpressionTypeCoercerTest.java +++ b/src/test/java/org/tikv/expression/visitor/ExpressionTypeCoercerTest.java @@ -13,32 +13,32 @@ * limitations under the License. */ -package com.pingcap.tikv.expression.visitor; +package org.tikv.expression.visitor; -import static com.pingcap.tikv.expression.ArithmeticBinaryExpression.minus; -import static com.pingcap.tikv.expression.ArithmeticBinaryExpression.plus; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.equal; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.lessThan; -import static com.pingcap.tikv.expression.LogicalBinaryExpression.and; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +import static org.tikv.expression.ArithmeticBinaryExpression.minus; +import static org.tikv.expression.ArithmeticBinaryExpression.plus; +import static org.tikv.expression.ComparisonBinaryExpression.equal; +import static org.tikv.expression.ComparisonBinaryExpression.lessThan; +import static org.tikv.expression.LogicalBinaryExpression.and; import com.google.common.collect.ImmutableList; -import com.pingcap.tikv.expression.ArithmeticBinaryExpression; -import com.pingcap.tikv.expression.ColumnRef; -import com.pingcap.tikv.expression.ComparisonBinaryExpression; -import com.pingcap.tikv.expression.Constant; -import com.pingcap.tikv.expression.Expression; -import com.pingcap.tikv.expression.LogicalBinaryExpression; -import com.pingcap.tikv.meta.MetaUtils; -import com.pingcap.tikv.meta.TiTableInfo; -import com.pingcap.tikv.types.DataType; -import com.pingcap.tikv.types.IntegerType; -import com.pingcap.tikv.types.RealType; -import com.pingcap.tikv.types.StringType; -import com.pingcap.tikv.types.TimestampType; import java.util.Map; import org.junit.Test; +import org.tikv.expression.ArithmeticBinaryExpression; +import org.tikv.expression.ColumnRef; +import org.tikv.expression.ComparisonBinaryExpression; +import org.tikv.expression.Constant; +import org.tikv.expression.Expression; +import org.tikv.expression.LogicalBinaryExpression; +import org.tikv.meta.MetaUtils; +import org.tikv.meta.TiTableInfo; +import org.tikv.types.DataType; +import org.tikv.types.IntegerType; +import org.tikv.types.RealType; +import org.tikv.types.StringType; +import org.tikv.types.TimestampType; public class ExpressionTypeCoercerTest { private static TiTableInfo createTable() { diff --git a/src/test/java/com/pingcap/tikv/key/CompoundKeyTest.java b/src/test/java/org/tikv/key/CompoundKeyTest.java similarity index 98% rename from src/test/java/com/pingcap/tikv/key/CompoundKeyTest.java rename to src/test/java/org/tikv/key/CompoundKeyTest.java index 28c6727177..44e8c0eba0 100644 --- a/src/test/java/com/pingcap/tikv/key/CompoundKeyTest.java +++ b/src/test/java/org/tikv/key/CompoundKeyTest.java @@ -15,7 +15,7 @@ * */ -package com.pingcap.tikv.key; +package org.tikv.key; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/pingcap/tikv/key/IndexKeyTest.java b/src/test/java/org/tikv/key/IndexKeyTest.java similarity index 95% rename from src/test/java/com/pingcap/tikv/key/IndexKeyTest.java rename to src/test/java/org/tikv/key/IndexKeyTest.java index 0117d8c7bf..3678735de6 100644 --- a/src/test/java/com/pingcap/tikv/key/IndexKeyTest.java +++ b/src/test/java/org/tikv/key/IndexKeyTest.java @@ -13,12 +13,12 @@ * limitations under the License. */ -package com.pingcap.tikv.key; +package org.tikv.key; import static org.junit.Assert.*; -import com.pingcap.tikv.types.IntegerType; import org.junit.Test; +import org.tikv.types.IntegerType; public class IndexKeyTest { diff --git a/src/test/java/com/pingcap/tikv/key/KeyTest.java b/src/test/java/org/tikv/key/KeyTest.java similarity index 94% rename from src/test/java/com/pingcap/tikv/key/KeyTest.java rename to src/test/java/org/tikv/key/KeyTest.java index 3349161fb0..e18fd1bf95 100644 --- a/src/test/java/com/pingcap/tikv/key/KeyTest.java +++ b/src/test/java/org/tikv/key/KeyTest.java @@ -13,18 +13,18 @@ * limitations under the License. */ -package com.pingcap.tikv.key; +package org.tikv.key; -import static com.pingcap.tikv.key.Key.toRawKey; import static org.junit.Assert.*; +import static org.tikv.key.Key.toRawKey; import com.google.common.primitives.UnsignedBytes; import com.google.protobuf.ByteString; -import com.pingcap.tikv.types.DataType; -import com.pingcap.tikv.types.IntegerType; import java.util.Arrays; import java.util.function.Function; import org.junit.Test; +import org.tikv.types.DataType; +import org.tikv.types.IntegerType; public class KeyTest { @Test diff --git a/src/test/java/com/pingcap/tikv/meta/DBInfoTest.java b/src/test/java/org/tikv/meta/DBInfoTest.java similarity index 97% rename from src/test/java/com/pingcap/tikv/meta/DBInfoTest.java rename to src/test/java/org/tikv/meta/DBInfoTest.java index f051f712a3..6a04e89e63 100644 --- a/src/test/java/com/pingcap/tikv/meta/DBInfoTest.java +++ b/src/test/java/org/tikv/meta/DBInfoTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.pingcap.tikv.meta; +package org.tikv.meta; import static org.junit.Assert.*; diff --git a/src/test/java/com/pingcap/tikv/meta/MetaUtils.java b/src/test/java/org/tikv/meta/MetaUtils.java similarity index 95% rename from src/test/java/com/pingcap/tikv/meta/MetaUtils.java rename to src/test/java/org/tikv/meta/MetaUtils.java index 935e8cd057..ebae97a8c4 100644 --- a/src/test/java/com/pingcap/tikv/meta/MetaUtils.java +++ b/src/test/java/org/tikv/meta/MetaUtils.java @@ -13,23 +13,23 @@ * limitations under the License. */ -package com.pingcap.tikv.meta; +package org.tikv.meta; import com.google.common.collect.ImmutableList; import com.google.protobuf.ByteString; -import com.pingcap.tikv.GrpcUtils; -import com.pingcap.tikv.KVMockServer; -import com.pingcap.tikv.PDMockServer; -import com.pingcap.tikv.codec.Codec.BytesCodec; -import com.pingcap.tikv.codec.Codec.IntegerCodec; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.exception.TiClientInternalException; -import com.pingcap.tikv.kvproto.Metapb; -import com.pingcap.tikv.types.DataType; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.tikv.GrpcUtils; +import org.tikv.KVMockServer; +import org.tikv.PDMockServer; +import org.tikv.codec.Codec.BytesCodec; +import org.tikv.codec.Codec.IntegerCodec; +import org.tikv.codec.CodecDataOutput; +import org.tikv.exception.TiClientInternalException; +import org.tikv.kvproto.Metapb; +import org.tikv.types.DataType; public class MetaUtils { public static class TableBuilder { diff --git a/src/test/java/com/pingcap/tikv/meta/TiDAGRequestTest.java b/src/test/java/org/tikv/meta/TiDAGRequestTest.java similarity index 92% rename from src/test/java/com/pingcap/tikv/meta/TiDAGRequestTest.java rename to src/test/java/org/tikv/meta/TiDAGRequestTest.java index fedfd9c96b..4774924ac5 100644 --- a/src/test/java/com/pingcap/tikv/meta/TiDAGRequestTest.java +++ b/src/test/java/org/tikv/meta/TiDAGRequestTest.java @@ -13,23 +13,16 @@ * limitations under the License. */ -package com.pingcap.tikv.meta; +package org.tikv.meta; -import static com.pingcap.tikv.expression.ArithmeticBinaryExpression.plus; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.lessEqual; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.tikv.expression.ArithmeticBinaryExpression.plus; +import static org.tikv.expression.ComparisonBinaryExpression.lessEqual; import com.google.common.collect.ImmutableList; import com.google.protobuf.ByteString; import com.pingcap.tidb.tipb.Expr; -import com.pingcap.tikv.expression.*; -import com.pingcap.tikv.expression.AggregateFunction.FunctionType; -import com.pingcap.tikv.expression.visitor.ExpressionTypeCoercer; -import com.pingcap.tikv.expression.visitor.ProtoConverter; -import com.pingcap.tikv.kvproto.Coprocessor; -import com.pingcap.tikv.types.IntegerType; -import com.pingcap.tikv.types.StringType; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; @@ -37,6 +30,13 @@ import java.io.ObjectOutputStream; import java.util.HashMap; import java.util.Map; import org.junit.Test; +import org.tikv.expression.*; +import org.tikv.expression.AggregateFunction.FunctionType; +import org.tikv.expression.visitor.ExpressionTypeCoercer; +import org.tikv.expression.visitor.ProtoConverter; +import org.tikv.kvproto.Coprocessor; +import org.tikv.types.IntegerType; +import org.tikv.types.StringType; public class TiDAGRequestTest { private static TiTableInfo createTable() { diff --git a/src/test/java/com/pingcap/tikv/meta/TiTableInfoTest.java b/src/test/java/org/tikv/meta/TiTableInfoTest.java similarity index 98% rename from src/test/java/com/pingcap/tikv/meta/TiTableInfoTest.java rename to src/test/java/org/tikv/meta/TiTableInfoTest.java index cb5767c172..ab09f5ebf7 100644 --- a/src/test/java/com/pingcap/tikv/meta/TiTableInfoTest.java +++ b/src/test/java/org/tikv/meta/TiTableInfoTest.java @@ -13,16 +13,16 @@ * limitations under the License. */ -package com.pingcap.tikv.meta; +package org.tikv.meta; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import com.fasterxml.jackson.databind.ObjectMapper; -import com.pingcap.tikv.types.IntegerType; -import com.pingcap.tikv.types.StringType; import java.io.*; import org.junit.Test; +import org.tikv.types.IntegerType; +import org.tikv.types.StringType; public class TiTableInfoTest { public static final String tableJson = diff --git a/src/test/java/com/pingcap/tikv/operation/ChunkIteratorTest.java b/src/test/java/org/tikv/operation/ChunkIteratorTest.java similarity index 88% rename from src/test/java/com/pingcap/tikv/operation/ChunkIteratorTest.java rename to src/test/java/org/tikv/operation/ChunkIteratorTest.java index 0c2142fcbe..c607fab36d 100644 --- a/src/test/java/com/pingcap/tikv/operation/ChunkIteratorTest.java +++ b/src/test/java/org/tikv/operation/ChunkIteratorTest.java @@ -15,24 +15,24 @@ * */ -package com.pingcap.tikv.operation; +package org.tikv.operation; import static org.junit.Assert.assertEquals; import com.google.protobuf.ByteString; import com.pingcap.tidb.tipb.Chunk; import com.pingcap.tidb.tipb.RowMeta; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.operation.iterator.ChunkIterator; -import com.pingcap.tikv.row.ObjectRowImpl; -import com.pingcap.tikv.row.Row; -import com.pingcap.tikv.types.DataType; -import com.pingcap.tikv.types.IntegerType; -import com.pingcap.tikv.types.StringType; import java.util.ArrayList; import java.util.List; import org.junit.Before; import org.junit.Test; +import org.tikv.codec.CodecDataInput; +import org.tikv.operation.iterator.ChunkIterator; +import org.tikv.row.ObjectRowImpl; +import org.tikv.row.Row; +import org.tikv.types.DataType; +import org.tikv.types.IntegerType; +import org.tikv.types.StringType; public class ChunkIteratorTest { private List chunks = new ArrayList<>(); diff --git a/src/test/java/com/pingcap/tikv/operation/SchemaInferTest.java b/src/test/java/org/tikv/operation/SchemaInferTest.java similarity index 86% rename from src/test/java/com/pingcap/tikv/operation/SchemaInferTest.java rename to src/test/java/org/tikv/operation/SchemaInferTest.java index 9808f0e0d8..9d40f95f65 100644 --- a/src/test/java/com/pingcap/tikv/operation/SchemaInferTest.java +++ b/src/test/java/org/tikv/operation/SchemaInferTest.java @@ -15,27 +15,27 @@ * */ -package com.pingcap.tikv.operation; +package org.tikv.operation; -import static com.pingcap.tikv.expression.ArithmeticBinaryExpression.plus; -import static com.pingcap.tikv.expression.visitor.ExpressionTypeCoercer.inferType; import static org.junit.Assert.assertEquals; +import static org.tikv.expression.ArithmeticBinaryExpression.plus; +import static org.tikv.expression.visitor.ExpressionTypeCoercer.inferType; import com.google.protobuf.ByteString; -import com.pingcap.tikv.catalog.CatalogTransaction; -import com.pingcap.tikv.expression.AggregateFunction; -import com.pingcap.tikv.expression.AggregateFunction.FunctionType; -import com.pingcap.tikv.expression.ByItem; -import com.pingcap.tikv.expression.ColumnRef; -import com.pingcap.tikv.expression.Constant; -import com.pingcap.tikv.expression.Expression; -import com.pingcap.tikv.meta.TiDAGRequest; -import com.pingcap.tikv.meta.TiTableInfo; -import com.pingcap.tikv.types.DataType; -import com.pingcap.tikv.types.DecimalType; -import com.pingcap.tikv.types.StringType; import java.util.List; import org.junit.Test; +import org.tikv.catalog.CatalogTransaction; +import org.tikv.expression.AggregateFunction; +import org.tikv.expression.AggregateFunction.FunctionType; +import org.tikv.expression.ByItem; +import org.tikv.expression.ColumnRef; +import org.tikv.expression.Constant; +import org.tikv.expression.Expression; +import org.tikv.meta.TiDAGRequest; +import org.tikv.meta.TiTableInfo; +import org.tikv.types.DataType; +import org.tikv.types.DecimalType; +import org.tikv.types.StringType; public class SchemaInferTest { private final String table29 = diff --git a/src/test/java/com/pingcap/tikv/operation/iterator/DAGIteratorTest.java b/src/test/java/org/tikv/operation/iterator/DAGIteratorTest.java similarity index 75% rename from src/test/java/com/pingcap/tikv/operation/iterator/DAGIteratorTest.java rename to src/test/java/org/tikv/operation/iterator/DAGIteratorTest.java index 74e8e70ce9..6c3ec88644 100644 --- a/src/test/java/com/pingcap/tikv/operation/iterator/DAGIteratorTest.java +++ b/src/test/java/org/tikv/operation/iterator/DAGIteratorTest.java @@ -13,32 +13,32 @@ * limitations under the License. */ -package com.pingcap.tikv.operation.iterator; +package org.tikv.operation.iterator; import static junit.framework.TestCase.assertEquals; import com.google.common.collect.ImmutableList; import com.google.protobuf.ByteString; -import com.pingcap.tikv.GrpcUtils; -import com.pingcap.tikv.KVMockServer; -import com.pingcap.tikv.MockServerTest; -import com.pingcap.tikv.codec.Codec.BytesCodec; -import com.pingcap.tikv.codec.Codec.IntegerCodec; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.expression.ColumnRef; -import com.pingcap.tikv.kvproto.Coprocessor.KeyRange; -import com.pingcap.tikv.kvproto.Metapb; -import com.pingcap.tikv.meta.MetaUtils; -import com.pingcap.tikv.meta.TiDAGRequest; -import com.pingcap.tikv.meta.TiDAGRequest.PushDownType; -import com.pingcap.tikv.meta.TiTableInfo; -import com.pingcap.tikv.operation.SchemaInfer; -import com.pingcap.tikv.row.Row; -import com.pingcap.tikv.types.IntegerType; -import com.pingcap.tikv.types.StringType; -import com.pingcap.tikv.util.RangeSplitter.RegionTask; import java.util.List; import org.junit.Test; +import org.tikv.GrpcUtils; +import org.tikv.KVMockServer; +import org.tikv.MockServerTest; +import org.tikv.codec.Codec.BytesCodec; +import org.tikv.codec.Codec.IntegerCodec; +import org.tikv.codec.CodecDataOutput; +import org.tikv.expression.ColumnRef; +import org.tikv.kvproto.Coprocessor.KeyRange; +import org.tikv.kvproto.Metapb; +import org.tikv.meta.MetaUtils; +import org.tikv.meta.TiDAGRequest; +import org.tikv.meta.TiDAGRequest.PushDownType; +import org.tikv.meta.TiTableInfo; +import org.tikv.operation.SchemaInfer; +import org.tikv.row.Row; +import org.tikv.types.IntegerType; +import org.tikv.types.StringType; +import org.tikv.util.RangeSplitter.RegionTask; public class DAGIteratorTest extends MockServerTest { diff --git a/src/test/java/com/pingcap/tikv/predicates/IndexMatcherTest.java b/src/test/java/org/tikv/predicates/IndexMatcherTest.java similarity index 77% rename from src/test/java/com/pingcap/tikv/predicates/IndexMatcherTest.java rename to src/test/java/org/tikv/predicates/IndexMatcherTest.java index add272993e..cc7dd67ad2 100644 --- a/src/test/java/com/pingcap/tikv/predicates/IndexMatcherTest.java +++ b/src/test/java/org/tikv/predicates/IndexMatcherTest.java @@ -13,29 +13,29 @@ * limitations under the License. */ -package com.pingcap.tikv.predicates; +package org.tikv.predicates; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.equal; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.greaterEqual; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.lessEqual; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.lessThan; -import static com.pingcap.tikv.expression.LogicalBinaryExpression.and; -import static com.pingcap.tikv.expression.LogicalBinaryExpression.or; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.tikv.expression.ComparisonBinaryExpression.equal; +import static org.tikv.expression.ComparisonBinaryExpression.greaterEqual; +import static org.tikv.expression.ComparisonBinaryExpression.lessEqual; +import static org.tikv.expression.ComparisonBinaryExpression.lessThan; +import static org.tikv.expression.LogicalBinaryExpression.and; +import static org.tikv.expression.LogicalBinaryExpression.or; import com.google.common.collect.ImmutableList; -import com.pingcap.tikv.expression.ColumnRef; -import com.pingcap.tikv.expression.Constant; -import com.pingcap.tikv.expression.Expression; -import com.pingcap.tikv.expression.visitor.IndexMatcher; -import com.pingcap.tikv.meta.MetaUtils; -import com.pingcap.tikv.meta.TiIndexColumn; -import com.pingcap.tikv.meta.TiIndexInfo; -import com.pingcap.tikv.meta.TiTableInfo; -import com.pingcap.tikv.types.IntegerType; -import com.pingcap.tikv.types.StringType; import org.junit.Test; +import org.tikv.expression.ColumnRef; +import org.tikv.expression.Constant; +import org.tikv.expression.Expression; +import org.tikv.expression.visitor.IndexMatcher; +import org.tikv.meta.MetaUtils; +import org.tikv.meta.TiIndexColumn; +import org.tikv.meta.TiIndexInfo; +import org.tikv.meta.TiTableInfo; +import org.tikv.types.IntegerType; +import org.tikv.types.StringType; public class IndexMatcherTest { private static TiTableInfo createTable() { diff --git a/src/test/java/com/pingcap/tikv/predicates/PredicateUtilsTest.java b/src/test/java/org/tikv/predicates/PredicateUtilsTest.java similarity index 84% rename from src/test/java/com/pingcap/tikv/predicates/PredicateUtilsTest.java rename to src/test/java/org/tikv/predicates/PredicateUtilsTest.java index ed2a78cc75..14f2f8ab2e 100644 --- a/src/test/java/com/pingcap/tikv/predicates/PredicateUtilsTest.java +++ b/src/test/java/org/tikv/predicates/PredicateUtilsTest.java @@ -13,33 +13,33 @@ * limitations under the License. */ -package com.pingcap.tikv.predicates; +package org.tikv.predicates; -import static com.pingcap.tikv.expression.ArithmeticBinaryExpression.*; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.equal; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.notEqual; -import static com.pingcap.tikv.expression.LogicalBinaryExpression.and; -import static com.pingcap.tikv.expression.LogicalBinaryExpression.or; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.tikv.expression.ArithmeticBinaryExpression.*; +import static org.tikv.expression.ComparisonBinaryExpression.equal; +import static org.tikv.expression.ComparisonBinaryExpression.notEqual; +import static org.tikv.expression.LogicalBinaryExpression.and; +import static org.tikv.expression.LogicalBinaryExpression.or; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Range; -import com.pingcap.tikv.expression.ColumnRef; -import com.pingcap.tikv.expression.Constant; -import com.pingcap.tikv.expression.Expression; -import com.pingcap.tikv.key.CompoundKey; -import com.pingcap.tikv.key.Key; -import com.pingcap.tikv.key.TypedKey; -import com.pingcap.tikv.meta.MetaUtils; -import com.pingcap.tikv.meta.TiTableInfo; -import com.pingcap.tikv.types.IntegerType; -import com.pingcap.tikv.types.StringType; import java.util.List; import java.util.Optional; import java.util.Set; import org.junit.Test; +import org.tikv.expression.ColumnRef; +import org.tikv.expression.Constant; +import org.tikv.expression.Expression; +import org.tikv.key.CompoundKey; +import org.tikv.key.Key; +import org.tikv.key.TypedKey; +import org.tikv.meta.MetaUtils; +import org.tikv.meta.TiTableInfo; +import org.tikv.types.IntegerType; +import org.tikv.types.StringType; public class PredicateUtilsTest { private static TiTableInfo createTable() { diff --git a/src/test/java/com/pingcap/tikv/predicates/ScanAnalyzerTest.java b/src/test/java/org/tikv/predicates/ScanAnalyzerTest.java similarity index 96% rename from src/test/java/com/pingcap/tikv/predicates/ScanAnalyzerTest.java rename to src/test/java/org/tikv/predicates/ScanAnalyzerTest.java index 4cc9b5285b..144e626843 100644 --- a/src/test/java/com/pingcap/tikv/predicates/ScanAnalyzerTest.java +++ b/src/test/java/org/tikv/predicates/ScanAnalyzerTest.java @@ -13,26 +13,26 @@ * limitations under the License. */ -package com.pingcap.tikv.predicates; +package org.tikv.predicates; -import static com.pingcap.tikv.expression.ComparisonBinaryExpression.*; -import static com.pingcap.tikv.predicates.PredicateUtils.expressionToIndexRanges; import static java.util.Objects.requireNonNull; import static org.junit.Assert.*; +import static org.tikv.expression.ComparisonBinaryExpression.*; +import static org.tikv.predicates.PredicateUtils.expressionToIndexRanges; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.protobuf.ByteString; -import com.pingcap.tikv.expression.ColumnRef; -import com.pingcap.tikv.expression.Constant; -import com.pingcap.tikv.expression.Expression; -import com.pingcap.tikv.key.RowKey; -import com.pingcap.tikv.kvproto.Coprocessor; -import com.pingcap.tikv.meta.*; -import com.pingcap.tikv.meta.TiColumnInfo.InternalTypeHolder; -import com.pingcap.tikv.types.*; import java.util.*; import org.junit.Test; +import org.tikv.expression.ColumnRef; +import org.tikv.expression.Constant; +import org.tikv.expression.Expression; +import org.tikv.key.RowKey; +import org.tikv.kvproto.Coprocessor; +import org.tikv.meta.*; +import org.tikv.meta.TiColumnInfo.InternalTypeHolder; +import org.tikv.types.*; public class ScanAnalyzerTest { private static TiTableInfo createTable() { diff --git a/src/test/java/com/pingcap/tikv/rule.bzl b/src/test/java/org/tikv/rule.bzl similarity index 100% rename from src/test/java/com/pingcap/tikv/rule.bzl rename to src/test/java/org/tikv/rule.bzl diff --git a/src/test/java/com/pingcap/tikv/txn/LockResolverTest.java b/src/test/java/org/tikv/txn/LockResolverTest.java similarity index 93% rename from src/test/java/com/pingcap/tikv/txn/LockResolverTest.java rename to src/test/java/org/tikv/txn/LockResolverTest.java index 6bd8e31d0f..34888a38e8 100644 --- a/src/test/java/com/pingcap/tikv/txn/LockResolverTest.java +++ b/src/test/java/org/tikv/txn/LockResolverTest.java @@ -13,42 +13,42 @@ * limitations under the License. */ -package com.pingcap.tikv.txn; +package org.tikv.txn; -import static com.pingcap.tikv.util.BackOffFunction.BackOffFuncType.BoTxnLock; import static junit.framework.TestCase.*; +import static org.tikv.util.BackOffFunction.BackOffFuncType.BoTxnLock; import com.google.protobuf.ByteString; import com.pingcap.tidb.tipb.*; -import com.pingcap.tikv.PDClient; -import com.pingcap.tikv.ReadOnlyPDClient; -import com.pingcap.tikv.TiConfiguration; -import com.pingcap.tikv.TiSession; -import com.pingcap.tikv.exception.KeyException; -import com.pingcap.tikv.exception.RegionException; -import com.pingcap.tikv.kvproto.Coprocessor; -import com.pingcap.tikv.kvproto.Kvrpcpb.CommitRequest; -import com.pingcap.tikv.kvproto.Kvrpcpb.CommitResponse; -import com.pingcap.tikv.kvproto.Kvrpcpb.IsolationLevel; -import com.pingcap.tikv.kvproto.Kvrpcpb.KeyError; -import com.pingcap.tikv.kvproto.Kvrpcpb.Mutation; -import com.pingcap.tikv.kvproto.Kvrpcpb.Op; -import com.pingcap.tikv.kvproto.Kvrpcpb.PrewriteRequest; -import com.pingcap.tikv.kvproto.Kvrpcpb.PrewriteResponse; -import com.pingcap.tikv.kvproto.Metapb.Store; -import com.pingcap.tikv.kvproto.TikvGrpc; -import com.pingcap.tikv.meta.TiTimestamp; -import com.pingcap.tikv.operation.KVErrorHandler; -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.lang.reflect.Field; import java.util.*; import java.util.function.Supplier; import org.junit.Before; import org.junit.Test; +import org.tikv.PDClient; +import org.tikv.ReadOnlyPDClient; +import org.tikv.TiConfiguration; +import org.tikv.TiSession; +import org.tikv.exception.KeyException; +import org.tikv.exception.RegionException; +import org.tikv.kvproto.Coprocessor; +import org.tikv.kvproto.Kvrpcpb.CommitRequest; +import org.tikv.kvproto.Kvrpcpb.CommitResponse; +import org.tikv.kvproto.Kvrpcpb.IsolationLevel; +import org.tikv.kvproto.Kvrpcpb.KeyError; +import org.tikv.kvproto.Kvrpcpb.Mutation; +import org.tikv.kvproto.Kvrpcpb.Op; +import org.tikv.kvproto.Kvrpcpb.PrewriteRequest; +import org.tikv.kvproto.Kvrpcpb.PrewriteResponse; +import org.tikv.kvproto.Metapb.Store; +import org.tikv.kvproto.TikvGrpc; +import org.tikv.meta.TiTimestamp; +import org.tikv.operation.KVErrorHandler; +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 LockResolverTest { private TiSession session; diff --git a/src/test/java/com/pingcap/tikv/types/ConverterTest.java b/src/test/java/org/tikv/types/ConverterTest.java similarity index 94% rename from src/test/java/com/pingcap/tikv/types/ConverterTest.java rename to src/test/java/org/tikv/types/ConverterTest.java index 2b22a6729e..f0b2e344af 100644 --- a/src/test/java/com/pingcap/tikv/types/ConverterTest.java +++ b/src/test/java/org/tikv/types/ConverterTest.java @@ -1,4 +1,4 @@ -package com.pingcap.tikv.types; +package org.tikv.types; import org.junit.Test; diff --git a/src/test/java/com/pingcap/tikv/types/DataTypeFactoryTest.java b/src/test/java/org/tikv/types/DataTypeFactoryTest.java similarity index 93% rename from src/test/java/com/pingcap/tikv/types/DataTypeFactoryTest.java rename to src/test/java/org/tikv/types/DataTypeFactoryTest.java index 66a184f9e1..4146b41666 100644 --- a/src/test/java/com/pingcap/tikv/types/DataTypeFactoryTest.java +++ b/src/test/java/org/tikv/types/DataTypeFactoryTest.java @@ -15,13 +15,13 @@ * */ -package com.pingcap.tikv.types; +package org.tikv.types; import static org.junit.Assert.assertEquals; import com.google.common.collect.ImmutableList; -import com.pingcap.tikv.meta.TiColumnInfo.InternalTypeHolder; import org.junit.Test; +import org.tikv.meta.TiColumnInfo.InternalTypeHolder; public class DataTypeFactoryTest { diff --git a/src/test/java/com/pingcap/tikv/types/DecimalTypeTest.java b/src/test/java/org/tikv/types/DecimalTypeTest.java similarity index 87% rename from src/test/java/com/pingcap/tikv/types/DecimalTypeTest.java rename to src/test/java/org/tikv/types/DecimalTypeTest.java index c314d090f6..2f90118c16 100644 --- a/src/test/java/com/pingcap/tikv/types/DecimalTypeTest.java +++ b/src/test/java/org/tikv/types/DecimalTypeTest.java @@ -15,15 +15,15 @@ * */ -package com.pingcap.tikv.types; +package org.tikv.types; import static org.junit.Assert.assertEquals; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.types.DataType.EncodeType; import java.math.BigDecimal; import org.junit.Test; +import org.tikv.codec.CodecDataInput; +import org.tikv.codec.CodecDataOutput; +import org.tikv.types.DataType.EncodeType; public class DecimalTypeTest { @Test diff --git a/src/test/java/com/pingcap/tikv/types/IntegerTypeTest.java b/src/test/java/org/tikv/types/IntegerTypeTest.java similarity index 88% rename from src/test/java/com/pingcap/tikv/types/IntegerTypeTest.java rename to src/test/java/org/tikv/types/IntegerTypeTest.java index 674c3daab1..970aa72a06 100644 --- a/src/test/java/com/pingcap/tikv/types/IntegerTypeTest.java +++ b/src/test/java/org/tikv/types/IntegerTypeTest.java @@ -15,14 +15,14 @@ * */ -package com.pingcap.tikv.types; +package org.tikv.types; import static org.junit.Assert.assertEquals; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.types.DataType.EncodeType; import org.junit.Test; +import org.tikv.codec.CodecDataInput; +import org.tikv.codec.CodecDataOutput; +import org.tikv.types.DataType.EncodeType; public class IntegerTypeTest { @Test diff --git a/src/test/java/com/pingcap/tikv/types/RealTypeTest.java b/src/test/java/org/tikv/types/RealTypeTest.java similarity index 88% rename from src/test/java/com/pingcap/tikv/types/RealTypeTest.java rename to src/test/java/org/tikv/types/RealTypeTest.java index 29e3f99f42..ba4eb4dc20 100644 --- a/src/test/java/com/pingcap/tikv/types/RealTypeTest.java +++ b/src/test/java/org/tikv/types/RealTypeTest.java @@ -15,14 +15,14 @@ * */ -package com.pingcap.tikv.types; +package org.tikv.types; import static org.junit.Assert.assertEquals; -import com.pingcap.tikv.codec.CodecDataInput; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.types.DataType.EncodeType; import org.junit.Test; +import org.tikv.codec.CodecDataInput; +import org.tikv.codec.CodecDataOutput; +import org.tikv.types.DataType.EncodeType; public class RealTypeTest { @Test diff --git a/src/test/java/com/pingcap/tikv/util/RangeSplitterTest.java b/src/test/java/org/tikv/util/RangeSplitterTest.java similarity index 94% rename from src/test/java/com/pingcap/tikv/util/RangeSplitterTest.java rename to src/test/java/org/tikv/util/RangeSplitterTest.java index 2f71384b79..139a992c50 100644 --- a/src/test/java/com/pingcap/tikv/util/RangeSplitterTest.java +++ b/src/test/java/org/tikv/util/RangeSplitterTest.java @@ -1,22 +1,10 @@ -package com.pingcap.tikv.util; +package org.tikv.util; -import static com.pingcap.tikv.GrpcUtils.encodeKey; import static org.junit.Assert.assertEquals; +import static org.tikv.GrpcUtils.encodeKey; import com.google.common.collect.ImmutableList; import com.google.protobuf.ByteString; -import com.pingcap.tikv.codec.Codec.IntegerCodec; -import com.pingcap.tikv.codec.CodecDataOutput; -import com.pingcap.tikv.key.Key; -import com.pingcap.tikv.key.RowKey; -import com.pingcap.tikv.key.RowKey.DecodeResult.Status; -import com.pingcap.tikv.kvproto.Coprocessor.KeyRange; -import com.pingcap.tikv.kvproto.Kvrpcpb.CommandPri; -import com.pingcap.tikv.kvproto.Kvrpcpb.IsolationLevel; -import com.pingcap.tikv.kvproto.Metapb; -import com.pingcap.tikv.kvproto.Metapb.Peer; -import com.pingcap.tikv.region.RegionManager; -import com.pingcap.tikv.region.TiRegion; import gnu.trove.list.array.TLongArrayList; import gnu.trove.map.hash.TLongObjectHashMap; import java.util.ArrayList; @@ -24,6 +12,18 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; import org.junit.Test; +import org.tikv.codec.Codec.IntegerCodec; +import org.tikv.codec.CodecDataOutput; +import org.tikv.key.Key; +import org.tikv.key.RowKey; +import org.tikv.key.RowKey.DecodeResult.Status; +import org.tikv.kvproto.Coprocessor.KeyRange; +import org.tikv.kvproto.Kvrpcpb.CommandPri; +import org.tikv.kvproto.Kvrpcpb.IsolationLevel; +import org.tikv.kvproto.Metapb; +import org.tikv.kvproto.Metapb.Peer; +import org.tikv.region.RegionManager; +import org.tikv.region.TiRegion; public class RangeSplitterTest { static class MockRegionManager extends RegionManager { diff --git a/src/test/java/com/pingcap/tikv/util/ReflectionWrapper.java b/src/test/java/org/tikv/util/ReflectionWrapper.java similarity index 96% rename from src/test/java/com/pingcap/tikv/util/ReflectionWrapper.java rename to src/test/java/org/tikv/util/ReflectionWrapper.java index 27f5cb8136..981895bc5e 100644 --- a/src/test/java/com/pingcap/tikv/util/ReflectionWrapper.java +++ b/src/test/java/org/tikv/util/ReflectionWrapper.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.pingcap.tikv.util; +package org.tikv.util; import java.lang.reflect.Method;