Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
温少
2012-05-21 16:31:26 +08:00
parent 65616b7b44
commit 90b680e157
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/hdriver/impl/HPreparedStatementImpl.java
+1 -1
View File
@@ -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) {
src/main/java/com/alibaba/druid/hdriver/impl/HResultSetMetaData.java → src/main/java/com/alibaba/druid/hdriver/impl/HResultSetMetaDataImpl.java
+1 -1
View File
@@ -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 {
}
src/main/java/com/alibaba/druid/hdriver/impl/HScannerResultSet.java → src/main/java/com/alibaba/druid/hdriver/impl/HScannerResultSetImpl.java
+5 -5
View File
@@ -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;
}
src/main/java/com/alibaba/druid/hdriver/impl/execute/ShowTablesPlan.java
+3 -3
View File
@@ -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);
}
src/main/java/com/alibaba/druid/hdriver/impl/execute/SingleTableQueryExecutePlan.java
+7 -7
View File
@@ -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;