Merge pull request #468 from fireflyhoo/master

---remove invalid import

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;

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;

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;

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 {
 

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]

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]

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]

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;

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;
 /**  
  * 功能详细描述

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 {

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]

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]

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;
 

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;
 

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;
 

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<BufferQueue> {
 	private final int size;

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;

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;
 

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

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;

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使得短期内数据分布的更均匀
  * 优点可以避免扩容时的数据迁移，又可以一定程度上避免范围分片的热点问题

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;
 
 /**