From 2c037654f3373983d2c5a05bf886c42ce9b1d8f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= Date: Mon, 21 May 2012 16:16:59 +0800 Subject: [PATCH] refactor --- src/main/java/com/alibaba/druid/hdriver/HDriver.java | 2 +- src/main/java/com/alibaba/druid/hdriver/HEngine.java | 2 +- .../hdriver/{ => impl}/execute/ExecutePlan.java | 6 +++--- .../{ => impl}/execute/ExecutePlanAdapter.java | 6 +++--- .../druid/hdriver/{ => impl}/execute/HBaseUtils.java | 2 +- .../{ => impl}/execute/InsertExecutePlan.java | 6 +++--- .../hdriver/{ => impl}/execute/ShowTablesPlan.java | 8 ++++---- .../{ => impl}/execute/SingleTableExecutePlan.java | 2 +- .../execute/SingleTableQueryExecutePlan.java | 12 ++++++------ .../hbql/ast/HBQLCreateMappingStatement.java | 4 ++-- .../hbql/ast/HBQLCreateTableStatement.java | 2 +- .../{ => impl}/hbql/ast/HBQLFamilyDefinition.java | 2 +- .../{ => impl}/hbql/ast/HBQLSelectQueryBlock.java | 2 +- .../{ => impl}/hbql/ast/HBQLShowStatement.java | 4 ++-- .../hdriver/{ => impl}/hbql/ast/HBQLStatement.java | 2 +- .../{ => impl}/hbql/ast/HBQLStatementImpl.java | 4 ++-- .../{ => impl}/hbql/parser/HBQLExprParser.java | 2 +- .../{ => impl}/hbql/parser/HBQLStatementParser.java | 4 ++-- .../{ => impl}/hbql/visitor/HBQLOutputVisitor.java | 4 ++-- .../hdriver/{ => impl}/hbql/visitor/HBQLVisitor.java | 4 ++-- .../hdriver/{ => impl}/jdbc/HBaseConnection.java | 2 +- .../hdriver/{ => impl}/jdbc/HPreparedStatement.java | 2 +- .../{ => impl}/jdbc/HPreparedStatementImpl.java | 12 ++++++------ .../druid/hdriver/{ => impl}/jdbc/HResultSet.java | 2 +- .../hdriver/{ => impl}/jdbc/HResultSetMetaData.java | 2 +- .../hdriver/{ => impl}/jdbc/HScannerResultSet.java | 4 ++-- .../druid/hdriver/{ => impl}/jdbc/HStatement.java | 2 +- .../hdriver/{ => impl}/jdbc/HStatementImpl.java | 2 +- .../druid/hdriver/{ => impl}/mapping/HMapping.java | 2 +- .../hdriver/{ => impl}/mapping/HMappingColumn.java | 2 +- .../{ => impl}/mapping/HMappingDefaultImpl.java | 2 +- .../hdriver/{ => impl}/mapping/HMappingTable.java | 2 +- .../com/alibaba/druid/sql/parser/SQLParserUtils.java | 4 ++-- 33 files changed, 60 insertions(+), 60 deletions(-) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/execute/ExecutePlan.java (57%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/execute/ExecutePlanAdapter.java (70%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/execute/HBaseUtils.java (96%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/execute/InsertExecutePlan.java (92%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/execute/ShowTablesPlan.java (96%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/execute/SingleTableExecutePlan.java (84%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/execute/SingleTableQueryExecutePlan.java (94%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/hbql/ast/HBQLCreateMappingStatement.java (80%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/hbql/ast/HBQLCreateTableStatement.java (80%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/hbql/ast/HBQLFamilyDefinition.java (98%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/hbql/ast/HBQLSelectQueryBlock.java (81%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/hbql/ast/HBQLShowStatement.java (69%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/hbql/ast/HBQLStatement.java (68%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/hbql/ast/HBQLStatementImpl.java (85%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/hbql/parser/HBQLExprParser.java (87%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/hbql/parser/HBQLStatementParser.java (83%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/hbql/visitor/HBQLOutputVisitor.java (78%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/hbql/visitor/HBQLVisitor.java (61%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/jdbc/HBaseConnection.java (99%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/jdbc/HPreparedStatement.java (72%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/jdbc/HPreparedStatementImpl.java (93%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/jdbc/HResultSet.java (64%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/jdbc/HResultSetMetaData.java (73%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/jdbc/HScannerResultSet.java (98%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/jdbc/HStatement.java (78%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/jdbc/HStatementImpl.java (91%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/mapping/HMapping.java (86%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/mapping/HMappingColumn.java (91%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/mapping/HMappingDefaultImpl.java (95%) rename src/main/java/com/alibaba/druid/hdriver/{ => impl}/mapping/HMappingTable.java (95%) diff --git a/src/main/java/com/alibaba/druid/hdriver/HDriver.java b/src/main/java/com/alibaba/druid/hdriver/HDriver.java index 1fb1668795..aa47337d99 100644 --- a/src/main/java/com/alibaba/druid/hdriver/HDriver.java +++ b/src/main/java/com/alibaba/druid/hdriver/HDriver.java @@ -5,7 +5,7 @@ import java.sql.DriverPropertyInfo; import java.sql.SQLException; import java.util.Properties; -import com.alibaba.druid.hdriver.jdbc.HBaseConnection; +import com.alibaba.druid.hdriver.impl.jdbc.HBaseConnection; public class HDriver implements Driver { diff --git a/src/main/java/com/alibaba/druid/hdriver/HEngine.java b/src/main/java/com/alibaba/druid/hdriver/HEngine.java index 1e9bfdd0be..debe13c8c6 100644 --- a/src/main/java/com/alibaba/druid/hdriver/HEngine.java +++ b/src/main/java/com/alibaba/druid/hdriver/HEngine.java @@ -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.hdriver.mapping.HMappingTable; +import com.alibaba.druid.hdriver.impl.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/hdriver/execute/ExecutePlan.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlan.java similarity index 57% rename from src/main/java/com/alibaba/druid/hdriver/execute/ExecutePlan.java rename to src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlan.java index b6ad4b14c7..bfcb844128 100644 --- a/src/main/java/com/alibaba/druid/hdriver/execute/ExecutePlan.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlan.java @@ -1,9 +1,9 @@ -package com.alibaba.druid.hdriver.execute; +package com.alibaba.druid.hdriver.impl.execute; import java.sql.SQLException; -import com.alibaba.druid.hdriver.jdbc.HPreparedStatementImpl; -import com.alibaba.druid.hdriver.jdbc.HResultSet; +import com.alibaba.druid.hdriver.impl.jdbc.HPreparedStatementImpl; +import com.alibaba.druid.hdriver.impl.jdbc.HResultSet; public interface ExecutePlan { diff --git a/src/main/java/com/alibaba/druid/hdriver/execute/ExecutePlanAdapter.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlanAdapter.java similarity index 70% rename from src/main/java/com/alibaba/druid/hdriver/execute/ExecutePlanAdapter.java rename to src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlanAdapter.java index 86f327233d..d101f3fd83 100644 --- a/src/main/java/com/alibaba/druid/hdriver/execute/ExecutePlanAdapter.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlanAdapter.java @@ -1,9 +1,9 @@ -package com.alibaba.druid.hdriver.execute; +package com.alibaba.druid.hdriver.impl.execute; import java.sql.SQLException; -import com.alibaba.druid.hdriver.jdbc.HPreparedStatementImpl; -import com.alibaba.druid.hdriver.jdbc.HResultSet; +import com.alibaba.druid.hdriver.impl.jdbc.HPreparedStatementImpl; +import com.alibaba.druid.hdriver.impl.jdbc.HResultSet; public class ExecutePlanAdapter implements ExecutePlan { diff --git a/src/main/java/com/alibaba/druid/hdriver/execute/HBaseUtils.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/HBaseUtils.java similarity index 96% rename from src/main/java/com/alibaba/druid/hdriver/execute/HBaseUtils.java rename to src/main/java/com/alibaba/druid/hdriver/impl/execute/HBaseUtils.java index 4adb1681a1..a17667f71d 100644 --- a/src/main/java/com/alibaba/druid/hdriver/execute/HBaseUtils.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/HBaseUtils.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.execute; +package com.alibaba.druid.hdriver.impl.execute; import java.io.IOException; import java.math.BigDecimal; diff --git a/src/main/java/com/alibaba/druid/hdriver/execute/InsertExecutePlan.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/InsertExecutePlan.java similarity index 92% rename from src/main/java/com/alibaba/druid/hdriver/execute/InsertExecutePlan.java rename to src/main/java/com/alibaba/druid/hdriver/impl/execute/InsertExecutePlan.java index de9457153d..acba50734e 100644 --- a/src/main/java/com/alibaba/druid/hdriver/execute/InsertExecutePlan.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/InsertExecutePlan.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.execute; +package com.alibaba.druid.hdriver.impl.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.hdriver.jdbc.HBaseConnection; -import com.alibaba.druid.hdriver.jdbc.HPreparedStatementImpl; +import com.alibaba.druid.hdriver.impl.jdbc.HBaseConnection; +import com.alibaba.druid.hdriver.impl.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/hdriver/execute/ShowTablesPlan.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ShowTablesPlan.java similarity index 96% rename from src/main/java/com/alibaba/druid/hdriver/execute/ShowTablesPlan.java rename to src/main/java/com/alibaba/druid/hdriver/impl/execute/ShowTablesPlan.java index a031373ac2..fb917e698a 100644 --- a/src/main/java/com/alibaba/druid/hdriver/execute/ShowTablesPlan.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ShowTablesPlan.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.execute; +package com.alibaba.druid.hdriver.impl.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.hdriver.jdbc.HPreparedStatementImpl; -import com.alibaba.druid.hdriver.jdbc.HResultSet; -import com.alibaba.druid.hdriver.jdbc.HResultSetMetaData; +import com.alibaba.druid.hdriver.impl.jdbc.HPreparedStatementImpl; +import com.alibaba.druid.hdriver.impl.jdbc.HResultSet; +import com.alibaba.druid.hdriver.impl.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/hdriver/execute/SingleTableExecutePlan.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/SingleTableExecutePlan.java similarity index 84% rename from src/main/java/com/alibaba/druid/hdriver/execute/SingleTableExecutePlan.java rename to src/main/java/com/alibaba/druid/hdriver/impl/execute/SingleTableExecutePlan.java index 6ede8e44f0..4970465b66 100644 --- a/src/main/java/com/alibaba/druid/hdriver/execute/SingleTableExecutePlan.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/SingleTableExecutePlan.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.execute; +package com.alibaba.druid.hdriver.impl.execute; public class SingleTableExecutePlan extends ExecutePlanAdapter { diff --git a/src/main/java/com/alibaba/druid/hdriver/execute/SingleTableQueryExecutePlan.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/SingleTableQueryExecutePlan.java similarity index 94% rename from src/main/java/com/alibaba/druid/hdriver/execute/SingleTableQueryExecutePlan.java rename to src/main/java/com/alibaba/druid/hdriver/impl/execute/SingleTableQueryExecutePlan.java index 384da0775d..613605f1ee 100644 --- a/src/main/java/com/alibaba/druid/hdriver/execute/SingleTableQueryExecutePlan.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/SingleTableQueryExecutePlan.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.execute; +package com.alibaba.druid.hdriver.impl.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.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.hdriver.impl.jdbc.HBaseConnection; +import com.alibaba.druid.hdriver.impl.jdbc.HPreparedStatementImpl; +import com.alibaba.druid.hdriver.impl.jdbc.HResultSetMetaData; +import com.alibaba.druid.hdriver.impl.jdbc.HScannerResultSet; +import com.alibaba.druid.hdriver.impl.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/hdriver/hbql/ast/HBQLCreateMappingStatement.java b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLCreateMappingStatement.java similarity index 80% rename from src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLCreateMappingStatement.java rename to src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLCreateMappingStatement.java index 89fe5b41c4..a124396918 100644 --- a/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLCreateMappingStatement.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLCreateMappingStatement.java @@ -1,6 +1,6 @@ -package com.alibaba.druid.hdriver.hbql.ast; +package com.alibaba.druid.hdriver.impl.hbql.ast; -import com.alibaba.druid.hdriver.mapping.HMappingTable; +import com.alibaba.druid.hdriver.impl.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/hdriver/hbql/ast/HBQLCreateTableStatement.java b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLCreateTableStatement.java similarity index 80% rename from src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLCreateTableStatement.java rename to src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLCreateTableStatement.java index c425f85dac..bc3d1aee6f 100644 --- a/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLCreateTableStatement.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.hbql.ast; +package com.alibaba.druid.hdriver.impl.hbql.ast; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; diff --git a/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLFamilyDefinition.java b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLFamilyDefinition.java similarity index 98% rename from src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLFamilyDefinition.java rename to src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLFamilyDefinition.java index 9170fc7739..851d503cc2 100644 --- a/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLFamilyDefinition.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLFamilyDefinition.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.hbql.ast; +package com.alibaba.druid.hdriver.impl.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/hdriver/hbql/ast/HBQLSelectQueryBlock.java b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLSelectQueryBlock.java similarity index 81% rename from src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLSelectQueryBlock.java rename to src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLSelectQueryBlock.java index a96f4ae1e6..caedd8530f 100644 --- a/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLSelectQueryBlock.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.hbql.ast; +package com.alibaba.druid.hdriver.impl.hbql.ast; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; diff --git a/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLShowStatement.java b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLShowStatement.java similarity index 69% rename from src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLShowStatement.java rename to src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLShowStatement.java index dd59b17022..30b67a6328 100644 --- a/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLShowStatement.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLShowStatement.java @@ -1,6 +1,6 @@ -package com.alibaba.druid.hdriver.hbql.ast; +package com.alibaba.druid.hdriver.impl.hbql.ast; -import com.alibaba.druid.hdriver.hbql.visitor.HBQLVisitor; +import com.alibaba.druid.hdriver.impl.hbql.visitor.HBQLVisitor; public class HBQLShowStatement extends HBQLStatementImpl { diff --git a/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLStatement.java b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLStatement.java similarity index 68% rename from src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLStatement.java rename to src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLStatement.java index fac2134de5..99cfb05f34 100644 --- a/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLStatement.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLStatement.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.hbql.ast; +package com.alibaba.druid.hdriver.impl.hbql.ast; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLStatementImpl.java b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLStatementImpl.java similarity index 85% rename from src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLStatementImpl.java rename to src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLStatementImpl.java index f43d6bd53b..466346836b 100644 --- a/src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLStatementImpl.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/ast/HBQLStatementImpl.java @@ -1,6 +1,6 @@ -package com.alibaba.druid.hdriver.hbql.ast; +package com.alibaba.druid.hdriver.impl.hbql.ast; -import com.alibaba.druid.hdriver.hbql.visitor.HBQLVisitor; +import com.alibaba.druid.hdriver.impl.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/hdriver/hbql/parser/HBQLExprParser.java b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLExprParser.java similarity index 87% rename from src/main/java/com/alibaba/druid/hdriver/hbql/parser/HBQLExprParser.java rename to src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLExprParser.java index ed85ad794c..fd3e3dcad6 100644 --- a/src/main/java/com/alibaba/druid/hdriver/hbql/parser/HBQLExprParser.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLExprParser.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.hbql.parser; +package com.alibaba.druid.hdriver.impl.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/hdriver/hbql/parser/HBQLStatementParser.java b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLStatementParser.java similarity index 83% rename from src/main/java/com/alibaba/druid/hdriver/hbql/parser/HBQLStatementParser.java rename to src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLStatementParser.java index d7bee34303..a623e73df9 100644 --- a/src/main/java/com/alibaba/druid/hdriver/hbql/parser/HBQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/parser/HBQLStatementParser.java @@ -1,6 +1,6 @@ -package com.alibaba.druid.hdriver.hbql.parser; +package com.alibaba.druid.hdriver.impl.hbql.parser; -import com.alibaba.druid.hdriver.hbql.ast.HBQLShowStatement; +import com.alibaba.druid.hdriver.impl.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/hdriver/hbql/visitor/HBQLOutputVisitor.java b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/visitor/HBQLOutputVisitor.java similarity index 78% rename from src/main/java/com/alibaba/druid/hdriver/hbql/visitor/HBQLOutputVisitor.java rename to src/main/java/com/alibaba/druid/hdriver/impl/hbql/visitor/HBQLOutputVisitor.java index c1198bf0c8..187bb8cfde 100644 --- a/src/main/java/com/alibaba/druid/hdriver/hbql/visitor/HBQLOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/visitor/HBQLOutputVisitor.java @@ -1,6 +1,6 @@ -package com.alibaba.druid.hdriver.hbql.visitor; +package com.alibaba.druid.hdriver.impl.hbql.visitor; -import com.alibaba.druid.hdriver.hbql.ast.HBQLShowStatement; +import com.alibaba.druid.hdriver.impl.hbql.ast.HBQLShowStatement; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; diff --git a/src/main/java/com/alibaba/druid/hdriver/hbql/visitor/HBQLVisitor.java b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/visitor/HBQLVisitor.java similarity index 61% rename from src/main/java/com/alibaba/druid/hdriver/hbql/visitor/HBQLVisitor.java rename to src/main/java/com/alibaba/druid/hdriver/impl/hbql/visitor/HBQLVisitor.java index 4dc0bf4387..5804a1b10f 100644 --- a/src/main/java/com/alibaba/druid/hdriver/hbql/visitor/HBQLVisitor.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/hbql/visitor/HBQLVisitor.java @@ -1,6 +1,6 @@ -package com.alibaba.druid.hdriver.hbql.visitor; +package com.alibaba.druid.hdriver.impl.hbql.visitor; -import com.alibaba.druid.hdriver.hbql.ast.HBQLShowStatement; +import com.alibaba.druid.hdriver.impl.hbql.ast.HBQLShowStatement; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public interface HBQLVisitor extends SQLASTVisitor { diff --git a/src/main/java/com/alibaba/druid/hdriver/jdbc/HBaseConnection.java b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HBaseConnection.java similarity index 99% rename from src/main/java/com/alibaba/druid/hdriver/jdbc/HBaseConnection.java rename to src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HBaseConnection.java index a441d46a81..d99d949ad9 100644 --- a/src/main/java/com/alibaba/druid/hdriver/jdbc/HBaseConnection.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HBaseConnection.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.jdbc; +package com.alibaba.druid.hdriver.impl.jdbc; import java.sql.Array; import java.sql.Blob; diff --git a/src/main/java/com/alibaba/druid/hdriver/jdbc/HPreparedStatement.java b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HPreparedStatement.java similarity index 72% rename from src/main/java/com/alibaba/druid/hdriver/jdbc/HPreparedStatement.java rename to src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HPreparedStatement.java index 83d3b93c86..2975ac74ce 100644 --- a/src/main/java/com/alibaba/druid/hdriver/jdbc/HPreparedStatement.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HPreparedStatement.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.jdbc; +package com.alibaba.druid.hdriver.impl.jdbc; import java.sql.PreparedStatement; diff --git a/src/main/java/com/alibaba/druid/hdriver/jdbc/HPreparedStatementImpl.java b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HPreparedStatementImpl.java similarity index 93% rename from src/main/java/com/alibaba/druid/hdriver/jdbc/HPreparedStatementImpl.java rename to src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HPreparedStatementImpl.java index 877cb87109..dd26099268 100644 --- a/src/main/java/com/alibaba/druid/hdriver/jdbc/HPreparedStatementImpl.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HPreparedStatementImpl.java @@ -1,15 +1,15 @@ -package com.alibaba.druid.hdriver.jdbc; +package com.alibaba.druid.hdriver.impl.jdbc; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import java.util.List; -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.hdriver.impl.execute.ExecutePlan; +import com.alibaba.druid.hdriver.impl.execute.InsertExecutePlan; +import com.alibaba.druid.hdriver.impl.execute.ShowTablesPlan; +import com.alibaba.druid.hdriver.impl.execute.SingleTableQueryExecutePlan; +import com.alibaba.druid.hdriver.impl.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/hdriver/jdbc/HResultSet.java b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HResultSet.java similarity index 64% rename from src/main/java/com/alibaba/druid/hdriver/jdbc/HResultSet.java rename to src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HResultSet.java index e7f26e0b0f..5655427d17 100644 --- a/src/main/java/com/alibaba/druid/hdriver/jdbc/HResultSet.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HResultSet.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.jdbc; +package com.alibaba.druid.hdriver.impl.jdbc; import java.sql.ResultSet; diff --git a/src/main/java/com/alibaba/druid/hdriver/jdbc/HResultSetMetaData.java b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HResultSetMetaData.java similarity index 73% rename from src/main/java/com/alibaba/druid/hdriver/jdbc/HResultSetMetaData.java rename to src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HResultSetMetaData.java index 583a3b6409..c1601669b3 100644 --- a/src/main/java/com/alibaba/druid/hdriver/jdbc/HResultSetMetaData.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HResultSetMetaData.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.jdbc; +package com.alibaba.druid.hdriver.impl.jdbc; import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase; diff --git a/src/main/java/com/alibaba/druid/hdriver/jdbc/HScannerResultSet.java b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HScannerResultSet.java similarity index 98% rename from src/main/java/com/alibaba/druid/hdriver/jdbc/HScannerResultSet.java rename to src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HScannerResultSet.java index cb99083f33..a7c898de6a 100644 --- a/src/main/java/com/alibaba/druid/hdriver/jdbc/HScannerResultSet.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HScannerResultSet.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.jdbc; +package com.alibaba.druid.hdriver.impl.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.hdriver.mapping.HMapping; +import com.alibaba.druid.hdriver.impl.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/hdriver/jdbc/HStatement.java b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HStatement.java similarity index 78% rename from src/main/java/com/alibaba/druid/hdriver/jdbc/HStatement.java rename to src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HStatement.java index 41d441b101..5dd1887177 100644 --- a/src/main/java/com/alibaba/druid/hdriver/jdbc/HStatement.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HStatement.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.jdbc; +package com.alibaba.druid.hdriver.impl.jdbc; import java.sql.SQLException; import java.sql.Statement; diff --git a/src/main/java/com/alibaba/druid/hdriver/jdbc/HStatementImpl.java b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HStatementImpl.java similarity index 91% rename from src/main/java/com/alibaba/druid/hdriver/jdbc/HStatementImpl.java rename to src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HStatementImpl.java index 67b3f6f586..e42ce70661 100644 --- a/src/main/java/com/alibaba/druid/hdriver/jdbc/HStatementImpl.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HStatementImpl.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.jdbc; +package com.alibaba.druid.hdriver.impl.jdbc; import java.sql.SQLException; import java.sql.Statement; diff --git a/src/main/java/com/alibaba/druid/hdriver/mapping/HMapping.java b/src/main/java/com/alibaba/druid/hdriver/impl/mapping/HMapping.java similarity index 86% rename from src/main/java/com/alibaba/druid/hdriver/mapping/HMapping.java rename to src/main/java/com/alibaba/druid/hdriver/impl/mapping/HMapping.java index 452e78475e..f9202a04e0 100644 --- a/src/main/java/com/alibaba/druid/hdriver/mapping/HMapping.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/mapping/HMapping.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.mapping; +package com.alibaba.druid.hdriver.impl.mapping; import org.apache.hadoop.hbase.client.Result; diff --git a/src/main/java/com/alibaba/druid/hdriver/mapping/HMappingColumn.java b/src/main/java/com/alibaba/druid/hdriver/impl/mapping/HMappingColumn.java similarity index 91% rename from src/main/java/com/alibaba/druid/hdriver/mapping/HMappingColumn.java rename to src/main/java/com/alibaba/druid/hdriver/impl/mapping/HMappingColumn.java index ad75c8dcb1..07468d26b9 100644 --- a/src/main/java/com/alibaba/druid/hdriver/mapping/HMappingColumn.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/mapping/HMappingColumn.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.mapping; +package com.alibaba.druid.hdriver.impl.mapping; public class HMappingColumn { diff --git a/src/main/java/com/alibaba/druid/hdriver/mapping/HMappingDefaultImpl.java b/src/main/java/com/alibaba/druid/hdriver/impl/mapping/HMappingDefaultImpl.java similarity index 95% rename from src/main/java/com/alibaba/druid/hdriver/mapping/HMappingDefaultImpl.java rename to src/main/java/com/alibaba/druid/hdriver/impl/mapping/HMappingDefaultImpl.java index 0ab3c97522..6089ad28a7 100644 --- a/src/main/java/com/alibaba/druid/hdriver/mapping/HMappingDefaultImpl.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/mapping/HMappingDefaultImpl.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.mapping; +package com.alibaba.druid.hdriver.impl.mapping; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.util.Bytes; diff --git a/src/main/java/com/alibaba/druid/hdriver/mapping/HMappingTable.java b/src/main/java/com/alibaba/druid/hdriver/impl/mapping/HMappingTable.java similarity index 95% rename from src/main/java/com/alibaba/druid/hdriver/mapping/HMappingTable.java rename to src/main/java/com/alibaba/druid/hdriver/impl/mapping/HMappingTable.java index 8237eeda2d..0eb33e35b4 100644 --- a/src/main/java/com/alibaba/druid/hdriver/mapping/HMappingTable.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/mapping/HMappingTable.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.mapping; +package com.alibaba.druid.hdriver.impl.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 4223c72f25..9c5203578c 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.hdriver.hbql.parser.HBQLExprParser; -import com.alibaba.druid.hdriver.hbql.parser.HBQLStatementParser; +import com.alibaba.druid.hdriver.impl.hbql.parser.HBQLExprParser; +import com.alibaba.druid.hdriver.impl.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;