From 97512b69ed263b5573b44531408182350159be18 Mon Sep 17 00:00:00 2001 From: birdstorm Date: Wed, 26 Jun 2019 16:38:46 +0800 Subject: [PATCH] optimize imports (#871) --- .../com/pingcap/tispark/BasicExpression.scala | 2 +- .../com/pingcap/tispark/TiDBRelation.scala | 3 +- .../scala/com/pingcap/tispark/TiDBUtils.scala | 7 +-- .../examples/TiBatchWritePressureTest.scala | 2 +- .../tispark/examples/TwoTiDBExample.scala | 2 +- .../tispark/statistics/StatisticsHelper.scala | 2 +- .../statistics/StatisticsManager.scala | 2 +- .../org/apache/spark/sql/TiContext.scala | 5 +-- .../org/apache/spark/sql/TiStrategy.scala | 4 +- .../sql/execution/command/TiCommand.scala | 2 +- .../apache/spark/sql/extensions/rules.scala | 6 +-- .../datasource/BaseDataSourceTest.scala | 2 +- .../datasource/EdgeConditionSuite.scala | 2 +- .../tispark/datatype/DataTypeSuite.scala | 2 +- .../org/apache/spark/SparkFunSuite.scala | 1 - .../org/apache/spark/sql/QueryTest.scala | 2 +- .../index/PrefixIndexTestSuite.scala | 1 - .../spark/sql/test/TestSparkSession.scala | 2 +- .../apache/spark/sql/txn/TxnTestSuite.scala | 5 ++- .../java/com/pingcap/tikv/TiDBJDBCClient.java | 6 +-- .../com/pingcap/tikv/TwoPhaseCommitter.java | 10 +---- .../com/pingcap/tikv/catalog/Catalog.java | 6 +-- .../tikv/catalog/CatalogTransaction.java | 12 +----- .../visitor/IndexRangeSetBuilder.java | 4 +- .../visitor/PartAndFilterExprRewriter.java | 7 +-- .../visitor/PrunedPartitionBuilder.java | 6 +-- .../java/com/pingcap/tikv/key/TypedKey.java | 5 ++- .../tikv/operation/iterator/DAGIterator.java | 7 +-- .../com/pingcap/tikv/parser/AstBuilder.java | 8 +--- .../tikv/predicates/TiKVScanAnalyzer.java | 15 +------ .../tikv/region/RegionStoreClient.java | 43 +++---------------- .../tikv/statistics/IndexStatistics.java | 3 +- .../pingcap/tikv/txn/LockResolverClient.java | 9 +--- .../com/pingcap/tikv/txn/TxnKVClient.java | 6 +-- .../com/pingcap/tikv/types/Converter.java | 5 +-- .../com/pingcap/tikv/util/RangeSplitter.java | 7 +-- .../java/com/pingcap/tikv/KVMockServer.java | 7 +-- .../java/com/pingcap/tikv/PDClientTest.java | 4 +- .../com/pingcap/tikv/catalog/CatalogTest.java | 7 ++- .../com/pingcap/tikv/codec/KeyUtilsTest.java | 7 ++- .../pingcap/tikv/codec/TableCodecTest.java | 2 +- .../ComparisonBinaryExpressionTest.java | 9 +--- .../visitor/ExpressionTypeCoercerTest.java | 13 +----- .../PartAndFilterExprRewriterTest.java | 8 +--- .../com/pingcap/tikv/key/IndexKeyTest.java | 4 +- .../java/com/pingcap/tikv/key/KeyTest.java | 4 +- .../com/pingcap/tikv/meta/DBInfoTest.java | 2 +- .../pingcap/tikv/meta/TiTableInfoTest.java | 1 - .../tikv/operation/SchemaInferTest.java | 6 +-- .../operation/iterator/DAGIteratorTest.java | 4 +- .../tikv/predicates/IndexMatcherTest.java | 5 +-- .../pingcap/tikv/txn/LockResolverTest.java | 15 +------ 52 files changed, 76 insertions(+), 235 deletions(-) diff --git a/core/src/main/scala/com/pingcap/tispark/BasicExpression.scala b/core/src/main/scala/com/pingcap/tispark/BasicExpression.scala index 78e69f0c6f..ff0cb5c3e2 100644 --- a/core/src/main/scala/com/pingcap/tispark/BasicExpression.scala +++ b/core/src/main/scala/com/pingcap/tispark/BasicExpression.scala @@ -20,7 +20,7 @@ import java.sql.Timestamp import com.pingcap.tikv.expression._ import com.pingcap.tikv.region.RegionStoreClient.RequestTypes import org.apache.spark.sql.catalyst.analysis.UnresolvedAttribute -import org.apache.spark.sql.catalyst.expressions.{Add, Alias, And, AttributeReference, Contains, Divide, EndsWith, EqualTo, Expression, GreaterThan, GreaterThanOrEqual, IsNotNull, IsNull, LessThan, LessThanOrEqual, Like, Literal, Multiply, Not, Or, StartsWith, Subtract, Year} +import org.apache.spark.sql.catalyst.expressions.{Add, Alias, And, AttributeReference, Contains, Divide, EndsWith, EqualTo, Expression, GreaterThan, GreaterThanOrEqual, IsNotNull, IsNull, LessThan, LessThanOrEqual, Like, Literal, Multiply, Not, Or, StartsWith, Subtract} import org.apache.spark.sql.catalyst.util.DateTimeUtils import org.apache.spark.sql.types._ import org.joda.time.DateTime diff --git a/core/src/main/scala/com/pingcap/tispark/TiDBRelation.scala b/core/src/main/scala/com/pingcap/tispark/TiDBRelation.scala index 53b084e481..e4fb457c09 100644 --- a/core/src/main/scala/com/pingcap/tispark/TiDBRelation.scala +++ b/core/src/main/scala/com/pingcap/tispark/TiDBRelation.scala @@ -18,15 +18,14 @@ package com.pingcap.tispark import com.pingcap.tikv.TiSession import com.pingcap.tikv.exception.{TiBatchWriteException, TiClientInternalException} import com.pingcap.tikv.meta.{TiDAGRequest, TiTableInfo, TiTimestamp} -import org.apache.spark.sql.{DataFrame, SaveMode} import com.pingcap.tispark.utils.TiUtil -import org.apache.spark.sql.SQLContext import org.apache.spark.sql.catalyst.expressions.aggregate._ import org.apache.spark.sql.catalyst.expressions.{Attribute, NamedExpression} import org.apache.spark.sql.execution._ import org.apache.spark.sql.sources.{BaseRelation, InsertableRelation} import org.apache.spark.sql.tispark.{TiHandleRDD, TiRDD} import org.apache.spark.sql.types.StructType +import org.apache.spark.sql.{DataFrame, SQLContext, SaveMode} import scala.collection.mutable.ListBuffer diff --git a/core/src/main/scala/com/pingcap/tispark/TiDBUtils.scala b/core/src/main/scala/com/pingcap/tispark/TiDBUtils.scala index 67519e2bb5..b33e531e2a 100644 --- a/core/src/main/scala/com/pingcap/tispark/TiDBUtils.scala +++ b/core/src/main/scala/com/pingcap/tispark/TiDBUtils.scala @@ -1,12 +1,9 @@ package com.pingcap.tispark -import java.sql.{Connection, Driver, DriverManager, SQLException} +import java.sql.{Connection, Driver, DriverManager} import java.util.Properties -import org.apache.spark.sql.execution.datasources.jdbc.{DriverRegistry, DriverWrapper, JdbcUtils} -import org.apache.spark.sql.jdbc.JdbcDialects -import org.apache.spark.sql.types.StructType -import org.apache.spark.sql.{DataFrame, SQLContext, TiContext} +import org.apache.spark.sql.execution.datasources.jdbc.{DriverRegistry, DriverWrapper} import scala.util.Try diff --git a/core/src/main/scala/com/pingcap/tispark/examples/TiBatchWritePressureTest.scala b/core/src/main/scala/com/pingcap/tispark/examples/TiBatchWritePressureTest.scala index 48dc87e958..2311ebf1ae 100644 --- a/core/src/main/scala/com/pingcap/tispark/examples/TiBatchWritePressureTest.scala +++ b/core/src/main/scala/com/pingcap/tispark/examples/TiBatchWritePressureTest.scala @@ -15,7 +15,7 @@ package com.pingcap.tispark.examples -import com.pingcap.tispark.{TiBatchWrite, TiDBOptions, TiTableReference} +import com.pingcap.tispark.{TiBatchWrite, TiDBOptions} import org.apache.spark.SparkConf import org.apache.spark.sql.{SparkSession, TiContext} diff --git a/core/src/main/scala/com/pingcap/tispark/examples/TwoTiDBExample.scala b/core/src/main/scala/com/pingcap/tispark/examples/TwoTiDBExample.scala index 063ae312ce..dd512edcda 100644 --- a/core/src/main/scala/com/pingcap/tispark/examples/TwoTiDBExample.scala +++ b/core/src/main/scala/com/pingcap/tispark/examples/TwoTiDBExample.scala @@ -16,7 +16,7 @@ package com.pingcap.tispark.examples import org.apache.spark.SparkConf -import org.apache.spark.sql.{DataFrame, SQLContext, SparkSession} +import org.apache.spark.sql.{SQLContext, SparkSession} /** * before run the code in IDE, please enable maven profile `local-debug` diff --git a/core/src/main/scala/com/pingcap/tispark/statistics/StatisticsHelper.scala b/core/src/main/scala/com/pingcap/tispark/statistics/StatisticsHelper.scala index 1380d8e47c..f1572c3d5d 100644 --- a/core/src/main/scala/com/pingcap/tispark/statistics/StatisticsHelper.scala +++ b/core/src/main/scala/com/pingcap/tispark/statistics/StatisticsHelper.scala @@ -21,7 +21,7 @@ import com.google.common.primitives.UnsignedLong import com.pingcap.tikv.expression.{ByItem, ColumnRef, ComparisonBinaryExpression, Constant} import com.pingcap.tikv.key.Key import com.pingcap.tikv.meta.TiDAGRequest.PushDownType -import com.pingcap.tikv.meta.{TiColumnInfo, TiDAGRequest, TiIndexInfo, TiTableInfo, TiTimestamp} +import com.pingcap.tikv.meta._ import com.pingcap.tikv.row.Row import com.pingcap.tikv.statistics._ import com.pingcap.tikv.types.BytesType diff --git a/core/src/main/scala/com/pingcap/tispark/statistics/StatisticsManager.scala b/core/src/main/scala/com/pingcap/tispark/statistics/StatisticsManager.scala index 9d9385cc08..18a8738b2e 100644 --- a/core/src/main/scala/com/pingcap/tispark/statistics/StatisticsManager.scala +++ b/core/src/main/scala/com/pingcap/tispark/statistics/StatisticsManager.scala @@ -19,11 +19,11 @@ package com.pingcap.tispark.statistics import com.google.common.cache.CacheBuilder import com.pingcap.tikv.catalog.Catalog -import com.pingcap.tikv.{Snapshot, TiSession} import com.pingcap.tikv.meta.{TiColumnInfo, TiDAGRequest, TiIndexInfo, TiTableInfo} import com.pingcap.tikv.row.Row import com.pingcap.tikv.statistics._ import com.pingcap.tikv.types.DataType +import com.pingcap.tikv.{Snapshot, TiSession} import com.pingcap.tispark.statistics.StatisticsHelper.shouldUpdateHistogram import com.pingcap.tispark.statistics.estimate.{DefaultTableSizeEstimator, TableSizeEstimator} import org.slf4j.LoggerFactory diff --git a/core/src/main/scala/org/apache/spark/sql/TiContext.scala b/core/src/main/scala/org/apache/spark/sql/TiContext.scala index 3f23db49d9..bc527ce996 100644 --- a/core/src/main/scala/org/apache/spark/sql/TiContext.scala +++ b/core/src/main/scala/org/apache/spark/sql/TiContext.scala @@ -31,11 +31,10 @@ import org.json4s.DefaultFormats import org.json4s.JsonAST._ import org.json4s.JsonDSL._ import org.json4s.jackson.JsonMethods._ +import scalaj.http.Http import scala.collection.JavaConverters._ -import scala.collection.JavaConversions._ import scala.collection.mutable -import scalaj.http.Http class TiContext(val sparkSession: SparkSession, options: Option[TiDBOptions] = None) extends Serializable @@ -108,7 +107,7 @@ class TiContext(val sparkSession: SparkSession, options: Option[TiDBOptions] = N var transCount = 0 storeRegionId.asScala - .flatMap(_._2) + .flatMap(_._2.asScala) .foreach((regionId: lang.Long) => { val resStr = Http(s"$pdAddress/$regionIDPrefix/$regionId").asString val json: JValue = parse(resStr.body) diff --git a/core/src/main/scala/org/apache/spark/sql/TiStrategy.scala b/core/src/main/scala/org/apache/spark/sql/TiStrategy.scala index 4ca97b0fc5..e57bb7c10c 100644 --- a/core/src/main/scala/org/apache/spark/sql/TiStrategy.scala +++ b/core/src/main/scala/org/apache/spark/sql/TiStrategy.scala @@ -21,12 +21,12 @@ import com.pingcap.tikv.exception.IgnoreUnsupportedTypeException import com.pingcap.tikv.expression.AggregateFunction.FunctionType import com.pingcap.tikv.expression._ import com.pingcap.tikv.expression.visitor.{ColumnMatcher, MetaResolver} -import com.pingcap.tikv.meta.{TiDAGRequest, TiTimestamp} import com.pingcap.tikv.meta.TiDAGRequest.PushDownType +import com.pingcap.tikv.meta.{TiDAGRequest, TiTimestamp} import com.pingcap.tikv.predicates.{PredicateUtils, TiKVScanAnalyzer} import com.pingcap.tikv.statistics.TableStatistics -import com.pingcap.tispark.utils.TiConverter._ import com.pingcap.tispark.statistics.StatisticsManager +import com.pingcap.tispark.utils.TiConverter._ import com.pingcap.tispark.utils.TiUtil import com.pingcap.tispark.{BasicExpression, TiConfigConst, TiDBRelation} import org.apache.spark.internal.Logging diff --git a/core/src/main/scala/org/apache/spark/sql/execution/command/TiCommand.scala b/core/src/main/scala/org/apache/spark/sql/execution/command/TiCommand.scala index 1300908369..0c3151eb02 100644 --- a/core/src/main/scala/org/apache/spark/sql/execution/command/TiCommand.scala +++ b/core/src/main/scala/org/apache/spark/sql/execution/command/TiCommand.scala @@ -14,10 +14,10 @@ */ package org.apache.spark.sql.execution.command -import org.apache.spark.sql.{Row, SparkSession, TiContext} import org.apache.spark.sql.catalyst.catalog.TiSessionCatalog import org.apache.spark.sql.catalyst.expressions.Attribute import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan +import org.apache.spark.sql.{Row, SparkSession, TiContext} /** * TiCommand is used to inherit from [[org.apache.spark.sql.execution.command.RunnableCommand]] diff --git a/core/src/main/scala/org/apache/spark/sql/extensions/rules.scala b/core/src/main/scala/org/apache/spark/sql/extensions/rules.scala index 1bde9a7770..d9eeb87038 100644 --- a/core/src/main/scala/org/apache/spark/sql/extensions/rules.scala +++ b/core/src/main/scala/org/apache/spark/sql/extensions/rules.scala @@ -15,15 +15,15 @@ package org.apache.spark.sql.extensions import com.pingcap.tispark.statistics.StatisticsManager -import org.apache.spark.sql.{AnalysisException, _} +import com.pingcap.tispark.{MetaManager, TiDBRelation, TiTableReference} import org.apache.spark.sql.catalyst.TableIdentifier import org.apache.spark.sql.catalyst.analysis.{EliminateSubqueryAliases, UnresolvedRelation} +import org.apache.spark.sql.catalyst.catalog.TiSessionCatalog import org.apache.spark.sql.catalyst.plans.logical.{InsertIntoTable, LogicalPlan, SubqueryAlias} import org.apache.spark.sql.catalyst.rules.Rule -import com.pingcap.tispark.{MetaManager, TiDBRelation, TiTableReference} -import org.apache.spark.sql.catalyst.catalog.TiSessionCatalog import org.apache.spark.sql.execution.command._ import org.apache.spark.sql.execution.datasources.LogicalRelation +import org.apache.spark.sql.{AnalysisException, _} case class TiResolutionRule(getOrCreateTiContext: SparkSession => TiContext)( sparkSession: SparkSession diff --git a/core/src/test/scala/com/pingcap/tispark/datasource/BaseDataSourceTest.scala b/core/src/test/scala/com/pingcap/tispark/datasource/BaseDataSourceTest.scala index ef4f38596d..e5da2acce1 100644 --- a/core/src/test/scala/com/pingcap/tispark/datasource/BaseDataSourceTest.scala +++ b/core/src/test/scala/com/pingcap/tispark/datasource/BaseDataSourceTest.scala @@ -2,7 +2,7 @@ package com.pingcap.tispark.datasource import java.util.Objects -import com.pingcap.tispark.{TiConfigConst, TiDBOptions} +import com.pingcap.tispark.TiConfigConst import org.apache.spark.SparkException import org.apache.spark.rdd.RDD import org.apache.spark.sql.types.StructType diff --git a/core/src/test/scala/com/pingcap/tispark/datasource/EdgeConditionSuite.scala b/core/src/test/scala/com/pingcap/tispark/datasource/EdgeConditionSuite.scala index dd1b7df0b7..d8dd728f13 100644 --- a/core/src/test/scala/com/pingcap/tispark/datasource/EdgeConditionSuite.scala +++ b/core/src/test/scala/com/pingcap/tispark/datasource/EdgeConditionSuite.scala @@ -1,7 +1,7 @@ package com.pingcap.tispark.datasource import org.apache.spark.sql.Row -import org.apache.spark.sql.types.{IntegerType, LongType, StringType, StructField, StructType} +import org.apache.spark.sql.types._ class EdgeConditionSuite extends BaseDataSourceTest("test_datasource_edge_condition") { diff --git a/core/src/test/scala/com/pingcap/tispark/datatype/DataTypeSuite.scala b/core/src/test/scala/com/pingcap/tispark/datatype/DataTypeSuite.scala index c0465bed3f..09b24bcf22 100644 --- a/core/src/test/scala/com/pingcap/tispark/datatype/DataTypeSuite.scala +++ b/core/src/test/scala/com/pingcap/tispark/datatype/DataTypeSuite.scala @@ -6,7 +6,7 @@ import java.util.Calendar import com.pingcap.tikv.exception.TiBatchWriteException import com.pingcap.tispark.datasource.BaseDataSourceTest import org.apache.spark.sql.Row -import org.apache.spark.sql.types.{ByteType, DecimalType, DoubleType, FloatType, IntegerType, LongType, StringType, StructField, StructType, TimestampType} +import org.apache.spark.sql.types._ class DataTypeSuite extends BaseDataSourceTest("test_data_type") { diff --git a/core/src/test/scala/org/apache/spark/SparkFunSuite.scala b/core/src/test/scala/org/apache/spark/SparkFunSuite.scala index b0c9890bd9..d5b9556e7a 100644 --- a/core/src/test/scala/org/apache/spark/SparkFunSuite.scala +++ b/core/src/test/scala/org/apache/spark/SparkFunSuite.scala @@ -18,7 +18,6 @@ package org.apache.spark import java.io.File import org.apache.spark.internal.Logging -import org.apache.spark.util.AccumulatorContext import org.scalatest._ import org.slf4j.Logger diff --git a/core/src/test/scala/org/apache/spark/sql/QueryTest.scala b/core/src/test/scala/org/apache/spark/sql/QueryTest.scala index 98dfe510d1..d724bbe0d9 100644 --- a/core/src/test/scala/org/apache/spark/sql/QueryTest.scala +++ b/core/src/test/scala/org/apache/spark/sql/QueryTest.scala @@ -17,7 +17,7 @@ package org.apache.spark.sql -import java.sql.{Date, ResultSet, Timestamp} +import java.sql.{Date, Timestamp} import java.text.SimpleDateFormat import java.util.TimeZone diff --git a/core/src/test/scala/org/apache/spark/sql/expression/index/PrefixIndexTestSuite.scala b/core/src/test/scala/org/apache/spark/sql/expression/index/PrefixIndexTestSuite.scala index 72fc85ffd3..cd31d8d38d 100644 --- a/core/src/test/scala/org/apache/spark/sql/expression/index/PrefixIndexTestSuite.scala +++ b/core/src/test/scala/org/apache/spark/sql/expression/index/PrefixIndexTestSuite.scala @@ -19,7 +19,6 @@ import java.nio.charset.Charset import org.apache.spark.sql.BaseTiSparkTest import org.apache.spark.sql.catalyst.util.resourceToString -import org.apache.spark.sql.execution.HandleRDDExec class PrefixIndexTestSuite extends BaseTiSparkTest { // https://github.com/pingcap/tispark/issues/272 diff --git a/core/src/test/scala/org/apache/spark/sql/test/TestSparkSession.scala b/core/src/test/scala/org/apache/spark/sql/test/TestSparkSession.scala index e16290bff2..504fd381c5 100644 --- a/core/src/test/scala/org/apache/spark/sql/test/TestSparkSession.scala +++ b/core/src/test/scala/org/apache/spark/sql/test/TestSparkSession.scala @@ -15,8 +15,8 @@ package org.apache.spark.sql.test -import org.apache.spark.sql.SparkSession import org.apache.spark.SparkConf +import org.apache.spark.sql.SparkSession /** * A special [[SparkSession]] prepared for testing. diff --git a/core/src/test/scala/org/apache/spark/sql/txn/TxnTestSuite.scala b/core/src/test/scala/org/apache/spark/sql/txn/TxnTestSuite.scala index be545b4b1d..8104d013e4 100644 --- a/core/src/test/scala/org/apache/spark/sql/txn/TxnTestSuite.scala +++ b/core/src/test/scala/org/apache/spark/sql/txn/TxnTestSuite.scala @@ -1,11 +1,12 @@ package org.apache.spark.sql.txn import java.sql.{DriverManager, SQLException} -import org.tikv.kvproto.Kvrpcpb.IsolationLevel + import org.apache.spark.sql.BaseTiSparkTest import org.apache.spark.sql.catalyst.util.resourceToString -import org.apache.spark.sql.test.Utils.getOrElse import org.apache.spark.sql.test.TestConstants.{TiDB_PASSWORD, TiDB_USER} +import org.apache.spark.sql.test.Utils.getOrElse +import org.tikv.kvproto.Kvrpcpb.IsolationLevel // TODO: this test is not so useful at all // what I do is to construct a very long-running write operation diff --git a/tikv-client/src/main/java/com/pingcap/tikv/TiDBJDBCClient.java b/tikv-client/src/main/java/com/pingcap/tikv/TiDBJDBCClient.java index 5f936360a7..d59bd91bc1 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/TiDBJDBCClient.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/TiDBJDBCClient.java @@ -18,11 +18,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.sql.Statement; +import java.sql.*; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/TwoPhaseCommitter.java b/tikv-client/src/main/java/com/pingcap/tikv/TwoPhaseCommitter.java index 30491d2c86..dccb77081c 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/TwoPhaseCommitter.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/TwoPhaseCommitter.java @@ -29,15 +29,7 @@ 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.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import java.util.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tikv.kvproto.Kvrpcpb; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/catalog/Catalog.java b/tikv-client/src/main/java/com/pingcap/tikv/catalog/Catalog.java index 982f8fcdbc..30a6b7a56f 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/catalog/Catalog.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/catalog/Catalog.java @@ -22,11 +22,7 @@ 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; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/catalog/CatalogTransaction.java b/tikv-client/src/main/java/com/pingcap/tikv/catalog/CatalogTransaction.java index 8d7d686829..d0788710b1 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/catalog/CatalogTransaction.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/catalog/CatalogTransaction.java @@ -22,11 +22,7 @@ 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.TiConfiguration; -import com.pingcap.tikv.TiSession; -import com.pingcap.tikv.TiSessionCache; -import com.pingcap.tikv.TwoPhaseCommitter; +import com.pingcap.tikv.*; import com.pingcap.tikv.codec.Codec.BytesCodec; import com.pingcap.tikv.codec.Codec.IntegerCodec; import com.pingcap.tikv.codec.CodecDataInput; @@ -39,11 +35,7 @@ import com.pingcap.tikv.util.ConcreteBackOffer; import com.pingcap.tikv.util.Pair; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.function.Function; import org.apache.log4j.Logger; import org.tikv.kvproto.Kvrpcpb; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/expression/visitor/IndexRangeSetBuilder.java b/tikv-client/src/main/java/com/pingcap/tikv/expression/visitor/IndexRangeSetBuilder.java index 929676c4af..434dda9204 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/expression/visitor/IndexRangeSetBuilder.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/expression/visitor/IndexRangeSetBuilder.java @@ -18,8 +18,10 @@ import com.google.common.collect.Range; import com.google.common.collect.RangeSet; import com.google.common.collect.TreeRangeSet; -import com.pingcap.tikv.expression.*; +import com.pingcap.tikv.expression.ColumnRef; +import com.pingcap.tikv.expression.ComparisonBinaryExpression; import com.pingcap.tikv.expression.ComparisonBinaryExpression.NormalizedPredicate; +import com.pingcap.tikv.expression.StringRegExpression; import com.pingcap.tikv.key.TypedKey; import com.pingcap.tikv.meta.TiIndexColumn; import com.pingcap.tikv.meta.TiIndexInfo; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/expression/visitor/PartAndFilterExprRewriter.java b/tikv-client/src/main/java/com/pingcap/tikv/expression/visitor/PartAndFilterExprRewriter.java index f08e5f6430..038a5df69c 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/expression/visitor/PartAndFilterExprRewriter.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/expression/visitor/PartAndFilterExprRewriter.java @@ -1,13 +1,8 @@ package com.pingcap.tikv.expression.visitor; -import com.pingcap.tikv.expression.ColumnRef; -import com.pingcap.tikv.expression.ComparisonBinaryExpression; +import com.pingcap.tikv.expression.*; import com.pingcap.tikv.expression.ComparisonBinaryExpression.NormalizedPredicate; -import com.pingcap.tikv.expression.Constant; -import com.pingcap.tikv.expression.Expression; -import com.pingcap.tikv.expression.FuncCallExpr; import com.pingcap.tikv.expression.FuncCallExpr.Type; -import com.pingcap.tikv.expression.LogicalBinaryExpression; import com.pingcap.tikv.predicates.PredicateUtils; import java.util.Objects; import java.util.Set; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/expression/visitor/PrunedPartitionBuilder.java b/tikv-client/src/main/java/com/pingcap/tikv/expression/visitor/PrunedPartitionBuilder.java index c1c82e4b58..7b390b834b 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/expression/visitor/PrunedPartitionBuilder.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/expression/visitor/PrunedPartitionBuilder.java @@ -18,12 +18,8 @@ import com.google.common.collect.RangeSet; import com.google.common.collect.TreeRangeSet; import com.pingcap.tikv.exception.UnsupportedPartitionExprException; -import com.pingcap.tikv.expression.ColumnRef; -import com.pingcap.tikv.expression.ComparisonBinaryExpression; +import com.pingcap.tikv.expression.*; import com.pingcap.tikv.expression.ComparisonBinaryExpression.NormalizedPredicate; -import com.pingcap.tikv.expression.Constant; -import com.pingcap.tikv.expression.Expression; -import com.pingcap.tikv.expression.LogicalBinaryExpression; import com.pingcap.tikv.meta.TiPartitionDef; import com.pingcap.tikv.meta.TiPartitionInfo; import com.pingcap.tikv.meta.TiPartitionInfo.PartitionType; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/key/TypedKey.java b/tikv-client/src/main/java/com/pingcap/tikv/key/TypedKey.java index ff7c09fd6b..dd0581a5e5 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/key/TypedKey.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/key/TypedKey.java @@ -21,7 +21,10 @@ import com.pingcap.tikv.codec.CodecDataOutput; import com.pingcap.tikv.codec.KeyUtils; import com.pingcap.tikv.exception.TypeException; -import com.pingcap.tikv.types.*; +import com.pingcap.tikv.types.BytesType; +import com.pingcap.tikv.types.DataType; +import com.pingcap.tikv.types.IntegerType; +import com.pingcap.tikv.types.StringType; public class TypedKey extends Key { private final DataType type; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/operation/iterator/DAGIterator.java b/tikv-client/src/main/java/com/pingcap/tikv/operation/iterator/DAGIterator.java index c49b6ccf43..df6c9f10eb 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/operation/iterator/DAGIterator.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/operation/iterator/DAGIterator.java @@ -15,12 +15,7 @@ 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; -import java.util.Iterator; -import java.util.List; -import java.util.Queue; +import java.util.*; import java.util.concurrent.ExecutorCompletionService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/parser/AstBuilder.java b/tikv-client/src/main/java/com/pingcap/tikv/parser/AstBuilder.java index 5f4d407401..71d5e22c24 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/parser/AstBuilder.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/parser/AstBuilder.java @@ -6,14 +6,8 @@ import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; import com.pingcap.tikv.exception.UnsupportedSyntaxException; -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.FuncCallExpr; +import com.pingcap.tikv.expression.*; import com.pingcap.tikv.expression.FuncCallExpr.Type; -import com.pingcap.tikv.expression.LogicalBinaryExpression; import com.pingcap.tikv.meta.TiTableInfo; import com.pingcap.tikv.parser.MySqlParser.ExpressionContext; import com.pingcap.tikv.parser.MySqlParser.FunctionNameBaseContext; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/predicates/TiKVScanAnalyzer.java b/tikv-client/src/main/java/com/pingcap/tikv/predicates/TiKVScanAnalyzer.java index 0fecec110d..af1eec1c10 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/predicates/TiKVScanAnalyzer.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/predicates/TiKVScanAnalyzer.java @@ -33,22 +33,11 @@ import com.pingcap.tikv.key.Key; import com.pingcap.tikv.key.RowKey; import com.pingcap.tikv.key.TypedKey; -import com.pingcap.tikv.meta.TiColumnInfo; -import com.pingcap.tikv.meta.TiDAGRequest; -import com.pingcap.tikv.meta.TiIndexColumn; -import com.pingcap.tikv.meta.TiIndexInfo; -import com.pingcap.tikv.meta.TiPartitionDef; -import com.pingcap.tikv.meta.TiTableInfo; -import com.pingcap.tikv.meta.TiTimestamp; +import com.pingcap.tikv.meta.*; import com.pingcap.tikv.statistics.IndexStatistics; import com.pingcap.tikv.statistics.TableStatistics; import com.pingcap.tikv.util.Pair; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; import org.tikv.kvproto.Coprocessor.KeyRange; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/region/RegionStoreClient.java b/tikv-client/src/main/java/com/pingcap/tikv/region/RegionStoreClient.java index b76cbac502..8f3bf98e55 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/region/RegionStoreClient.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/region/RegionStoreClient.java @@ -20,9 +20,7 @@ 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.BoTxnLock; -import static com.pingcap.tikv.util.BackOffFunction.BackOffFuncType.BoTxnLockFast; +import static com.pingcap.tikv.util.BackOffFunction.BackOffFuncType.*; import com.google.common.annotations.VisibleForTesting; import com.google.protobuf.ByteString; @@ -31,29 +29,14 @@ import com.pingcap.tidb.tipb.SelectResponse; import com.pingcap.tikv.AbstractGRPCClient; import com.pingcap.tikv.TiConfiguration; -import com.pingcap.tikv.exception.GrpcException; -import com.pingcap.tikv.exception.KeyException; -import com.pingcap.tikv.exception.LockException; -import com.pingcap.tikv.exception.RegionException; -import com.pingcap.tikv.exception.SelectException; -import com.pingcap.tikv.exception.TiClientInternalException; +import com.pingcap.tikv.exception.*; 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.ChannelFactory; -import com.pingcap.tikv.util.ConcreteBackOffer; -import com.pingcap.tikv.util.Pair; -import com.pingcap.tikv.util.RangeSplitter; +import com.pingcap.tikv.util.*; import io.grpc.ManagedChannel; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Objects; -import java.util.Queue; +import java.util.*; import java.util.function.Supplier; import org.apache.log4j.Logger; import org.tikv.kvproto.Coprocessor; @@ -61,23 +44,7 @@ import org.tikv.kvproto.Coprocessor.Request; import org.tikv.kvproto.Coprocessor.Response; import org.tikv.kvproto.Errorpb; -import org.tikv.kvproto.Kvrpcpb.BatchGetRequest; -import org.tikv.kvproto.Kvrpcpb.BatchGetResponse; -import org.tikv.kvproto.Kvrpcpb.CommitRequest; -import org.tikv.kvproto.Kvrpcpb.CommitResponse; -import org.tikv.kvproto.Kvrpcpb.Context; -import org.tikv.kvproto.Kvrpcpb.GetRequest; -import org.tikv.kvproto.Kvrpcpb.GetResponse; -import org.tikv.kvproto.Kvrpcpb.KeyError; -import org.tikv.kvproto.Kvrpcpb.KvPair; -import org.tikv.kvproto.Kvrpcpb.Mutation; -import org.tikv.kvproto.Kvrpcpb.PrewriteRequest; -import org.tikv.kvproto.Kvrpcpb.PrewriteResponse; -import org.tikv.kvproto.Kvrpcpb.ScanRequest; -import org.tikv.kvproto.Kvrpcpb.ScanResponse; -import org.tikv.kvproto.Kvrpcpb.SplitRegionRequest; -import org.tikv.kvproto.Kvrpcpb.SplitRegionResponse; -import org.tikv.kvproto.Kvrpcpb.WriteConflict; +import org.tikv.kvproto.Kvrpcpb.*; import org.tikv.kvproto.Metapb.Store; import org.tikv.kvproto.TikvGrpc; import org.tikv.kvproto.TikvGrpc.TikvBlockingStub; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/statistics/IndexStatistics.java b/tikv-client/src/main/java/com/pingcap/tikv/statistics/IndexStatistics.java index a084e6b29d..ea14257015 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/statistics/IndexStatistics.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/statistics/IndexStatistics.java @@ -16,7 +16,8 @@ package com.pingcap.tikv.statistics; -import com.pingcap.tikv.key.*; +import com.pingcap.tikv.key.Key; +import com.pingcap.tikv.key.StatisticsKeyRangeBuilder; import com.pingcap.tikv.meta.TiIndexInfo; import com.pingcap.tikv.predicates.IndexRange; import com.pingcap.tikv.util.Pair; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/txn/LockResolverClient.java b/tikv-client/src/main/java/com/pingcap/tikv/txn/LockResolverClient.java index 30764e47f2..a03f62d1e8 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/txn/LockResolverClient.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/txn/LockResolverClient.java @@ -33,14 +33,7 @@ import com.pingcap.tikv.util.ChannelFactory; import com.pingcap.tikv.util.TsoUtils; import io.grpc.ManagedChannel; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Queue; -import java.util.Set; +import java.util.*; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Supplier; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/txn/TxnKVClient.java b/tikv-client/src/main/java/com/pingcap/tikv/txn/TxnKVClient.java index 534a8bcc0b..55daa97321 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/txn/TxnKVClient.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/txn/TxnKVClient.java @@ -19,11 +19,7 @@ import com.google.protobuf.ByteString; import com.pingcap.tikv.ReadOnlyPDClient; import com.pingcap.tikv.TiConfiguration; -import com.pingcap.tikv.exception.GrpcException; -import com.pingcap.tikv.exception.KeyException; -import com.pingcap.tikv.exception.RegionException; -import com.pingcap.tikv.exception.TiClientInternalException; -import com.pingcap.tikv.exception.TiKVException; +import com.pingcap.tikv.exception.*; import com.pingcap.tikv.meta.TiTimestamp; import com.pingcap.tikv.region.RegionManager; import com.pingcap.tikv.region.RegionStoreClient; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/types/Converter.java b/tikv-client/src/main/java/com/pingcap/tikv/types/Converter.java index 6a82ffa250..623683a207 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/types/Converter.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/types/Converter.java @@ -17,10 +17,7 @@ package com.pingcap.tikv.types; -import static com.pingcap.tikv.types.TimeType.HOUR; -import static com.pingcap.tikv.types.TimeType.MICROSECOND; -import static com.pingcap.tikv.types.TimeType.MINUTE; -import static com.pingcap.tikv.types.TimeType.SECOND; +import static com.pingcap.tikv.types.TimeType.*; import static java.util.Objects.requireNonNull; import com.google.common.primitives.UnsignedLong; diff --git a/tikv-client/src/main/java/com/pingcap/tikv/util/RangeSplitter.java b/tikv-client/src/main/java/com/pingcap/tikv/util/RangeSplitter.java index dea30ae4d7..e25dc22844 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/util/RangeSplitter.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/util/RangeSplitter.java @@ -28,12 +28,7 @@ import gnu.trove.list.array.TLongArrayList; import gnu.trove.map.hash.TLongObjectHashMap; import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import org.tikv.kvproto.Coprocessor.KeyRange; import org.tikv.kvproto.Metapb; diff --git a/tikv-client/src/test/java/com/pingcap/tikv/KVMockServer.java b/tikv-client/src/test/java/com/pingcap/tikv/KVMockServer.java index 7df9c09d03..fefd0ea202 100644 --- a/tikv-client/src/test/java/com/pingcap/tikv/KVMockServer.java +++ b/tikv-client/src/test/java/com/pingcap/tikv/KVMockServer.java @@ -29,12 +29,7 @@ import io.grpc.Status; import java.io.IOException; import java.net.ServerSocket; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.SortedMap; -import java.util.TreeMap; +import java.util.*; import java.util.stream.Collectors; import org.tikv.kvproto.Coprocessor; import org.tikv.kvproto.Errorpb; diff --git a/tikv-client/src/test/java/com/pingcap/tikv/PDClientTest.java b/tikv-client/src/test/java/com/pingcap/tikv/PDClientTest.java index 850795c531..f67f5710ac 100644 --- a/tikv-client/src/test/java/com/pingcap/tikv/PDClientTest.java +++ b/tikv-client/src/test/java/com/pingcap/tikv/PDClientTest.java @@ -16,9 +16,7 @@ package com.pingcap.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.junit.Assert.*; import com.google.common.collect.ImmutableList; import com.google.protobuf.ByteString; diff --git a/tikv-client/src/test/java/com/pingcap/tikv/catalog/CatalogTest.java b/tikv-client/src/test/java/com/pingcap/tikv/catalog/CatalogTest.java index b1620e78d8..40c747df4c 100644 --- a/tikv-client/src/test/java/com/pingcap/tikv/catalog/CatalogTest.java +++ b/tikv-client/src/test/java/com/pingcap/tikv/catalog/CatalogTest.java @@ -15,11 +15,10 @@ package com.pingcap.tikv.catalog; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; -import com.pingcap.tikv.*; +import com.pingcap.tikv.KVMockServer; +import com.pingcap.tikv.PDMockServerTest; import com.pingcap.tikv.meta.MetaUtils.MetaMockHelper; import com.pingcap.tikv.meta.TiDBInfo; import com.pingcap.tikv.meta.TiTableInfo; diff --git a/tikv-client/src/test/java/com/pingcap/tikv/codec/KeyUtilsTest.java b/tikv-client/src/test/java/com/pingcap/tikv/codec/KeyUtilsTest.java index 562fc985c1..66ee01112a 100644 --- a/tikv-client/src/test/java/com/pingcap/tikv/codec/KeyUtilsTest.java +++ b/tikv-client/src/test/java/com/pingcap/tikv/codec/KeyUtilsTest.java @@ -15,10 +15,9 @@ package com.pingcap.tikv.codec; -import static com.pingcap.tikv.codec.KeyUtils.*; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static com.pingcap.tikv.codec.KeyUtils.formatBytes; +import static com.pingcap.tikv.codec.KeyUtils.hasPrefix; +import static org.junit.Assert.*; import com.google.protobuf.ByteString; import org.junit.Test; diff --git a/tikv-client/src/test/java/com/pingcap/tikv/codec/TableCodecTest.java b/tikv-client/src/test/java/com/pingcap/tikv/codec/TableCodecTest.java index 610df85f14..6edbb6c508 100644 --- a/tikv-client/src/test/java/com/pingcap/tikv/codec/TableCodecTest.java +++ b/tikv-client/src/test/java/com/pingcap/tikv/codec/TableCodecTest.java @@ -1,6 +1,6 @@ package com.pingcap.tikv.codec; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import com.google.common.collect.ImmutableList; import com.pingcap.tikv.meta.MetaUtils; diff --git a/tikv-client/src/test/java/com/pingcap/tikv/expression/ComparisonBinaryExpressionTest.java b/tikv-client/src/test/java/com/pingcap/tikv/expression/ComparisonBinaryExpressionTest.java index fd0fd4b9a4..5862469763 100644 --- a/tikv-client/src/test/java/com/pingcap/tikv/expression/ComparisonBinaryExpressionTest.java +++ b/tikv-client/src/test/java/com/pingcap/tikv/expression/ComparisonBinaryExpressionTest.java @@ -16,14 +16,7 @@ package com.pingcap.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 com.pingcap.tikv.expression.ComparisonBinaryExpression.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/tikv-client/src/test/java/com/pingcap/tikv/expression/visitor/ExpressionTypeCoercerTest.java b/tikv-client/src/test/java/com/pingcap/tikv/expression/visitor/ExpressionTypeCoercerTest.java index f63cd0a798..af685d07d0 100644 --- a/tikv-client/src/test/java/com/pingcap/tikv/expression/visitor/ExpressionTypeCoercerTest.java +++ b/tikv-client/src/test/java/com/pingcap/tikv/expression/visitor/ExpressionTypeCoercerTest.java @@ -24,19 +24,10 @@ import static org.junit.Assert.fail; 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.expression.*; 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 com.pingcap.tikv.types.*; import java.util.Map; import org.junit.Test; diff --git a/tikv-client/src/test/java/com/pingcap/tikv/expression/visitor/PartAndFilterExprRewriterTest.java b/tikv-client/src/test/java/com/pingcap/tikv/expression/visitor/PartAndFilterExprRewriterTest.java index 5021ef41d8..5c1a34d9ed 100644 --- a/tikv-client/src/test/java/com/pingcap/tikv/expression/visitor/PartAndFilterExprRewriterTest.java +++ b/tikv-client/src/test/java/com/pingcap/tikv/expression/visitor/PartAndFilterExprRewriterTest.java @@ -2,14 +2,8 @@ import static org.junit.Assert.*; -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.FuncCallExpr; +import com.pingcap.tikv.expression.*; import com.pingcap.tikv.expression.FuncCallExpr.Type; -import com.pingcap.tikv.expression.LogicalBinaryExpression; -import com.pingcap.tikv.expression.Not; import org.joda.time.DateTime; import org.junit.Test; diff --git a/tikv-client/src/test/java/com/pingcap/tikv/key/IndexKeyTest.java b/tikv-client/src/test/java/com/pingcap/tikv/key/IndexKeyTest.java index 52eb61fc15..43a562bf6e 100644 --- a/tikv-client/src/test/java/com/pingcap/tikv/key/IndexKeyTest.java +++ b/tikv-client/src/test/java/com/pingcap/tikv/key/IndexKeyTest.java @@ -15,9 +15,7 @@ package com.pingcap.tikv.key; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; import com.pingcap.tikv.types.IntegerType; import org.junit.Test; diff --git a/tikv-client/src/test/java/com/pingcap/tikv/key/KeyTest.java b/tikv-client/src/test/java/com/pingcap/tikv/key/KeyTest.java index a7250ae9ed..fb4da727e2 100644 --- a/tikv-client/src/test/java/com/pingcap/tikv/key/KeyTest.java +++ b/tikv-client/src/test/java/com/pingcap/tikv/key/KeyTest.java @@ -16,9 +16,7 @@ package com.pingcap.tikv.key; import static com.pingcap.tikv.key.Key.toRawKey; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import com.google.common.primitives.UnsignedBytes; import com.google.protobuf.ByteString; diff --git a/tikv-client/src/test/java/com/pingcap/tikv/meta/DBInfoTest.java b/tikv-client/src/test/java/com/pingcap/tikv/meta/DBInfoTest.java index f051f712a3..75e26e007c 100644 --- a/tikv-client/src/test/java/com/pingcap/tikv/meta/DBInfoTest.java +++ b/tikv-client/src/test/java/com/pingcap/tikv/meta/DBInfoTest.java @@ -15,7 +15,7 @@ package com.pingcap.tikv.meta; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; diff --git a/tikv-client/src/test/java/com/pingcap/tikv/meta/TiTableInfoTest.java b/tikv-client/src/test/java/com/pingcap/tikv/meta/TiTableInfoTest.java index 3ebf7d601a..cd592f7125 100644 --- a/tikv-client/src/test/java/com/pingcap/tikv/meta/TiTableInfoTest.java +++ b/tikv-client/src/test/java/com/pingcap/tikv/meta/TiTableInfoTest.java @@ -21,7 +21,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.pingcap.tikv.types.IntegerType; import com.pingcap.tikv.types.StringType; -import java.io.*; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; diff --git a/tikv-client/src/test/java/com/pingcap/tikv/operation/SchemaInferTest.java b/tikv-client/src/test/java/com/pingcap/tikv/operation/SchemaInferTest.java index dfe31098ed..b638c6b3f5 100644 --- a/tikv-client/src/test/java/com/pingcap/tikv/operation/SchemaInferTest.java +++ b/tikv-client/src/test/java/com/pingcap/tikv/operation/SchemaInferTest.java @@ -23,12 +23,8 @@ import com.google.protobuf.ByteString; import com.pingcap.tikv.catalog.CatalogTransaction; -import com.pingcap.tikv.expression.AggregateFunction; +import com.pingcap.tikv.expression.*; 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.meta.TiTimestamp; diff --git a/tikv-client/src/test/java/com/pingcap/tikv/operation/iterator/DAGIteratorTest.java b/tikv-client/src/test/java/com/pingcap/tikv/operation/iterator/DAGIteratorTest.java index f68950d93b..673fe92b54 100644 --- a/tikv-client/src/test/java/com/pingcap/tikv/operation/iterator/DAGIteratorTest.java +++ b/tikv-client/src/test/java/com/pingcap/tikv/operation/iterator/DAGIteratorTest.java @@ -19,7 +19,9 @@ import com.google.common.collect.ImmutableList; import com.google.protobuf.ByteString; -import com.pingcap.tikv.*; +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; diff --git a/tikv-client/src/test/java/com/pingcap/tikv/predicates/IndexMatcherTest.java b/tikv-client/src/test/java/com/pingcap/tikv/predicates/IndexMatcherTest.java index 4511ba068f..e703ce05df 100644 --- a/tikv-client/src/test/java/com/pingcap/tikv/predicates/IndexMatcherTest.java +++ b/tikv-client/src/test/java/com/pingcap/tikv/predicates/IndexMatcherTest.java @@ -15,10 +15,7 @@ package com.pingcap.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.ComparisonBinaryExpression.*; import static com.pingcap.tikv.expression.LogicalBinaryExpression.and; import static com.pingcap.tikv.expression.LogicalBinaryExpression.or; import static org.junit.Assert.assertFalse; diff --git a/tikv-client/src/test/java/com/pingcap/tikv/txn/LockResolverTest.java b/tikv-client/src/test/java/com/pingcap/tikv/txn/LockResolverTest.java index 384ed9c23c..005bf469be 100644 --- a/tikv-client/src/test/java/com/pingcap/tikv/txn/LockResolverTest.java +++ b/tikv-client/src/test/java/com/pingcap/tikv/txn/LockResolverTest.java @@ -16,11 +16,7 @@ package com.pingcap.tikv.txn; import static com.pingcap.tikv.util.BackOffFunction.BackOffFuncType.BoTxnLock; -import static junit.framework.TestCase.assertEquals; -import static junit.framework.TestCase.assertNotNull; -import static junit.framework.TestCase.assertNotSame; -import static junit.framework.TestCase.assertTrue; -import static junit.framework.TestCase.fail; +import static junit.framework.TestCase.*; import com.google.protobuf.ByteString; import com.pingcap.tikv.ReadOnlyPDClient; @@ -43,14 +39,7 @@ import org.apache.log4j.Logger; import org.junit.Before; import org.junit.Test; -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.Kvrpcpb.*; import org.tikv.kvproto.TikvGrpc; public class LockResolverTest {