From a0dcb633c1f150033c183206b79eb4795243bca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= Date: Mon, 21 May 2012 16:18:12 +0800 Subject: [PATCH] refactor --- .../druid/hdriver/{impl/jdbc => }/HPreparedStatement.java | 3 ++- .../com/alibaba/druid/hdriver/{impl/jdbc => }/HResultSet.java | 2 +- .../com/alibaba/druid/hdriver/{impl/jdbc => }/HStatement.java | 4 +++- .../com/alibaba/druid/hdriver/impl/execute/ExecutePlan.java | 2 +- .../druid/hdriver/impl/execute/ExecutePlanAdapter.java | 2 +- .../alibaba/druid/hdriver/impl/execute/ShowTablesPlan.java | 2 +- .../druid/hdriver/impl/jdbc/HPreparedStatementImpl.java | 1 + .../alibaba/druid/hdriver/impl/jdbc/HScannerResultSet.java | 2 ++ .../com/alibaba/druid/hdriver/impl/jdbc/HStatementImpl.java | 1 + 9 files changed, 13 insertions(+), 6 deletions(-) rename src/main/java/com/alibaba/druid/hdriver/{impl/jdbc => }/HPreparedStatement.java (72%) rename src/main/java/com/alibaba/druid/hdriver/{impl/jdbc => }/HResultSet.java (64%) rename src/main/java/com/alibaba/druid/hdriver/{impl/jdbc => }/HStatement.java (63%) diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HPreparedStatement.java b/src/main/java/com/alibaba/druid/hdriver/HPreparedStatement.java similarity index 72% rename from src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HPreparedStatement.java rename to src/main/java/com/alibaba/druid/hdriver/HPreparedStatement.java index 2975ac74ce..bb4d04b45f 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HPreparedStatement.java +++ b/src/main/java/com/alibaba/druid/hdriver/HPreparedStatement.java @@ -1,8 +1,9 @@ -package com.alibaba.druid.hdriver.impl.jdbc; +package com.alibaba.druid.hdriver; import java.sql.PreparedStatement; + public interface HPreparedStatement extends PreparedStatement, HStatement { } diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HResultSet.java b/src/main/java/com/alibaba/druid/hdriver/HResultSet.java similarity index 64% rename from src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HResultSet.java rename to src/main/java/com/alibaba/druid/hdriver/HResultSet.java index 5655427d17..1605ec692e 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HResultSet.java +++ b/src/main/java/com/alibaba/druid/hdriver/HResultSet.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.hdriver.impl.jdbc; +package com.alibaba.druid.hdriver; import java.sql.ResultSet; diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HStatement.java b/src/main/java/com/alibaba/druid/hdriver/HStatement.java similarity index 63% rename from src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HStatement.java rename to src/main/java/com/alibaba/druid/hdriver/HStatement.java index 5dd1887177..65c9bc64e0 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HStatement.java +++ b/src/main/java/com/alibaba/druid/hdriver/HStatement.java @@ -1,8 +1,10 @@ -package com.alibaba.druid.hdriver.impl.jdbc; +package com.alibaba.druid.hdriver; import java.sql.SQLException; import java.sql.Statement; +import com.alibaba.druid.hdriver.impl.jdbc.HBaseConnection; + public interface HStatement extends Statement { HBaseConnection getConnection() throws SQLException; } diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlan.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlan.java index bfcb844128..2b8714ec2f 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlan.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlan.java @@ -2,8 +2,8 @@ package com.alibaba.druid.hdriver.impl.execute; import java.sql.SQLException; +import com.alibaba.druid.hdriver.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/impl/execute/ExecutePlanAdapter.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlanAdapter.java index d101f3fd83..476724220d 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlanAdapter.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ExecutePlanAdapter.java @@ -2,8 +2,8 @@ package com.alibaba.druid.hdriver.impl.execute; import java.sql.SQLException; +import com.alibaba.druid.hdriver.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/impl/execute/ShowTablesPlan.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ShowTablesPlan.java index fb917e698a..d39d2bb413 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/execute/ShowTablesPlan.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/ShowTablesPlan.java @@ -8,8 +8,8 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.client.HBaseAdmin; +import com.alibaba.druid.hdriver.HResultSet; 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/impl/jdbc/HPreparedStatementImpl.java b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HPreparedStatementImpl.java index dd26099268..25da92c514 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HPreparedStatementImpl.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HPreparedStatementImpl.java @@ -5,6 +5,7 @@ import java.sql.SQLException; import java.sql.Types; import java.util.List; +import com.alibaba.druid.hdriver.HPreparedStatement; import com.alibaba.druid.hdriver.impl.execute.ExecutePlan; import com.alibaba.druid.hdriver.impl.execute.InsertExecutePlan; import com.alibaba.druid.hdriver.impl.execute.ShowTablesPlan; diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HScannerResultSet.java b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HScannerResultSet.java index a7c898de6a..19f41532a1 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HScannerResultSet.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HScannerResultSet.java @@ -11,6 +11,8 @@ 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.HResultSet; +import com.alibaba.druid.hdriver.HStatement; import com.alibaba.druid.hdriver.impl.mapping.HMapping; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.jdbc.ResultSetBase; diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HStatementImpl.java b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HStatementImpl.java index e42ce70661..0adf63cee7 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HStatementImpl.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HStatementImpl.java @@ -3,6 +3,7 @@ package com.alibaba.druid.hdriver.impl.jdbc; import java.sql.SQLException; import java.sql.Statement; +import com.alibaba.druid.hdriver.HStatement; import com.alibaba.druid.util.jdbc.StatementBase; public class HStatementImpl extends StatementBase implements Statement, HStatement {