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-18 22:41:14 +08:00
parent a4bba782e9
commit fc1146ec05
8 changed files with 1291 additions and 1296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/common/jdbc/ResultSetBase.java
+1160
View File
File diff suppressed because it is too large Load Diff
src/main/java/com/alibaba/druid/hbase/HBaseConnection.java
+32 -10
View File
@@ -21,10 +21,17 @@ import java.util.Map;
import java.util.Properties;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import com.alibaba.druid.common.jdbc.ConnectionBase;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
public class HBaseConnection extends ConnectionBase implements Connection {
@@ -238,16 +245,31 @@ public class HBaseConnection extends ConnectionBase implements Connection {
return null;
}
public ResultSet executeQuery(String sql, List<Object> parameters) throws SQLException {
String dbType = this.getConnectProperties().getProperty("dbType");
List<SQLStatement> stmtList = SQLUtils.parseStatements(sql, dbType);
if (stmtList.size() != 1) {
throw new SQLException("not support multi-statement");
public ResultSet executeQuery(HBaseStatementInterface jdbcHbaseStmt, String sql, List<Object> parameters) throws SQLException {
try {
String dbType = this.getConnectProperties().getProperty("dbType");
List<SQLStatement> stmtList = SQLUtils.parseStatements(sql, dbType);
if (stmtList.size() != 1) {
throw new SQLException("not support multi-statement");
}
SQLSelectStatement stmt = (SQLSelectStatement) stmtList.get(0);
SQLSelectQueryBlock selectQueryBlock = (SQLSelectQueryBlock) stmt.getSelect().getQuery();
SQLExprTableSource tableSource = (SQLExprTableSource) selectQueryBlock.getFrom();
String tableName = ((SQLIdentifierExpr) tableSource.getExpr()).getName();
HTable htable = new HTable(config, tableName);
Scan scan = new Scan();
ResultScanner scanner = htable.getScanner(scan);
return new HBaseResultSet(jdbcHbaseStmt, scanner);
} catch (SQLException ex) {
throw ex;
} catch (Exception ex) {
throw new SQLException("executeQuery error", ex);
}
SQLStatement stmt = stmtList.get(0);
throw new SQLException("TODO");
}
}
src/main/java/com/alibaba/druid/hbase/HBaseDriver.java
+1 -1
View File
@@ -15,7 +15,7 @@ public class HBaseDriver implements Driver {
return null;
}
String rest = url.substring(PREFIX.length());
String rest = url.substring(PREFIX.length() + 1);
info.put("hbase.zookeeper.quorum", rest);
src/main/java/com/alibaba/druid/hbase/HBasePreparedStatement.java
+7 -2
View File
@@ -6,7 +6,7 @@ import java.sql.SQLException;
import com.alibaba.druid.common.jdbc.PreparedStatementBase;
public class HBasePreparedStatement extends PreparedStatementBase implements PreparedStatement {
public class HBasePreparedStatement extends PreparedStatementBase implements PreparedStatement, HBaseStatementInterface {
private final String sql;
private String[] columnNames;
@@ -31,9 +31,14 @@ public class HBasePreparedStatement extends PreparedStatementBase implements Pre
return sql;
}
@Override
public HBaseConnection getConnection() throws SQLException {
return hbaseConnection;
}
@Override
public ResultSet executeQuery() throws SQLException {
return hbaseConnection.executeQuery(sql, getParameters());
return hbaseConnection.executeQuery(this, sql, getParameters());
}
@Override
src/main/java/com/alibaba/druid/hbase/HBaseResultSet.java
+73
View File
@@ -0,0 +1,73 @@
package com.alibaba.druid.hbase;
import java.io.IOException;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
import com.alibaba.druid.common.jdbc.ResultSetBase;
public class HBaseResultSet extends ResultSetBase {
private HBaseStatementInterface statement;
private ResultScanner scanner;
private Result result;
public HBaseResultSet(HBaseStatementInterface statement, ResultScanner scanner){
super(statement);
this.statement = statement;
this.scanner = scanner;
}
@Override
public Statement getStatement() throws SQLException {
return statement;
}
@Override
public boolean next() throws SQLException {
try {
result = scanner.next();
return result != null && !result.isEmpty();
} catch (IOException ex) {
throw new SQLException("read next error", ex);
}
}
@Override
public ResultSetMetaData getMetaData() throws SQLException {
// TODO Auto-generated method stub
return null;
}
@Override
public boolean previous() throws SQLException {
// TODO Auto-generated method stub
return false;
}
@Override
public void updateObject(int columnIndex, Object x) throws SQLException {
// TODO Auto-generated method stub
}
@Override
public Object getObjectInternal(int columnIndex) {
return null;
}
@Override
public void close() throws SQLException {
try {
scanner.close();
} catch (Exception ex) {
throw new SQLException("close error", ex);
}
super.close();
}
}
src/main/java/com/alibaba/druid/hbase/HBaseStatement.java
+2 -148
View File
@@ -1,13 +1,11 @@
package com.alibaba.druid.hbase;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import com.alibaba.druid.common.jdbc.StatementBase;
public class HBaseStatement extends StatementBase implements Statement {
public class HBaseStatement extends StatementBase implements Statement, HBaseStatementInterface {
private HBaseConnection conn;
@@ -17,154 +15,10 @@ public class HBaseStatement extends StatementBase implements Statement {
}
@Override
public <T> T unwrap(Class<T> iface) throws SQLException {
// TODO Auto-generated method stub
return null;
}
@Override
public boolean isWrapperFor(Class<?> iface) throws SQLException {
// TODO Auto-generated method stub
return false;
}
@Override
public ResultSet executeQuery(String sql) throws SQLException {
// TODO Auto-generated method stub
return null;
}
@Override
public int executeUpdate(String sql) throws SQLException {
// TODO Auto-generated method stub
return 0;
}
@Override
public void close() throws SQLException {
// TODO Auto-generated method stub
}
@Override
public void cancel() throws SQLException {
}
@Override
public boolean execute(String sql) throws SQLException {
// TODO Auto-generated method stub
return false;
}
@Override
public ResultSet getResultSet() throws SQLException {
// TODO Auto-generated method stub
return null;
}
@Override
public int getUpdateCount() throws SQLException {
// TODO Auto-generated method stub
return 0;
}
@Override
public boolean getMoreResults() throws SQLException {
// TODO Auto-generated method stub
return false;
}
@Override
public void addBatch(String sql) throws SQLException {
// TODO Auto-generated method stub
}
@Override
public void clearBatch() throws SQLException {
// TODO Auto-generated method stub
}
@Override
public int[] executeBatch() throws SQLException {
// TODO Auto-generated method stub
return null;
}
@Override
public Connection getConnection() throws SQLException {
public HBaseConnection getConnection() throws SQLException {
return conn;
}
@Override
public boolean getMoreResults(int current) throws SQLException {
// TODO Auto-generated method stub
return false;
}
@Override
public ResultSet getGeneratedKeys() throws SQLException {
// TODO Auto-generated method stub
return null;
}
@Override
public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
// TODO Auto-generated method stub
return 0;
}
@Override
public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
// TODO Auto-generated method stub
return 0;
}
@Override
public int executeUpdate(String sql, String[] columnNames) throws SQLException {
// TODO Auto-generated method stub
return 0;
}
@Override
public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean execute(String sql, int[] columnIndexes) throws SQLException {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean execute(String sql, String[] columnNames) throws SQLException {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean isClosed() throws SQLException {
// TODO Auto-generated method stub
return false;
}
@Override
public void setPoolable(boolean poolable) throws SQLException {
// TODO Auto-generated method stub
}
@Override
public boolean isPoolable() throws SQLException {
// TODO Auto-generated method stub
return false;
}
public void checkOpen() {
}
src/main/java/com/alibaba/druid/hbase/HBaseStatementInterface.java
+8
View File
@@ -0,0 +1,8 @@
package com.alibaba.druid.hbase;
import java.sql.SQLException;
import java.sql.Statement;
public interface HBaseStatementInterface extends Statement {
HBaseConnection getConnection() throws SQLException;
}
src/main/java/com/alibaba/druid/mock/MockResultSet.java
+8 -1135
View File
File diff suppressed because it is too large Load Diff