diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java index 5fcd270188..b3d5f77a6d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -import oracle.sql.SQLUtil; public class SQLInsertStatement extends SQLInsertInto implements SQLStatement { protected SQLWithSubqueryClause with; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectQueryBlock.java index f31de05295..f632f29e0f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectQueryBlock.java @@ -27,7 +27,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectQueryBlock; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import com.alibaba.druid.util.JdbcConstants; -import oracle.sql.SQLUtil; public class MySqlSelectQueryBlock extends SQLSelectQueryBlock implements MySqlObject { private boolean hignPriority; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/transform/FromSubqueryResolver.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/transform/FromSubqueryResolver.java index 4638f3b789..2d1d4c9f4f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/transform/FromSubqueryResolver.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/transform/FromSubqueryResolver.java @@ -21,11 +21,9 @@ import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.statement.*; -import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectJoin; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectSubqueryTableSource; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectTableReference; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitorAdapter; -import oracle.sql.SQLName; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java index c321ac626f..07ca4fd4ba 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -46,7 +46,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleFunctionDataType; import com.alibaba.druid.sql.dialect.oracle.parser.OracleProcedureDataType; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.util.JdbcUtils; -import oracle.sql.SQLUtil; import static com.alibaba.druid.util.Utils.getBoolean; diff --git a/src/main/java/com/alibaba/druid/wall/WallProviderStatLoggerImpl.java b/src/main/java/com/alibaba/druid/wall/WallProviderStatLoggerImpl.java index d6180c708a..2dcb7c3a55 100644 --- a/src/main/java/com/alibaba/druid/wall/WallProviderStatLoggerImpl.java +++ b/src/main/java/com/alibaba/druid/wall/WallProviderStatLoggerImpl.java @@ -25,7 +25,7 @@ import com.alibaba.druid.support.logging.LogFactory; public class WallProviderStatLoggerImpl extends WallProviderStatLoggerAdapter implements WallProviderStatLogger { - private static Log LOG = LogFactory.getLog(DruidDataSourceStatLoggerImpl.class); + private static Log LOG = LogFactory.getLog(WallProviderStatLoggerImpl.class); private Log logger = LOG; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParamTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParamTest.java index 3ec04e74e1..8f3e0e93a5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParamTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParamTest.java @@ -6,6 +6,9 @@ import com.alibaba.druid.util.FnvHash; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; +import java.util.ArrayList; +import java.util.List; + public class MySqlParamTest extends TestCase { public final static String dbType = JdbcConstants.MYSQL; @@ -15,10 +18,12 @@ public class MySqlParamTest extends TestCase { long hash2 = FnvHash.fnv1a_64_lower(ParameterizedOutputVisitorUtils.parameterize(sql, dbType)); assertEquals(hash1, hash2); + SQLSelectListCache cache = new SQLSelectListCache(dbType); cache.add("select `miller_cart`.`CART_ID`,`miller_cart`.`SKU_ID`,`miller_cart`.`ITEM_ID`,`miller_cart`.`QUANTITY`,`miller_cart`.`USER_ID`,`miller_cart`.`SELLER_ID`,`miller_cart`.`STATUS`,`miller_cart`.`EXT_STATUS`,`miller_cart`.`TYPE`,`miller_cart`.`SUB_TYPE`,`miller_cart`.`GMT_CREATE`,`miller_cart`.`GMT_MODIFIED`,`miller_cart`.`ATTRIBUTE`,`miller_cart`.`ATTRIBUTE_CC`,`miller_cart`.`EX2` from"); - long hash3 = ParameterizedOutputVisitorUtils.parameterizeHash(sql, dbType, cache, null); + List outParameters = new ArrayList(); // 这个参数如果为null时,性能会进一步提升 + long hash3 = ParameterizedOutputVisitorUtils.parameterizeHash(sql, dbType, cache, outParameters); assertEquals(hash1, hash3); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest88_bindvar.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest88_bindvar.java index d71ffe2df4..aeee9182f0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest88_bindvar.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest88_bindvar.java @@ -58,7 +58,7 @@ public class OracleSelectTest88_bindvar extends OracleTest { "FROM (\n" + "\tSELECT *\n" + "\tFROM \"rme\" \"rm\"\n" + - "\tWHERE \"rm\".a - (:\"sys_b_07\") DAY(:\"sys_b_08\") TO SECOND(:\"sys_b_09\")\n" + + "\tWHERE \"rm\".a - INTERVAL :\"sys_b_07\" DAY(:\"sys_b_08\") TO SECOND(:\"sys_b_09\")\n" + ")", text); }