diff --git a/src/main/java/com/alibaba/druid/hbase/HDriver.java b/src/main/java/com/alibaba/druid/hdriver/HDriver.java similarity index 92% rename from src/main/java/com/alibaba/druid/hbase/HDriver.java rename to src/main/java/com/alibaba/druid/hdriver/HDriver.java index b161e2f88a..1fb1668795 100644 --- a/src/main/java/com/alibaba/druid/hbase/HDriver.java +++ b/src/main/java/com/alibaba/druid/hdriver/HDriver.java @@ -1,11 +1,11 @@ -package com.alibaba.druid.hbase; +package com.alibaba.druid.hdriver; import java.sql.Driver; import java.sql.DriverPropertyInfo; import java.sql.SQLException; import java.util.Properties; -import com.alibaba.druid.hbase.jdbc.HBaseConnection; +import com.alibaba.druid.hdriver.jdbc.HBaseConnection; public class HDriver implements Driver { diff --git a/src/main/java/com/alibaba/druid/hbase/HEngine.java b/src/main/java/com/alibaba/druid/hdriver/HEngine.java similarity index 96% rename from src/main/java/com/alibaba/druid/hbase/HEngine.java rename to src/main/java/com/alibaba/druid/hdriver/HEngine.java index 01e793debb..1e9bfdd0be 100644 --- a/src/main/java/com/alibaba/druid/hbase/HEngine.java +++ b/src/main/java/com/alibaba/druid/hdriver/HEngine.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase; +package com.alibaba.druid.hdriver; import java.io.IOException; import java.util.Properties; @@ -10,7 +10,7 @@ import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTableInterface; import org.apache.hadoop.hbase.client.HTablePool; -import com.alibaba.druid.hbase.mapping.HMappingTable; +import com.alibaba.druid.hdriver.mapping.HMappingTable; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; diff --git a/src/main/java/com/alibaba/druid/hbase/exec/ExecutePlan.java b/src/main/java/com/alibaba/druid/hdriver/execute/ExecutePlan.java similarity index 59% rename from src/main/java/com/alibaba/druid/hbase/exec/ExecutePlan.java rename to src/main/java/com/alibaba/druid/hdriver/execute/ExecutePlan.java index 1cf89db325..b6ad4b14c7 100644 --- a/src/main/java/com/alibaba/druid/hbase/exec/ExecutePlan.java +++ b/src/main/java/com/alibaba/druid/hdriver/execute/ExecutePlan.java @@ -1,9 +1,9 @@ -package com.alibaba.druid.hbase.exec; +package com.alibaba.druid.hdriver.execute; import java.sql.SQLException; -import com.alibaba.druid.hbase.jdbc.HPreparedStatementImpl; -import com.alibaba.druid.hbase.jdbc.HResultSet; +import com.alibaba.druid.hdriver.jdbc.HPreparedStatementImpl; +import com.alibaba.druid.hdriver.jdbc.HResultSet; public interface ExecutePlan { diff --git a/src/main/java/com/alibaba/druid/hbase/exec/ExecutePlanAdapter.java b/src/main/java/com/alibaba/druid/hdriver/execute/ExecutePlanAdapter.java similarity index 72% rename from src/main/java/com/alibaba/druid/hbase/exec/ExecutePlanAdapter.java rename to src/main/java/com/alibaba/druid/hdriver/execute/ExecutePlanAdapter.java index 94a946a8b2..86f327233d 100644 --- a/src/main/java/com/alibaba/druid/hbase/exec/ExecutePlanAdapter.java +++ b/src/main/java/com/alibaba/druid/hdriver/execute/ExecutePlanAdapter.java @@ -1,9 +1,9 @@ -package com.alibaba.druid.hbase.exec; +package com.alibaba.druid.hdriver.execute; import java.sql.SQLException; -import com.alibaba.druid.hbase.jdbc.HPreparedStatementImpl; -import com.alibaba.druid.hbase.jdbc.HResultSet; +import com.alibaba.druid.hdriver.jdbc.HPreparedStatementImpl; +import com.alibaba.druid.hdriver.jdbc.HResultSet; public class ExecutePlanAdapter implements ExecutePlan { diff --git a/src/main/java/com/alibaba/druid/hbase/exec/HBaseUtils.java b/src/main/java/com/alibaba/druid/hdriver/execute/HBaseUtils.java similarity index 96% rename from src/main/java/com/alibaba/druid/hbase/exec/HBaseUtils.java rename to src/main/java/com/alibaba/druid/hdriver/execute/HBaseUtils.java index f25f53ef42..4adb1681a1 100644 --- a/src/main/java/com/alibaba/druid/hbase/exec/HBaseUtils.java +++ b/src/main/java/com/alibaba/druid/hdriver/execute/HBaseUtils.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.exec; +package com.alibaba.druid.hdriver.execute; import java.io.IOException; import java.math.BigDecimal; diff --git a/src/main/java/com/alibaba/druid/hbase/exec/InsertExecutePlan.java b/src/main/java/com/alibaba/druid/hdriver/execute/InsertExecutePlan.java similarity index 92% rename from src/main/java/com/alibaba/druid/hbase/exec/InsertExecutePlan.java rename to src/main/java/com/alibaba/druid/hdriver/execute/InsertExecutePlan.java index 7a5384d7fe..de9457153d 100644 --- a/src/main/java/com/alibaba/druid/hbase/exec/InsertExecutePlan.java +++ b/src/main/java/com/alibaba/druid/hdriver/execute/InsertExecutePlan.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.exec; +package com.alibaba.druid.hdriver.execute; import java.sql.SQLException; import java.util.LinkedHashMap; @@ -8,8 +8,8 @@ import org.apache.hadoop.hbase.client.HTableInterface; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.util.Bytes; -import com.alibaba.druid.hbase.jdbc.HBaseConnection; -import com.alibaba.druid.hbase.jdbc.HPreparedStatementImpl; +import com.alibaba.druid.hdriver.jdbc.HBaseConnection; +import com.alibaba.druid.hdriver.jdbc.HPreparedStatementImpl; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/main/java/com/alibaba/druid/hbase/exec/ShowTablesPlan.java b/src/main/java/com/alibaba/druid/hdriver/execute/ShowTablesPlan.java similarity index 96% rename from src/main/java/com/alibaba/druid/hbase/exec/ShowTablesPlan.java rename to src/main/java/com/alibaba/druid/hdriver/execute/ShowTablesPlan.java index 614e908031..a031373ac2 100644 --- a/src/main/java/com/alibaba/druid/hbase/exec/ShowTablesPlan.java +++ b/src/main/java/com/alibaba/druid/hdriver/execute/ShowTablesPlan.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.exec; +package com.alibaba.druid.hdriver.execute; import java.sql.SQLException; import java.sql.Statement; @@ -8,9 +8,9 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.client.HBaseAdmin; -import com.alibaba.druid.hbase.jdbc.HPreparedStatementImpl; -import com.alibaba.druid.hbase.jdbc.HResultSet; -import com.alibaba.druid.hbase.jdbc.HResultSetMetaData; +import com.alibaba.druid.hdriver.jdbc.HPreparedStatementImpl; +import com.alibaba.druid.hdriver.jdbc.HResultSet; +import com.alibaba.druid.hdriver.jdbc.HResultSetMetaData; import com.alibaba.druid.util.jdbc.ResultSetBase; import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData; diff --git a/src/main/java/com/alibaba/druid/hbase/exec/SingleTableExecutePlan.java b/src/main/java/com/alibaba/druid/hdriver/execute/SingleTableExecutePlan.java similarity index 85% rename from src/main/java/com/alibaba/druid/hbase/exec/SingleTableExecutePlan.java rename to src/main/java/com/alibaba/druid/hdriver/execute/SingleTableExecutePlan.java index e49ab07064..6ede8e44f0 100644 --- a/src/main/java/com/alibaba/druid/hbase/exec/SingleTableExecutePlan.java +++ b/src/main/java/com/alibaba/druid/hdriver/execute/SingleTableExecutePlan.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.exec; +package com.alibaba.druid.hdriver.execute; public class SingleTableExecutePlan extends ExecutePlanAdapter { diff --git a/src/main/java/com/alibaba/druid/hbase/exec/SingleTableQueryExecutePlan.java b/src/main/java/com/alibaba/druid/hdriver/execute/SingleTableQueryExecutePlan.java similarity index 94% rename from src/main/java/com/alibaba/druid/hbase/exec/SingleTableQueryExecutePlan.java rename to src/main/java/com/alibaba/druid/hdriver/execute/SingleTableQueryExecutePlan.java index b8df5eaa1e..384da0775d 100644 --- a/src/main/java/com/alibaba/druid/hbase/exec/SingleTableQueryExecutePlan.java +++ b/src/main/java/com/alibaba/druid/hdriver/execute/SingleTableQueryExecutePlan.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.exec; +package com.alibaba.druid.hdriver.execute; import java.sql.SQLException; import java.util.ArrayList; @@ -15,11 +15,11 @@ import org.apache.hadoop.hbase.filter.RowFilter; import org.apache.hadoop.hbase.filter.SingleColumnValueFilter; import org.apache.hadoop.hbase.util.Bytes; -import com.alibaba.druid.hbase.jdbc.HBaseConnection; -import com.alibaba.druid.hbase.jdbc.HScannerResultSet; -import com.alibaba.druid.hbase.jdbc.HPreparedStatementImpl; -import com.alibaba.druid.hbase.jdbc.HResultSetMetaData; -import com.alibaba.druid.hbase.mapping.HMappingTable; +import com.alibaba.druid.hdriver.jdbc.HBaseConnection; +import com.alibaba.druid.hdriver.jdbc.HPreparedStatementImpl; +import com.alibaba.druid.hdriver.jdbc.HResultSetMetaData; +import com.alibaba.druid.hdriver.jdbc.HScannerResultSet; +import com.alibaba.druid.hdriver.mapping.HMappingTable; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java b/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLCreateMappingStatement.java similarity index 81% rename from src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java rename to src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLCreateMappingStatement.java index a5841ce4eb..89fe5b41c4 100644 --- a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java +++ b/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLCreateMappingStatement.java @@ -1,6 +1,6 @@ -package com.alibaba.druid.hbase.hbql.ast; +package com.alibaba.druid.hdriver.hbql.ast; -import com.alibaba.druid.hbase.mapping.HMappingTable; +import com.alibaba.druid.hdriver.mapping.HMappingTable; import com.alibaba.druid.sql.ast.SQLStatementImpl; public class HBQLCreateMappingStatement extends SQLStatementImpl implements HBQLStatement { diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateTableStatement.java b/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLCreateTableStatement.java similarity index 81% rename from src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateTableStatement.java rename to src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLCreateTableStatement.java index bd222ec73a..c425f85dac 100644 --- a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLCreateTableStatement.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.hbql.ast; +package com.alibaba.druid.hdriver.hbql.ast; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLFamilyDefinition.java b/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLFamilyDefinition.java similarity index 98% rename from src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLFamilyDefinition.java rename to src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLFamilyDefinition.java index 8b31cc32fd..9170fc7739 100644 --- a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLFamilyDefinition.java +++ b/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLFamilyDefinition.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.hbql.ast; +package com.alibaba.druid.hdriver.hbql.ast; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.ast.statement.SQLTableElement; diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLSelectQueryBlock.java b/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLSelectQueryBlock.java similarity index 82% rename from src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLSelectQueryBlock.java rename to src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLSelectQueryBlock.java index ee446bd071..a96f4ae1e6 100644 --- a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLSelectQueryBlock.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.hbql.ast; +package com.alibaba.druid.hdriver.hbql.ast; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLShowStatement.java b/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLShowStatement.java similarity index 71% rename from src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLShowStatement.java rename to src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLShowStatement.java index 75dafe543c..dd59b17022 100644 --- a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLShowStatement.java +++ b/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLShowStatement.java @@ -1,6 +1,6 @@ -package com.alibaba.druid.hbase.hbql.ast; +package com.alibaba.druid.hdriver.hbql.ast; -import com.alibaba.druid.hbase.hbql.visitor.HBQLVisitor; +import com.alibaba.druid.hdriver.hbql.visitor.HBQLVisitor; public class HBQLShowStatement extends HBQLStatementImpl { diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLStatement.java b/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLStatement.java similarity index 70% rename from src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLStatement.java rename to src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLStatement.java index af1ecf8f6a..fac2134de5 100644 --- a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLStatement.java +++ b/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLStatement.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.hbql.ast; +package com.alibaba.druid.hdriver.hbql.ast; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLStatementImpl.java b/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLStatementImpl.java similarity index 86% rename from src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLStatementImpl.java rename to src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLStatementImpl.java index 8de6299743..f43d6bd53b 100644 --- a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLStatementImpl.java +++ b/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLStatementImpl.java @@ -1,6 +1,6 @@ -package com.alibaba.druid.hbase.hbql.ast; +package com.alibaba.druid.hdriver.hbql.ast; -import com.alibaba.druid.hbase.hbql.visitor.HBQLVisitor; +import com.alibaba.druid.hdriver.hbql.visitor.HBQLVisitor; import com.alibaba.druid.sql.ast.SQLStatementImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLExprParser.java b/src/main/java/com/alibaba/druid/hdriver/hbql/parser/HBQLExprParser.java similarity index 88% rename from src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLExprParser.java rename to src/main/java/com/alibaba/druid/hdriver/hbql/parser/HBQLExprParser.java index e8a323d848..ed85ad794c 100644 --- a/src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLExprParser.java +++ b/src/main/java/com/alibaba/druid/hdriver/hbql/parser/HBQLExprParser.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.hbql.parser; +package com.alibaba.druid.hdriver.hbql.parser; import com.alibaba.druid.sql.parser.Lexer; import com.alibaba.druid.sql.parser.ParserException; diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java b/src/main/java/com/alibaba/druid/hdriver/hbql/parser/HBQLStatementParser.java similarity index 84% rename from src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java rename to src/main/java/com/alibaba/druid/hdriver/hbql/parser/HBQLStatementParser.java index fbc58304a4..d7bee34303 100644 --- a/src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/hdriver/hbql/parser/HBQLStatementParser.java @@ -1,6 +1,6 @@ -package com.alibaba.druid.hbase.hbql.parser; +package com.alibaba.druid.hdriver.hbql.parser; -import com.alibaba.druid.hbase.hbql.ast.HBQLShowStatement; +import com.alibaba.druid.hdriver.hbql.ast.HBQLShowStatement; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLExprParser; import com.alibaba.druid.sql.parser.SQLStatementParser; diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/visitor/HBQLOutputVisitor.java b/src/main/java/com/alibaba/druid/hdriver/hbql/visitor/HBQLOutputVisitor.java similarity index 79% rename from src/main/java/com/alibaba/druid/hbase/hbql/visitor/HBQLOutputVisitor.java rename to src/main/java/com/alibaba/druid/hdriver/hbql/visitor/HBQLOutputVisitor.java index a3a061f470..c1198bf0c8 100644 --- a/src/main/java/com/alibaba/druid/hbase/hbql/visitor/HBQLOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/hdriver/hbql/visitor/HBQLOutputVisitor.java @@ -1,6 +1,6 @@ -package com.alibaba.druid.hbase.hbql.visitor; +package com.alibaba.druid.hdriver.hbql.visitor; -import com.alibaba.druid.hbase.hbql.ast.HBQLShowStatement; +import com.alibaba.druid.hdriver.hbql.ast.HBQLShowStatement; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/visitor/HBQLVisitor.java b/src/main/java/com/alibaba/druid/hdriver/hbql/visitor/HBQLVisitor.java similarity index 63% rename from src/main/java/com/alibaba/druid/hbase/hbql/visitor/HBQLVisitor.java rename to src/main/java/com/alibaba/druid/hdriver/hbql/visitor/HBQLVisitor.java index 8a0af606ae..4dc0bf4387 100644 --- a/src/main/java/com/alibaba/druid/hbase/hbql/visitor/HBQLVisitor.java +++ b/src/main/java/com/alibaba/druid/hdriver/hbql/visitor/HBQLVisitor.java @@ -1,6 +1,6 @@ -package com.alibaba.druid.hbase.hbql.visitor; +package com.alibaba.druid.hdriver.hbql.visitor; -import com.alibaba.druid.hbase.hbql.ast.HBQLShowStatement; +import com.alibaba.druid.hdriver.hbql.ast.HBQLShowStatement; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public interface HBQLVisitor extends SQLASTVisitor { diff --git a/src/main/java/com/alibaba/druid/hbase/jdbc/HBaseConnection.java b/src/main/java/com/alibaba/druid/hdriver/jdbc/HBaseConnection.java similarity index 98% rename from src/main/java/com/alibaba/druid/hbase/jdbc/HBaseConnection.java rename to src/main/java/com/alibaba/druid/hdriver/jdbc/HBaseConnection.java index 3d2f1d83ad..a441d46a81 100644 --- a/src/main/java/com/alibaba/druid/hbase/jdbc/HBaseConnection.java +++ b/src/main/java/com/alibaba/druid/hdriver/jdbc/HBaseConnection.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.jdbc; +package com.alibaba.druid.hdriver.jdbc; import java.sql.Array; import java.sql.Blob; @@ -21,7 +21,7 @@ import java.util.Properties; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.client.HTableInterface; -import com.alibaba.druid.hbase.HEngine; +import com.alibaba.druid.hdriver.HEngine; import com.alibaba.druid.util.jdbc.ConnectionBase; public class HBaseConnection extends ConnectionBase implements Connection { diff --git a/src/main/java/com/alibaba/druid/hbase/jdbc/HPreparedStatement.java b/src/main/java/com/alibaba/druid/hdriver/jdbc/HPreparedStatement.java similarity index 74% rename from src/main/java/com/alibaba/druid/hbase/jdbc/HPreparedStatement.java rename to src/main/java/com/alibaba/druid/hdriver/jdbc/HPreparedStatement.java index ccb7b72ca4..83d3b93c86 100644 --- a/src/main/java/com/alibaba/druid/hbase/jdbc/HPreparedStatement.java +++ b/src/main/java/com/alibaba/druid/hdriver/jdbc/HPreparedStatement.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.jdbc; +package com.alibaba.druid.hdriver.jdbc; import java.sql.PreparedStatement; diff --git a/src/main/java/com/alibaba/druid/hbase/jdbc/HPreparedStatementImpl.java b/src/main/java/com/alibaba/druid/hdriver/jdbc/HPreparedStatementImpl.java similarity index 94% rename from src/main/java/com/alibaba/druid/hbase/jdbc/HPreparedStatementImpl.java rename to src/main/java/com/alibaba/druid/hdriver/jdbc/HPreparedStatementImpl.java index 9269a1394b..877cb87109 100644 --- a/src/main/java/com/alibaba/druid/hbase/jdbc/HPreparedStatementImpl.java +++ b/src/main/java/com/alibaba/druid/hdriver/jdbc/HPreparedStatementImpl.java @@ -1,15 +1,15 @@ -package com.alibaba.druid.hbase.jdbc; +package com.alibaba.druid.hdriver.jdbc; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import java.util.List; -import com.alibaba.druid.hbase.exec.ExecutePlan; -import com.alibaba.druid.hbase.exec.InsertExecutePlan; -import com.alibaba.druid.hbase.exec.ShowTablesPlan; -import com.alibaba.druid.hbase.exec.SingleTableQueryExecutePlan; -import com.alibaba.druid.hbase.hbql.ast.HBQLShowStatement; +import com.alibaba.druid.hdriver.execute.ExecutePlan; +import com.alibaba.druid.hdriver.execute.InsertExecutePlan; +import com.alibaba.druid.hdriver.execute.ShowTablesPlan; +import com.alibaba.druid.hdriver.execute.SingleTableQueryExecutePlan; +import com.alibaba.druid.hdriver.hbql.ast.HBQLShowStatement; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/main/java/com/alibaba/druid/hbase/jdbc/HResultSet.java b/src/main/java/com/alibaba/druid/hdriver/jdbc/HResultSet.java similarity index 66% rename from src/main/java/com/alibaba/druid/hbase/jdbc/HResultSet.java rename to src/main/java/com/alibaba/druid/hdriver/jdbc/HResultSet.java index ed83a286e9..e7f26e0b0f 100644 --- a/src/main/java/com/alibaba/druid/hbase/jdbc/HResultSet.java +++ b/src/main/java/com/alibaba/druid/hdriver/jdbc/HResultSet.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.jdbc; +package com.alibaba.druid.hdriver.jdbc; import java.sql.ResultSet; diff --git a/src/main/java/com/alibaba/druid/hbase/jdbc/HResultSetMetaData.java b/src/main/java/com/alibaba/druid/hdriver/jdbc/HResultSetMetaData.java similarity index 76% rename from src/main/java/com/alibaba/druid/hbase/jdbc/HResultSetMetaData.java rename to src/main/java/com/alibaba/druid/hdriver/jdbc/HResultSetMetaData.java index d2e72b7205..583a3b6409 100644 --- a/src/main/java/com/alibaba/druid/hbase/jdbc/HResultSetMetaData.java +++ b/src/main/java/com/alibaba/druid/hdriver/jdbc/HResultSetMetaData.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.jdbc; +package com.alibaba.druid.hdriver.jdbc; import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase; diff --git a/src/main/java/com/alibaba/druid/hbase/jdbc/HScannerResultSet.java b/src/main/java/com/alibaba/druid/hdriver/jdbc/HScannerResultSet.java similarity index 98% rename from src/main/java/com/alibaba/druid/hbase/jdbc/HScannerResultSet.java rename to src/main/java/com/alibaba/druid/hdriver/jdbc/HScannerResultSet.java index 87132de089..cb99083f33 100644 --- a/src/main/java/com/alibaba/druid/hbase/jdbc/HScannerResultSet.java +++ b/src/main/java/com/alibaba/druid/hdriver/jdbc/HScannerResultSet.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.jdbc; +package com.alibaba.druid.hdriver.jdbc; import java.io.IOException; import java.math.BigDecimal; @@ -11,7 +11,7 @@ import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.util.Bytes; -import com.alibaba.druid.hbase.mapping.HMapping; +import com.alibaba.druid.hdriver.mapping.HMapping; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.jdbc.ResultSetBase; import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData; diff --git a/src/main/java/com/alibaba/druid/hbase/jdbc/HStatement.java b/src/main/java/com/alibaba/druid/hdriver/jdbc/HStatement.java similarity index 80% rename from src/main/java/com/alibaba/druid/hbase/jdbc/HStatement.java rename to src/main/java/com/alibaba/druid/hdriver/jdbc/HStatement.java index bee153b3be..41d441b101 100644 --- a/src/main/java/com/alibaba/druid/hbase/jdbc/HStatement.java +++ b/src/main/java/com/alibaba/druid/hdriver/jdbc/HStatement.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.jdbc; +package com.alibaba.druid.hdriver.jdbc; import java.sql.SQLException; import java.sql.Statement; diff --git a/src/main/java/com/alibaba/druid/hbase/jdbc/HStatementImpl.java b/src/main/java/com/alibaba/druid/hdriver/jdbc/HStatementImpl.java similarity index 92% rename from src/main/java/com/alibaba/druid/hbase/jdbc/HStatementImpl.java rename to src/main/java/com/alibaba/druid/hdriver/jdbc/HStatementImpl.java index c71768f9d3..67b3f6f586 100644 --- a/src/main/java/com/alibaba/druid/hbase/jdbc/HStatementImpl.java +++ b/src/main/java/com/alibaba/druid/hdriver/jdbc/HStatementImpl.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.jdbc; +package com.alibaba.druid.hdriver.jdbc; import java.sql.SQLException; import java.sql.Statement; diff --git a/src/main/java/com/alibaba/druid/hbase/mapping/HMapping.java b/src/main/java/com/alibaba/druid/hdriver/mapping/HMapping.java similarity index 88% rename from src/main/java/com/alibaba/druid/hbase/mapping/HMapping.java rename to src/main/java/com/alibaba/druid/hdriver/mapping/HMapping.java index d6080248a3..452e78475e 100644 --- a/src/main/java/com/alibaba/druid/hbase/mapping/HMapping.java +++ b/src/main/java/com/alibaba/druid/hdriver/mapping/HMapping.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.mapping; +package com.alibaba.druid.hdriver.mapping; import org.apache.hadoop.hbase.client.Result; diff --git a/src/main/java/com/alibaba/druid/hbase/mapping/HMappingColumn.java b/src/main/java/com/alibaba/druid/hdriver/mapping/HMappingColumn.java similarity index 92% rename from src/main/java/com/alibaba/druid/hbase/mapping/HMappingColumn.java rename to src/main/java/com/alibaba/druid/hdriver/mapping/HMappingColumn.java index d61f6caafd..ad75c8dcb1 100644 --- a/src/main/java/com/alibaba/druid/hbase/mapping/HMappingColumn.java +++ b/src/main/java/com/alibaba/druid/hdriver/mapping/HMappingColumn.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.mapping; +package com.alibaba.druid.hdriver.mapping; public class HMappingColumn { diff --git a/src/main/java/com/alibaba/druid/hbase/mapping/HMappingDefaultImpl.java b/src/main/java/com/alibaba/druid/hdriver/mapping/HMappingDefaultImpl.java similarity index 96% rename from src/main/java/com/alibaba/druid/hbase/mapping/HMappingDefaultImpl.java rename to src/main/java/com/alibaba/druid/hdriver/mapping/HMappingDefaultImpl.java index 77689365f8..0ab3c97522 100644 --- a/src/main/java/com/alibaba/druid/hbase/mapping/HMappingDefaultImpl.java +++ b/src/main/java/com/alibaba/druid/hdriver/mapping/HMappingDefaultImpl.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.mapping; +package com.alibaba.druid.hdriver.mapping; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.util.Bytes; diff --git a/src/main/java/com/alibaba/druid/hbase/mapping/HMappingTable.java b/src/main/java/com/alibaba/druid/hdriver/mapping/HMappingTable.java similarity index 96% rename from src/main/java/com/alibaba/druid/hbase/mapping/HMappingTable.java rename to src/main/java/com/alibaba/druid/hdriver/mapping/HMappingTable.java index e86271ef30..8237eeda2d 100644 --- a/src/main/java/com/alibaba/druid/hbase/mapping/HMappingTable.java +++ b/src/main/java/com/alibaba/druid/hdriver/mapping/HMappingTable.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hbase.mapping; +package com.alibaba.druid.hdriver.mapping; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java b/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java index e9cbe0eaf6..4223c72f25 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java @@ -1,7 +1,7 @@ package com.alibaba.druid.sql.parser; -import com.alibaba.druid.hbase.hbql.parser.HBQLExprParser; -import com.alibaba.druid.hbase.hbql.parser.HBQLStatementParser; +import com.alibaba.druid.hdriver.hbql.parser.HBQLExprParser; +import com.alibaba.druid.hdriver.hbql.parser.HBQLStatementParser; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlExprParser; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; diff --git a/src/test/java/com/alibaba/druid/hbase/HBQLShowTableTest.java b/src/test/java/com/alibaba/druid/hbase/HBQLShowTableTest.java index fa80915c03..5405bc9abf 100644 --- a/src/test/java/com/alibaba/druid/hbase/HBQLShowTableTest.java +++ b/src/test/java/com/alibaba/druid/hbase/HBQLShowTableTest.java @@ -5,6 +5,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.Properties; +import com.alibaba.druid.hdriver.HDriver; import com.alibaba.druid.util.JdbcUtils; import junit.framework.TestCase; diff --git a/src/test/java/com/alibaba/druid/hbase/HBaseDriverInsertTest.java b/src/test/java/com/alibaba/druid/hbase/HBaseDriverInsertTest.java index b297a58f55..eb676e62da 100644 --- a/src/test/java/com/alibaba/druid/hbase/HBaseDriverInsertTest.java +++ b/src/test/java/com/alibaba/druid/hbase/HBaseDriverInsertTest.java @@ -5,6 +5,8 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.util.Properties; +import com.alibaba.druid.hdriver.HDriver; + import junit.framework.TestCase; public class HBaseDriverInsertTest extends TestCase { diff --git a/src/test/java/com/alibaba/druid/hbase/HBaseDriverTest.java b/src/test/java/com/alibaba/druid/hbase/HBaseDriverTest.java index 6cd471cb99..b5b2903ba6 100644 --- a/src/test/java/com/alibaba/druid/hbase/HBaseDriverTest.java +++ b/src/test/java/com/alibaba/druid/hbase/HBaseDriverTest.java @@ -5,6 +5,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.Properties; +import com.alibaba.druid.hdriver.HDriver; + import junit.framework.TestCase; diff --git a/src/test/java/com/alibaba/druid/hbase/HBaseDriverTest_getIndex.java b/src/test/java/com/alibaba/druid/hbase/HBaseDriverTest_getIndex.java index 5fdee86074..d64669fbc0 100644 --- a/src/test/java/com/alibaba/druid/hbase/HBaseDriverTest_getIndex.java +++ b/src/test/java/com/alibaba/druid/hbase/HBaseDriverTest_getIndex.java @@ -5,6 +5,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.Properties; +import com.alibaba.druid.hdriver.HDriver; + import junit.framework.TestCase; diff --git a/src/test/java/com/alibaba/druid/hbase/HBaseDriverTest_notRowFilter.java b/src/test/java/com/alibaba/druid/hbase/HBaseDriverTest_notRowFilter.java index 2aded3a734..04705dbe09 100644 --- a/src/test/java/com/alibaba/druid/hbase/HBaseDriverTest_notRowFilter.java +++ b/src/test/java/com/alibaba/druid/hbase/HBaseDriverTest_notRowFilter.java @@ -5,6 +5,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.Properties; +import com.alibaba.druid.hdriver.HDriver; + import junit.framework.TestCase;