From 43442071fc28cdea116b5be82da1c955b7b2de5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= Date: Mon, 21 May 2012 14:57:38 +0800 Subject: [PATCH] refactor --- .../exec/SingleTableQueryExecutePlan.java | 1 - .../druid/hbase/jdbc/HScannerResultSet.java | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) 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 f20b49b562..b46c6fcafc 100644 --- a/src/main/java/com/alibaba/druid/hbase/exec/SingleTableQueryExecutePlan.java +++ b/src/main/java/com/alibaba/druid/hbase/exec/SingleTableQueryExecutePlan.java @@ -124,7 +124,6 @@ public class SingleTableQueryExecutePlan extends SingleTableExecutePlan { HScannerResultSet resultSet = new HScannerResultSet(statement, htable, scanner); resultSet.setMetaData(resultMetaData); - resultSet.setMapping(mapping); return resultSet; } catch (SQLException e) { 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 7397ae7a40..b9afd637da 100644 --- a/src/main/java/com/alibaba/druid/hbase/jdbc/HScannerResultSet.java +++ b/src/main/java/com/alibaba/druid/hbase/jdbc/HScannerResultSet.java @@ -13,18 +13,18 @@ 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.HMappingTable; +import com.alibaba.druid.hbase.mapping.HMapping; import com.alibaba.druid.util.JdbcUtils; public class HScannerResultSet extends ResultSetBase implements HResultSet { - private HStatement statement; - private ResultScanner scanner; - private HTableInterface htable; - private Result result; - private byte[] family = Bytes.toBytes("d"); + private HStatement statement; + private ResultScanner scanner; + private HTableInterface htable; + private Result result; + private byte[] family = Bytes.toBytes("d"); - private HMappingTable mapping; + private HMapping mapping; public HScannerResultSet(HStatement statement, HTableInterface htable, ResultScanner scanner){ super(statement); @@ -33,11 +33,11 @@ public class HScannerResultSet extends ResultSetBase implements HResultSet { this.scanner = scanner; } - public HMappingTable getMapping() { + public HMapping getMapping() { return mapping; } - public void setMapping(HMappingTable mapping) { + public void setMapping(HMapping mapping) { this.mapping = mapping; }