diff --git a/src/main/java/demo/catlets/ShareJoin.java b/src/main/java/demo/catlets/ShareJoin.java index 458caeb3f..b34709995 100644 --- a/src/main/java/demo/catlets/ShareJoin.java +++ b/src/main/java/demo/catlets/ShareJoin.java @@ -24,14 +24,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - - - - - - - - //import org.opencloudb.route.RouteStrategy; //import org.opencloudb.route.impl.DruidMysqlRouteStrategy; //import org.opencloudb.parser.druid.DruidParser; diff --git a/src/main/java/io/mycat/backend/jdbc/JDBCConnection.java b/src/main/java/io/mycat/backend/jdbc/JDBCConnection.java index c39326ecd..774e22776 100644 --- a/src/main/java/io/mycat/backend/jdbc/JDBCConnection.java +++ b/src/main/java/io/mycat/backend/jdbc/JDBCConnection.java @@ -9,7 +9,12 @@ import io.mycat.server.MySQLFrontConnection; import io.mycat.server.executors.ConnectionHeartBeatHandler; import io.mycat.server.executors.ResponseHandler; -import io.mycat.server.packet.*; +import io.mycat.server.packet.EOFPacket; +import io.mycat.server.packet.ErrorPacket; +import io.mycat.server.packet.FieldPacket; +import io.mycat.server.packet.OkPacket; +import io.mycat.server.packet.ResultSetHeaderPacket; +import io.mycat.server.packet.RowDataPacket; import io.mycat.server.parser.ServerParse; import io.mycat.server.response.ShowVariables; import io.mycat.util.ResultSetUtil; diff --git a/src/main/java/io/mycat/backend/jdbc/JDBCHeartbeat.java b/src/main/java/io/mycat/backend/jdbc/JDBCHeartbeat.java index a76877fd4..5c9c32848 100644 --- a/src/main/java/io/mycat/backend/jdbc/JDBCHeartbeat.java +++ b/src/main/java/io/mycat/backend/jdbc/JDBCHeartbeat.java @@ -4,7 +4,6 @@ import io.mycat.backend.heartbeat.DBHeartbeat; import java.sql.Connection; -import java.sql.SQLException; import java.sql.Statement; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/main/java/io/mycat/backend/jdbc/mongodb/MongoData.java b/src/main/java/io/mycat/backend/jdbc/mongodb/MongoData.java index 529eb35be..5ebf81e8c 100644 --- a/src/main/java/io/mycat/backend/jdbc/mongodb/MongoData.java +++ b/src/main/java/io/mycat/backend/jdbc/mongodb/MongoData.java @@ -6,9 +6,9 @@ import java.sql.Types; import java.util.HashMap; +import com.mongodb.BasicDBList; import com.mongodb.DBCursor; import com.mongodb.DBObject; -import com.mongodb.BasicDBList; public class MongoData { diff --git a/src/main/java/io/mycat/backend/jdbc/mongodb/MongoResultSet.java b/src/main/java/io/mycat/backend/jdbc/mongodb/MongoResultSet.java index d31824097..8013e2a59 100644 --- a/src/main/java/io/mycat/backend/jdbc/mongodb/MongoResultSet.java +++ b/src/main/java/io/mycat/backend/jdbc/mongodb/MongoResultSet.java @@ -1,9 +1,5 @@ package io.mycat.backend.jdbc.mongodb; -import com.mongodb.BasicDBList; -import com.mongodb.DBCursor; -import com.mongodb.DBObject; - import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; @@ -30,6 +26,10 @@ //import java.util.HashMap; import java.util.Map; import java.util.Set; + +import com.mongodb.BasicDBList; +import com.mongodb.DBCursor; +import com.mongodb.DBObject; /** * 功能详细描述 * @author sohudo[http://blog.csdn.net/wind520] diff --git a/src/main/java/io/mycat/backend/jdbc/mongodb/MongoResultSetMetaData.java b/src/main/java/io/mycat/backend/jdbc/mongodb/MongoResultSetMetaData.java index 92949fadf..52d503115 100644 --- a/src/main/java/io/mycat/backend/jdbc/mongodb/MongoResultSetMetaData.java +++ b/src/main/java/io/mycat/backend/jdbc/mongodb/MongoResultSetMetaData.java @@ -4,7 +4,6 @@ import java.sql.SQLException; import java.sql.Types; //import java.util.Arrays; -import java.util.Set; /** * 功能详细描述 * @author sohudo[http://blog.csdn.net/wind520] diff --git a/src/main/java/io/mycat/backend/jdbc/mongodb/MongoSQLParser.java b/src/main/java/io/mycat/backend/jdbc/mongodb/MongoSQLParser.java index 225e0802b..dd8544478 100644 --- a/src/main/java/io/mycat/backend/jdbc/mongodb/MongoSQLParser.java +++ b/src/main/java/io/mycat/backend/jdbc/mongodb/MongoSQLParser.java @@ -8,21 +8,40 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.mongodb.BasicDBList; -import com.mongodb.BasicDBObject; -import com.mongodb.DB; -import com.mongodb.DBCollection; -import com.mongodb.DBCursor; -import com.mongodb.DBObject; import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.ast.SQLOrderingSpecification; import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr; +import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr; +import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; +import com.alibaba.druid.sql.ast.expr.SQLBooleanExpr; +import com.alibaba.druid.sql.ast.expr.SQLCharExpr; +import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; +import com.alibaba.druid.sql.ast.expr.SQLNullExpr; +import com.alibaba.druid.sql.ast.expr.SQLNumberExpr; +import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; +import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; +import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement; +import com.alibaba.druid.sql.ast.statement.SQLDropTableStatement; +import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; +import com.alibaba.druid.sql.ast.statement.SQLSelectGroupByClause; +import com.alibaba.druid.sql.ast.statement.SQLSelectItem; +import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; +import com.alibaba.druid.sql.ast.statement.SQLSelectQuery; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.ast.statement.SQLTableSource; +import com.alibaba.druid.sql.ast.statement.SQLUpdateSetItem; +import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement; import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlSelectGroupByExpr; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.ast.statement.*; -import com.alibaba.druid.sql.ast.expr.*; -import com.alibaba.druid.sql.ast.*; +import com.mongodb.BasicDBList; +import com.mongodb.BasicDBObject; +import com.mongodb.DB; +import com.mongodb.DBCollection; +import com.mongodb.DBCursor; +import com.mongodb.DBObject; /** * 功能详细描述 * @author sohudo[http://blog.csdn.net/wind520] diff --git a/src/main/java/io/mycat/backend/jdbc/mongodb/MongoStatement.java b/src/main/java/io/mycat/backend/jdbc/mongodb/MongoStatement.java index 16f26c015..48c880159 100644 --- a/src/main/java/io/mycat/backend/jdbc/mongodb/MongoStatement.java +++ b/src/main/java/io/mycat/backend/jdbc/mongodb/MongoStatement.java @@ -1,7 +1,5 @@ package io.mycat.backend.jdbc.mongodb; -import com.mongodb.DBCursor; - import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/src/main/java/io/mycat/backend/jdbc/sequoiadb/SequoiaConnection.java b/src/main/java/io/mycat/backend/jdbc/sequoiadb/SequoiaConnection.java index 17d783fec..368b4b261 100644 --- a/src/main/java/io/mycat/backend/jdbc/sequoiadb/SequoiaConnection.java +++ b/src/main/java/io/mycat/backend/jdbc/sequoiadb/SequoiaConnection.java @@ -20,8 +20,8 @@ import java.util.Properties; import java.util.concurrent.Executor; -import com.sequoiadb.base.Sequoiadb; import com.sequoiadb.base.CollectionSpace; +import com.sequoiadb.base.Sequoiadb; import com.sequoiadb.exception.BaseException; /** * 功能详细描述 diff --git a/src/main/java/io/mycat/backend/jdbc/sequoiadb/SequoiaData.java b/src/main/java/io/mycat/backend/jdbc/sequoiadb/SequoiaData.java index 9a4ef2715..357620069 100644 --- a/src/main/java/io/mycat/backend/jdbc/sequoiadb/SequoiaData.java +++ b/src/main/java/io/mycat/backend/jdbc/sequoiadb/SequoiaData.java @@ -7,8 +7,8 @@ import java.util.HashMap; import org.bson.BSONObject; -import org.bson.BasicBSONObject; import org.bson.types.BasicBSONList; + import com.sequoiadb.base.DBCursor; public class SequoiaData { diff --git a/src/main/java/io/mycat/backend/jdbc/sequoiadb/SequoiaResultSet.java b/src/main/java/io/mycat/backend/jdbc/sequoiadb/SequoiaResultSet.java index 83b6f7c9e..6501e52a5 100644 --- a/src/main/java/io/mycat/backend/jdbc/sequoiadb/SequoiaResultSet.java +++ b/src/main/java/io/mycat/backend/jdbc/sequoiadb/SequoiaResultSet.java @@ -1,10 +1,6 @@ package io.mycat.backend.jdbc.sequoiadb; -import com.sequoiadb.base.DBCursor; -import org.bson.BSONObject; -import org.bson.types.BasicBSONList; - import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; @@ -31,6 +27,11 @@ //import java.util.HashMap; import java.util.Map; import java.util.Set; + +import org.bson.BSONObject; +import org.bson.types.BasicBSONList; + +import com.sequoiadb.base.DBCursor; /** * 功能详细描述 * @author sohudo[http://blog.csdn.net/wind520] diff --git a/src/main/java/io/mycat/backend/jdbc/sequoiadb/SequoiaSQLParser.java b/src/main/java/io/mycat/backend/jdbc/sequoiadb/SequoiaSQLParser.java index d4caff0a3..c430ac572 100644 --- a/src/main/java/io/mycat/backend/jdbc/sequoiadb/SequoiaSQLParser.java +++ b/src/main/java/io/mycat/backend/jdbc/sequoiadb/SequoiaSQLParser.java @@ -5,26 +5,43 @@ import java.sql.Types; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.sequoiadb.base.CollectionSpace; -import com.sequoiadb.base.DBCollection; -import com.sequoiadb.base.DBCursor; - import org.bson.BSONObject; import org.bson.BasicBSONObject; import org.bson.types.BasicBSONList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.ast.SQLOrderingSpecification; import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr; +import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr; +import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; +import com.alibaba.druid.sql.ast.expr.SQLBooleanExpr; +import com.alibaba.druid.sql.ast.expr.SQLCharExpr; +import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; +import com.alibaba.druid.sql.ast.expr.SQLNullExpr; +import com.alibaba.druid.sql.ast.expr.SQLNumberExpr; +import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; +import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; +import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement; +import com.alibaba.druid.sql.ast.statement.SQLDropTableStatement; +import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; +import com.alibaba.druid.sql.ast.statement.SQLSelectGroupByClause; +import com.alibaba.druid.sql.ast.statement.SQLSelectItem; +import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; +import com.alibaba.druid.sql.ast.statement.SQLSelectQuery; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.ast.statement.SQLTableSource; +import com.alibaba.druid.sql.ast.statement.SQLUpdateSetItem; +import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement; import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlSelectGroupByExpr; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.ast.statement.*; -import com.alibaba.druid.sql.ast.expr.*; -import com.alibaba.druid.sql.ast.*; +import com.sequoiadb.base.CollectionSpace; +import com.sequoiadb.base.DBCollection; +import com.sequoiadb.base.DBCursor; /** * 功能详细描述 * @author sohudo[http://blog.csdn.net/wind520] diff --git a/src/main/java/io/mycat/cache/impl/LevelDBCachePooFactory.java b/src/main/java/io/mycat/cache/impl/LevelDBCachePooFactory.java index 0ebedc0ec..9e71a761d 100644 --- a/src/main/java/io/mycat/cache/impl/LevelDBCachePooFactory.java +++ b/src/main/java/io/mycat/cache/impl/LevelDBCachePooFactory.java @@ -1,13 +1,12 @@ package io.mycat.cache.impl; +import static org.iq80.leveldb.impl.Iq80DBFactory.factory; import io.mycat.cache.CachePool; import io.mycat.cache.CachePoolFactory; import java.io.File; -import static org.iq80.leveldb.impl.Iq80DBFactory.factory; - import org.iq80.leveldb.DB; import org.iq80.leveldb.Options; diff --git a/src/main/java/io/mycat/net/Connection.java b/src/main/java/io/mycat/net/Connection.java index 8e15972f4..3a29c9ff1 100644 --- a/src/main/java/io/mycat/net/Connection.java +++ b/src/main/java/io/mycat/net/Connection.java @@ -1,5 +1,7 @@ package io.mycat.net; +import io.mycat.util.TimeUtil; + import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.SelectionKey; @@ -10,7 +12,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; -import io.mycat.util.TimeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/mycat/net/NetSystem.java b/src/main/java/io/mycat/net/NetSystem.java index 9075ba490..8b5d2b49b 100644 --- a/src/main/java/io/mycat/net/NetSystem.java +++ b/src/main/java/io/mycat/net/NetSystem.java @@ -1,6 +1,9 @@ package io.mycat.net; import io.mycat.backend.BackendConnection; +import io.mycat.server.MycatServer; +import io.mycat.server.SystemConfig; +import io.mycat.util.TimeUtil; import java.io.IOException; import java.net.StandardSocketOptions; @@ -10,10 +13,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import io.mycat.server.MycatServer; -import io.mycat.server.SystemConfig; - -import io.mycat.util.TimeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/mycat/net/ThreadLocalBufferPool.java b/src/main/java/io/mycat/net/ThreadLocalBufferPool.java index f57960aae..bef438a86 100644 --- a/src/main/java/io/mycat/net/ThreadLocalBufferPool.java +++ b/src/main/java/io/mycat/net/ThreadLocalBufferPool.java @@ -1,6 +1,5 @@ package io.mycat.net; -import io.mycat.net.BufferQueue; public class ThreadLocalBufferPool extends ThreadLocal { private final int size; diff --git a/src/main/java/io/mycat/route/RouteResultset.java b/src/main/java/io/mycat/route/RouteResultset.java index 70699cae9..40dba3cda 100644 --- a/src/main/java/io/mycat/route/RouteResultset.java +++ b/src/main/java/io/mycat/route/RouteResultset.java @@ -23,9 +23,7 @@ */ package io.mycat.route; -import io.mycat.MycatConfig; import io.mycat.route.util.PageSQLUtil; -import io.mycat.server.MycatServer; import io.mycat.server.config.SchemaConfig; import io.mycat.sqlengine.mpp.HavingCols; import io.mycat.util.FormatUtil; diff --git a/src/main/java/io/mycat/route/factory/RouteStrategyFactory.java b/src/main/java/io/mycat/route/factory/RouteStrategyFactory.java index ccee69425..8f2ad5430 100644 --- a/src/main/java/io/mycat/route/factory/RouteStrategyFactory.java +++ b/src/main/java/io/mycat/route/factory/RouteStrategyFactory.java @@ -4,8 +4,6 @@ import io.mycat.route.impl.DruidMycatRouteStrategy; import io.mycat.server.MycatServer; -import java.util.HashMap; -import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/src/main/java/io/mycat/route/function/PartitionByMod.java b/src/main/java/io/mycat/route/function/PartitionByMod.java index 40fc6e7d6..377db18ea 100644 --- a/src/main/java/io/mycat/route/function/PartitionByMod.java +++ b/src/main/java/io/mycat/route/function/PartitionByMod.java @@ -25,14 +25,11 @@ import io.mycat.server.config.RuleAlgorithm; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.math.BigInteger; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Properties; /** * number column partion by Mod operator diff --git a/src/main/java/io/mycat/route/function/PartitionByMurmurHash.java b/src/main/java/io/mycat/route/function/PartitionByMurmurHash.java index 01e3b751d..c956946e5 100644 --- a/src/main/java/io/mycat/route/function/PartitionByMurmurHash.java +++ b/src/main/java/io/mycat/route/function/PartitionByMurmurHash.java @@ -29,14 +29,8 @@ import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; -import java.io.OutputStream; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/io/mycat/route/function/PartitionByRangeDateHash.java b/src/main/java/io/mycat/route/function/PartitionByRangeDateHash.java index aa7e6d723..fd7c3822e 100644 --- a/src/main/java/io/mycat/route/function/PartitionByRangeDateHash.java +++ b/src/main/java/io/mycat/route/function/PartitionByRangeDateHash.java @@ -1,14 +1,14 @@ package io.mycat.route.function; -import com.google.common.hash.Hashing; - -import org.apache.log4j.Logger; - import io.mycat.server.config.RuleAlgorithm; import java.text.ParseException; import java.text.SimpleDateFormat; +import org.apache.log4j.Logger; + +import com.google.common.hash.Hashing; + /** * 先根据日期分组,再根据时间hash使得短期内数据分布的更均匀 * 优点可以避免扩容时的数据迁移,又可以一定程度上避免范围分片的热点问题 diff --git a/src/main/java/io/mycat/route/parser/druid/DruidParser.java b/src/main/java/io/mycat/route/parser/druid/DruidParser.java index 0b685326e..22454c17e 100644 --- a/src/main/java/io/mycat/route/parser/druid/DruidParser.java +++ b/src/main/java/io/mycat/route/parser/druid/DruidParser.java @@ -6,7 +6,6 @@ import java.sql.SQLNonTransientException; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.sql.ast.SQLStatement; /** diff --git a/src/main/java/io/mycat/route/parser/druid/DruidParserFactory.java b/src/main/java/io/mycat/route/parser/druid/DruidParserFactory.java index 92d79261c..35016cc34 100644 --- a/src/main/java/io/mycat/route/parser/druid/DruidParserFactory.java +++ b/src/main/java/io/mycat/route/parser/druid/DruidParserFactory.java @@ -1,15 +1,33 @@ package io.mycat.route.parser.druid; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.*; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; - -import io.mycat.route.parser.druid.impl.*; +import io.mycat.route.parser.druid.impl.DefaultDruidParser; +import io.mycat.route.parser.druid.impl.DruidAlterTableParser; +import io.mycat.route.parser.druid.impl.DruidCreateTableParser; +import io.mycat.route.parser.druid.impl.DruidDeleteParser; +import io.mycat.route.parser.druid.impl.DruidInsertParser; +import io.mycat.route.parser.druid.impl.DruidSelectDb2Parser; +import io.mycat.route.parser.druid.impl.DruidSelectOracleParser; +import io.mycat.route.parser.druid.impl.DruidSelectParser; +import io.mycat.route.parser.druid.impl.DruidSelectPostgresqlParser; +import io.mycat.route.parser.druid.impl.DruidSelectSqlServerParser; +import io.mycat.route.parser.druid.impl.DruidUpdateParser; import io.mycat.server.config.SchemaConfig; import io.mycat.server.config.TableConfig; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlDeleteStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; +import com.alibaba.druid.sql.visitor.SchemaStatVisitor; /** * DruidParser的工厂类 diff --git a/src/main/java/io/mycat/route/parser/druid/DruidShardingParseInfo.java b/src/main/java/io/mycat/route/parser/druid/DruidShardingParseInfo.java index 6a34c0752..f13ba2850 100644 --- a/src/main/java/io/mycat/route/parser/druid/DruidShardingParseInfo.java +++ b/src/main/java/io/mycat/route/parser/druid/DruidShardingParseInfo.java @@ -1,15 +1,9 @@ package io.mycat.route.parser.druid; -import io.mycat.sqlengine.mpp.ColumnRoutePair; -import io.mycat.sqlengine.mpp.RangeValue; - import java.util.ArrayList; -import java.util.HashSet; import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Set; /** * druid parser result diff --git a/src/main/java/io/mycat/route/parser/druid/MycatLexer.java b/src/main/java/io/mycat/route/parser/druid/MycatLexer.java index 21a019327..691e2d225 100644 --- a/src/main/java/io/mycat/route/parser/druid/MycatLexer.java +++ b/src/main/java/io/mycat/route/parser/druid/MycatLexer.java @@ -1,12 +1,12 @@ package io.mycat.route.parser.druid; +import java.util.HashMap; +import java.util.Map; + import com.alibaba.druid.sql.dialect.mysql.parser.MySqlLexer; import com.alibaba.druid.sql.parser.Keywords; import com.alibaba.druid.sql.parser.Token; -import java.util.HashMap; -import java.util.Map; - /** * Created by magicdoom on 2015/3/13. */ diff --git a/src/main/java/io/mycat/route/parser/druid/MycatStatementParser.java b/src/main/java/io/mycat/route/parser/druid/MycatStatementParser.java index cacde44fa..0965633bf 100644 --- a/src/main/java/io/mycat/route/parser/druid/MycatStatementParser.java +++ b/src/main/java/io/mycat/route/parser/druid/MycatStatementParser.java @@ -6,7 +6,10 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlLoadDataInFileStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.parser.*; +import com.alibaba.druid.sql.parser.Lexer; +import com.alibaba.druid.sql.parser.ParserException; +import com.alibaba.druid.sql.parser.SQLExprParser; +import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.util.JdbcConstants; /** diff --git a/src/main/java/io/mycat/route/parser/druid/impl/DruidSelectDb2Parser.java b/src/main/java/io/mycat/route/parser/druid/impl/DruidSelectDb2Parser.java index 75f87c8a2..3bcad991c 100644 --- a/src/main/java/io/mycat/route/parser/druid/impl/DruidSelectDb2Parser.java +++ b/src/main/java/io/mycat/route/parser/druid/impl/DruidSelectDb2Parser.java @@ -1,22 +1,27 @@ package io.mycat.route.parser.druid.impl; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLOrderBy; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.expr.*; -import com.alibaba.druid.sql.ast.statement.*; -import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelect; -import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectQueryBlock; -import com.alibaba.druid.util.JdbcConstants; - import io.mycat.route.RouteResultset; -import io.mycat.route.util.PageSQLUtil; import io.mycat.server.config.SchemaConfig; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLOrderBy; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr; +import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; +import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; +import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; +import com.alibaba.druid.sql.ast.statement.SQLSelectItem; +import com.alibaba.druid.sql.ast.statement.SQLSelectQuery; +import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource; +import com.alibaba.druid.sql.ast.statement.SQLTableSource; +import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelect; +import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectQueryBlock; +import com.alibaba.druid.util.JdbcConstants; + /** * 由于druid的db2解析部分不够完整,且使用oracle的解析基本能满足需求 diff --git a/src/main/java/io/mycat/route/parser/druid/impl/DruidSelectOracleParser.java b/src/main/java/io/mycat/route/parser/druid/impl/DruidSelectOracleParser.java index cd75e750f..78f409cf2 100644 --- a/src/main/java/io/mycat/route/parser/druid/impl/DruidSelectOracleParser.java +++ b/src/main/java/io/mycat/route/parser/druid/impl/DruidSelectOracleParser.java @@ -1,8 +1,24 @@ package io.mycat.route.parser.druid.impl; -import com.alibaba.druid.sql.ast.*; -import com.alibaba.druid.sql.ast.expr.*; -import com.alibaba.druid.sql.ast.statement.*; +import io.mycat.route.RouteResultset; +import io.mycat.server.config.SchemaConfig; + +import java.util.List; +import java.util.Map; + +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLOrderBy; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr; +import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; +import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; +import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; +import com.alibaba.druid.sql.ast.statement.SQLSelectItem; +import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; +import com.alibaba.druid.sql.ast.statement.SQLSelectQuery; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource; +import com.alibaba.druid.sql.ast.statement.SQLTableSource; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock.Limit; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelect; @@ -10,13 +26,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.util.JdbcConstants; -import io.mycat.route.RouteResultset; -import io.mycat.route.util.PageSQLUtil; -import io.mycat.server.config.SchemaConfig; - -import java.util.List; -import java.util.Map; - public class DruidSelectOracleParser extends DruidSelectParser { @Override diff --git a/src/main/java/io/mycat/route/parser/druid/impl/DruidSelectParser.java b/src/main/java/io/mycat/route/parser/druid/impl/DruidSelectParser.java index fd262fe9c..d9fc04e31 100644 --- a/src/main/java/io/mycat/route/parser/druid/impl/DruidSelectParser.java +++ b/src/main/java/io/mycat/route/parser/druid/impl/DruidSelectParser.java @@ -1,5 +1,21 @@ package io.mycat.route.parser.druid.impl; +import io.mycat.cache.LayerCachePool; +import io.mycat.route.RouteResultset; +import io.mycat.route.RouteResultsetNode; +import io.mycat.route.parser.druid.RouteCalculateUnit; +import io.mycat.route.util.RouterUtil; +import io.mycat.server.ErrorCode; +import io.mycat.server.MycatServer; +import io.mycat.server.config.SchemaConfig; +import io.mycat.server.config.TableConfig; +import io.mycat.sqlengine.mpp.ColumnRoutePair; +import io.mycat.sqlengine.mpp.HavingCols; +import io.mycat.sqlengine.mpp.MergeCol; +import io.mycat.sqlengine.mpp.OrderCol; +import io.mycat.util.ObjectUtil; +import io.mycat.util.StringUtil; + import java.sql.SQLNonTransientException; import java.util.HashMap; import java.util.Iterator; @@ -10,13 +26,20 @@ import java.util.SortedSet; import java.util.TreeSet; -import com.alibaba.druid.sql.ast.expr.*; - - import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLOrderingSpecification; import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr; +import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr; +import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; +import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; +import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; +import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; +import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; +import com.alibaba.druid.sql.ast.expr.SQLNumericLiteralExpr; +import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; +import com.alibaba.druid.sql.ast.expr.SQLTextLiteralExpr; import com.alibaba.druid.sql.ast.statement.SQLSelectGroupByClause; import com.alibaba.druid.sql.ast.statement.SQLSelectItem; import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; @@ -29,21 +52,6 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnionQuery; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.wall.spi.WallVisitorUtils; -import io.mycat.cache.LayerCachePool; -import io.mycat.route.RouteResultset; -import io.mycat.route.RouteResultsetNode; -import io.mycat.route.parser.druid.RouteCalculateUnit; -import io.mycat.route.util.RouterUtil; -import io.mycat.server.ErrorCode; -import io.mycat.server.MycatServer; -import io.mycat.server.config.SchemaConfig; -import io.mycat.server.config.TableConfig; -import io.mycat.sqlengine.mpp.ColumnRoutePair; -import io.mycat.sqlengine.mpp.HavingCols; -import io.mycat.sqlengine.mpp.MergeCol; -import io.mycat.sqlengine.mpp.OrderCol; -import io.mycat.util.ObjectUtil; -import io.mycat.util.StringUtil; public class DruidSelectParser extends DefaultDruidParser { diff --git a/src/main/java/io/mycat/route/parser/druid/impl/DruidSelectSqlServerParser.java b/src/main/java/io/mycat/route/parser/druid/impl/DruidSelectSqlServerParser.java index 9fa5783f7..a15ff0c55 100644 --- a/src/main/java/io/mycat/route/parser/druid/impl/DruidSelectSqlServerParser.java +++ b/src/main/java/io/mycat/route/parser/druid/impl/DruidSelectSqlServerParser.java @@ -1,5 +1,11 @@ package io.mycat.route.parser.druid.impl; +import io.mycat.route.RouteResultset; +import io.mycat.server.config.SchemaConfig; + +import java.util.List; +import java.util.Map; + import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.ast.SQLStatement; @@ -7,7 +13,12 @@ import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; -import com.alibaba.druid.sql.ast.statement.*; +import com.alibaba.druid.sql.ast.statement.SQLSelectItem; +import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; +import com.alibaba.druid.sql.ast.statement.SQLSelectQuery; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource; +import com.alibaba.druid.sql.ast.statement.SQLTableSource; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelect; import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock; @@ -15,13 +26,6 @@ import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser; import com.alibaba.druid.util.JdbcConstants; -import io.mycat.route.RouteResultset; -import io.mycat.route.util.PageSQLUtil; -import io.mycat.server.config.SchemaConfig; - -import java.util.List; -import java.util.Map; - public class DruidSelectSqlServerParser extends DruidSelectParser { diff --git a/src/main/java/io/mycat/route/util/PageSQLUtil.java b/src/main/java/io/mycat/route/util/PageSQLUtil.java index da7708859..84f0fc95d 100644 --- a/src/main/java/io/mycat/route/util/PageSQLUtil.java +++ b/src/main/java/io/mycat/route/util/PageSQLUtil.java @@ -1,12 +1,26 @@ package io.mycat.route.util; +import java.util.List; + import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.ast.SQLOver; -import com.alibaba.druid.sql.ast.expr.*; -import com.alibaba.druid.sql.ast.statement.*; +import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr; +import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr; +import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; +import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; +import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; +import com.alibaba.druid.sql.ast.expr.SQLNumberExpr; +import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; +import com.alibaba.druid.sql.ast.statement.SQLSelect; +import com.alibaba.druid.sql.ast.statement.SQLSelectItem; +import com.alibaba.druid.sql.ast.statement.SQLSelectQuery; +import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource; +import com.alibaba.druid.sql.ast.statement.SQLTableSource; import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; @@ -18,8 +32,6 @@ import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser; import com.alibaba.druid.util.JdbcConstants; -import java.util.List; - /** * Created by magicdoom on 2015/3/15. */ diff --git a/src/main/java/io/mycat/route/util/RouterUtil.java b/src/main/java/io/mycat/route/util/RouterUtil.java index 49eebf43c..4253b042f 100644 --- a/src/main/java/io/mycat/route/util/RouterUtil.java +++ b/src/main/java/io/mycat/route/util/RouterUtil.java @@ -1,5 +1,6 @@ package io.mycat.route.util; +import io.mycat.backend.PhysicalDBNode; import io.mycat.cache.LayerCachePool; import io.mycat.route.RouteResultset; import io.mycat.route.RouteResultsetNode; @@ -18,7 +19,6 @@ import io.mycat.sqlengine.mpp.ColumnRoutePair; import io.mycat.sqlengine.mpp.LoadData; import io.mycat.util.StringUtil; -import io.mycat.backend.PhysicalDBNode; import java.sql.SQLNonTransientException; import java.sql.SQLSyntaxErrorException; diff --git a/src/main/java/io/mycat/route/util/VelocityUtil.java b/src/main/java/io/mycat/route/util/VelocityUtil.java index 3bbc7bade..fc2a67ba9 100644 --- a/src/main/java/io/mycat/route/util/VelocityUtil.java +++ b/src/main/java/io/mycat/route/util/VelocityUtil.java @@ -3,6 +3,7 @@ import java.io.IOException; import java.io.StringWriter; import java.io.Writer; + import org.apache.log4j.Logger; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; diff --git a/src/main/java/io/mycat/server/classloader/JarLoader.java b/src/main/java/io/mycat/server/classloader/JarLoader.java index 36a559fd6..9ad9e1216 100644 --- a/src/main/java/io/mycat/server/classloader/JarLoader.java +++ b/src/main/java/io/mycat/server/classloader/JarLoader.java @@ -1,12 +1,18 @@ package io.mycat.server.classloader; -import java.util.jar.*; -import java.lang.reflect.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.net.URL; import java.net.URLClassLoader; -import java.io.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.jar.Manifest; public class JarLoader { /** Unpack a jar file into a directory. */ diff --git a/src/main/java/io/mycat/server/config/XMLSchemaLoader.java b/src/main/java/io/mycat/server/config/XMLSchemaLoader.java index 33f75714d..e47ba087f 100644 --- a/src/main/java/io/mycat/server/config/XMLSchemaLoader.java +++ b/src/main/java/io/mycat/server/config/XMLSchemaLoader.java @@ -29,7 +29,14 @@ import java.io.IOException; import java.io.InputStream; import java.net.URI; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/src/main/java/io/mycat/server/packet/util/CharsetUtil.java b/src/main/java/io/mycat/server/packet/util/CharsetUtil.java index 401516d77..cf615b77e 100644 --- a/src/main/java/io/mycat/server/packet/util/CharsetUtil.java +++ b/src/main/java/io/mycat/server/packet/util/CharsetUtil.java @@ -23,12 +23,14 @@ */ package io.mycat.server.packet.util; +import java.io.FileInputStream; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.FileInputStream; -import java.util.*; - /** * @author mycat */ @@ -38,7 +40,7 @@ public class CharsetUtil { private static final Map INDEX_TO_CHARSET = new HashMap<>(); private static final Map CHARSET_TO_INDEX = new HashMap<>(); static { - //ӳĬֵֹûδļ index_to_charset.properties + //��ӳ������Ĭ��ֵ����ֹ�û�δ�����ļ� index_to_charset.properties INDEX_TO_CHARSET.put(1,"big5"); INDEX_TO_CHARSET.put(8,"latin1"); INDEX_TO_CHARSET.put(9,"latin2"); diff --git a/src/main/java/io/mycat/server/response/SelectVariables.java b/src/main/java/io/mycat/server/response/SelectVariables.java index 5348366c1..1fb6dd3be 100644 --- a/src/main/java/io/mycat/server/response/SelectVariables.java +++ b/src/main/java/io/mycat/server/response/SelectVariables.java @@ -23,7 +23,6 @@ */ package io.mycat.server.response; -import com.google.common.base.Splitter; import io.mycat.net.BufferArray; import io.mycat.net.NetSystem; import io.mycat.server.Fields; @@ -33,14 +32,15 @@ import io.mycat.server.packet.ResultSetHeaderPacket; import io.mycat.server.packet.RowDataPacket; import io.mycat.server.packet.util.PacketUtil; -import org.apache.log4j.Logger; - -import java.nio.ByteBuffer; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.log4j.Logger; + +import com.google.common.base.Splitter; + /** * @author mycat */ diff --git a/src/main/java/io/mycat/server/sqlhandler/SelectHandler.java b/src/main/java/io/mycat/server/sqlhandler/SelectHandler.java index ca92f53bc..0cfc7f36e 100644 --- a/src/main/java/io/mycat/server/sqlhandler/SelectHandler.java +++ b/src/main/java/io/mycat/server/sqlhandler/SelectHandler.java @@ -26,7 +26,15 @@ import io.mycat.server.MySQLFrontConnection; import io.mycat.server.parser.ServerParse; import io.mycat.server.parser.ServerParseSelect; -import io.mycat.server.response.*; +import io.mycat.server.response.SelectDatabase; +import io.mycat.server.response.SelectIdentity; +import io.mycat.server.response.SelectLastInsertId; +import io.mycat.server.response.SelectUser; +import io.mycat.server.response.SelectVariables; +import io.mycat.server.response.SelectVersion; +import io.mycat.server.response.SelectVersionComment; +import io.mycat.server.response.SessionIncrement; +import io.mycat.server.response.SessionIsolation; import io.mycat.util.ParseUtil; /** diff --git a/src/main/java/io/mycat/sqlengine/sharejoin/JoinParser.java b/src/main/java/io/mycat/sqlengine/sharejoin/JoinParser.java index 885cbe6de..116e177cd 100644 --- a/src/main/java/io/mycat/sqlengine/sharejoin/JoinParser.java +++ b/src/main/java/io/mycat/sqlengine/sharejoin/JoinParser.java @@ -1,10 +1,10 @@ package io.mycat.sqlengine.sharejoin; -import java.util.LinkedHashMap; import java.util.List; import org.apache.log4j.Logger; + import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.ast.SQLOrderingSpecification; diff --git a/src/main/java/io/mycat/sqlengine/sharejoin/TableFilter.java b/src/main/java/io/mycat/sqlengine/sharejoin/TableFilter.java index d5d660604..074147abe 100644 --- a/src/main/java/io/mycat/sqlengine/sharejoin/TableFilter.java +++ b/src/main/java/io/mycat/sqlengine/sharejoin/TableFilter.java @@ -4,6 +4,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; + import org.apache.log4j.Logger; /** * 功能详细描述:分片join,单独的语句 diff --git a/src/main/java/io/mycat/sqlengine/tmp/RowDataSorter.java b/src/main/java/io/mycat/sqlengine/tmp/RowDataSorter.java index da7c36367..74266c64f 100644 --- a/src/main/java/io/mycat/sqlengine/tmp/RowDataSorter.java +++ b/src/main/java/io/mycat/sqlengine/tmp/RowDataSorter.java @@ -4,7 +4,8 @@ import io.mycat.sqlengine.mpp.OrderCol; import io.mycat.sqlengine.mpp.RowDataPacketSorter; -import java.util.*; +import java.util.Collection; +import java.util.List; /** * diff --git a/src/main/java/io/mycat/util/ByteBufferUtil.java b/src/main/java/io/mycat/util/ByteBufferUtil.java index f73587027..6dd09e581 100644 --- a/src/main/java/io/mycat/util/ByteBufferUtil.java +++ b/src/main/java/io/mycat/util/ByteBufferUtil.java @@ -23,7 +23,10 @@ * afterward, and ensure the tests still pass. */ -import java.io.*; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.io.InputStream; import java.net.InetAddress; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; diff --git a/src/main/java/io/mycat/util/FastByteOperations.java b/src/main/java/io/mycat/util/FastByteOperations.java index fe2615c83..a469ecea9 100644 --- a/src/main/java/io/mycat/util/FastByteOperations.java +++ b/src/main/java/io/mycat/util/FastByteOperations.java @@ -24,11 +24,12 @@ import java.security.AccessController; import java.security.PrivilegedAction; -import com.google.common.primitives.*; - - import sun.misc.Unsafe; +import com.google.common.primitives.Longs; +import com.google.common.primitives.UnsignedBytes; +import com.google.common.primitives.UnsignedLongs; + /** * Utility code to do optimized byte-array comparison. * This is borrowed and slightly modified from Guava's {@link UnsignedBytes} diff --git a/src/main/java/io/mycat/util/StringUtil.java b/src/main/java/io/mycat/util/StringUtil.java index 01a49a7c2..9a7ccdb14 100644 --- a/src/main/java/io/mycat/util/StringUtil.java +++ b/src/main/java/io/mycat/util/StringUtil.java @@ -23,15 +23,15 @@ */ package io.mycat.util; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import io.mycat.sqlengine.mpp.LoadData; import java.io.ByteArrayOutputStream; import java.io.UnsupportedEncodingException; import java.util.Random; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author mycat */ diff --git a/src/test/java/io/mycat/ConfigInitializerTest.java b/src/test/java/io/mycat/ConfigInitializerTest.java index f0b71e814..86c52f799 100644 --- a/src/test/java/io/mycat/ConfigInitializerTest.java +++ b/src/test/java/io/mycat/ConfigInitializerTest.java @@ -23,8 +23,6 @@ */ package io.mycat; -import io.mycat.ConfigInitializer; - import org.junit.Test; /** diff --git a/src/test/java/io/mycat/cache/DefaultLayedCachePoolTest.java b/src/test/java/io/mycat/cache/DefaultLayedCachePoolTest.java index 2dedcc4ee..1551c090b 100644 --- a/src/test/java/io/mycat/cache/DefaultLayedCachePoolTest.java +++ b/src/test/java/io/mycat/cache/DefaultLayedCachePoolTest.java @@ -23,8 +23,6 @@ */ package io.mycat.cache; -import io.mycat.cache.CacheStatic; -import io.mycat.cache.DefaultLayedCachePool; import io.mycat.cache.impl.EnchachePooFactory; import junit.framework.Assert; diff --git a/src/test/java/io/mycat/cache/EnCachePoolTest.java b/src/test/java/io/mycat/cache/EnCachePoolTest.java index 986b61b6c..b52ce5f70 100644 --- a/src/test/java/io/mycat/cache/EnCachePoolTest.java +++ b/src/test/java/io/mycat/cache/EnCachePoolTest.java @@ -23,7 +23,6 @@ */ package io.mycat.cache; -import io.mycat.cache.CacheStatic; import io.mycat.cache.impl.EnchachePool; import junit.framework.Assert; import net.sf.ehcache.Cache; diff --git a/src/test/java/io/mycat/cache/TestCachePoolPerformance.java b/src/test/java/io/mycat/cache/TestCachePoolPerformance.java index 742553fff..6d520a009 100644 --- a/src/test/java/io/mycat/cache/TestCachePoolPerformance.java +++ b/src/test/java/io/mycat/cache/TestCachePoolPerformance.java @@ -27,8 +27,6 @@ * test cache performance ,for encache test set VM param -server -Xms1100M -Xmx1100M * for mapdb set vm param -server -Xms100M -Xmx100M -XX:MaxPermSize=1G */ -import io.mycat.cache.CachePool; -import io.mycat.cache.CacheStatic; import io.mycat.cache.impl.EnchachePool; import io.mycat.cache.impl.MapDBCachePooFactory; import net.sf.ehcache.Cache; diff --git a/src/test/java/io/mycat/parser/TestEscapeProcess.java b/src/test/java/io/mycat/parser/TestEscapeProcess.java index 54c29db32..6a6939af7 100644 --- a/src/test/java/io/mycat/parser/TestEscapeProcess.java +++ b/src/test/java/io/mycat/parser/TestEscapeProcess.java @@ -17,11 +17,8 @@ package io.mycat.parser; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; import io.mycat.server.interceptor.impl.DefaultSqlInterceptor; -import java.sql.SQLSyntaxErrorException; - import org.junit.Test; public class TestEscapeProcess { diff --git a/src/test/java/io/mycat/parser/druid/MycatSchemaStatVisitorTest.java b/src/test/java/io/mycat/parser/druid/MycatSchemaStatVisitorTest.java index 19b6c096c..65c642310 100644 --- a/src/test/java/io/mycat/parser/druid/MycatSchemaStatVisitorTest.java +++ b/src/test/java/io/mycat/parser/druid/MycatSchemaStatVisitorTest.java @@ -1,15 +1,12 @@ package io.mycat.parser.druid; -import io.mycat.route.impl.DruidMycatRouteStrategy; import io.mycat.route.parser.druid.MycatSchemaStatVisitor; -import java.sql.SQLSyntaxErrorException; import java.util.ArrayList; import java.util.List; import junit.framework.Assert; -import org.apache.log4j.Logger; import org.junit.Test; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/io/mycat/performance/AbstractMultiTreadBatchTester.java b/src/test/java/io/mycat/performance/AbstractMultiTreadBatchTester.java index 53fa47694..bc1a15b4e 100644 --- a/src/test/java/io/mycat/performance/AbstractMultiTreadBatchTester.java +++ b/src/test/java/io/mycat/performance/AbstractMultiTreadBatchTester.java @@ -23,14 +23,12 @@ */ package io.mycat.performance; -import java.io.FileInputStream; import java.sql.SQLException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.LinkedList; -import java.util.Properties; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicLong; diff --git a/src/test/java/io/mycat/route/function/AutoPartitionByLongTest.java b/src/test/java/io/mycat/route/function/AutoPartitionByLongTest.java index b202289f5..d78ae61ba 100644 --- a/src/test/java/io/mycat/route/function/AutoPartitionByLongTest.java +++ b/src/test/java/io/mycat/route/function/AutoPartitionByLongTest.java @@ -23,7 +23,6 @@ */ package io.mycat.route.function; -import io.mycat.route.function.AutoPartitionByLong; import junit.framework.Assert; import org.junit.Test; diff --git a/src/test/java/io/mycat/route/function/PartitionByDateTest.java b/src/test/java/io/mycat/route/function/PartitionByDateTest.java index a93533214..fb69cedb8 100644 --- a/src/test/java/io/mycat/route/function/PartitionByDateTest.java +++ b/src/test/java/io/mycat/route/function/PartitionByDateTest.java @@ -23,8 +23,6 @@ */ package io.mycat.route.function; -import io.mycat.route.function.PartitionByDate; - import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/io/mycat/route/function/PartitionByJumpConsistentHashTest.java b/src/test/java/io/mycat/route/function/PartitionByJumpConsistentHashTest.java index c3252cce8..4f573c66c 100644 --- a/src/test/java/io/mycat/route/function/PartitionByJumpConsistentHashTest.java +++ b/src/test/java/io/mycat/route/function/PartitionByJumpConsistentHashTest.java @@ -1,6 +1,5 @@ package io.mycat.route.function; -import io.mycat.route.function.PartitionByJumpConsistentHash; import junit.framework.Assert; import org.junit.Test; diff --git a/src/test/java/io/mycat/route/function/PartitionByMonthTest.java b/src/test/java/io/mycat/route/function/PartitionByMonthTest.java index ea324de90..78907ea17 100644 --- a/src/test/java/io/mycat/route/function/PartitionByMonthTest.java +++ b/src/test/java/io/mycat/route/function/PartitionByMonthTest.java @@ -23,8 +23,6 @@ */ package io.mycat.route.function; -import io.mycat.route.function.PartitionByMonth; - import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/io/mycat/route/function/PartitionByPatternTest.java b/src/test/java/io/mycat/route/function/PartitionByPatternTest.java index d7812a50b..a22b4c67d 100644 --- a/src/test/java/io/mycat/route/function/PartitionByPatternTest.java +++ b/src/test/java/io/mycat/route/function/PartitionByPatternTest.java @@ -23,8 +23,6 @@ */ package io.mycat.route.function; -import io.mycat.route.function.PartitionByPattern; - import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/io/mycat/route/function/PartitionByPrefixPatternTest.java b/src/test/java/io/mycat/route/function/PartitionByPrefixPatternTest.java index 13078b86e..9ba9a38ae 100644 --- a/src/test/java/io/mycat/route/function/PartitionByPrefixPatternTest.java +++ b/src/test/java/io/mycat/route/function/PartitionByPrefixPatternTest.java @@ -23,7 +23,6 @@ */ package io.mycat.route.function; -import io.mycat.route.function.PartitionByPrefixPattern; import junit.framework.Assert; import org.junit.Test; diff --git a/src/test/java/io/mycat/route/function/PartitionByStringTest.java b/src/test/java/io/mycat/route/function/PartitionByStringTest.java index 0ce077068..9cd50961c 100644 --- a/src/test/java/io/mycat/route/function/PartitionByStringTest.java +++ b/src/test/java/io/mycat/route/function/PartitionByStringTest.java @@ -23,8 +23,6 @@ */ package io.mycat.route.function; -import io.mycat.route.function.PartitionByString; - import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/io/mycat/route/function/PartitionByVelocityTest.java b/src/test/java/io/mycat/route/function/PartitionByVelocityTest.java index 1e0942609..363b6c94f 100644 --- a/src/test/java/io/mycat/route/function/PartitionByVelocityTest.java +++ b/src/test/java/io/mycat/route/function/PartitionByVelocityTest.java @@ -23,8 +23,6 @@ */ package io.mycat.route.function; -import io.mycat.route.function.PartitionByString; - import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/io/mycat/route/function/TestLatestMonthPartion.java b/src/test/java/io/mycat/route/function/TestLatestMonthPartion.java index 5624b08a6..96ef15978 100644 --- a/src/test/java/io/mycat/route/function/TestLatestMonthPartion.java +++ b/src/test/java/io/mycat/route/function/TestLatestMonthPartion.java @@ -1,7 +1,6 @@ package io.mycat.route.function; import static org.junit.Assert.assertTrue; -import io.mycat.route.function.LatestMonthPartion; import org.junit.Test; diff --git a/src/test/java/io/mycat/route/function/TestNumberParseUtil.java b/src/test/java/io/mycat/route/function/TestNumberParseUtil.java index f0fd2bf3c..0caf7abcc 100644 --- a/src/test/java/io/mycat/route/function/TestNumberParseUtil.java +++ b/src/test/java/io/mycat/route/function/TestNumberParseUtil.java @@ -23,12 +23,10 @@ */ package io.mycat.route.function; -import io.mycat.route.function.NumberParseUtil; +import junit.framework.Assert; import org.junit.Test; -import junit.framework.Assert; - public class TestNumberParseUtil { @Test diff --git a/src/test/java/io/mycat/route/util/PartitionUtilTest.java b/src/test/java/io/mycat/route/util/PartitionUtilTest.java index d4cca9d90..164fd6531 100644 --- a/src/test/java/io/mycat/route/util/PartitionUtilTest.java +++ b/src/test/java/io/mycat/route/util/PartitionUtilTest.java @@ -23,8 +23,6 @@ */ package io.mycat.route.util; -import io.mycat.route.util.PartitionUtil; - import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/io/mycat/sqlexecute/TestJdbc.java b/src/test/java/io/mycat/sqlexecute/TestJdbc.java index db6fe5572..d92ff81aa 100644 --- a/src/test/java/io/mycat/sqlexecute/TestJdbc.java +++ b/src/test/java/io/mycat/sqlexecute/TestJdbc.java @@ -4,10 +4,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; public class TestJdbc { public static void main(String[] args) throws SQLException { diff --git a/src/test/java/io/mycat/util/HexFormatUtilMain.java b/src/test/java/io/mycat/util/HexFormatUtilMain.java index 613c461dc..7c946428e 100644 --- a/src/test/java/io/mycat/util/HexFormatUtilMain.java +++ b/src/test/java/io/mycat/util/HexFormatUtilMain.java @@ -23,8 +23,6 @@ */ package io.mycat.util; -import io.mycat.util.HexFormatUtil; - import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/io/mycat/util/SmallSetTest.java b/src/test/java/io/mycat/util/SmallSetTest.java index a4ab65e54..f7d1427f1 100644 --- a/src/test/java/io/mycat/util/SmallSetTest.java +++ b/src/test/java/io/mycat/util/SmallSetTest.java @@ -23,8 +23,6 @@ */ package io.mycat.util; -import io.mycat.util.SmallSet; - import java.util.Collection; import java.util.Iterator; diff --git a/src/test/java/io/mycat/util/SplitUtilTest.java b/src/test/java/io/mycat/util/SplitUtilTest.java index ec96bdfd4..b97aa4233 100644 --- a/src/test/java/io/mycat/util/SplitUtilTest.java +++ b/src/test/java/io/mycat/util/SplitUtilTest.java @@ -23,7 +23,6 @@ */ package io.mycat.util; -import io.mycat.util.SplitUtil; import junit.framework.Assert; import org.junit.Test; diff --git a/src/test/java/io/mycat/util/StringHashPerfMain.java b/src/test/java/io/mycat/util/StringHashPerfMain.java index 6fb59c2f8..281cd79b5 100644 --- a/src/test/java/io/mycat/util/StringHashPerfMain.java +++ b/src/test/java/io/mycat/util/StringHashPerfMain.java @@ -23,7 +23,6 @@ */ package io.mycat.util; -import io.mycat.util.StringUtil; /** * @author mycat diff --git a/src/test/java/io/mycat/util/StringUtilTest.java b/src/test/java/io/mycat/util/StringUtilTest.java index b31623661..a79bad6f5 100644 --- a/src/test/java/io/mycat/util/StringUtilTest.java +++ b/src/test/java/io/mycat/util/StringUtilTest.java @@ -23,8 +23,6 @@ */ package io.mycat.util; -import io.mycat.util.StringUtil; - import java.io.PrintWriter; import java.io.StringWriter;