diff --git a/druid-spring-boot-starter/README.md b/druid-spring-boot-starter/README.md index 8b5c4ef194..2eb6d8f34e 100644 --- a/druid-spring-boot-starter/README.md +++ b/druid-spring-boot-starter/README.md @@ -61,7 +61,7 @@ spring.datasource.druid.filters= #配置多个英文逗号分隔 - 监控配置 ``` # WebStatFilter配置,说明请参考Druid Wiki,配置_配置WebStatFilter -spring.datasource.druid.web-stat-filter.enabled= #是否启用StatFilter默认值true +spring.datasource.druid.web-stat-filter.enabled= #是否启用StatFilter默认值false spring.datasource.druid.web-stat-filter.url-pattern= spring.datasource.druid.web-stat-filter.exclusions= spring.datasource.druid.web-stat-filter.session-stat-enable= @@ -71,7 +71,7 @@ spring.datasource.druid.web-stat-filter.principal-cookie-name= spring.datasource.druid.web-stat-filter.profile-enable= # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置 -spring.datasource.druid.stat-view-servlet.enabled= #是否启用StatViewServlet默认值true +spring.datasource.druid.stat-view-servlet.enabled= #是否启用StatViewServlet(监控页面)默认值为false(考虑到安全问题默认并未启动,如需启用建议设置密码或白名单以保障安全) spring.datasource.druid.stat-view-servlet.url-pattern= spring.datasource.druid.stat-view-servlet.reset-enable= spring.datasource.druid.stat-view-servlet.login-username= @@ -132,6 +132,7 @@ public DataSource dataSourceTwo(){ 你可以通过 ```spring.datasource.druid.filters=stat,wall,log4j ...``` 的方式来启用相应的内置Filter,不过这些Filter都是默认配置。如果默认配置不能满足你的需求,你可以放弃这种方式,通过配置文件来配置Filter,下面是例子。 ```xml # 配置StatFilter +spring.datasource.druid.filter.stat.enabled=true spring.datasource.druid.filter.stat.db-type=h2 spring.datasource.druid.filter.stat.log-slow-sql=true spring.datasource.druid.filter.stat.slow-sql-millis=2000 @@ -154,11 +155,11 @@ spring.datasource.druid.filter.wall.config.drop-table-allow=false - Log4j2Filter - CommonsLogFilter -要想使自定义 Filter 配置生效需要将对应 Filter 的 ```enabled``` 设置为 ```true``` ,Druid Spring Boot Starter 默认会启用 StatFilter,你也可以将其 ```enabled``` 设置为 ```false``` 来禁用它。 +要想使自定义 Filter 配置生效需要将对应 Filter 的 ```enabled``` 设置为 ```true``` ,Druid Spring Boot Starter 默认禁用 StatFilter,你也可以将其 ```enabled``` 设置为 ```true``` 来启用它。 ## 如何获取 Druid 的监控数据 -Druid 的监控数据可以通过 DruidStatManagerFacade 进行获取,获取到监控数据之后你可以将其暴露给你的监控系统进行使用。Druid 默认的监控系统数据也来源于此。下面给做一个简单的演示,在 Spring Boot 中如何通过 HTTP 接口将 Druid 监控数据以 JSON 的形式暴露出去,实际使用中你可以根据你的需要自由地对监控数据、暴露方式进行扩展。 +Druid 的监控数据可以在开启 StatFilter 后通过 DruidStatManagerFacade 进行获取,获取到监控数据之后你可以将其暴露给你的监控系统进行使用。Druid 默认的监控系统数据也来源于此。下面给做一个简单的演示,在 Spring Boot 中如何通过 HTTP 接口将 Druid 监控数据以 JSON 的形式暴露出去,实际使用中你可以根据你的需要自由地对监控数据、暴露方式进行扩展。 ```java @RestController diff --git a/druid-spring-boot-starter/README_EN.md b/druid-spring-boot-starter/README_EN.md index 0d3b333889..1a78002773 100644 --- a/druid-spring-boot-starter/README_EN.md +++ b/druid-spring-boot-starter/README_EN.md @@ -58,7 +58,7 @@ spring.datasource.druid.filters= #Druid filters, default value stat, multiple se - Monitor ``` # WebStatFilter properties, detail see Druid Wiki -spring.datasource.druid.web-stat-filter.enabled= #Enable StatFilter, default value true. +spring.datasource.druid.web-stat-filter.enabled= #Enable StatFilter, default value false. spring.datasource.druid.web-stat-filter.url-pattern= spring.datasource.druid.web-stat-filter.exclusions= spring.datasource.druid.web-stat-filter.session-stat-enable= @@ -68,7 +68,7 @@ spring.datasource.druid.web-stat-filter.principal-cookie-name= spring.datasource.druid.web-stat-filter.profile-enable= # StatViewServlet properties, detail see Druid Wiki -spring.datasource.druid.stat-view-servlet.enabled= #Enable StatViewServlet, default value true. +spring.datasource.druid.stat-view-servlet.enabled= #Enable StatViewServlet (monitor console), default value false. spring.datasource.druid.stat-view-servlet.url-pattern= spring.datasource.druid.stat-view-servlet.reset-enable= spring.datasource.druid.stat-view-servlet.login-username= @@ -126,6 +126,7 @@ public DataSource dataSourceTwo(){ You can ```spring.datasource.druid.filters = stat, wall, log4j, dtc.``` way to enable the corresponding built-in Filter, but these are the default configuration Filter. If the default configuration can not meet your needs, you can give up this way, through the configuration file to configure the Filter, the following is an example. ```xml # StatFilter configuration example. +spring.datasource.druid.filter.stat.enabled=true spring.datasource.druid.filter.stat.db-type=h2 spring.datasource.druid.filter.stat.log-slow-sql=true spring.datasource.druid.filter.stat.slow-sql-millis=2000 @@ -148,11 +149,10 @@ Currently, configuration support is provided for the following filters. Please r - Log4j2Filter - CommonsLogFilter -Druid Spring Boot Starter will enable StatFilter by default, and you can also set its enabled to false.,make the Filter configuration take effect and need to set enabled to true. +Druid Spring Boot Starter will forbid StatFilter by default, and you can also set its enabled to true.,make the Filter configuration take effect and need to set enabled to true. ## How to get Druid monitoring(stat) data - -Druid's monitoring data can be obtained through DruidStatManagerFacade. After obtaining the monitoring data, you can expose it to your monitoring system for use. Druid's default monitoring system data also comes from this. Let's take a simple demonstration. In Spring Boot, how to expose Druid monitoring data in the form of JSON through the HTTP interface. In actual use, you can freely expand the monitoring data and exposure methods according to your needs. +Druid's monitoring data can be obtained through DruidStatManagerFacade after the StatFilter is enable. After obtaining the monitoring data, you can expose it to your monitoring system for use. Druid's default monitoring system data also comes from this. Let's take a simple demonstration. In Spring Boot, how to expose Druid monitoring data in the form of JSON through the HTTP interface. In actual use, you can freely expand the monitoring data and exposure methods according to your needs. ```java @RestController public class DruidStatController { diff --git a/druid-spring-boot-starter/pom.xml b/druid-spring-boot-starter/pom.xml index e47427e730..3758290c29 100644 --- a/druid-spring-boot-starter/pom.xml +++ b/druid-spring-boot-starter/pom.xml @@ -4,14 +4,14 @@ 4.0.0 com.alibaba druid-spring-boot-starter - 1.1.10-SNAPSHOT + 1.1.13 jar druid-spring-boot-starter Spring Boot with Druid support,help you simplify Druid config in Spring Boot. https://github.com/alibaba/druid - 1.1.9 + 1.1.13 1.5.12.RELEASE diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/properties/DruidStatProperties.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/properties/DruidStatProperties.java index 70bdbb7475..ad6d3da70e 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/properties/DruidStatProperties.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/properties/DruidStatProperties.java @@ -53,9 +53,9 @@ public class DruidStatProperties { public static class StatViewServlet { /** - * Enable StatViewServlet. + * Enable StatViewServlet, default false. */ - private boolean enabled = true; + private boolean enabled; private String urlPattern; private String allow; private String deny; @@ -122,9 +122,9 @@ public class DruidStatProperties { public static class WebStatFilter { /** - * Enable WebStatFilter. + * Enable WebStatFilter, default false. */ - private boolean enabled = true; + private boolean enabled; private String urlPattern; private String exclusions; private String sessionStatMaxCount; diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java index 548614d989..c604ee040e 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java @@ -33,7 +33,7 @@ public class DruidFilterConfiguration { @Bean @ConfigurationProperties(FILTER_STAT_PREFIX) - @ConditionalOnProperty(prefix = FILTER_STAT_PREFIX, name = "enabled", matchIfMissing = true) + @ConditionalOnProperty(prefix = FILTER_STAT_PREFIX, name = "enabled") @ConditionalOnMissingBean public StatFilter statFilter() { return new StatFilter(); diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidStatViewServletConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidStatViewServletConfiguration.java index efe754be62..b33c689e9f 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidStatViewServletConfiguration.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidStatViewServletConfiguration.java @@ -26,8 +26,10 @@ import org.springframework.context.annotation.Bean; * @author lihengming [89921218@qq.com] */ @ConditionalOnWebApplication -@ConditionalOnProperty(name = "spring.datasource.druid.stat-view-servlet.enabled", havingValue = "true", matchIfMissing = true) +@ConditionalOnProperty(name = "spring.datasource.druid.stat-view-servlet.enabled", havingValue = "true") public class DruidStatViewServletConfiguration { + private static final String DEFAULT_ALLOW_IP = "127.0.0.1"; + @Bean public ServletRegistrationBean statViewServletRegistrationBean(DruidStatProperties properties) { DruidStatProperties.StatViewServlet config = properties.getStatViewServlet(); @@ -36,6 +38,8 @@ public class DruidStatViewServletConfiguration { registrationBean.addUrlMappings(config.getUrlPattern() != null ? config.getUrlPattern() : "/druid/*"); if (config.getAllow() != null) { registrationBean.addInitParameter("allow", config.getAllow()); + } else { + registrationBean.addInitParameter("allow", DEFAULT_ALLOW_IP); } if (config.getDeny() != null) { registrationBean.addInitParameter("deny", config.getDeny()); diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidWebStatFilterConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidWebStatFilterConfiguration.java index 9117ee83a8..d9c95ae0e7 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidWebStatFilterConfiguration.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidWebStatFilterConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.context.annotation.Bean; * @author lihengming [89921218@qq.com] */ @ConditionalOnWebApplication -@ConditionalOnProperty(name = "spring.datasource.druid.web-stat-filter.enabled", havingValue = "true", matchIfMissing = true) +@ConditionalOnProperty(name = "spring.datasource.druid.web-stat-filter.enabled", havingValue = "true") public class DruidWebStatFilterConfiguration { @Bean public FilterRegistrationBean webStatFilterRegistrationBean(DruidStatProperties properties) { diff --git a/druid-spring-boot-starter/src/test/resources/application.properties b/druid-spring-boot-starter/src/test/resources/application.properties index 31a15c2b2a..1ae3b4ac48 100644 --- a/druid-spring-boot-starter/src/test/resources/application.properties +++ b/druid-spring-boot-starter/src/test/resources/application.properties @@ -5,14 +5,14 @@ spring.datasource.password=sa # driver-class-name 非必填可根据url推断 spring.datasource.driver-class-name=org.h2.Driver -#Druid 数据源配置,继承spring.datasource.* 配置,相同则覆盖 +# Druid 数据源配置,继承spring.datasource.* 配置,相同则覆盖 spring.datasource.druid.initial-size=2 spring.datasource.druid.max-active=30 spring.datasource.druid.min-idle=2 spring.datasource.druid.max-wait=1234 spring.datasource.druid.pool-prepared-statements=true spring.datasource.druid.max-pool-prepared-statement-per-connection-size=5 -#spring.datasource.druid.max-open-prepared-statements= #等价于上面的max-pool-prepared-statement-per-connection-size +# spring.datasource.druid.max-open-prepared-statements= #等价于上面的max-pool-prepared-statement-per-connection-size spring.datasource.druid.validation-query=select 1 spring.datasource.druid.validation-query-timeout=1 spring.datasource.druid.test-on-borrow=true @@ -34,8 +34,12 @@ spring.datasource.druid.filter.stat.slow-sql-millis=2000 spring.jpa.show-sql= true spring.jpa.hibernate.ddl-auto=create-drop +# 配置下面参数用于启动监控页面,考虑安全问题,默认是关闭的,按需开启 +spring.datasource.druid.stat-view-servlet.enabled=true +spring.datasource.druid.filter.stat.enabled=true +spring.datasource.druid.web-stat-filter.enabled=true + # 更多配置属性见 DruidDataSource 内成员变量(只要有set方法便支持),或者根据IDE提示,或者查看官方文档 - diff --git a/pom.xml b/pom.xml index b83cf4682f..c6e0c7c3f9 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.alibaba druid - 1.1.12-preview_1 + 1.1.14-preview_1 jar druid @@ -12,7 +12,7 @@ 2013 - 4.2.5.RELEASE + 4.3.20.RELEASE 4.12 1.19 @@ -602,7 +602,7 @@ org.apache.commons commons-dbcp2 - 2.1.1 + 2.5.0 test diff --git a/src/main/java/com/alibaba/druid/VERSION.java b/src/main/java/com/alibaba/druid/VERSION.java index 8f9a3d6efb..2701cfddff 100644 --- a/src/main/java/com/alibaba/druid/VERSION.java +++ b/src/main/java/com/alibaba/druid/VERSION.java @@ -19,7 +19,7 @@ public final class VERSION { public final static int MajorVersion = 1; public final static int MinorVersion = 1; - public final static int RevisionVersion = 12; + public final static int RevisionVersion = 14; public static String getVersionNumber() { return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion; diff --git a/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java b/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java index 037eb98d22..710da121ee 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java +++ b/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java @@ -546,7 +546,7 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM } private void logExecutableSql(StatementProxy statement, String sql) { - if (!isStatementExecutableSqlLogEnable()) { + if ((!isStatementExecutableSqlLogEnable()) || !isStatementLogEnabled()) { return; } diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index a2cf6cbafb..ccc568a0a6 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -150,6 +150,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat private boolean asyncInit = false; protected boolean killWhenSocketReadTimeout = false; + private static List autoFilters = null; + private boolean loadSpifilterSkip = false; + protected static final AtomicLongFieldUpdater recycleErrorCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidDataSource.class, "recycleErrorCount"); protected static final AtomicLongFieldUpdater connectErrorCountUpdater @@ -157,6 +160,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat protected static final AtomicLongFieldUpdater resetCountUpdater = AtomicLongFieldUpdater.newUpdater(DruidDataSource.class, "resetCount"); + public DruidDataSource(){ this(false); } @@ -316,6 +320,17 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } } } + { + String property = properties.getProperty("druid.maxWait"); + if (property != null && property.length() > 0) { + try { + int value = Integer.parseInt(property); + this.setMaxWait(value); + } catch (NumberFormatException e) { + LOG.error("illegal property 'druid.maxWait'", e); + } + } + } { Boolean value = getBoolean(properties, "druid.failFast"); if (value != null) { @@ -333,6 +348,17 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } } } + { + String property = properties.getProperty("druid.phyMaxUseCount"); + if (property != null && property.length() > 0) { + try { + long value = Long.parseLong(property); + this.setPhyMaxUseCount(value); + } catch (NumberFormatException e) { + LOG.error("illegal property 'druid.phyMaxUseCount'", e); + } + } + } { String property = properties.getProperty("druid.minEvictableIdleTimeMillis"); if (property != null && property.length() > 0) { @@ -458,6 +484,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } } } + { + String property = System.getProperty("druid.load.spifilter.skip"); + if (property != null && !"false".equals(property)) { + loadSpifilterSkip = true; + } + } } public boolean isKillWhenSocketReadTimeout() { @@ -728,6 +760,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat return; } + // bug fixed for dead lock, for issue #2980 + DruidDriver.getInstance(); + final ReentrantLock lock = this.lock; try { lock.lockInterruptibly(); @@ -986,22 +1021,28 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat * @see ServiceLoader */ private void initFromSPIServiceLoader() { - - String property = System.getProperty("druid.load.spifilter.skip"); - if (property != null) { + if (loadSpifilterSkip) { return; } - ServiceLoader druidAutoFilterLoader = ServiceLoader.load(Filter.class); + if (autoFilters == null) { + List filters = new ArrayList(); + ServiceLoader autoFilterLoader = ServiceLoader.load(Filter.class); - for (Filter autoFilter : druidAutoFilterLoader) { - AutoLoad autoLoad = autoFilter.getClass().getAnnotation(AutoLoad.class); - if (autoLoad != null && autoLoad.value()) { - if (LOG.isInfoEnabled()) { - LOG.info("load filter from spi :" + autoFilter.getClass().getName()); + for (Filter filter : autoFilterLoader) { + AutoLoad autoLoad = filter.getClass().getAnnotation(AutoLoad.class); + if (autoLoad != null && autoLoad.value()) { + filters.add(filter); } - addFilter(autoFilter); } + autoFilters = filters; + } + + for (Filter filter : autoFilters) { + if (LOG.isInfoEnabled()) { + LOG.info("load filter from spi :" + filter.getClass().getName()); + } + addFilter(filter); } } @@ -1096,6 +1137,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat || JdbcUtils.MYSQL_DRIVER_6.equals(this.dbType)) { isMySql = true; } + + if (removeAbandoned) { + LOG.warn("removeAbandoned is true, not use in productiion."); + } } private void oracleValidationQueryCheck() { @@ -1432,19 +1477,26 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat && activeCount >= onFatalErrorMaxActive) { connectErrorCountUpdater.incrementAndGet(this); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String errorMsg = "onFatalError, activeCount " + activeCount - + ", onFatalErrorMaxActive " + onFatalErrorMaxActive; + StringBuilder errorMsg = new StringBuilder(); + errorMsg.append("onFatalError, activeCount ") + .append(activeCount) + .append(", onFatalErrorMaxActive ") + .append(onFatalErrorMaxActive); if (lastFatalErrorTimeMillis > 0) { - errorMsg += ", time '" + format.format(new Date(lastFatalErrorTimeMillis)) + "'"; + errorMsg.append(", time '") + .append(StringUtils.formatDateTime19( + lastFatalErrorTimeMillis, TimeZone.getDefault())) + .append("'"); } if (lastFatalErrorSql != null) { - errorMsg += ", sql \n" + lastFatalErrorSql; + errorMsg.append(", sql \n") + .append(lastFatalErrorSql); } - throw new SQLException(errorMsg, lastFatalError); + throw new SQLException( + errorMsg.toString(), lastFatalError); } connectCount++; @@ -1490,7 +1542,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat if (holder == null) { long waitNanos = waitNanosLocal.get(); - StringBuilder buf = new StringBuilder(); + StringBuilder buf = new StringBuilder(128); buf.append("wait millis ")// .append(waitNanos / (1000 * 1000))// .append(", active ").append(activeCount)// @@ -1504,6 +1556,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } } + if (createErrorCount > 0) { + buf.append(", createErrorCount ").append(createErrorCount); + } + List sqlList = this.getDataSourceStat().getRuningSqlList(); for (int i = 0; i < sqlList.size(); ++i) { if (i != 0) { diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java index 686d1a3586..545c2112da 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java @@ -39,53 +39,78 @@ public class DruidDataSourceFactory implements ObjectFactory { static final int UNKNOWN_TRANSACTIONISOLATION = -1; - public final static String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit"; - public final static String PROP_DEFAULTREADONLY = "defaultReadOnly"; - public final static String PROP_DEFAULTTRANSACTIONISOLATION = "defaultTransactionIsolation"; - public final static String PROP_DEFAULTCATALOG = "defaultCatalog"; - public final static String PROP_DRIVERCLASSNAME = "driverClassName"; - public final static String PROP_MAXACTIVE = "maxActive"; - public final static String PROP_MAXIDLE = "maxIdle"; - public final static String PROP_MINIDLE = "minIdle"; - public final static String PROP_INITIALSIZE = "initialSize"; - public final static String PROP_MAXWAIT = "maxWait"; - public final static String PROP_TESTONBORROW = "testOnBorrow"; - public final static String PROP_TESTONRETURN = "testOnReturn"; - public final static String PROP_TIMEBETWEENEVICTIONRUNSMILLIS = "timeBetweenEvictionRunsMillis"; - public final static String PROP_NUMTESTSPEREVICTIONRUN = "numTestsPerEvictionRun"; - public final static String PROP_MINEVICTABLEIDLETIMEMILLIS = "minEvictableIdleTimeMillis"; - public final static String PROP_PHY_TIMEOUT_MILLIS = "phyTimeoutMillis"; - public final static String PROP_TESTWHILEIDLE = "testWhileIdle"; - public final static String PROP_PASSWORD = "password"; - public final static String PROP_URL = "url"; - public final static String PROP_USERNAME = "username"; - public final static String PROP_VALIDATIONQUERY = "validationQuery"; - public final static String PROP_VALIDATIONQUERY_TIMEOUT = "validationQueryTimeout"; - - public final static String PROP_INITCONNECTIONSQLS = "initConnectionSqls"; + public final static String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit"; + public final static String PROP_DEFAULTREADONLY = "defaultReadOnly"; + public final static String PROP_DEFAULTTRANSACTIONISOLATION = "defaultTransactionIsolation"; + public final static String PROP_DEFAULTCATALOG = "defaultCatalog"; + public final static String PROP_DRIVERCLASSNAME = "driverClassName"; + public final static String PROP_MAXACTIVE = "maxActive"; + public final static String PROP_MAXIDLE = "maxIdle"; + public final static String PROP_MINIDLE = "minIdle"; + public final static String PROP_INITIALSIZE = "initialSize"; + public final static String PROP_MAXWAIT = "maxWait"; + public final static String PROP_TESTONBORROW = "testOnBorrow"; + public final static String PROP_TESTONRETURN = "testOnReturn"; + public final static String PROP_TIMEBETWEENEVICTIONRUNSMILLIS = "timeBetweenEvictionRunsMillis"; + public final static String PROP_NUMTESTSPEREVICTIONRUN = "numTestsPerEvictionRun"; + public final static String PROP_MINEVICTABLEIDLETIMEMILLIS = "minEvictableIdleTimeMillis"; + public final static String PROP_PHY_TIMEOUT_MILLIS = "phyTimeoutMillis"; + public final static String PROP_TESTWHILEIDLE = "testWhileIdle"; + public final static String PROP_PASSWORD = "password"; + public final static String PROP_URL = "url"; + public final static String PROP_USERNAME = "username"; + public final static String PROP_VALIDATIONQUERY = "validationQuery"; + public final static String PROP_VALIDATIONQUERY_TIMEOUT = "validationQueryTimeout"; + public final static String PROP_INITCONNECTIONSQLS = "initConnectionSqls"; public final static String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED = "accessToUnderlyingConnectionAllowed"; - public final static String PROP_REMOVEABANDONED = "removeAbandoned"; - public final static String PROP_REMOVEABANDONEDTIMEOUT = "removeAbandonedTimeout"; - public final static String PROP_LOGABANDONED = "logAbandoned"; - public final static String PROP_POOLPREPAREDSTATEMENTS = "poolPreparedStatements"; - public final static String PROP_MAXOPENPREPAREDSTATEMENTS = "maxOpenPreparedStatements"; - public final static String PROP_CONNECTIONPROPERTIES = "connectionProperties"; - public final static String PROP_FILTERS = "filters"; - public final static String PROP_EXCEPTION_SORTER = "exceptionSorter"; - public final static String PROP_EXCEPTION_SORTER_CLASS_NAME = "exception-sorter-class-name"; - public final static String PROP_NAME = "name"; + public final static String PROP_REMOVEABANDONED = "removeAbandoned"; + public final static String PROP_REMOVEABANDONEDTIMEOUT = "removeAbandonedTimeout"; + public final static String PROP_LOGABANDONED = "logAbandoned"; + public final static String PROP_POOLPREPAREDSTATEMENTS = "poolPreparedStatements"; + public final static String PROP_MAXOPENPREPAREDSTATEMENTS = "maxOpenPreparedStatements"; + public final static String PROP_CONNECTIONPROPERTIES = "connectionProperties"; + public final static String PROP_FILTERS = "filters"; + public final static String PROP_EXCEPTION_SORTER = "exceptionSorter"; + public final static String PROP_EXCEPTION_SORTER_CLASS_NAME = "exception-sorter-class-name"; + public final static String PROP_NAME = "name"; + public final static String PROP_INIT = "init"; - public final static String PROP_INIT = "init"; + private final static String[] ALL_PROPERTIES = { + PROP_DEFAULTAUTOCOMMIT, + PROP_DEFAULTREADONLY, + PROP_DEFAULTTRANSACTIONISOLATION, + PROP_DEFAULTCATALOG, + PROP_DRIVERCLASSNAME, + PROP_MAXACTIVE, + PROP_MAXIDLE, + PROP_MINIDLE, + PROP_INITIALSIZE, + PROP_MAXWAIT, + PROP_TESTONBORROW, + PROP_TESTONRETURN, + PROP_TIMEBETWEENEVICTIONRUNSMILLIS, + PROP_NUMTESTSPEREVICTIONRUN, + PROP_MINEVICTABLEIDLETIMEMILLIS, + PROP_TESTWHILEIDLE, + PROP_PASSWORD, + PROP_FILTERS, + PROP_URL, + PROP_USERNAME, + PROP_VALIDATIONQUERY, + PROP_VALIDATIONQUERY_TIMEOUT, + PROP_INITCONNECTIONSQLS, + PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED, + PROP_REMOVEABANDONED, + PROP_REMOVEABANDONEDTIMEOUT, + PROP_LOGABANDONED, + PROP_POOLPREPAREDSTATEMENTS, + PROP_MAXOPENPREPAREDSTATEMENTS, + PROP_CONNECTIONPROPERTIES, + PROP_EXCEPTION_SORTER, + PROP_EXCEPTION_SORTER_CLASS_NAME, + PROP_INIT, + PROP_NAME, // - private final static String[] ALL_PROPERTIES = {PROP_DEFAULTAUTOCOMMIT, - PROP_DEFAULTREADONLY, PROP_DEFAULTTRANSACTIONISOLATION, PROP_DEFAULTCATALOG, PROP_DRIVERCLASSNAME, - PROP_MAXACTIVE, PROP_MAXIDLE, PROP_MINIDLE, PROP_INITIALSIZE, PROP_MAXWAIT, PROP_TESTONBORROW, - PROP_TESTONRETURN, PROP_TIMEBETWEENEVICTIONRUNSMILLIS, PROP_NUMTESTSPEREVICTIONRUN, - PROP_MINEVICTABLEIDLETIMEMILLIS, PROP_TESTWHILEIDLE, PROP_PASSWORD, PROP_FILTERS, PROP_URL, PROP_USERNAME, - PROP_VALIDATIONQUERY, PROP_VALIDATIONQUERY_TIMEOUT, PROP_INITCONNECTIONSQLS, - PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED, PROP_REMOVEABANDONED, PROP_REMOVEABANDONEDTIMEOUT, - PROP_LOGABANDONED, PROP_POOLPREPAREDSTATEMENTS, PROP_MAXOPENPREPAREDSTATEMENTS, PROP_CONNECTIONPROPERTIES, - PROP_EXCEPTION_SORTER, PROP_EXCEPTION_SORTER_CLASS_NAME, PROP_INIT, PROP_NAME, // "druid.timeBetweenLogStatsMillis", // "druid.stat.sql.MaxSize", // "druid.clearFiltersEnable", // @@ -115,7 +140,7 @@ public class DruidDataSourceFactory implements ObjectFactory { if ((!"javax.sql.DataSource".equals(ref.getClassName())) // && (!"com.alibaba.druid.pool.DruidDataSource".equals(ref.getClassName())) // - ) { + ) { return null; } diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java index 5dcea2ee41..be7a4ff4ff 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java @@ -28,6 +28,8 @@ public interface DruidDataSourceMBean extends DruidAbstractDataSourceMBean { boolean isEnable(); + String getUrl(); + void shrink(); int removeAbandoned(); diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLoggerImpl.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLoggerImpl.java index 7080f6aba0..dc365a34d9 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLoggerImpl.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLoggerImpl.java @@ -206,7 +206,7 @@ public class DruidDataSourceStatLoggerImpl extends DruidDataSourceStatLoggerAdap if (sqlStat.getFetchRowCount() > 0) { sqlStatMap.put("fetchRowCount", sqlStat.getFetchRowCount()); - sqlStatMap.put("fetchRowCount", sqlStat.getFetchRowCountMax()); + sqlStatMap.put("fetchRowCountMax", sqlStat.getFetchRowCountMax()); sqlStatMap.put("fetchRowHistogram", rtrim(sqlStat.getFetchRowHistogram())); } diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java index 98d9679c28..2276983b38 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java @@ -1150,14 +1150,6 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql. } private void checkStateInternal() throws SQLException { - if (holder == null) { - if (disableError != null) { - throw new SQLException("connection holder is null", disableError); - } else { - throw new SQLException("connection holder is null"); - } - } - if (closed) { if (disableError != null) { throw new SQLException("connection closed", disableError); @@ -1173,6 +1165,14 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql. throw new SQLException("connection disabled"); } } + + if (holder == null) { + if (disableError != null) { + throw new SQLException("connection holder is null", disableError); + } else { + throw new SQLException("connection holder is null"); + } + } } public String toString() { diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java b/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java index 6db3b309a3..85667f0226 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java @@ -485,16 +485,19 @@ public class DruidPooledStatement extends PoolableWrapper implements Statement { @Override public void close() throws SQLException { - if (!this.closed) { - clearResultSet(); - if (stmt != null) { - stmt.close(); - } - this.closed = true; + if (this.closed) { + return; + } - if (conn.getConnectionHolder() != null) { - conn.getConnectionHolder().removeTrace(this); - } + clearResultSet(); + if (stmt != null) { + stmt.close(); + } + this.closed = true; + + DruidConnectionHolder connHolder = conn.getConnectionHolder(); + if (connHolder != null) { + connHolder.removeTrace(this); } } diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java index b5b1fc0568..acbded2c43 100644 --- a/src/main/java/com/alibaba/druid/sql/SQLUtils.java +++ b/src/main/java/com/alibaba/druid/sql/SQLUtils.java @@ -477,6 +477,24 @@ public class SQLUtils { return stmtList; } + public static SQLStatement parseSingleStatement(String sql, String dbType, SQLParserFeature... features) { + SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType, features); + List stmtList = parser.parseStatementList(); + + if (stmtList.size() > 1) { + throw new ParserException(" Mutil-Statment be found."); + } + + if (parser.getLexer().token() != Token.EOF) { + throw new ParserException("syntax error. " + sql); + } + return stmtList.get(0); + } + + public static SQLStatement parseSingleMysqlStatement(String sql) { + return parseSingleStatement(sql, JdbcConstants.MYSQL); + } + /** * @author owenludong.lud * @param columnName diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLStatement.java b/src/main/java/com/alibaba/druid/sql/ast/SQLStatement.java index 740a6388e5..63b5742058 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLStatement.java @@ -24,4 +24,7 @@ public interface SQLStatement extends SQLObject { SQLStatement clone(); List getChildren(); String toLowerCaseString(); + + List getHeadHintsDirect(); + void setHeadHints(List headHints); } 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 842d2dfab5..e275e1f750 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 @@ -19,10 +19,7 @@ import java.util.ArrayList; import java.util.List; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLExpr; -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.ast.*; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLInsertStatement extends SQLInsertInto implements SQLStatement { @@ -34,6 +31,8 @@ public class SQLInsertStatement extends SQLInsertInto implements SQLStatement { private boolean afterSemi; + protected List headHints; + public SQLInsertStatement(){ } @@ -198,4 +197,12 @@ public class SQLInsertStatement extends SQLInsertInto implements SQLStatement { public String toLowerCaseString() { return SQLUtils.toSQLString(this, dbType, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); } + + public List getHeadHintsDirect() { + return headHints; + } + + public void setHeadHints(List headHints) { + this.headHints = headHints; + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveExprParser.java index 775be5454b..6a6ab3a7ad 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveExprParser.java @@ -16,6 +16,7 @@ package com.alibaba.druid.sql.dialect.hive.parser; import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.expr.SQLArrayExpr; import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; import com.alibaba.druid.sql.parser.Lexer; import com.alibaba.druid.sql.parser.SQLExprParser; @@ -64,6 +65,13 @@ public class HiveExprParser extends SQLExprParser { String propertyName = lexer.stringVal(); lexer.nextToken(); expr = new SQLPropertyExpr(expr, propertyName); + } else if (lexer.token() == Token.LBRACKET) { + SQLArrayExpr array = new SQLArrayExpr(); + array.setExpr(expr); + lexer.nextToken(); + this.exprList(array.getValues(), array); + accept(Token.RBRACKET); + expr = array; } return super.primaryRest(expr); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcessListStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcessListStatement.java index c14c2444a5..50f39732f8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcessListStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcessListStatement.java @@ -15,14 +15,18 @@ */ package com.alibaba.druid.sql.dialect.mysql.ast.statement; +import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; public class MySqlShowProcessListStatement extends MySqlStatementImpl implements MySqlShowStatement { private boolean full = false; + private SQLExpr where; public void accept0(MySqlASTVisitor visitor) { - visitor.visit(this); + if (visitor.visit(this)) { + acceptChild(visitor, where); + } visitor.endVisit(this); } @@ -34,4 +38,14 @@ public class MySqlShowProcessListStatement extends MySqlStatementImpl implements this.full = full; } + public SQLExpr getWhere() { + return where; + } + + public void setWhere(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.where = x; + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java index f177434143..daadb1d407 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java @@ -516,6 +516,16 @@ public class MySqlExprParser extends SQLExprParser { column.setName(name()); column.setDataType(parseDataType()); + if (lexer.identifierEquals(FnvHash.Constants.GENERATED)) { + lexer.nextToken(); + acceptIdentifier("ALWAYS"); + accept(Token.AS); + accept(Token.LPAREN); + SQLExpr expr = this.expr(); + accept(Token.RPAREN); + column.setGeneratedAlawsAs(expr); + } + return parseColumnRest(column); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java index c559b25cd2..1994d58c8c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java @@ -289,7 +289,7 @@ public class MySqlLexer extends Lexer { final char first = ch; - if (ch == 'b' + if ((ch == 'b' || ch == 'B' ) && charAt(pos + 1) == '\'') { int i = 2; int mark = pos + 2; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java index 50afefc6b2..bdb048595d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java @@ -934,12 +934,12 @@ public class MySqlStatementParser extends SQLStatementParser { } if (tddlHints) { - SQLStatementImpl stmt = (SQLStatementImpl)this.parseStatement(); + SQLStatement stmt = this.parseStatement(); stmt.setHeadHints(hints); statementList.add(stmt); return true; } else if (accept) { - SQLStatementImpl stmt = (SQLStatementImpl) this.parseStatement(); + SQLStatement stmt = this.parseStatement(); stmt.setHeadHints(hints); statementList.add(stmt); return true; @@ -1712,6 +1712,14 @@ public class MySqlStatementParser extends SQLStatementParser { if (lexer.identifierEquals("PROCESSLIST")) { lexer.nextToken(); MySqlShowProcessListStatement stmt = new MySqlShowProcessListStatement(); + + if (lexer.token() == Token.WHERE) { + lexer.nextToken(); + stmt.setWhere( + this.exprParser.expr() + ); + } + return stmt; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java index 718daac486..302c639567 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java @@ -269,6 +269,13 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV dataType.accept(this); } + SQLExpr generatedAlawsAs = x.getGeneratedAlawsAs(); + if (generatedAlawsAs != null) { + print0(ucase ? " GENERATED ALWAYS AS (" : " generated always as ("); + printExpr(generatedAlawsAs); + print(')'); + } + final SQLExpr charsetExpr = x.getCharsetExpr(); if (charsetExpr != null) { print0(ucase ? " CHARSET " : " charset "); @@ -881,6 +888,14 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV @Override public boolean visit(MySqlInsertStatement x) { + List headHints = x.getHeadHintsDirect(); + if (headHints != null) { + for (SQLCommentHint hint : headHints) { + hint.accept(this); + println(); + } + } + print0(ucase ? "INSERT " : "insert "); if (x.isLowPriority()) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsExprParser.java index 9838758c39..87fe12eb3d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsExprParser.java @@ -73,7 +73,8 @@ public class OdpsExprParser extends SQLExprParser { } protected SQLExpr parseAliasExpr(String alias) { - return new SQLCharExpr(alias); + String chars = alias.substring(1, alias.length() - 1); + return new SQLCharExpr(chars); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java index 4aba23d22a..263df3ec6a 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java @@ -270,7 +270,7 @@ public class Lexer { } this.posLine = line; - this.posColumn = posColumn; + this.posColumn = column; StringBuilder buf = new StringBuilder(); buf @@ -1358,8 +1358,9 @@ public class Lexer { stringVal = new String(buf, 0, bufPos); } } - + protected final void scanAlias() { + final char quote = ch; { boolean hasSpecial = false; int startIndex = pos + 1; @@ -1370,22 +1371,16 @@ public class Lexer { hasSpecial = true; continue; } - if (ch == '"') { + if (ch == quote) { if (i + 1 < text.length()) { char ch_next = charAt(i + 1); - if (ch_next == '"' || ch_next == '\'') { + if (ch_next == quote) { hasSpecial = true; i++; continue; } } - if (i > 0) { - char ch_last = charAt(i - 1); - if (ch_last == '\'') { - hasSpecial = true; - continue; - } - } + endIndex = i; break; } @@ -1415,6 +1410,7 @@ public class Lexer { initBuff(bufPos); //putChar(ch); + putChar(ch); for (;;) { if (isEOF()) { lexError("unclosed.str.lit"); @@ -1431,9 +1427,15 @@ public class Lexer { putChar('\0'); break; case '\'': + if (ch == quote) { + putChar('\\'); + } putChar('\''); break; case '"': + if (ch == quote) { + putChar('\\'); + } putChar('"'); break; case 'b': @@ -1449,6 +1451,7 @@ public class Lexer { putChar('\t'); break; case '\\': + putChar('\\'); putChar('\\'); break; case 'Z': @@ -1462,23 +1465,19 @@ public class Lexer { continue; } -// if (ch == '\'') { -// char ch_next = charAt(pos + 1); -// if (ch_next == '"') { -// scanChar(); -// continue; -// } -// } else - if (ch == '\"') { + if (ch == quote) { char ch_next = charAt(pos + 1); - if (ch_next == '"' || ch_next == '\'') { + + if (ch_next == quote) { + putChar('\\'); + putChar(ch); scanChar(); continue; } - //putChar(ch); + putChar(ch); scanChar(); - token = LITERAL_CHARS; + token = LITERAL_ALIAS; break; } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index ac164ca967..b3d4dbf2fc 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -436,7 +436,6 @@ public class SQLExprParser extends SQLParser { break; case DUAL: case KEY: - case DISTINCT: case LIMIT: case SCHEMA: case COLUMN: @@ -629,6 +628,8 @@ public class SQLExprParser extends SQLParser { lexer.nextToken(); break; case IDENTIFIER: // 当负号后面为字段的情况 + case LITERAL_CHARS: + case LITERAL_ALIAS: sqlExpr = new SQLIdentifierExpr(lexer.stringVal()); lexer.nextToken(); @@ -671,6 +672,8 @@ public class SQLExprParser extends SQLParser { lexer.nextToken(); break; case IDENTIFIER: // 当+号后面为字段的情况 + case LITERAL_CHARS: + case LITERAL_ALIAS: sqlExpr = new SQLIdentifierExpr(lexer.stringVal()); sqlExpr = new SQLUnaryExpr(SQLUnaryOperator.Plus, sqlExpr); lexer.nextToken(); diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java index 58b5f37f81..b680f35411 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParser.java @@ -17,6 +17,7 @@ package com.alibaba.druid.sql.parser; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.sql.dialect.hive.stmt.HiveCreateTableStatement; +import com.alibaba.druid.util.FnvHash; public class SQLParser { protected final Lexer lexer; @@ -79,8 +80,11 @@ public class SQLParser { } if (token == Token.IDENTIFIER) { - String ident = lexer.stringVal; - if (ident.equalsIgnoreCase("START") || ident.equalsIgnoreCase("CONNECT")) { + long hash = lexer.hash_lower; + if (hash == FnvHash.Constants.START + || hash == FnvHash.Constants.CONNECT + || hash == FnvHash.Constants.OFFSET + || hash == FnvHash.Constants.LIMIT) { if (must) { throw new ParserException("illegal alias. " + lexer.info()); } 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 77ced32a4e..05cc4645d7 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -2548,6 +2548,14 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet } public boolean visit(SQLInsertStatement x) { + List headHints = x.getHeadHintsDirect(); + if (headHints != null) { + for (SQLCommentHint hint : headHints) { + hint.accept(this); + println(); + } + } + if (x.isUpsert()) { print0(ucase ? "UPSERT INTO " : "upsert into "); } else { diff --git a/src/main/java/com/alibaba/druid/util/FnvHash.java b/src/main/java/com/alibaba/druid/util/FnvHash.java index 347b0b630e..968597239f 100644 --- a/src/main/java/com/alibaba/druid/util/FnvHash.java +++ b/src/main/java/com/alibaba/druid/util/FnvHash.java @@ -444,6 +444,7 @@ public final class FnvHash { long LESS = fnv1a_64_lower("LESS"); long MAXVALUE = fnv1a_64_lower("MAXVALUE"); long OFFSET = fnv1a_64_lower("OFFSET"); + long LIMIT = fnv1a_64_lower("LIMIT"); long RAW = fnv1a_64_lower("RAW"); long LONG_RAW = fnv1a_64_lower("LONG RAW"); long LONG = fnv1a_64_lower("LONG"); diff --git a/src/main/java/com/alibaba/druid/util/JdbcConstants.java b/src/main/java/com/alibaba/druid/util/JdbcConstants.java index 4e4ced1755..8b7757b334 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcConstants.java +++ b/src/main/java/com/alibaba/druid/util/JdbcConstants.java @@ -109,6 +109,7 @@ public interface JdbcConstants { String ALIYUN_DRDS = "aliyun_drds"; String PRESTO = "presto"; + String PRESTO_DRIVER = "com.facebook.presto.jdbc.PrestoDriver"; String ELASTIC_SEARCH = "elastic_search"; diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index 4b955dd74f..5f49498328 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -470,7 +470,9 @@ public final class JdbcUtils implements JdbcConstants { return JdbcConstants.ELASTIC_SEARCH_DRIVER; } else if (rawUrl.startsWith("jdbc:clickhouse:")) { return JdbcConstants.CLICKHOUSE_DRIVER; - } else { + } else if(rawUrl.startsWith("jdbc:presto:")) { + return JdbcConstants.PRESTO_DRIVER; + }else { throw new SQLException("unkow jdbc driver : " + rawUrl); } } @@ -563,6 +565,8 @@ public final class JdbcUtils implements JdbcConstants { return ELASTIC_SEARCH; } else if (rawUrl.startsWith("jdbc:clickhouse:")) { return CLICKHOUSE; + }else if (rawUrl.startsWith("jdbc:presto:")) { + return PRESTO; } else { return null; } diff --git a/src/main/java/com/alibaba/druid/util/MySqlUtils.java b/src/main/java/com/alibaba/druid/util/MySqlUtils.java index 0a15be4c10..9109e9fa1a 100644 --- a/src/main/java/com/alibaba/druid/util/MySqlUtils.java +++ b/src/main/java/com/alibaba/druid/util/MySqlUtils.java @@ -132,14 +132,14 @@ public class MySqlUtils { try { // pinGlobalTxToPhysicalConnection - boolean pinGlobTx = (Boolean) method_6_getValue.invoke( + Boolean pinGlobTx = (Boolean) method_6_getValue.invoke( method_6_getBooleanReadableProperty.invoke( method_6_getPropertySet.invoke(physicalConn) , "pinGlobalTxToPhysicalConnection" ) ); - if (pinGlobTx) { + if (pinGlobTx != null && pinGlobTx) { try { if (method_6_getInstance == null && !method_6_getInstance_error) { class_6_suspendableXAConnection = Class.forName("com.mysql.cj.jdbc.SuspendableXAConnection"); @@ -349,14 +349,14 @@ public class MySqlUtils { return SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); } - private static Class class_connectionImpl = null; - private static boolean class_connectionImpl_Error = false; - private static Method method_getIO = null; - private static boolean method_getIO_error = false; - private static Class class_MysqlIO = null; - private static boolean class_MysqlIO_Error = false; - private static Method method_getLastPacketReceivedTimeMs = null; - private static boolean method_getLastPacketReceivedTimeMs_error = false; + private static transient Class class_connectionImpl = null; + private static transient boolean class_connectionImpl_Error = false; + private static transient Method method_getIO = null; + private static transient boolean method_getIO_error = false; + private static transient Class class_MysqlIO = null; + private static transient boolean class_MysqlIO_Error = false; + private static transient Method method_getLastPacketReceivedTimeMs = null; + private static transient boolean method_getLastPacketReceivedTimeMs_error = false; public static long getLastPacketReceivedTimeMs(Connection conn) throws SQLException { if (class_connectionImpl == null && !class_connectionImpl_Error) { diff --git a/src/main/java/com/alibaba/druid/util/StringUtils.java b/src/main/java/com/alibaba/druid/util/StringUtils.java index 8ea8b6e6d3..770dfe538d 100644 --- a/src/main/java/com/alibaba/druid/util/StringUtils.java +++ b/src/main/java/com/alibaba/druid/util/StringUtils.java @@ -18,6 +18,9 @@ package com.alibaba.druid.util; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; +import java.util.Calendar; +import java.util.TimeZone; + /** * @author sandzhang[sandzhangtoo@gmail.com] */ @@ -347,4 +350,40 @@ public class StringUtils { // found digit it to make sure weird stuff like '.' and '1E-' doesn't pass return !allowSigns && foundDigit; } + + public static String formatDateTime19(long millis, TimeZone timeZone) { + Calendar cale = timeZone == null + ? Calendar.getInstance() + : Calendar.getInstance(timeZone); + cale.setTimeInMillis(millis); + + int year = cale.get(Calendar.YEAR); + int month = cale.get(Calendar.MONTH) + 1; + int dayOfMonth = cale.get(Calendar.DAY_OF_MONTH); + int hour = cale.get(Calendar.HOUR_OF_DAY); + int minute = cale.get(Calendar.MINUTE); + int second = cale.get(Calendar.SECOND); + + char[] chars = new char[19]; + chars[0] = (char) (year/1000 + '0'); + chars[1] = (char) ((year/100)%10 + '0'); + chars[2] = (char) ((year/10)%10 + '0'); + chars[3] = (char) (year%10 + '0'); + chars[4] = '-'; + chars[5] = (char) (month/10 + '0'); + chars[6] = (char) (month%10 + '0'); + chars[7] = '-'; + chars[8] = (char) (dayOfMonth/10 + '0'); + chars[9] = (char) (dayOfMonth%10 + '0'); + chars[10] = ' '; + chars[11] = (char) (hour/10 + '0'); + chars[12] = (char) (hour%10 + '0'); + chars[13] = ':'; + chars[14] = (char) (minute/10 + '0'); + chars[15] = (char) (minute%10 + '0'); + chars[16] = ':'; + chars[17] = (char) (second/10 + '0'); + chars[18] = (char) (second%10 + '0'); + return new String(chars); + } } diff --git a/src/main/java/com/alibaba/druid/wall/WallFilter.java b/src/main/java/com/alibaba/druid/wall/WallFilter.java index 4b005c7d35..7a3c2f3776 100644 --- a/src/main/java/com/alibaba/druid/wall/WallFilter.java +++ b/src/main/java/com/alibaba/druid/wall/WallFilter.java @@ -124,7 +124,8 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean { if (JdbcUtils.MYSQL.equals(dbType) || // JdbcUtils.MARIADB.equals(dbType) || // - JdbcUtils.H2.equals(dbType)) { + JdbcUtils.H2.equals(dbType)|| + JdbcUtils.PRESTO.equals(dbType)) { if (config == null) { config = new WallConfig(MySqlWallProvider.DEFAULT_CONFIG_DIR); } diff --git a/src/main/resources/support/http/resources/datasource.html b/src/main/resources/support/http/resources/datasource.html index a031f9df3d..4794ac5631 100644 --- a/src/main/resources/support/http/resources/datasource.html +++ b/src/main/resources/support/http/resources/datasource.html @@ -216,7 +216,7 @@ TransactionHistogram {{=datasourceNow.TransactionHistogram}} - The histogram values of transaction time, [0-10 ms, 10-100 ms, 100-1 s, 1-10 s, 10-100 s, >100 s] + The histogram values of transaction time, [0-1 ms, 1-10 ms, 10-100 ms, 100-1 s, 1-10 s, 10-100 s, >100 s] PoolingCount diff --git a/src/main/resources/support/http/resources/js/common.js b/src/main/resources/support/http/resources/js/common.js index 862c5d5f2c..fdccbf4ace 100644 --- a/src/main/resources/support/http/resources/js/common.js +++ b/src/main/resources/support/http/resources/js/common.js @@ -30,7 +30,7 @@ druid.common = function () { var html =''; $(document.body).append(html); diff --git a/src/main/resources/support/http/resources/js/lang.js b/src/main/resources/support/http/resources/js/lang.js index 8dedabf525..76c9eaef21 100644 --- a/src/main/resources/support/http/resources/js/lang.js +++ b/src/main/resources/support/http/resources/js/lang.js @@ -101,7 +101,7 @@ druid.lang = function() { 'NotEmptyWaitMillisDesc' : ['Total millins for wait to get a connection', '获取连接时最多等待多长时间'], 'WaitThreadCountDesc' : ['The current waiting thread count', '当前等待获取连接的线程数'], 'StartTransactionCountDesc' : ['The count of start transaction', '事务开始的个数'], - 'TransactionHistogramDesc' : ['The histogram values of transaction time, [0-10 ms, 10-100 ms, 100-1 s, 1-10 s, 10-100 s, >100 s]', '事务运行时间分布,分布区间为[0-10 ms, 10-100 ms, 100-1 s, 1-10 s, 10-100 s, >100 s]'], + 'TransactionHistogramDesc' : ['The histogram values of transaction time, [0-1 ms, 1-10 ms, 10-100 ms, 100-1 s, 1-10 s, 10-100 s, >100 s]', '事务运行时间分布,分布区间为[0-1 ms, 1-10 ms, 10-100 ms, 100-1 s, 1-10 s, 10-100 s, >100 s]'], 'PoolingCountDesc' : ['The current usefull connection count', '当前连接池中的数目'],// 'PoolingPeakDesc' : ['The usefull connection peak count', '连接池中数目的峰值'], 'PoolingPeakTimeDesc' : ['The usefull connection peak time', '连接池数目峰值出现的时间'], diff --git a/src/main/resources/support/http/resources/sql-detail.html b/src/main/resources/support/http/resources/sql-detail.html index ced573ad86..5f35f98b23 100644 --- a/src/main/resources/support/http/resources/sql-detail.html +++ b/src/main/resources/support/http/resources/sql-detail.html @@ -138,7 +138,14 @@ if (sqlInfo == null) return; - $("#fullSql").text(sqlInfo.SQL) + var sql = sqlInfo.SQL; + if (sql != null) { + sql = sql.replace(//g,">"); + } else { + sql = ''; + } + + $("#fullSql").text(sql) $("#formattedSql").text(sqlInfo.formattedSql) $("#parsedtable").text(sqlInfo.parsedTable) $("#parsedfields").text(sqlInfo.parsedFields) diff --git a/src/main/resources/support/http/resources/sql.html b/src/main/resources/support/http/resources/sql.html index dca2ba896e..90f3f93f9a 100644 --- a/src/main/resources/support/http/resources/sql.html +++ b/src/main/resources/support/http/resources/sql.html @@ -143,7 +143,7 @@ var html = ""; for ( var i = 0; i < sqlStatList.length; i++) { var stat = sqlStatList[i], statSQL=stat.SQL; - var newStatSQL=statSQL.replace(/\"/g,"'"); + var newStatSQL=statSQL.replace(/\"/g,"'").replace(//g,">"); var newRow = sqlStatTable.insertRow(-1); html += ""; html += "" + (i + 1) + ""; diff --git a/src/main/resources/support/http/resources/wall.html b/src/main/resources/support/http/resources/wall.html index a61b191489..7b663e78c7 100644 --- a/src/main/resources/support/http/resources/wall.html +++ b/src/main/resources/support/http/resources/wall.html @@ -287,6 +287,10 @@ if (whiteList) { for ( var i = 0; i < whiteList.length; ++i) { var white = whiteList[i]; + if (white.sql != null) { + white.sql = white.sql.replace(//g,">"); + } + html += ""; html += ""+ (i+1) +""; html += '' + white.sql + ""; @@ -331,6 +335,10 @@ if (blackList) { for ( var i = 0; i < blackList.length; ++i) { var black = blackList[i]; + if (black.sql != null) { + black.sql = black.sql.replace(//g,">"); + } + html += ""; html += ""+ (i+1) +""; html += '' + black.sql + ""; diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/SqlHolder.java b/src/test/java/com/alibaba/druid/benckmark/sql/SqlHolder.java index dc90f84cc9..5661e64603 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/SqlHolder.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/SqlHolder.java @@ -12,10 +12,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlSelectParser; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import com.alibaba.druid.sql.parser.LayoutCharacters; -import com.alibaba.druid.sql.parser.ParserException; -import com.alibaba.druid.sql.parser.SQLParserFeature; -import com.alibaba.druid.sql.parser.Token; +import com.alibaba.druid.sql.parser.*; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; @@ -36,6 +33,40 @@ public class SqlHolder { private boolean parsed; public SQLStatement ast; + private boolean isParam; + + public static SQLSelectListCache selectListCache = new SQLSelectListCache(JdbcConstants.MYSQL); + static { + selectListCache.add("select id as id, gmt_create as gmtCreate, gmt_modified as gmtModified, name as name, owner as owner, type as type, statement as statement, datasource as datasource, meta as meta, param_file as paramFile, sharable as sharable, data_type as dataType, status as status, config as config, project_id as projectId, plugins as plugins, field_compare as fieldCompare, field_ext as fieldExt, openx as openx from"); + selectListCache.add("SELECT id, dispute_id, buyer_id, seller_id, total_fee, refund_fee, max_apply_goods_fee, apply_goods_fee, apply_carriage_fee, refund_goods_fee, refund_carriage_fee, refund_point, refund_coupon, refund_return_point, refund_cash, real_deduct_refund_point, real_refund_return_point, refund_return_commission, gmt_create, gmt_modified, attributes, attributes_cc FROM"); +// selectListCache.add("select `auction_relation`.`id`,`auction_relation`.`item_id`,`auction_relation`.`sku_id`,`auction_relation`.`user_id`,`auction_relation`.`target_id`,`auction_relation`.`extra_id`,`auction_relation`.`type`,`auction_relation`.`target_type`,`auction_relation`.`type_attr`,`auction_relation`.`status`,`auction_relation`.`target_user_id`,`auction_relation`.`options`,`auction_relation`.`features`,`auction_relation`.`version`,`auction_relation`.`sub_type`,`auction_relation`.`gmt_create`,`auction_relation`.`gmt_modified` from"); +// selectListCache.add("SELECT biz_order_id, value_type, key_value, gmt_create, gmt_modified\n" + +// "\t, attribute_cc, buyer_id\n" + +// "FROM"); +// selectListCache.add("SELECT biz_order_id, value_type, key_value, gmt_create, gmt_modified\n" + +// "\t, attribute_cc, buyer_id\n" + +// "FROM"); +// selectListCache.add("SELECT sub_logistics_order_id, consign_time, attribute_cc, attributes, out_logistics_id\n" + +// "\t, parent_id, gmt_create, gmt_modified, detail_order_id, is_last\n" + +// "\t, ship_amount, buyer_id, seller_id, ship_status, step_order_id\n" + +// "FROM"); + selectListCache.add("SELECT biz_order_id, out_order_id, seller_nick, buyer_nick, seller_id\n" + + "\t, buyer_id, auction_id, auction_title, auction_price, buy_amount\n" + + "\t, biz_type, sub_biz_type, fail_reason, pay_status, logistics_status\n" + + "\t, out_trade_status, snap_path, gmt_create, status\n" + + "\t, ifnull(buyer_rate_status, 4) AS buyer_rate_status\n" + + "\t, ifnull(seller_rate_status, 4) AS seller_rate_status, auction_pict_url\n" + + "\t, seller_memo, buyer_memo, seller_flag, buyer_flag, buyer_message_path\n" + + "\t, refund_status, attributes, attributes_cc, gmt_modified, ip\n" + + "\t, end_time, pay_time, is_main, is_detail, point_rate\n" + + "\t, parent_id, adjust_fee, discount_fee, refund_fee, confirm_paid_fee\n" + + "\t, cod_status, trade_tag, shop_id, sync_version, options\n" + + "\t, ignore_sold_quantity, from_group, attribute1, attribute2, attribute3\n" + + "\t, attribute4, attribute11\n" + + "FROM"); + selectListCache.add("select `member_cart`.`CART_ID`,`member_cart`.`SKU_ID`,`member_cart`.`ITEM_ID`,`member_cart`.`QUANTITY`,`member_cart`.`USER_ID`,`member_cart`.`SELLER_ID`,`member_cart`.`STATUS`,`member_cart`.`EXT_STATUS`,`member_cart`.`TYPE`,`member_cart`.`SUB_TYPE`,`member_cart`.`GMT_CREATE`,`member_cart`.`GMT_MODIFIED`,`member_cart`.`ATTRIBUTE`,`member_cart`.`ATTRIBUTE_CC`,`member_cart`.`EX2` from"); + } + public static SqlHolder of(String sql) { return new SqlHolder(sql); } @@ -44,6 +75,11 @@ public class SqlHolder { this(text, JdbcConstants.MYSQL); } + public SqlHolder(String text, String dbType, boolean isParam) { + this(text, dbType); + this.isParam = isParam; + } + SqlHolder(String text, String dialect) { if (!"mysql".equalsIgnoreCase(dialect)) { throw new IllegalArgumentException("only mysql is"); @@ -78,9 +114,21 @@ public class SqlHolder { // } // ast = SQLUtils.parseStatements(text, dialect).get(0); - SQLParserFeature[] features = {SQLParserFeature.EnableSQLBinaryOpExprGroup, SQLParserFeature.OptimizedForParameterized}; + SQLParserFeature[] features; + + if (isParam) { + features = new SQLParserFeature[]{SQLParserFeature.EnableSQLBinaryOpExprGroup, SQLParserFeature.OptimizedForParameterized}; + } else { + features = new SQLParserFeature[]{SQLParserFeature.EnableSQLBinaryOpExprGroup + , SQLParserFeature.OptimizedForParameterized + , SQLParserFeature.UseInsertColumnsCache + }; + } + try { - ast = new SqlHolderParser(text, features).parseStatement(); + MySqlStatementParser parser = new MySqlStatementParser(text, features); + parser.setSelectListCache(selectListCache); + ast = parser.parseStatement(); } catch (ParserException e) { throw new UnsupportedOperationException(e); } @@ -238,75 +286,4 @@ public class SqlHolder { } return tableName; } - - public static class SqlHolderParser extends MySqlStatementParser { - - public SqlHolderParser(String sql, SQLParserFeature... features) { - super(sql, features); - } - - public void parseStatementList(List statementList, int max, SQLObject parent) { - // special optimized - if (lexer.token() == Token.SELECT) { - String source = lexer.getSource(); - if ("select @@session.tx_read_only".equals(source)) { - SQLSelect select = new SQLSelect(); - MySqlSelectQueryBlock queryBlock = new MySqlSelectQueryBlock(); - queryBlock.addSelectItem(new SQLPropertyExpr(new SQLVariantRefExpr("@@session"), "tx_read_only")); - select.setQuery(queryBlock); - - SQLSelectStatement stmt = new SQLSelectStatement(select); - statementList.add(stmt); - - lexer.reset(29, '\u001A', Token.EOF); - return; - } - - int pos = lexer.pos(); - if (source.startsWith(" id, dispute_id, buyer_id, seller_id, total_fee, refund_fee, max_apply_goods_fee, apply_goods_fee, apply_carriage_fee, refund_goods_fee, refund_carriage_fee, refund_point, refund_coupon, refund_return_point, refund_cash, real_deduct_refund_point, real_refund_return_point, refund_return_commission, gmt_create, gmt_modified, attributes, attributes_cc FROM", pos)) { - MySqlSelectQueryBlock queryBlock = new MySqlSelectQueryBlock(); - queryBlock.addSelectItem(new SQLIdentifierExpr("id")); - queryBlock.addSelectItem(new SQLIdentifierExpr("dispute_id")); - queryBlock.addSelectItem(new SQLIdentifierExpr("buyer_id")); - queryBlock.addSelectItem(new SQLIdentifierExpr("seller_id")); - queryBlock.addSelectItem(new SQLIdentifierExpr("total_fee")); - - queryBlock.addSelectItem(new SQLIdentifierExpr("refund_fee")); - queryBlock.addSelectItem(new SQLIdentifierExpr("max_apply_goods_fee")); - queryBlock.addSelectItem(new SQLIdentifierExpr("apply_goods_fee")); - queryBlock.addSelectItem(new SQLIdentifierExpr("apply_carriage_fee")); - queryBlock.addSelectItem(new SQLIdentifierExpr("refund_goods_fee")); - - queryBlock.addSelectItem(new SQLIdentifierExpr("refund_carriage_fee")); - queryBlock.addSelectItem(new SQLIdentifierExpr("refund_point")); - queryBlock.addSelectItem(new SQLIdentifierExpr("refund_coupon")); - queryBlock.addSelectItem(new SQLIdentifierExpr("refund_return_point")); - queryBlock.addSelectItem(new SQLIdentifierExpr("refund_cash")); - - queryBlock.addSelectItem(new SQLIdentifierExpr("real_deduct_refund_point")); - queryBlock.addSelectItem(new SQLIdentifierExpr("real_refund_return_point")); - queryBlock.addSelectItem(new SQLIdentifierExpr("refund_return_commission")); - queryBlock.addSelectItem(new SQLIdentifierExpr("gmt_create")); - queryBlock.addSelectItem(new SQLIdentifierExpr("gmt_modified")); - - queryBlock.addSelectItem(new SQLIdentifierExpr("attributes")); - queryBlock.addSelectItem(new SQLIdentifierExpr("attributes_cc")); - - lexer.reset(430, ' ', Token.FROM); - - MySqlSelectParser selectParser = new MySqlSelectParser(this.exprParser); - selectParser.parseFrom(queryBlock); - selectParser.parseWhere(queryBlock); - - SQLSelect select = new SQLSelect(queryBlock); - SQLSelectStatement stmt = new SQLSelectStatement(select); - stmt.setDbType(JdbcConstants.MYSQL); - statementList.add(stmt); - return; - } - } - - super.parseStatementList(statementList, max, parent); - } - } } diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Issue2876.java b/src/test/java/com/alibaba/druid/bvt/bug/Issue2876.java new file mode 100644 index 0000000000..e1a391e791 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/bug/Issue2876.java @@ -0,0 +1,31 @@ +package com.alibaba.druid.bvt.bug; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource; +import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; + +public class Issue2876 extends TestCase { + public void test_0() throws Exception { + String sql = "SELECT CONCAT(\"'\",b.PRIMARY_ID,\"'\") \n" + + "FROM s_user_session_attributes a \n" + + "LEFT JOIN s_user_session b ON a.SESSION_PRIMARY_ID=b.PRIMARY_ID \n" + + "WHERE a.ATTRIBUTE_NAME='KAPTCHA_SESSION_KEY' AND b.LAST_ACCESS_TIME <= 1540429945459"; + + System.out.println(sql); + + List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); + + SQLSelectStatement stmt = (SQLSelectStatement) stmtList.get(0); + SQLSelectQueryBlock queryBlock = stmt.getSelect().getQueryBlock(); + SQLJoinTableSource joinTableSource = (SQLJoinTableSource) queryBlock.getFrom(); + + assertEquals("a", joinTableSource.getLeft().getAlias()); + assertEquals("b", joinTableSource.getRight().getAlias()); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest4.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest4.java index 1cd1e85ebf..6cf507a5b7 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest4.java @@ -20,7 +20,6 @@ public class DruidDataSourceTest4 extends TestCase { dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(false); dataSource.setInitialSize(1); - } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest9_phyMaxUseCount.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest9_phyMaxUseCount.java index 461d499153..105130e4d8 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest9_phyMaxUseCount.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest9_phyMaxUseCount.java @@ -21,6 +21,18 @@ public class DruidDataSourceTest9_phyMaxUseCount extends TestCase { dataSource.setUrl("jdbc:mock:xxx"); dataSource.setInitialSize(1); dataSource.setPhyMaxUseCount(10); + + assertEquals(10, dataSource.getPhyMaxUseCount()); + + Properties properties = new Properties(); + properties.put("druid.phyMaxUseCount", "20"); + dataSource.configFromPropety(properties); + assertEquals(20, dataSource.getPhyMaxUseCount()); + + properties.put("druid.phyMaxUseCount", "10"); + dataSource.configFromPropety(properties); + assertEquals(10, dataSource.getPhyMaxUseCount()); + dataSource.setFilters("log4j"); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java index 7aec461778..6143d306f8 100755 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java @@ -853,7 +853,7 @@ public class DALParserTest extends TestCase { Assert.assertEquals("SHOW FULL PROCESSLIST", output); } - + public void test_show_profiles() throws Exception { String sql = "SHOW profiles"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/derby/DerbySelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/derby/DerbySelectTest.java new file mode 100644 index 0000000000..2c76920079 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/derby/DerbySelectTest.java @@ -0,0 +1,13 @@ +package com.alibaba.druid.bvt.sql.derby; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +public class DerbySelectTest extends TestCase { + public void test_for_derby() throws Exception { + String sql = "select * from sys_user offset ? rows fetch next ? rows only"; + + SQLUtils.parseSingleStatement(sql, JdbcConstants.DERBY); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_41.java b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_41.java new file mode 100644 index 0000000000..a2c91a11f9 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_41.java @@ -0,0 +1,78 @@ +/* + * Copyright 1999-2017 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.hive; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; + +public class HiveSelectTest_41 extends TestCase { + + public void test_0() throws Exception { + String sql = "select\n" + + "field['id'].string_type as banner_id\n" + + ",field['index'].string_type as banner_index\n" + + ",field['pageName'].string_type as pageName\n" + + "from\n" + + "bdm_book.midu_xcx_web_main_log\n" + + "where day = '2019-01-09'\n" + + "and eventid = '151'\n" + + "and cmd in ('26002','26003')\n" + + "group by field['id'].string_type\n" + + ",field['index'].string_type\n" + + ",field['pageName'].string_type ;"; + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.HIVE); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); + + assertEquals("SELECT field['id'].string_type AS banner_id, field['index'].string_type AS banner_index, field['pageName'].string_type AS pageName\n" + + "FROM bdm_book.midu_xcx_web_main_log\n" + + "WHERE day = '2019-01-09'\n" + + "\tAND eventid = '151'\n" + + "\tAND cmd IN ('26002', '26003')\n" + + "GROUP BY field['id'].string_type, field['index'].string_type, field['pageName'].string_type;", stmt.toString()); + + assertEquals("select field['id'].string_type as banner_id, field['index'].string_type as banner_index, field['pageName'].string_type as pageName\n" + + "from bdm_book.midu_xcx_web_main_log\n" + + "where day = '2019-01-09'\n" + + "\tand eventid = '151'\n" + + "\tand cmd in ('26002', '26003')\n" + + "group by field['id'].string_type, field['index'].string_type, field['pageName'].string_type;", stmt.toLowerCaseString()); + + assertEquals(1, statementList.size()); + + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.HIVE); + stmt.accept(visitor); + +// System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + System.out.println("groupBy : " + visitor.getGroupByColumns()); + + assertEquals(1, visitor.getTables().size()); + assertEquals(4, visitor.getColumns().size()); + assertEquals(3, visitor.getConditions().size()); + assertEquals(0, visitor.getGroupByColumns().size()); + +// assertTrue(visitor.containsColumn("source", "*")); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest134.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest134.java new file mode 100644 index 0000000000..259db6f755 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest134.java @@ -0,0 +1,47 @@ +package com.alibaba.druid.bvt.sql.mysql.createTable; + +import com.alibaba.druid.sql.MysqlTest; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; + +import java.util.List; + +public class MySqlCreateTableTest134 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "create table xuhan3(\n" + + "id int not null AUTO_INCREMENT primary key, \n" + + "name char(40), SimpleDate date, \n" + + "SimpleDate_dayofweek tinyint(4) GENERATED ALWAYS AS (dayofweek(SimpleDate)) VIRTUAL, \n" + + "KEY SimpleDate_dayofweek (SimpleDate_dayofweek));"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + + assertEquals(1, statementList.size()); + + + assertEquals("CREATE TABLE xuhan3 (\n" + + "\tid int NOT NULL PRIMARY KEY AUTO_INCREMENT,\n" + + "\tname char(40),\n" + + "\tSimpleDate date,\n" + + "\tSimpleDate_dayofweek tinyint(4) GENERATED ALWAYS AS (dayofweek(SimpleDate)) VIRTUAL,\n" + + "\tKEY SimpleDate_dayofweek (SimpleDate_dayofweek)\n" + + ");", stmt.toString()); + + assertEquals("create table xuhan3 (\n" + + "\tid int not null primary key auto_increment,\n" + + "\tname char(40),\n" + + "\tSimpleDate date,\n" + + "\tSimpleDate_dayofweek tinyint(4) generated always as (dayofweek(SimpleDate)) virtual,\n" + + "\tkey SimpleDate_dayofweek (SimpleDate_dayofweek)\n" + + ");", stmt.toLowerCaseString()); + + } + + + + +} \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_17.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_17.java index 0ba2dead84..069949ae47 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_17.java @@ -12,7 +12,8 @@ import java.util.List; public class MySqlInsertTest_17 extends MysqlTest { public void test_insert_rollback_on_fail() throws Exception { - String sql = "INSERT INTO dashboard_crowd_analysis(cname,cvalue,orders,users,dt,tagid)\n" + String sql = "/*+engine=MPP, mppNativeInsertFromSelect=true*/\n" + + "INSERT INTO dashboard_crowd_analysis(cname,cvalue,orders,users,dt,tagid)\n" + "SELECT x.cname as cname,\n" + " x.cvalue as cvalue,\n" + " x.orders as orders,\n" + " x.users as users,\n" + " 20171211 as dt,\n" + " 91 as tagid\n" + "FROM (WITH h AS\n" + " (SELECT a.userid,\n" + " a.col_1,\n" @@ -40,22 +41,44 @@ public class MySqlInsertTest_17 extends MysqlTest { MySqlInsertStatement insertStmt = (MySqlInsertStatement) stmt; // System.out.println(SQLUtils.toMySqlString(insertStmt)); - String formatSql = "INSERT INTO dashboard_crowd_analysis (cname, cvalue, orders, users, dt\n" + "\t, tagid)\n" - + "SELECT x.cname AS cname, x.cvalue AS cvalue, x.orders AS orders, x.users AS users, 20171211 AS dt\n" - + "\t, 91 AS tagid\n" + "FROM (\n" + "\tWITH h AS (\n" - + "\t\t\tSELECT a.userid, a.col_1, a.col_2, a.col_3, a.col_4\n" - + "\t\t\t\t, a.col_5, a.col_6, c.orders_week\n" + "\t\t\tFROM (\n" - + "\t\t\t\tSELECT userid, col_1, col_2, col_3, col_4\n" + "\t\t\t\t\t, col_5, col_6\n" - + "\t\t\t\tFROM ofo_personas_dimensions\n" + "\t\t\t\tWHERE dt = 20171211\n" + "\t\t\t) a\n" - + "\t\t\t\tJOIN (\n" + "\t\t\t\t\tSELECT userid\n" + "\t\t\t\t\tFROM personas_user_tag\n" - + "\t\t\t\t\tWHERE tagid = 91\n" + "\t\t\t\t) b\n" + "\t\t\t\tON a.userid = b.userid\n" - + "\t\t\t\tJOIN (\n" + "\t\t\t\t\tSELECT userid, orders_week\n" - + "\t\t\t\t\tFROM ofo_personas_metrics\n" + "\t\t\t\t\tWHERE dt = 20171211\n" - + "\t\t\t\t) c\n" + "\t\t\t\tON a.userid = c.userid\n" + "\t\t)\n" - + "\tSELECT 'col_1' AS cname, col_1 AS cvalue, SUM(orders_week) AS orders\n" - + "\t\t, COUNT(userid) AS users\n" + "\tFROM h\n" + "\tGROUP BY col_1\n" + "\tUNION ALL\n" - + "\tSELECT 'col_2' AS cname, col_2 AS cvalue, SUM(orders_week) AS orders\n" - + "\t\t, COUNT(userid) AS users\n" + "\tFROM h\n" + "\tGROUP BY col_2\n" + ") x"; + String formatSql = "/*+engine=MPP, mppNativeInsertFromSelect=true*/\n" + + "INSERT INTO dashboard_crowd_analysis (cname, cvalue, orders, users, dt\n" + + "\t, tagid)\n" + + "SELECT x.cname AS cname, x.cvalue AS cvalue, x.orders AS orders, x.users AS users, 20171211 AS dt\n" + + "\t, 91 AS tagid\n" + + "FROM (\n" + + "\tWITH h AS (\n" + + "\t\t\tSELECT a.userid, a.col_1, a.col_2, a.col_3, a.col_4\n" + + "\t\t\t\t, a.col_5, a.col_6, c.orders_week\n" + + "\t\t\tFROM (\n" + + "\t\t\t\tSELECT userid, col_1, col_2, col_3, col_4\n" + + "\t\t\t\t\t, col_5, col_6\n" + + "\t\t\t\tFROM ofo_personas_dimensions\n" + + "\t\t\t\tWHERE dt = 20171211\n" + + "\t\t\t) a\n" + + "\t\t\t\tJOIN (\n" + + "\t\t\t\t\tSELECT userid\n" + + "\t\t\t\t\tFROM personas_user_tag\n" + + "\t\t\t\t\tWHERE tagid = 91\n" + + "\t\t\t\t) b\n" + + "\t\t\t\tON a.userid = b.userid\n" + + "\t\t\t\tJOIN (\n" + + "\t\t\t\t\tSELECT userid, orders_week\n" + + "\t\t\t\t\tFROM ofo_personas_metrics\n" + + "\t\t\t\t\tWHERE dt = 20171211\n" + + "\t\t\t\t) c\n" + + "\t\t\t\tON a.userid = c.userid\n" + + "\t\t)\n" + + "\tSELECT 'col_1' AS cname, col_1 AS cvalue, SUM(orders_week) AS orders\n" + + "\t\t, COUNT(userid) AS users\n" + + "\tFROM h\n" + + "\tGROUP BY col_1\n" + + "\tUNION ALL\n" + + "\tSELECT 'col_2' AS cname, col_2 AS cvalue, SUM(orders_week) AS orders\n" + + "\t\t, COUNT(userid) AS users\n" + + "\tFROM h\n" + + "\tGROUP BY col_2\n" + + ") x"; Assert.assertEquals(formatSql, SQLUtils.toMySqlString(insertStmt)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_43.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_43.java new file mode 100644 index 0000000000..7872bb344c --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_43.java @@ -0,0 +1,125 @@ +/* + * Copyright 1999-2017 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.mysql.insert; + +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.parser.SQLParserFeature; +import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; + +public class MySqlInsertTest_43 extends TestCase { + + public void test_insert_0() throws Exception { + String sql = "insert into adl_indication_ums_warehouse_ebax_a (sys_pk,sys_ds,sys_biztime,sys_gmt_modified,business_type,parcelled_order_num,warehouse_id)\n" + + "select\n" + + " concat(20190115,'_',ifnull(businessType, '#null#') ,'_',ifnull(warehouseId, '#null#') ) as sys_pk,\n" + + " cast(20190115 as bigint) as sys_ds,\n" + + " str_to_date('2019-01-15 21:51:00', '%Y-%m-%d %H:%i:%s') as sys_biztime,\n" + + " now() as sys_gmt_modified,\n" + + " cast(businessType as varchar) as business_type,\n" + + " cast(parcelledOrderNum as bigint) as parcelled_order_num,\n" + + " cast(warehouseId as varchar) as warehouse_id\n" + + "from (\n" + + "\n" + + "\n" + + "select cast(t1.warehouse_id as varchar) as warehouseId\n" + + " , t2.businessType\n" + + " , count(1) as parcelledOrderNum\n" + + "from sales_order t1\n" + + "join (\n" + + " select t2_1.warehouse_id\n" + + " , t2_1.external_batch_code\n" + + " ,(case\n" + + " when t2_2.operation_type = 2 or t2_2.operation_type is null then '2'\n" + + " when t2_2.operation_type = 3 then '800'\n" + + " when t2_2.operation_type = 1 then '900'\n" + + " end) as businessType\n" + + " from batch_order t2_1\n" + + " join wave_order t2_2\n" + + " on t2_1.wave_id = t2_2.id\n" + + " and t2_1.warehouse_id = t2_2.warehouse_id\n" + + " and t2_2.wave_status in (5,6)\n" + + " and t2_1.ds >= (201901 - 1)\n" + + " and t2_2.ds >= (201901 - 1)\n" + + " and t2_1.gmt_create >= date_add(now(), interval -3 day)\n" + + " and t2_1.gmt_create <= now()\n" + + " and t2_2.gmt_create >= date_add(now(), interval -3 day)\n" + + " and t2_2.gmt_create <= now()\n" + + "\n" + + ") t2 on t1.out_batch_code = t2.external_batch_code\n" + + " and t1.warehouse_id = t2.warehouse_id\n" + + " and t1.out_operation_mode = 3\n" + + " and t1.gmt_create >= CURDATE()\n" + + " and t1.gmt_create <= now()\n" + + " and t1.ds >= 201901\n" + + " and t2.businessType is not null\n" + + "group by t1.warehouse_id, t2.businessType\n" + + ") a\n"; + + MySqlStatementParser parser = new MySqlStatementParser(sql, false, true); + parser.config(SQLParserFeature.KeepInsertValueClauseOriginalString, true); + + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + + MySqlInsertStatement insertStmt = (MySqlInsertStatement) stmt; + assertEquals("INSERT INTO adl_indication_ums_warehouse_ebax_a (sys_pk, sys_ds, sys_biztime, sys_gmt_modified, business_type\n" + + "\t, parcelled_order_num, warehouse_id)\n" + + "SELECT concat(20190115, '_', ifnull(businessType, '#null#'), '_', ifnull(warehouseId, '#null#')) AS sys_pk\n" + + "\t, CAST(20190115 AS bigint) AS sys_ds, str_to_date('2019-01-15 21:51:00', '%Y-%m-%d %H:%i:%s') AS sys_biztime, now() AS sys_gmt_modified\n" + + "\t, CAST(businessType AS varchar) AS business_type, CAST(parcelledOrderNum AS bigint) AS parcelled_order_num, CAST(warehouseId AS varchar) AS warehouse_id\n" + + "FROM (\n" + + "\tSELECT CAST(t1.warehouse_id AS varchar) AS warehouseId, t2.businessType, COUNT(1) AS parcelledOrderNum\n" + + "\tFROM sales_order t1\n" + + "\t\tJOIN (\n" + + "\t\t\tSELECT t2_1.warehouse_id, t2_1.external_batch_code\n" + + "\t\t\t\t, CASE \n" + + "\t\t\t\t\tWHEN t2_2.operation_type = 2\n" + + "\t\t\t\t\tOR t2_2.operation_type IS NULL THEN '2'\n" + + "\t\t\t\t\tWHEN t2_2.operation_type = 3 THEN '800'\n" + + "\t\t\t\t\tWHEN t2_2.operation_type = 1 THEN '900'\n" + + "\t\t\t\tEND AS businessType\n" + + "\t\t\tFROM batch_order t2_1\n" + + "\t\t\t\tJOIN wave_order t2_2\n" + + "\t\t\t\tON t2_1.wave_id = t2_2.id\n" + + "\t\t\t\t\tAND t2_1.warehouse_id = t2_2.warehouse_id\n" + + "\t\t\t\t\tAND t2_2.wave_status IN (5, 6)\n" + + "\t\t\t\t\tAND t2_1.ds >= 201901 - 1\n" + + "\t\t\t\t\tAND t2_2.ds >= 201901 - 1\n" + + "\t\t\t\t\tAND t2_1.gmt_create >= date_add(now(), INTERVAL -3 DAY)\n" + + "\t\t\t\t\tAND t2_1.gmt_create <= now()\n" + + "\t\t\t\t\tAND t2_2.gmt_create >= date_add(now(), INTERVAL -3 DAY)\n" + + "\t\t\t\t\tAND t2_2.gmt_create <= now()\n" + + "\t\t) t2\n" + + "\t\tON t1.out_batch_code = t2.external_batch_code\n" + + "\t\t\tAND t1.warehouse_id = t2.warehouse_id\n" + + "\t\t\tAND t1.out_operation_mode = 3\n" + + "\t\t\tAND t1.gmt_create >= CURDATE()\n" + + "\t\t\tAND t1.gmt_create <= now()\n" + + "\t\t\tAND t1.ds >= 201901\n" + + "\t\t\tAND t2.businessType IS NOT NULL\n" + + "\tGROUP BY t1.warehouse_id, t2.businessType\n" + + ") a", insertStmt.toString()); + + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, null, null); + } + +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_227.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_227.java new file mode 100644 index 0000000000..c51ad9400a --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_227.java @@ -0,0 +1,35 @@ +/* + * Copyright 1999-2017 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.mysql.select; + +import com.alibaba.druid.sql.MysqlTest; +import com.alibaba.druid.sql.SQLUtils; + + +public class MySqlSelectTest_227 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "select id, distinct name from a"; + + Exception error = null; + try { + SQLUtils.parseSingleMysqlStatement(sql); + } catch (Exception ex) { + error = ex; + } + assertNotNull(error); + } +} \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_229_interval.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_229_interval.java new file mode 100644 index 0000000000..a472c63e54 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_229_interval.java @@ -0,0 +1,65 @@ +/* + * Copyright 1999-2017 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.mysql.select; + +import com.alibaba.druid.sql.MysqlTest; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter; +import com.alibaba.druid.sql.visitor.SQLASTVisitor; + +import java.util.List; + + +public class MySqlSelectTest_229_interval extends MysqlTest { + + public void test_0() throws Exception { + String sql = "select DATE_ADD(utc_date(), INTERVAL -'5' DAY)"; + +// System.out.println(sql); + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + + assertEquals(1, statementList.size()); + + SQLStatement stmt = statementList.get(0); + + + assertEquals("SELECT DATE_ADD(utc_date(), INTERVAL -5 DAY)", stmt.toString()); + + assertEquals("select DATE_ADD(utc_date(), interval -5 day)", stmt.clone().toLowerCaseString()); + } + + public void test_1() throws Exception { + String sql = "select DATE_ADD(utc_date(), INTERVAL +'5' DAY)"; + +// System.out.println(sql); + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + + assertEquals(1, statementList.size()); + + SQLStatement stmt = statementList.get(0); + + + assertEquals("SELECT DATE_ADD(utc_date(), INTERVAL +5 DAY)", stmt.toString()); + + assertEquals("select DATE_ADD(utc_date(), interval +5 day)", stmt.clone().toLowerCaseString()); + } +} \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords.java new file mode 100644 index 0000000000..2dbb789d24 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords.java @@ -0,0 +1,59 @@ +/* + * Copyright 1999-2017 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.mysql.select; + +import com.alibaba.druid.sql.MysqlTest; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.expr.SQLNotExpr; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; + +import java.util.List; + +public class MySqlSelectTest_ads_keywords extends MysqlTest { + + public void test_0() throws Exception { + String sql = "select label from a where not id > 50"; + + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + + assertEquals(1, statementList.size()); + + assertEquals("SELECT label\n" + + "FROM a\n" + + "WHERE NOT id > 50", // + stmt.toString()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); + + assertEquals(1, visitor.getTables().size()); + assertEquals(2, visitor.getColumns().size()); + assertEquals(1, visitor.getConditions().size()); + assertEquals(0, visitor.getOrderByColumns().size()); + + SQLNotExpr notExpr = (SQLNotExpr) ((SQLSelectStatement) stmt).getSelect().getQueryBlock().getWhere(); + assertNotNull(notExpr.getParent()); + assertNotNull(notExpr.getExpr().getParent()); + + + } + +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest133.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest133.java new file mode 100644 index 0000000000..20d3e76f88 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest133.java @@ -0,0 +1,62 @@ +/* + * Copyright 1999-2017 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.oracle.select; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; + + +public class OracleSelectTest133 extends TestCase { + public void test_0() throws Exception { + String sql = "SELECT to_char(sysdate-interval '1' hour,'hh24:mi:ss') as num FROM DUAL;"; + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); + + assertEquals(1, statementList.size()); + + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); + + assertEquals("SELECT to_char(SYSDATE - INTERVAL '1' HOUR, 'hh24:mi:ss') AS num\n" + + "FROM DUAL;", stmt.toString()); + + assertEquals("select to_char(sysdate - interval '1' HOUR, 'hh24:mi:ss') as num\n" + + "from DUAL;", stmt.toLowerCaseString()); + + OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); + stmt.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("relationships : " + visitor.getRelationships()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + assertEquals(0, visitor.getTables().size()); + assertEquals(0, visitor.getColumns().size()); + assertEquals(0, visitor.getConditions().size()); + assertEquals(0, visitor.getRelationships().size()); + assertEquals(0, visitor.getOrderByColumns().size()); + +// assertTrue(visitor.containsColumn("srm1.CONSIGNEE_ADDRESS", "id")); + } + +} \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/postgresql/PG_getCreateTableScriptTest.java b/src/test/java/com/alibaba/druid/postgresql/PG_getCreateTableScriptTest.java index 6ffe893830..7e14da15ce 100644 --- a/src/test/java/com/alibaba/druid/postgresql/PG_getCreateTableScriptTest.java +++ b/src/test/java/com/alibaba/druid/postgresql/PG_getCreateTableScriptTest.java @@ -2,6 +2,7 @@ package com.alibaba.druid.postgresql; import com.alibaba.druid.DbTestCase; import com.alibaba.druid.benckmark.proxy.BenchmarkExecutor; +import com.alibaba.druid.pool.vendor.PGValidConnectionChecker; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.util.JdbcUtils; @@ -22,6 +23,10 @@ public class PG_getCreateTableScriptTest extends DbTestCase { public void test_oracle() throws Exception { Connection conn = getConnection(); + PGValidConnectionChecker checker = new PGValidConnectionChecker(); + Connection raw = conn.unwrap(Connection.class); + checker.isValidConnection(raw, "select 1", 100); + // 从Oracle通过DBMS_METADATA.GET_DDL获取CreateTable语句列表 //String createTableScript = JdbcUtils.getCreateTableScript(conn, JdbcConstants.ORACLE); //System.out.println(createTableScript);