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:11:51 +08:00
parent 74c5f89b05
commit 98e8e226c5
38 changed files with 72 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/hbase/HDriver.java → src/main/java/com/alibaba/druid/hdriver/HDriver.java
+2 -2
View File
@@ -1,11 +1,11 @@
package com.alibaba.druid.hbase;
package com.alibaba.druid.hdriver;
import java.sql.Driver;
import java.sql.DriverPropertyInfo;
import java.sql.SQLException;
import java.util.Properties;
import com.alibaba.druid.hbase.jdbc.HBaseConnection;
import com.alibaba.druid.hdriver.jdbc.HBaseConnection;
public class HDriver implements Driver {
src/main/java/com/alibaba/druid/hbase/HEngine.java → src/main/java/com/alibaba/druid/hdriver/HEngine.java
+2 -2
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase;
package com.alibaba.druid.hdriver;
import java.io.IOException;
import java.util.Properties;
@@ -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.HMappingTable;
import com.alibaba.druid.hdriver.mapping.HMappingTable;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
src/main/java/com/alibaba/druid/hbase/exec/ExecutePlan.java → src/main/java/com/alibaba/druid/hdriver/execute/ExecutePlan.java
+3 -3
View File
@@ -1,9 +1,9 @@
package com.alibaba.druid.hbase.exec;
package com.alibaba.druid.hdriver.execute;
import java.sql.SQLException;
import com.alibaba.druid.hbase.jdbc.HPreparedStatementImpl;
import com.alibaba.druid.hbase.jdbc.HResultSet;
import com.alibaba.druid.hdriver.jdbc.HPreparedStatementImpl;
import com.alibaba.druid.hdriver.jdbc.HResultSet;
public interface ExecutePlan {
src/main/java/com/alibaba/druid/hbase/exec/ExecutePlanAdapter.java → src/main/java/com/alibaba/druid/hdriver/execute/ExecutePlanAdapter.java
+3 -3
View File
@@ -1,9 +1,9 @@
package com.alibaba.druid.hbase.exec;
package com.alibaba.druid.hdriver.execute;
import java.sql.SQLException;
import com.alibaba.druid.hbase.jdbc.HPreparedStatementImpl;
import com.alibaba.druid.hbase.jdbc.HResultSet;
import com.alibaba.druid.hdriver.jdbc.HPreparedStatementImpl;
import com.alibaba.druid.hdriver.jdbc.HResultSet;
public class ExecutePlanAdapter implements ExecutePlan {
src/main/java/com/alibaba/druid/hbase/exec/HBaseUtils.java → src/main/java/com/alibaba/druid/hdriver/execute/HBaseUtils.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.exec;
package com.alibaba.druid.hdriver.execute;
import java.io.IOException;
import java.math.BigDecimal;
src/main/java/com/alibaba/druid/hbase/exec/InsertExecutePlan.java → src/main/java/com/alibaba/druid/hdriver/execute/InsertExecutePlan.java
+3 -3
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.exec;
package com.alibaba.druid.hdriver.execute;
import java.sql.SQLException;
import java.util.LinkedHashMap;
@@ -8,8 +8,8 @@ import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.util.Bytes;
import com.alibaba.druid.hbase.jdbc.HBaseConnection;
import com.alibaba.druid.hbase.jdbc.HPreparedStatementImpl;
import com.alibaba.druid.hdriver.jdbc.HBaseConnection;
import com.alibaba.druid.hdriver.jdbc.HPreparedStatementImpl;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils;
src/main/java/com/alibaba/druid/hbase/exec/ShowTablesPlan.java → src/main/java/com/alibaba/druid/hdriver/execute/ShowTablesPlan.java
+4 -4
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.exec;
package com.alibaba.druid.hdriver.execute;
import java.sql.SQLException;
import java.sql.Statement;
@@ -8,9 +8,9 @@ import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import com.alibaba.druid.hbase.jdbc.HPreparedStatementImpl;
import com.alibaba.druid.hbase.jdbc.HResultSet;
import com.alibaba.druid.hbase.jdbc.HResultSetMetaData;
import com.alibaba.druid.hdriver.jdbc.HPreparedStatementImpl;
import com.alibaba.druid.hdriver.jdbc.HResultSet;
import com.alibaba.druid.hdriver.jdbc.HResultSetMetaData;
import com.alibaba.druid.util.jdbc.ResultSetBase;
import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData;
src/main/java/com/alibaba/druid/hbase/exec/SingleTableExecutePlan.java → src/main/java/com/alibaba/druid/hdriver/execute/SingleTableExecutePlan.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.exec;
package com.alibaba.druid.hdriver.execute;
public class SingleTableExecutePlan extends ExecutePlanAdapter {
src/main/java/com/alibaba/druid/hbase/exec/SingleTableQueryExecutePlan.java → src/main/java/com/alibaba/druid/hdriver/execute/SingleTableQueryExecutePlan.java
+6 -6
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.exec;
package com.alibaba.druid.hdriver.execute;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -15,11 +15,11 @@ import org.apache.hadoop.hbase.filter.RowFilter;
import org.apache.hadoop.hbase.filter.SingleColumnValueFilter;
import org.apache.hadoop.hbase.util.Bytes;
import com.alibaba.druid.hbase.jdbc.HBaseConnection;
import com.alibaba.druid.hbase.jdbc.HScannerResultSet;
import com.alibaba.druid.hbase.jdbc.HPreparedStatementImpl;
import com.alibaba.druid.hbase.jdbc.HResultSetMetaData;
import com.alibaba.druid.hbase.mapping.HMappingTable;
import com.alibaba.druid.hdriver.jdbc.HBaseConnection;
import com.alibaba.druid.hdriver.jdbc.HPreparedStatementImpl;
import com.alibaba.druid.hdriver.jdbc.HResultSetMetaData;
import com.alibaba.druid.hdriver.jdbc.HScannerResultSet;
import com.alibaba.druid.hdriver.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;
src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java → src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLCreateMappingStatement.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.alibaba.druid.hbase.hbql.ast;
package com.alibaba.druid.hdriver.hbql.ast;
import com.alibaba.druid.hbase.mapping.HMappingTable;
import com.alibaba.druid.hdriver.mapping.HMappingTable;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
public class HBQLCreateMappingStatement extends SQLStatementImpl implements HBQLStatement {
src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateTableStatement.java → src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLCreateTableStatement.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.hbql.ast;
package com.alibaba.druid.hdriver.hbql.ast;
import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLFamilyDefinition.java → src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLFamilyDefinition.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.hbql.ast;
package com.alibaba.druid.hdriver.hbql.ast;
import com.alibaba.druid.sql.ast.SQLObjectImpl;
import com.alibaba.druid.sql.ast.statement.SQLTableElement;
src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLSelectQueryBlock.java → src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLSelectQueryBlock.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.hbql.ast;
package com.alibaba.druid.hdriver.hbql.ast;
import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLShowStatement.java → src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLShowStatement.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.alibaba.druid.hbase.hbql.ast;
package com.alibaba.druid.hdriver.hbql.ast;
import com.alibaba.druid.hbase.hbql.visitor.HBQLVisitor;
import com.alibaba.druid.hdriver.hbql.visitor.HBQLVisitor;
public class HBQLShowStatement extends HBQLStatementImpl {
src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLStatement.java → src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLStatement.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.hbql.ast;
package com.alibaba.druid.hdriver.hbql.ast;
import com.alibaba.druid.sql.ast.SQLStatement;
src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLStatementImpl.java → src/main/java/com/alibaba/druid/hdriver/hbql/ast/HBQLStatementImpl.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.alibaba.druid.hbase.hbql.ast;
package com.alibaba.druid.hdriver.hbql.ast;
import com.alibaba.druid.hbase.hbql.visitor.HBQLVisitor;
import com.alibaba.druid.hdriver.hbql.visitor.HBQLVisitor;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLExprParser.java → src/main/java/com/alibaba/druid/hdriver/hbql/parser/HBQLExprParser.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.hbql.parser;
package com.alibaba.druid.hdriver.hbql.parser;
import com.alibaba.druid.sql.parser.Lexer;
import com.alibaba.druid.sql.parser.ParserException;
src/main/java/com/alibaba/druid/hbase/hbql/parser/HBQLStatementParser.java → src/main/java/com/alibaba/druid/hdriver/hbql/parser/HBQLStatementParser.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.alibaba.druid.hbase.hbql.parser;
package com.alibaba.druid.hdriver.hbql.parser;
import com.alibaba.druid.hbase.hbql.ast.HBQLShowStatement;
import com.alibaba.druid.hdriver.hbql.ast.HBQLShowStatement;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.parser.SQLExprParser;
import com.alibaba.druid.sql.parser.SQLStatementParser;
src/main/java/com/alibaba/druid/hbase/hbql/visitor/HBQLOutputVisitor.java → src/main/java/com/alibaba/druid/hdriver/hbql/visitor/HBQLOutputVisitor.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.alibaba.druid.hbase.hbql.visitor;
package com.alibaba.druid.hdriver.hbql.visitor;
import com.alibaba.druid.hbase.hbql.ast.HBQLShowStatement;
import com.alibaba.druid.hdriver.hbql.ast.HBQLShowStatement;
import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
src/main/java/com/alibaba/druid/hbase/hbql/visitor/HBQLVisitor.java → src/main/java/com/alibaba/druid/hdriver/hbql/visitor/HBQLVisitor.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.alibaba.druid.hbase.hbql.visitor;
package com.alibaba.druid.hdriver.hbql.visitor;
import com.alibaba.druid.hbase.hbql.ast.HBQLShowStatement;
import com.alibaba.druid.hdriver.hbql.ast.HBQLShowStatement;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public interface HBQLVisitor extends SQLASTVisitor {
src/main/java/com/alibaba/druid/hbase/jdbc/HBaseConnection.java → src/main/java/com/alibaba/druid/hdriver/jdbc/HBaseConnection.java
+2 -2
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.jdbc;
package com.alibaba.druid.hdriver.jdbc;
import java.sql.Array;
import java.sql.Blob;
@@ -21,7 +21,7 @@ import java.util.Properties;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.client.HTableInterface;
import com.alibaba.druid.hbase.HEngine;
import com.alibaba.druid.hdriver.HEngine;
import com.alibaba.druid.util.jdbc.ConnectionBase;
public class HBaseConnection extends ConnectionBase implements Connection {
src/main/java/com/alibaba/druid/hbase/jdbc/HPreparedStatement.java → src/main/java/com/alibaba/druid/hdriver/jdbc/HPreparedStatement.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.jdbc;
package com.alibaba.druid.hdriver.jdbc;
import java.sql.PreparedStatement;
src/main/java/com/alibaba/druid/hbase/jdbc/HPreparedStatementImpl.java → src/main/java/com/alibaba/druid/hdriver/jdbc/HPreparedStatementImpl.java
+6 -6
View File
@@ -1,15 +1,15 @@
package com.alibaba.druid.hbase.jdbc;
package com.alibaba.druid.hdriver.jdbc;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;
import java.util.List;
import com.alibaba.druid.hbase.exec.ExecutePlan;
import com.alibaba.druid.hbase.exec.InsertExecutePlan;
import com.alibaba.druid.hbase.exec.ShowTablesPlan;
import com.alibaba.druid.hbase.exec.SingleTableQueryExecutePlan;
import com.alibaba.druid.hbase.hbql.ast.HBQLShowStatement;
import com.alibaba.druid.hdriver.execute.ExecutePlan;
import com.alibaba.druid.hdriver.execute.InsertExecutePlan;
import com.alibaba.druid.hdriver.execute.ShowTablesPlan;
import com.alibaba.druid.hdriver.execute.SingleTableQueryExecutePlan;
import com.alibaba.druid.hdriver.hbql.ast.HBQLShowStatement;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLStatement;
src/main/java/com/alibaba/druid/hbase/jdbc/HResultSet.java → src/main/java/com/alibaba/druid/hdriver/jdbc/HResultSet.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.jdbc;
package com.alibaba.druid.hdriver.jdbc;
import java.sql.ResultSet;
src/main/java/com/alibaba/druid/hbase/jdbc/HResultSetMetaData.java → src/main/java/com/alibaba/druid/hdriver/jdbc/HResultSetMetaData.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.jdbc;
package com.alibaba.druid.hdriver.jdbc;
import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase;
src/main/java/com/alibaba/druid/hbase/jdbc/HScannerResultSet.java → src/main/java/com/alibaba/druid/hdriver/jdbc/HScannerResultSet.java
+2 -2
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.jdbc;
package com.alibaba.druid.hdriver.jdbc;
import java.io.IOException;
import java.math.BigDecimal;
@@ -11,7 +11,7 @@ import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.util.Bytes;
import com.alibaba.druid.hbase.mapping.HMapping;
import com.alibaba.druid.hdriver.mapping.HMapping;
import com.alibaba.druid.util.JdbcUtils;
import com.alibaba.druid.util.jdbc.ResultSetBase;
import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData;
src/main/java/com/alibaba/druid/hbase/jdbc/HStatement.java → src/main/java/com/alibaba/druid/hdriver/jdbc/HStatement.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.jdbc;
package com.alibaba.druid.hdriver.jdbc;
import java.sql.SQLException;
import java.sql.Statement;
src/main/java/com/alibaba/druid/hbase/jdbc/HStatementImpl.java → src/main/java/com/alibaba/druid/hdriver/jdbc/HStatementImpl.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.jdbc;
package com.alibaba.druid.hdriver.jdbc;
import java.sql.SQLException;
import java.sql.Statement;
src/main/java/com/alibaba/druid/hbase/mapping/HMapping.java → src/main/java/com/alibaba/druid/hdriver/mapping/HMapping.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.mapping;
package com.alibaba.druid.hdriver.mapping;
import org.apache.hadoop.hbase.client.Result;
src/main/java/com/alibaba/druid/hbase/mapping/HMappingColumn.java → src/main/java/com/alibaba/druid/hdriver/mapping/HMappingColumn.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.mapping;
package com.alibaba.druid.hdriver.mapping;
public class HMappingColumn {
src/main/java/com/alibaba/druid/hbase/mapping/HMappingDefaultImpl.java → src/main/java/com/alibaba/druid/hdriver/mapping/HMappingDefaultImpl.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.mapping;
package com.alibaba.druid.hdriver.mapping;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.util.Bytes;
src/main/java/com/alibaba/druid/hbase/mapping/HMappingTable.java → src/main/java/com/alibaba/druid/hdriver/mapping/HMappingTable.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.hbase.mapping;
package com.alibaba.druid.hdriver.mapping;
import java.util.Collection;
import java.util.Collections;
src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.alibaba.druid.sql.parser;
import com.alibaba.druid.hbase.hbql.parser.HBQLExprParser;
import com.alibaba.druid.hbase.hbql.parser.HBQLStatementParser;
import com.alibaba.druid.hdriver.hbql.parser.HBQLExprParser;
import com.alibaba.druid.hdriver.hbql.parser.HBQLStatementParser;
import com.alibaba.druid.sql.dialect.mysql.parser.MySqlExprParser;
import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser;
src/test/java/com/alibaba/druid/hbase/HBQLShowTableTest.java
+1
View File
@@ -5,6 +5,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Properties;
import com.alibaba.druid.hdriver.HDriver;
import com.alibaba.druid.util.JdbcUtils;
import junit.framework.TestCase;
src/test/java/com/alibaba/druid/hbase/HBaseDriverInsertTest.java
+2
View File
@@ -5,6 +5,8 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.util.Properties;
import com.alibaba.druid.hdriver.HDriver;
import junit.framework.TestCase;
public class HBaseDriverInsertTest extends TestCase {
src/test/java/com/alibaba/druid/hbase/HBaseDriverTest.java
+2
View File
@@ -5,6 +5,8 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Properties;
import com.alibaba.druid.hdriver.HDriver;
import junit.framework.TestCase;
src/test/java/com/alibaba/druid/hbase/HBaseDriverTest_getIndex.java
+2
View File
@@ -5,6 +5,8 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Properties;
import com.alibaba.druid.hdriver.HDriver;
import junit.framework.TestCase;
src/test/java/com/alibaba/druid/hbase/HBaseDriverTest_notRowFilter.java
+2
View File
@@ -5,6 +5,8 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Properties;
import com.alibaba.druid.hdriver.HDriver;
import junit.framework.TestCase;