From 1b8c27bcc4ce449ba0356f3de2ad8bc782bb551a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= Date: Mon, 21 May 2012 16:19:50 +0800 Subject: [PATCH] refactor --- src/main/java/com/alibaba/druid/hdriver/HConnection.java | 7 +++++++ src/main/java/com/alibaba/druid/hdriver/HDriver.java | 6 +++--- src/main/java/com/alibaba/druid/hdriver/HStatement.java | 4 ++-- .../druid/hdriver/impl/execute/InsertExecutePlan.java | 4 ++-- .../impl/execute/SingleTableQueryExecutePlan.java | 4 ++-- .../{HBaseConnection.java => HBaseConnectionImpl.java} | 9 +++++---- .../druid/hdriver/impl/jdbc/HPreparedStatementImpl.java | 6 +++--- .../alibaba/druid/hdriver/impl/jdbc/HStatementImpl.java | 6 +++--- 8 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/alibaba/druid/hdriver/HConnection.java rename src/main/java/com/alibaba/druid/hdriver/impl/jdbc/{HBaseConnection.java => HBaseConnectionImpl.java} (96%) diff --git a/src/main/java/com/alibaba/druid/hdriver/HConnection.java b/src/main/java/com/alibaba/druid/hdriver/HConnection.java new file mode 100644 index 0000000000..f33ca3e2b9 --- /dev/null +++ b/src/main/java/com/alibaba/druid/hdriver/HConnection.java @@ -0,0 +1,7 @@ +package com.alibaba.druid.hdriver; + +import java.sql.Connection; + +public interface HConnection extends Connection { + +} diff --git a/src/main/java/com/alibaba/druid/hdriver/HDriver.java b/src/main/java/com/alibaba/druid/hdriver/HDriver.java index aa47337d99..cb36294dbe 100644 --- a/src/main/java/com/alibaba/druid/hdriver/HDriver.java +++ b/src/main/java/com/alibaba/druid/hdriver/HDriver.java @@ -5,14 +5,14 @@ import java.sql.DriverPropertyInfo; import java.sql.SQLException; import java.util.Properties; -import com.alibaba.druid.hdriver.impl.jdbc.HBaseConnection; +import com.alibaba.druid.hdriver.impl.jdbc.HBaseConnectionImpl; public class HDriver implements Driver { public static String PREFIX = "jdbc:druid-hbase:"; @Override - public HBaseConnection connect(String url, Properties info) throws SQLException { + public HBaseConnectionImpl connect(String url, Properties info) throws SQLException { if (!acceptsURL(url)) { return null; } @@ -23,7 +23,7 @@ public class HDriver implements Driver { info.put("hbase.zookeeper.quorum", rest); - return new HBaseConnection(engine, info); + return new HBaseConnectionImpl(engine, info); } @Override diff --git a/src/main/java/com/alibaba/druid/hdriver/HStatement.java b/src/main/java/com/alibaba/druid/hdriver/HStatement.java index 65c9bc64e0..47c498d365 100644 --- a/src/main/java/com/alibaba/druid/hdriver/HStatement.java +++ b/src/main/java/com/alibaba/druid/hdriver/HStatement.java @@ -3,8 +3,8 @@ package com.alibaba.druid.hdriver; import java.sql.SQLException; import java.sql.Statement; -import com.alibaba.druid.hdriver.impl.jdbc.HBaseConnection; +import com.alibaba.druid.hdriver.impl.jdbc.HBaseConnectionImpl; public interface HStatement extends Statement { - HBaseConnection getConnection() throws SQLException; + HBaseConnectionImpl getConnection() throws SQLException; } diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/execute/InsertExecutePlan.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/InsertExecutePlan.java index acba50734e..fd2254bf3c 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/execute/InsertExecutePlan.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/InsertExecutePlan.java @@ -8,7 +8,7 @@ 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.impl.jdbc.HBaseConnection; +import com.alibaba.druid.hdriver.impl.jdbc.HBaseConnectionImpl; import com.alibaba.druid.hdriver.impl.jdbc.HPreparedStatementImpl; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; @@ -21,7 +21,7 @@ public class InsertExecutePlan extends SingleTableExecutePlan { @Override public boolean execute(HPreparedStatementImpl statement) throws SQLException { try { - HBaseConnection connection = statement.getConnection(); + HBaseConnectionImpl connection = statement.getConnection(); String dbType = connection.getConnectProperties().getProperty("dbType"); Put put = null; diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/execute/SingleTableQueryExecutePlan.java b/src/main/java/com/alibaba/druid/hdriver/impl/execute/SingleTableQueryExecutePlan.java index 613605f1ee..a7f75feec6 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/execute/SingleTableQueryExecutePlan.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/execute/SingleTableQueryExecutePlan.java @@ -15,7 +15,7 @@ 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.impl.jdbc.HBaseConnection; +import com.alibaba.druid.hdriver.impl.jdbc.HBaseConnectionImpl; import com.alibaba.druid.hdriver.impl.jdbc.HPreparedStatementImpl; import com.alibaba.druid.hdriver.impl.jdbc.HResultSetMetaData; import com.alibaba.druid.hdriver.impl.jdbc.HScannerResultSet; @@ -72,7 +72,7 @@ public class SingleTableQueryExecutePlan extends SingleTableExecutePlan { @Override public HScannerResultSet executeQuery(HPreparedStatementImpl statement) throws SQLException { try { - HBaseConnection connection = statement.getConnection(); + HBaseConnectionImpl connection = statement.getConnection(); String dbType = connection.getConnectProperties().getProperty("dbType"); Scan scan = new Scan(); diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HBaseConnection.java b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HBaseConnectionImpl.java similarity index 96% rename from src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HBaseConnection.java rename to src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HBaseConnectionImpl.java index d99d949ad9..7352242058 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HBaseConnection.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/jdbc/HBaseConnectionImpl.java @@ -21,15 +21,16 @@ import java.util.Properties; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.client.HTableInterface; +import com.alibaba.druid.hdriver.HConnection; import com.alibaba.druid.hdriver.HEngine; import com.alibaba.druid.util.jdbc.ConnectionBase; -public class HBaseConnection extends ConnectionBase implements Connection { +public class HBaseConnectionImpl extends ConnectionBase implements HConnection { private final HEngine engine; - public HBaseConnection(HEngine engine, Properties info){ + public HBaseConnectionImpl(HEngine engine, Properties info){ super(engine.getUrl(), info); this.engine = engine; @@ -127,7 +128,7 @@ public class HBaseConnection extends ConnectionBase implements Connection { return true; } - if (iface == Connection.class || iface == HBaseConnection.class) { + if (iface == Connection.class || iface == HBaseConnectionImpl.class) { return true; } @@ -239,7 +240,7 @@ public class HBaseConnection extends ConnectionBase implements Connection { return (T) engine; } - if (iface == Connection.class || iface == HBaseConnection.class) { + if (iface == Connection.class || iface == HBaseConnectionImpl.class) { return (T) this; } 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 25da92c514..0cc836ab9c 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 @@ -32,13 +32,13 @@ public class HPreparedStatementImpl extends PreparedStatementBase implements HPr private final String sql; private String[] columnNames; - private HBaseConnection hbaseConnection; + private HBaseConnectionImpl hbaseConnection; private ExecutePlan executePlan; private String dbType = "hbase"; - public HPreparedStatementImpl(HBaseConnection conn, String sql) throws SQLException{ + public HPreparedStatementImpl(HBaseConnectionImpl conn, String sql) throws SQLException{ super(conn); this.sql = sql; this.hbaseConnection = conn; @@ -140,7 +140,7 @@ public class HPreparedStatementImpl extends PreparedStatementBase implements HPr } @Override - public HBaseConnection getConnection() throws SQLException { + public HBaseConnectionImpl getConnection() throws SQLException { return hbaseConnection; } 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 0adf63cee7..87db3e832f 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 @@ -8,15 +8,15 @@ import com.alibaba.druid.util.jdbc.StatementBase; public class HStatementImpl extends StatementBase implements Statement, HStatement { - private HBaseConnection conn; + private HBaseConnectionImpl conn; - public HStatementImpl(HBaseConnection conn){ + public HStatementImpl(HBaseConnectionImpl conn){ super(conn); this.conn = conn; } @Override - public HBaseConnection getConnection() throws SQLException { + public HBaseConnectionImpl getConnection() throws SQLException { return conn; }