From 0658c1d0a1a497cba0e5f64d2208f27a7ac07b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= Date: Mon, 21 May 2012 16:01:08 +0800 Subject: [PATCH] refactor --- .../java/com/alibaba/druid/hbase/exec/ShowTablesPlan.java | 4 ++-- .../java/com/alibaba/druid/hbase/jdbc/HBaseConnection.java | 2 +- .../com/alibaba/druid/hbase/jdbc/HPreparedStatementImpl.java | 4 ++-- .../java/com/alibaba/druid/hbase/jdbc/HResultSetMetaData.java | 2 +- .../java/com/alibaba/druid/hbase/jdbc/HScannerResultSet.java | 4 ++-- .../java/com/alibaba/druid/hbase/jdbc/HStatementImpl.java | 2 +- src/main/java/com/alibaba/druid/mock/MockConnection.java | 2 +- .../java/com/alibaba/druid/mock/MockPreparedStatement.java | 2 +- src/main/java/com/alibaba/druid/mock/MockResultSet.java | 2 +- .../java/com/alibaba/druid/mock/MockResultSetMetaData.java | 2 +- src/main/java/com/alibaba/druid/mock/MockStatement.java | 2 +- .../druid/mock/handler/MySqlMockExecuteHandlerImpl.java | 2 +- .../alibaba/druid/{common => util}/jdbc/ConnectionBase.java | 2 +- .../alibaba/druid/{common => util}/jdbc/LocalResultSet.java | 2 +- .../druid/{common => util}/jdbc/PreparedStatementBase.java | 2 +- .../alibaba/druid/{common => util}/jdbc/ResultSetBase.java | 2 +- .../druid/{common => util}/jdbc/ResultSetMetaDataBase.java | 2 +- .../alibaba/druid/{common => util}/jdbc/StatementBase.java | 2 +- .../com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java | 4 ++-- 19 files changed, 23 insertions(+), 23 deletions(-) rename src/main/java/com/alibaba/druid/{common => util}/jdbc/ConnectionBase.java (98%) rename src/main/java/com/alibaba/druid/{common => util}/jdbc/LocalResultSet.java (97%) rename src/main/java/com/alibaba/druid/{common => util}/jdbc/PreparedStatementBase.java (99%) rename src/main/java/com/alibaba/druid/{common => util}/jdbc/ResultSetBase.java (99%) rename src/main/java/com/alibaba/druid/{common => util}/jdbc/ResultSetMetaDataBase.java (95%) rename src/main/java/com/alibaba/druid/{common => util}/jdbc/StatementBase.java (99%) diff --git a/src/main/java/com/alibaba/druid/hbase/exec/ShowTablesPlan.java b/src/main/java/com/alibaba/druid/hbase/exec/ShowTablesPlan.java index a1a20666ad..614e908031 100644 --- a/src/main/java/com/alibaba/druid/hbase/exec/ShowTablesPlan.java +++ b/src/main/java/com/alibaba/druid/hbase/exec/ShowTablesPlan.java @@ -8,11 +8,11 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.client.HBaseAdmin; -import com.alibaba.druid.common.jdbc.ResultSetBase; -import com.alibaba.druid.common.jdbc.ResultSetMetaDataBase.ColumnMetaData; 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.util.jdbc.ResultSetBase; +import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData; public class ShowTablesPlan implements ExecutePlan { diff --git a/src/main/java/com/alibaba/druid/hbase/jdbc/HBaseConnection.java b/src/main/java/com/alibaba/druid/hbase/jdbc/HBaseConnection.java index c29cdc05bc..3d2f1d83ad 100644 --- a/src/main/java/com/alibaba/druid/hbase/jdbc/HBaseConnection.java +++ b/src/main/java/com/alibaba/druid/hbase/jdbc/HBaseConnection.java @@ -21,8 +21,8 @@ import java.util.Properties; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.client.HTableInterface; -import com.alibaba.druid.common.jdbc.ConnectionBase; import com.alibaba.druid.hbase.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/HPreparedStatementImpl.java b/src/main/java/com/alibaba/druid/hbase/jdbc/HPreparedStatementImpl.java index c74abae1e5..9269a1394b 100644 --- a/src/main/java/com/alibaba/druid/hbase/jdbc/HPreparedStatementImpl.java +++ b/src/main/java/com/alibaba/druid/hbase/jdbc/HPreparedStatementImpl.java @@ -5,8 +5,6 @@ import java.sql.SQLException; import java.sql.Types; import java.util.List; -import com.alibaba.druid.common.jdbc.PreparedStatementBase; -import com.alibaba.druid.common.jdbc.ResultSetMetaDataBase.ColumnMetaData; import com.alibaba.druid.hbase.exec.ExecutePlan; import com.alibaba.druid.hbase.exec.InsertExecutePlan; import com.alibaba.druid.hbase.exec.ShowTablesPlan; @@ -25,6 +23,8 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.visitor.SQLEvalVisitor; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; +import com.alibaba.druid.util.jdbc.PreparedStatementBase; +import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData; public class HPreparedStatementImpl extends PreparedStatementBase implements HPreparedStatement { diff --git a/src/main/java/com/alibaba/druid/hbase/jdbc/HResultSetMetaData.java b/src/main/java/com/alibaba/druid/hbase/jdbc/HResultSetMetaData.java index a0b57034a8..d2e72b7205 100644 --- a/src/main/java/com/alibaba/druid/hbase/jdbc/HResultSetMetaData.java +++ b/src/main/java/com/alibaba/druid/hbase/jdbc/HResultSetMetaData.java @@ -1,6 +1,6 @@ package com.alibaba.druid.hbase.jdbc; -import com.alibaba.druid.common.jdbc.ResultSetMetaDataBase; +import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase; public class HResultSetMetaData extends ResultSetMetaDataBase { diff --git a/src/main/java/com/alibaba/druid/hbase/jdbc/HScannerResultSet.java b/src/main/java/com/alibaba/druid/hbase/jdbc/HScannerResultSet.java index b9afd637da..87132de089 100644 --- a/src/main/java/com/alibaba/druid/hbase/jdbc/HScannerResultSet.java +++ b/src/main/java/com/alibaba/druid/hbase/jdbc/HScannerResultSet.java @@ -11,10 +11,10 @@ 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.common.jdbc.ResultSetBase; -import com.alibaba.druid.common.jdbc.ResultSetMetaDataBase.ColumnMetaData; import com.alibaba.druid.hbase.mapping.HMapping; import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.util.jdbc.ResultSetBase; +import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData; public class HScannerResultSet extends ResultSetBase implements HResultSet { diff --git a/src/main/java/com/alibaba/druid/hbase/jdbc/HStatementImpl.java b/src/main/java/com/alibaba/druid/hbase/jdbc/HStatementImpl.java index 5da6614697..c71768f9d3 100644 --- a/src/main/java/com/alibaba/druid/hbase/jdbc/HStatementImpl.java +++ b/src/main/java/com/alibaba/druid/hbase/jdbc/HStatementImpl.java @@ -3,7 +3,7 @@ package com.alibaba.druid.hbase.jdbc; import java.sql.SQLException; import java.sql.Statement; -import com.alibaba.druid.common.jdbc.StatementBase; +import com.alibaba.druid.util.jdbc.StatementBase; public class HStatementImpl extends StatementBase implements Statement, HStatement { diff --git a/src/main/java/com/alibaba/druid/mock/MockConnection.java b/src/main/java/com/alibaba/druid/mock/MockConnection.java index 938a2e939d..33345a8506 100644 --- a/src/main/java/com/alibaba/druid/mock/MockConnection.java +++ b/src/main/java/com/alibaba/druid/mock/MockConnection.java @@ -34,7 +34,7 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.Executor; -import com.alibaba.druid.common.jdbc.ConnectionBase; +import com.alibaba.druid.util.jdbc.ConnectionBase; public class MockConnection extends ConnectionBase implements Connection { diff --git a/src/main/java/com/alibaba/druid/mock/MockPreparedStatement.java b/src/main/java/com/alibaba/druid/mock/MockPreparedStatement.java index 4464115ac7..bfa0df5140 100644 --- a/src/main/java/com/alibaba/druid/mock/MockPreparedStatement.java +++ b/src/main/java/com/alibaba/druid/mock/MockPreparedStatement.java @@ -19,7 +19,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import com.alibaba.druid.common.jdbc.PreparedStatementBase; +import com.alibaba.druid.util.jdbc.PreparedStatementBase; public class MockPreparedStatement extends PreparedStatementBase implements PreparedStatement { diff --git a/src/main/java/com/alibaba/druid/mock/MockResultSet.java b/src/main/java/com/alibaba/druid/mock/MockResultSet.java index 435e53e116..f2182faf77 100644 --- a/src/main/java/com/alibaba/druid/mock/MockResultSet.java +++ b/src/main/java/com/alibaba/druid/mock/MockResultSet.java @@ -22,7 +22,7 @@ import java.sql.Statement; import java.util.ArrayList; import java.util.List; -import com.alibaba.druid.common.jdbc.ResultSetBase; +import com.alibaba.druid.util.jdbc.ResultSetBase; public class MockResultSet extends ResultSetBase implements ResultSet { diff --git a/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java b/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java index 9930fa1b2f..2abddd6fed 100644 --- a/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java +++ b/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java @@ -17,7 +17,7 @@ package com.alibaba.druid.mock; import java.sql.ResultSetMetaData; -import com.alibaba.druid.common.jdbc.ResultSetMetaDataBase; +import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase; public class MockResultSetMetaData extends ResultSetMetaDataBase implements ResultSetMetaData { diff --git a/src/main/java/com/alibaba/druid/mock/MockStatement.java b/src/main/java/com/alibaba/druid/mock/MockStatement.java index d1a5b2a209..3ff6c4c592 100644 --- a/src/main/java/com/alibaba/druid/mock/MockStatement.java +++ b/src/main/java/com/alibaba/druid/mock/MockStatement.java @@ -20,7 +20,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import com.alibaba.druid.common.jdbc.StatementBase; +import com.alibaba.druid.util.jdbc.StatementBase; public class MockStatement extends StatementBase implements Statement { diff --git a/src/main/java/com/alibaba/druid/mock/handler/MySqlMockExecuteHandlerImpl.java b/src/main/java/com/alibaba/druid/mock/handler/MySqlMockExecuteHandlerImpl.java index 1bd67316a5..03d27b5121 100644 --- a/src/main/java/com/alibaba/druid/mock/handler/MySqlMockExecuteHandlerImpl.java +++ b/src/main/java/com/alibaba/druid/mock/handler/MySqlMockExecuteHandlerImpl.java @@ -6,7 +6,6 @@ import java.sql.Timestamp; import java.sql.Types; import java.util.List; -import com.alibaba.druid.common.jdbc.ResultSetMetaDataBase.ColumnMetaData; import com.alibaba.druid.mock.MockResultSet; import com.alibaba.druid.mock.MockResultSetMetaData; import com.alibaba.druid.mock.MockStatement; @@ -31,6 +30,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlBooleanExpr; import com.alibaba.druid.sql.dialect.mysql.ast.statement.CobarShowStatus; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData; public class MySqlMockExecuteHandlerImpl implements MockExecuteHandler { diff --git a/src/main/java/com/alibaba/druid/common/jdbc/ConnectionBase.java b/src/main/java/com/alibaba/druid/util/jdbc/ConnectionBase.java similarity index 98% rename from src/main/java/com/alibaba/druid/common/jdbc/ConnectionBase.java rename to src/main/java/com/alibaba/druid/util/jdbc/ConnectionBase.java index 4030e36df5..026341bae7 100644 --- a/src/main/java/com/alibaba/druid/common/jdbc/ConnectionBase.java +++ b/src/main/java/com/alibaba/druid/util/jdbc/ConnectionBase.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.common.jdbc; +package com.alibaba.druid.util.jdbc; import java.sql.Connection; import java.sql.SQLException; diff --git a/src/main/java/com/alibaba/druid/common/jdbc/LocalResultSet.java b/src/main/java/com/alibaba/druid/util/jdbc/LocalResultSet.java similarity index 97% rename from src/main/java/com/alibaba/druid/common/jdbc/LocalResultSet.java rename to src/main/java/com/alibaba/druid/util/jdbc/LocalResultSet.java index 42227c31c5..dc71f71fd3 100644 --- a/src/main/java/com/alibaba/druid/common/jdbc/LocalResultSet.java +++ b/src/main/java/com/alibaba/druid/util/jdbc/LocalResultSet.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.common.jdbc; +package com.alibaba.druid.util.jdbc; import java.sql.SQLException; import java.sql.Statement; diff --git a/src/main/java/com/alibaba/druid/common/jdbc/PreparedStatementBase.java b/src/main/java/com/alibaba/druid/util/jdbc/PreparedStatementBase.java similarity index 99% rename from src/main/java/com/alibaba/druid/common/jdbc/PreparedStatementBase.java rename to src/main/java/com/alibaba/druid/util/jdbc/PreparedStatementBase.java index 5dc843628a..6a335438cb 100644 --- a/src/main/java/com/alibaba/druid/common/jdbc/PreparedStatementBase.java +++ b/src/main/java/com/alibaba/druid/util/jdbc/PreparedStatementBase.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.common.jdbc; +package com.alibaba.druid.util.jdbc; import java.io.InputStream; import java.io.Reader; diff --git a/src/main/java/com/alibaba/druid/common/jdbc/ResultSetBase.java b/src/main/java/com/alibaba/druid/util/jdbc/ResultSetBase.java similarity index 99% rename from src/main/java/com/alibaba/druid/common/jdbc/ResultSetBase.java rename to src/main/java/com/alibaba/druid/util/jdbc/ResultSetBase.java index 823360de78..c73e2f9d91 100644 --- a/src/main/java/com/alibaba/druid/common/jdbc/ResultSetBase.java +++ b/src/main/java/com/alibaba/druid/util/jdbc/ResultSetBase.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.common.jdbc; +package com.alibaba.druid.util.jdbc; import java.io.InputStream; import java.io.Reader; diff --git a/src/main/java/com/alibaba/druid/common/jdbc/ResultSetMetaDataBase.java b/src/main/java/com/alibaba/druid/util/jdbc/ResultSetMetaDataBase.java similarity index 95% rename from src/main/java/com/alibaba/druid/common/jdbc/ResultSetMetaDataBase.java rename to src/main/java/com/alibaba/druid/util/jdbc/ResultSetMetaDataBase.java index a3ae87d639..ed175958b8 100644 --- a/src/main/java/com/alibaba/druid/common/jdbc/ResultSetMetaDataBase.java +++ b/src/main/java/com/alibaba/druid/util/jdbc/ResultSetMetaDataBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.druid.common.jdbc; +package com.alibaba.druid.util.jdbc; import java.sql.ResultSetMetaData; import java.sql.SQLException; diff --git a/src/main/java/com/alibaba/druid/common/jdbc/StatementBase.java b/src/main/java/com/alibaba/druid/util/jdbc/StatementBase.java similarity index 99% rename from src/main/java/com/alibaba/druid/common/jdbc/StatementBase.java rename to src/main/java/com/alibaba/druid/util/jdbc/StatementBase.java index 05676e39d2..821e00aefe 100644 --- a/src/main/java/com/alibaba/druid/common/jdbc/StatementBase.java +++ b/src/main/java/com/alibaba/druid/util/jdbc/StatementBase.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.common.jdbc; +package com.alibaba.druid.util.jdbc; import java.sql.Connection; import java.sql.ResultSet; diff --git a/src/test/java/com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java b/src/test/java/com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java index 1636b25e7e..b617fa011b 100644 --- a/src/test/java/com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java +++ b/src/test/java/com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java @@ -8,9 +8,9 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.common.jdbc.ResultSetMetaDataBase; -import com.alibaba.druid.common.jdbc.ResultSetMetaDataBase.ColumnMetaData; import com.alibaba.druid.mock.MockResultSetMetaData; +import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase; +import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData; public class MockResultSetMetaDataTest extends TestCase {