optimize imports (pingcap#871)

wanfangdata · Jun 26, 2019 · 97512b6 · 97512b6
1 parent 823636e
commit 97512b6
Show file tree

Hide file tree

Showing 52 changed files with 76 additions and 235 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;