From 90b680e157f57db74ffc1ab3e9c656cfb51cc29a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= Date: Mon, 21 May 2012 16:31:26 +0800 Subject: [PATCH] refactor --- .../druid/hdriver/impl/HPreparedStatementImpl.java | 2 +- ...etMetaData.java => HResultSetMetaDataImpl.java} | 2 +- ...erResultSet.java => HScannerResultSetImpl.java} | 10 +++++----- .../druid/hdriver/impl/execute/ShowTablesPlan.java | 6 +++--- .../impl/execute/SingleTableQueryExecutePlan.java | 14 +++++++------- 5 files changed, 17 insertions(+), 17 deletions(-) rename src/main/java/com/alibaba/druid/hdriver/impl/{HResultSetMetaData.java => HResultSetMetaDataImpl.java} (60%) rename src/main/java/com/alibaba/druid/hdriver/impl/{HScannerResultSet.java => HScannerResultSetImpl.java} (93%) diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/HPreparedStatementImpl.java b/src/main/java/com/alibaba/druid/hdriver/impl/HPreparedStatementImpl.java index 7a5662286f..2a823e9a1b 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/HPreparedStatementImpl.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/HPreparedStatementImpl.java @@ -82,7 +82,7 @@ public class HPreparedStatementImpl extends PreparedStatementBase implements HPr splitCondition(singleTableQueryExecuetePlan.getConditions(), selectQueryBlock.getWhere()); - HResultSetMetaData resultMetaData = new HResultSetMetaData(); + HResultSetMetaDataImpl resultMetaData = new HResultSetMetaDataImpl(); for (SQLSelectItem selectItem : selectQueryBlock.getSelectList()) { ColumnMetaData columnMetaData = new ColumnMetaData(); if (selectItem.getAlias() != null) { diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/HResultSetMetaData.java b/src/main/java/com/alibaba/druid/hdriver/impl/HResultSetMetaDataImpl.java similarity index 60% rename from src/main/java/com/alibaba/druid/hdriver/impl/HResultSetMetaData.java rename to src/main/java/com/alibaba/druid/hdriver/impl/HResultSetMetaDataImpl.java index cc807ba46a..2174fb7352 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/HResultSetMetaData.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/HResultSetMetaDataImpl.java @@ -3,6 +3,6 @@ package com.alibaba.druid.hdriver.impl; import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase; -public class HResultSetMetaData extends ResultSetMetaDataBase { +public class HResultSetMetaDataImpl extends ResultSetMetaDataBase { } diff --git a/src/main/java/com/alibaba/druid/hdriver/impl/HScannerResultSet.java b/src/main/java/com/alibaba/druid/hdriver/impl/HScannerResultSetImpl.java similarity index 93% rename from src/main/java/com/alibaba/druid/hdriver/impl/HScannerResultSet.java rename to src/main/java/com/alibaba/druid/hdriver/impl/HScannerResultSetImpl.java index 2dabc248e3..d6c28d2b05 100644 --- a/src/main/java/com/alibaba/druid/hdriver/impl/HScannerResultSet.java +++ b/src/main/java/com/alibaba/druid/hdriver/impl/HScannerResultSetImpl.java @@ -17,7 +17,7 @@ import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.jdbc.ResultSetBase; import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData; -public class HScannerResultSet extends ResultSetBase implements HResultSet { +public class HScannerResultSetImpl extends ResultSetBase implements HResultSet { private HStatement statement; private ResultScanner scanner; @@ -27,7 +27,7 @@ public class HScannerResultSet extends ResultSetBase implements HResultSet { private HMapping mapping; - public HScannerResultSet(HStatement statement, HTableInterface htable, ResultScanner scanner){ + public HScannerResultSetImpl(HStatement statement, HTableInterface htable, ResultScanner scanner){ super(statement); this.statement = statement; this.htable = htable; @@ -58,11 +58,11 @@ public class HScannerResultSet extends ResultSetBase implements HResultSet { } @Override - public HResultSetMetaData getMetaData() throws SQLException { - return (HResultSetMetaData) metaData; + public HResultSetMetaDataImpl getMetaData() throws SQLException { + return (HResultSetMetaDataImpl) metaData; } - public void setMetaData(HResultSetMetaData metaData) { + public void setMetaData(HResultSetMetaDataImpl metaData) { this.metaData = metaData; } 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 655ac2b0fe..5dbace6a1d 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 @@ -11,7 +11,7 @@ import org.apache.hadoop.hbase.client.HBaseAdmin; import com.alibaba.druid.hdriver.HResultSet; import com.alibaba.druid.hdriver.HStatement; import com.alibaba.druid.hdriver.impl.HPreparedStatementImpl; -import com.alibaba.druid.hdriver.impl.HResultSetMetaData; +import com.alibaba.druid.hdriver.impl.HResultSetMetaDataImpl; import com.alibaba.druid.util.jdbc.ResultSetBase; import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData; @@ -48,7 +48,7 @@ public class ShowTablesPlan implements ExecutePlan { super(statement); this.tables = tables; - HResultSetMetaData metaData = new HResultSetMetaData(); + HResultSetMetaDataImpl metaData = new HResultSetMetaDataImpl(); { ColumnMetaData column = new ColumnMetaData(); column.setColumnName("name"); @@ -163,7 +163,7 @@ public class ShowTablesPlan implements ExecutePlan { @Override public int findColumn(String columnName) throws SQLException { - HResultSetMetaData meta = (HResultSetMetaData) this.metaData; + HResultSetMetaDataImpl meta = (HResultSetMetaDataImpl) this.metaData; return meta.findColumn(columnName); } 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 0dc0354437..7a912bbe6d 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 @@ -17,8 +17,8 @@ import org.apache.hadoop.hbase.util.Bytes; import com.alibaba.druid.hdriver.impl.HBaseConnectionImpl; import com.alibaba.druid.hdriver.impl.HPreparedStatementImpl; -import com.alibaba.druid.hdriver.impl.HResultSetMetaData; -import com.alibaba.druid.hdriver.impl.HScannerResultSet; +import com.alibaba.druid.hdriver.impl.HResultSetMetaDataImpl; +import com.alibaba.druid.hdriver.impl.HScannerResultSetImpl; import com.alibaba.druid.hdriver.impl.mapping.HMappingTable; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; @@ -33,7 +33,7 @@ public class SingleTableQueryExecutePlan extends SingleTableExecutePlan { private byte[] family = Bytes.toBytes("d"); - private HResultSetMetaData resultMetaData; + private HResultSetMetaDataImpl resultMetaData; private HMappingTable mapping; @@ -61,16 +61,16 @@ public class SingleTableQueryExecutePlan extends SingleTableExecutePlan { return columeNames; } - public HResultSetMetaData getResultMetaData() { + public HResultSetMetaDataImpl getResultMetaData() { return resultMetaData; } - public void setResultMetaData(HResultSetMetaData resultMetaData) { + public void setResultMetaData(HResultSetMetaDataImpl resultMetaData) { this.resultMetaData = resultMetaData; } @Override - public HScannerResultSet executeQuery(HPreparedStatementImpl statement) throws SQLException { + public HScannerResultSetImpl executeQuery(HPreparedStatementImpl statement) throws SQLException { try { HBaseConnectionImpl 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); - HScannerResultSet resultSet = new HScannerResultSet(statement, htable, scanner); + HScannerResultSetImpl resultSet = new HScannerResultSetImpl(statement, htable, scanner); resultSet.setMetaData(resultMetaData); return resultSet;