refactor

src/main/java/com/alibaba/druid/hbase/HEngine.java

@@ -10,7 +10,7 @@ import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.HTableInterface;
 import org.apache.hadoop.hbase.client.HTablePool;
 
-import com.alibaba.druid.hbase.mapping.HMapping;
+import com.alibaba.druid.hbase.mapping.HMappingTable;
 import com.alibaba.druid.logging.Log;
 import com.alibaba.druid.logging.LogFactory;
 
@@ -37,7 +37,7 @@ public class HEngine {
     private HTablePool                      tablePool;
     private int                             htablePoolMaxSize = 256;
     private Configuration                   config;
-    private ConcurrentMap<String, HMapping> mappings          = new ConcurrentHashMap<String, HMapping>();
+    private ConcurrentMap<String, HMappingTable> mappings          = new ConcurrentHashMap<String, HMappingTable>();
 
     public HEngine(String url, Properties connectProperties){
         super();
@@ -69,7 +69,7 @@ public class HEngine {
         return config;
     }
 
-    public ConcurrentMap<String, HMapping> getMappings() {
+    public ConcurrentMap<String, HMappingTable> getMappings() {
         return mappings;
     }
 

src/main/java/com/alibaba/druid/hbase/exec/SingleTableQueryExecutePlan.java

@@ -19,7 +19,7 @@ import com.alibaba.druid.hbase.jdbc.HBaseConnection;
 import com.alibaba.druid.hbase.jdbc.HBaseResultSet;
 import com.alibaba.druid.hbase.jdbc.HPreparedStatementImpl;
 import com.alibaba.druid.hbase.jdbc.HResultSetMetaData;
-import com.alibaba.druid.hbase.mapping.HMapping;
+import com.alibaba.druid.hbase.mapping.HMappingTable;
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
 import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
@@ -35,17 +35,17 @@ public class SingleTableQueryExecutePlan extends SingleTableExecutePlan {
 
     private HResultSetMetaData resultMetaData;
 
-    private HMapping           mapping;
+    private HMappingTable           mapping;
 
     public SingleTableQueryExecutePlan(){
 
     }
 
-    public HMapping getMapping() {
+    public HMappingTable getMapping() {
         return mapping;
     }
 
-    public void setMapping(HMapping mapping) {
+    public void setMapping(HMappingTable mapping) {
         this.mapping = mapping;
     }
 

src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java

@@ -1,19 +1,19 @@
 package com.alibaba.druid.hbase.hbql.ast;
 
-import com.alibaba.druid.hbase.mapping.HMapping;
+import com.alibaba.druid.hbase.mapping.HMappingTable;
 import com.alibaba.druid.sql.ast.SQLStatementImpl;
 
 public class HBQLCreateMappingStatement extends SQLStatementImpl implements HBQLStatement {
 
     private static final long serialVersionUID = 1L;
 
-    private HMapping          mapping          = new HMapping();
+    private HMappingTable          mapping          = new HMappingTable();
 
-    public HMapping getMapping() {
+    public HMappingTable getMapping() {
         return mapping;
     }
 
-    public void setMapping(HMapping mapping) {
+    public void setMapping(HMappingTable mapping) {
         this.mapping = mapping;
     }
 

src/main/java/com/alibaba/druid/hbase/jdbc/HBaseResultSet.java

@@ -13,7 +13,7 @@ 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.hbase.mapping.HMappingTable;
 import com.alibaba.druid.util.JdbcUtils;
 
 public class HBaseResultSet extends ResultSetBase implements HResultSet {
@@ -24,7 +24,7 @@ public class HBaseResultSet extends ResultSetBase implements HResultSet {
     private Result              result;
     private byte[]              family = Bytes.toBytes("d");
 
-    private HMapping            mapping;
+    private HMappingTable            mapping;
 
     public HBaseResultSet(HStatement statement, HTableInterface htable, ResultScanner scanner){
         super(statement);
@@ -33,11 +33,11 @@ public class HBaseResultSet extends ResultSetBase implements HResultSet {
         this.scanner = scanner;
     }
 
-    public HMapping getMapping() {
+    public HMappingTable getMapping() {
         return mapping;
     }
 
-    public void setMapping(HMapping mapping) {
+    public void setMapping(HMappingTable mapping) {
         this.mapping = mapping;
     }
 

src/main/java/com/alibaba/druid/hbase/mapping/HMappingTable.java

@@ -5,7 +5,7 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class HMapping {
+public class HMappingTable {
 
     private String                      tableName;