diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlDeallocatePrepareStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlDeallocatePrepareStatement.java new file mode 100644 index 0000000000..04472cdfa1 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MysqlDeallocatePrepareStatement.java @@ -0,0 +1,40 @@ +/* + * Copyright 1999-2101 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.sql.dialect.mysql.ast.statement; + +import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; + +public class MysqlDeallocatePrepareStatement extends MySqlStatementImpl { + + private SQLName statementName; + + public SQLName getStatementName() { + return statementName; + } + + public void setStatementName(SQLName statementName) { + this.statementName = statementName; + } + + public void accept0(MySqlASTVisitor visitor) { + if (visitor.visit(this)) { + acceptChild(visitor, statementName); + } + visitor.endVisit(this); + } + +} 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 d26ec0224b..64ce2ad047 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 @@ -182,6 +182,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowWarningsStatem import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlStartTransactionStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnlockTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MysqlDeallocatePrepareStatement; import com.alibaba.druid.sql.parser.Lexer; import com.alibaba.druid.sql.parser.ParserException; import com.alibaba.druid.sql.parser.SQLSelectParser; @@ -603,6 +604,12 @@ public class MySqlStatementParser extends SQLStatementParser { statementList.add(stmt); return true; } + + if(identifierEquals("DEALLOCATE")) { + MysqlDeallocatePrepareStatement stmt = parseDeallocatePrepare(); + statementList.add(stmt); + return true; + } if (identifierEquals("LOAD")) { SQLStatement stmt = parseLoad(); @@ -1931,6 +1938,17 @@ public class MySqlStatementParser extends SQLStatementParser { return stmt; } + public MysqlDeallocatePrepareStatement parseDeallocatePrepare() { + acceptIdentifier("DEALLOCATE"); + acceptIdentifier("PREPARE"); + + MysqlDeallocatePrepareStatement stmt = new MysqlDeallocatePrepareStatement(); + SQLName statementName = exprParser.name(); + stmt.setStatementName(statementName); + + return stmt; + } + public SQLInsertStatement parseInsert() { MySqlInsertStatement insertStatement = new MySqlInsertStatement(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java index 2e5eff03e5..0e1ea06f2f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java @@ -126,6 +126,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnionQuery; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnlockTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateTableSource; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MysqlDeallocatePrepareStatement; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public interface MySqlASTVisitor extends SQLASTVisitor { @@ -170,6 +171,10 @@ public interface MySqlASTVisitor extends SQLASTVisitor { boolean visit(MySqlPrepareStatement x); void endVisit(MySqlExecuteStatement x); + + boolean visit(MysqlDeallocatePrepareStatement x); + + void endVisit(MysqlDeallocatePrepareStatement x); boolean visit(MySqlExecuteStatement x); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java index e125e5203c..da27ed482a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java @@ -129,6 +129,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnionQuery; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnlockTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateTableSource; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MysqlDeallocatePrepareStatement; import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter; public class MySqlASTVisitorAdapter extends SQLASTVisitorAdapter implements MySqlASTVisitor { @@ -228,6 +229,16 @@ public class MySqlASTVisitorAdapter extends SQLASTVisitorAdapter implements MySq return true; } + + @Override + public void endVisit(MysqlDeallocatePrepareStatement x) { + + } + + @Override + public boolean visit(MysqlDeallocatePrepareStatement x) { + return true; + } @Override public void endVisit(MySqlDeleteStatement x) { 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 901f5487b9..77efa363de 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 @@ -163,6 +163,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnionQuery; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnlockTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateTableSource; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MysqlDeallocatePrepareStatement; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.util.JdbcConstants; @@ -875,6 +876,17 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV } return false; } + + @Override + public void endVisit(MysqlDeallocatePrepareStatement x) { + + } + + public boolean visit(MysqlDeallocatePrepareStatement x) { + print0(ucase ? "DEALLOCATE PREPARE " : "deallocate prepare "); + x.getStatementName().accept(this); + return false; + } @Override public void endVisit(MySqlDeleteStatement x) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java index 1f2c4d40a1..62df154e4b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java @@ -144,6 +144,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnionQuery; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnlockTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateTableSource; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MysqlDeallocatePrepareStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Mode; @@ -324,6 +325,16 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS return true; } + + @Override + public void endVisit(MysqlDeallocatePrepareStatement x) { + + } + + @Override + public boolean visit(MysqlDeallocatePrepareStatement x) { + return true; + } @Override public void endVisit(MySqlLoadDataInFileStatement x) { diff --git a/src/main/resources/support/http/resources/js/lang.js b/src/main/resources/support/http/resources/js/lang.js index 3359d5b161..9954feb4e4 100644 --- a/src/main/resources/support/http/resources/js/lang.js +++ b/src/main/resources/support/http/resources/js/lang.js @@ -241,6 +241,8 @@ druid.lang = function() { 'RequestTimeMillisTotal':['RequestTimeMillisTotal', '总共请求时间'], 'RequestInterval':['RequestInterval', '请求间隔'], /**weburi-detail*/ + 'RefreshPeriod':['Refresh Period', '刷新时间'], + 'SuspendRefresh':['Suspend Refresh', '暂停刷新'], 'RequestTimeMillis':['RequestTimeMillis', '请求时间'], 'JdbcExecutePeak':['JdbcExecutePeak', 'jdbc执行峰值'], 'JdbcFetchRowPeak':['JdbcFetchRowPeak', 'jdbc查询取回行数峰值'], diff --git a/src/main/resources/support/http/resources/login.html b/src/main/resources/support/http/resources/login.html index 3031dc74e6..d4d0f614b6 100644 --- a/src/main/resources/support/http/resources/login.html +++ b/src/main/resources/support/http/resources/login.html @@ -55,7 +55,7 @@ The username or password you entered is incorrect.
- +
@@ -83,16 +83,29 @@ else { $("#alertInfo").show(); $("#loginForm")[0].reset(); + $("input[name=loginUsername]").focus(); } }, dataType: "text" }); - } + }, + unamecr : function(e) { + if(e.which == 13) { // enter key event + $("input[name=loginPassword]").focus(); + } + }, + upasscr : function(e) { + if(e.which == 13) { // enter key event + $("#loginBtn").click(); + } + } } }(); $(document).ready(function() { $("#loginBtn").click(druid.login.login); + $("input[name=loginUsername]").keypress(druid.login.unamecr); + $("input[name=loginPassword]").keypress(druid.login.upasscr); }); diff --git a/src/main/resources/support/http/resources/weburi.html b/src/main/resources/support/http/resources/weburi.html index 8de74bce8f..0bb79588c2 100644 --- a/src/main/resources/support/http/resources/weburi.html +++ b/src/main/resources/support/http/resources/weburi.html @@ -17,6 +17,17 @@

Web URI Stat View JSON API + + + + Suspend Refresh +

@@ -64,10 +75,37 @@ druid.common.ajaxuri = 'weburi.json?'; druid.common.handleCallback = druid.weburi.handleAjaxResult; druid.common.setOrderBy("URI"); - druid.common.ajaxRequestForBasicInfo(); - setInterval("druid.common.ajaxRequestForBasicInfo();",5000); + druid.weburi.controlRefresh(); }, - + controlRefresh : function() { + var FIVE = 5; + if(!druid.weburi.refreshSeconds){ + druid.weburi.refreshSeconds=FIVE; + } + if(!druid.weburi.suspendedSeconds){ + druid.weburi.suspendedSeconds=0; + } + druid.weburi.suspendedSeconds += FIVE; + if(!druid.weburi.disableAutoRefresh){ + if(druid.weburi.suspendedSeconds >= druid.weburi.refreshSeconds){ + druid.weburi.suspendedSeconds = 0; + druid.common.ajaxRequestForBasicInfo(); + } + } + setTimeout(druid.weburi.controlRefresh, FIVE * 1000); + }, + switchSuspendRefresh : function() { + druid.weburi.disableAutoRefresh = !druid.weburi.disableAutoRefresh; + if(druid.weburi.disableAutoRefresh){ + $("#btnSuspendRefresh").addClass("btn-warning").removeClass("btn-primary"); + } else { + $("#btnSuspendRefresh").addClass("btn-primary").removeClass("btn-warning"); + } + }, + disableAutoRefresh : false, + refreshSeconds : 5, + suspendedSeconds : 0, + handleAjaxResult : function(data) { var statList = data.Content; if(statList == null) return; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlASTVisitorAdapterTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlASTVisitorAdapterTest.java index daf98d69ee..d4753001af 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlASTVisitorAdapterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlASTVisitorAdapterTest.java @@ -84,6 +84,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlTableIndex; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnionQuery; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnlockTablesStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MysqlDeallocatePrepareStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter; import junit.framework.TestCase; @@ -101,6 +102,7 @@ public class MySqlASTVisitorAdapterTest extends TestCase { new SQLBinaryExpr().accept(adapter); new MySqlPrepareStatement().accept(adapter); new MySqlExecuteStatement().accept(adapter); + new MysqlDeallocatePrepareStatement().accept(adapter); new MySqlDeleteStatement().accept(adapter); new MySqlInsertStatement().accept(adapter); new MySqlLoadXmlStatement().accept(adapter); diff --git a/src/test/java/com/alibaba/druid/sql/parser/DeallocatePrepareTest.java b/src/test/java/com/alibaba/druid/sql/parser/DeallocatePrepareTest.java new file mode 100644 index 0000000000..da65fc8964 --- /dev/null +++ b/src/test/java/com/alibaba/druid/sql/parser/DeallocatePrepareTest.java @@ -0,0 +1,23 @@ +package com.alibaba.druid.sql.parser; + +import org.junit.Assert; + +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MysqlDeallocatePrepareStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; + +import junit.framework.TestCase; + +public class DeallocatePrepareTest extends TestCase { + + public void test() { + String sql = "DEALLOCATE PREPARE stmt1"; + MySqlStatementParser parser = new MySqlStatementParser(sql); + SQLStatement stmt =parser.parseStatement(); + Assert.assertEquals(MysqlDeallocatePrepareStatement.class, stmt.getClass()); + MysqlDeallocatePrepareStatement dpStmt = (MysqlDeallocatePrepareStatement) stmt; + Assert.assertEquals("stmt1", dpStmt.getStatementName().getSimpleName()); + Assert.assertEquals(sql, dpStmt.toString()); + } + +}