From 5d3e0093a2e40411b54f723d130ffc0da97f6d48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= Date: Mon, 21 May 2012 14:55:57 +0800 Subject: [PATCH] refactor --- .../druid/hbase/exec/SingleTableQueryExecutePlan.java | 6 +++--- .../jdbc/{HBaseResultSet.java => HScannerResultSet.java} | 4 ++-- src/main/java/com/alibaba/druid/hbase/mapping/HMapping.java | 6 ++++++ 3 files changed, 11 insertions(+), 5 deletions(-) rename src/main/java/com/alibaba/druid/hbase/jdbc/{HBaseResultSet.java => HScannerResultSet.java} (96%) create mode 100644 src/main/java/com/alibaba/druid/hbase/mapping/HMapping.java diff --git a/src/main/java/com/alibaba/druid/hbase/exec/SingleTableQueryExecutePlan.java b/src/main/java/com/alibaba/druid/hbase/exec/SingleTableQueryExecutePlan.java index 52cb6b6454..f20b49b562 100644 --- a/src/main/java/com/alibaba/druid/hbase/exec/SingleTableQueryExecutePlan.java +++ b/src/main/java/com/alibaba/druid/hbase/exec/SingleTableQueryExecutePlan.java @@ -16,7 +16,7 @@ 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.HBaseResultSet; +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; @@ -70,7 +70,7 @@ public class SingleTableQueryExecutePlan extends SingleTableExecutePlan { } @Override - public HBaseResultSet executeQuery(HPreparedStatementImpl statement) throws SQLException { + public HScannerResultSet executeQuery(HPreparedStatementImpl statement) throws SQLException { try { HBaseConnection connection = statement.getConnection(); String dbType = connection.getConnectProperties().getProperty("dbType"); @@ -122,7 +122,7 @@ public class SingleTableQueryExecutePlan extends SingleTableExecutePlan { HTableInterface htable = connection.getHTable(getTableName()); ResultScanner scanner = htable.getScanner(scan); - HBaseResultSet resultSet = new HBaseResultSet(statement, htable, scanner); + HScannerResultSet resultSet = new HScannerResultSet(statement, htable, scanner); resultSet.setMetaData(resultMetaData); resultSet.setMapping(mapping); diff --git a/src/main/java/com/alibaba/druid/hbase/jdbc/HBaseResultSet.java b/src/main/java/com/alibaba/druid/hbase/jdbc/HScannerResultSet.java similarity index 96% rename from src/main/java/com/alibaba/druid/hbase/jdbc/HBaseResultSet.java rename to src/main/java/com/alibaba/druid/hbase/jdbc/HScannerResultSet.java index 0bb7b34cd9..7397ae7a40 100644 --- a/src/main/java/com/alibaba/druid/hbase/jdbc/HBaseResultSet.java +++ b/src/main/java/com/alibaba/druid/hbase/jdbc/HScannerResultSet.java @@ -16,7 +16,7 @@ import com.alibaba.druid.common.jdbc.ResultSetMetaDataBase.ColumnMetaData; import com.alibaba.druid.hbase.mapping.HMappingTable; import com.alibaba.druid.util.JdbcUtils; -public class HBaseResultSet extends ResultSetBase implements HResultSet { +public class HScannerResultSet extends ResultSetBase implements HResultSet { private HStatement statement; private ResultScanner scanner; @@ -26,7 +26,7 @@ public class HBaseResultSet extends ResultSetBase implements HResultSet { private HMappingTable mapping; - public HBaseResultSet(HStatement statement, HTableInterface htable, ResultScanner scanner){ + public HScannerResultSet(HStatement statement, HTableInterface htable, ResultScanner scanner){ super(statement); this.statement = statement; this.htable = htable; diff --git a/src/main/java/com/alibaba/druid/hbase/mapping/HMapping.java b/src/main/java/com/alibaba/druid/hbase/mapping/HMapping.java new file mode 100644 index 0000000000..86c5786e52 --- /dev/null +++ b/src/main/java/com/alibaba/druid/hbase/mapping/HMapping.java @@ -0,0 +1,6 @@ +package com.alibaba.druid.hbase.mapping; + + +public interface HMapping { + +}