From bb53597cfe3311b4f7f32f279637aa570022d99f Mon Sep 17 00:00:00 2001 From: HadesLee Date: Fri, 21 Mar 2014 09:13:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8DConcurrentModificationExc?= =?UTF-8?q?eption=E7=9A=84=E5=BC=82=E5=B8=B8=EF=BC=8C=E5=BD=93=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E9=87=8F=E6=AF=94=E8=BE=83=E5=A4=A7=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/druid/support/http/stat/WebAppStat.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java index b0956e85b5..775d8eb83e 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java @@ -31,6 +31,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.util.LRUCache; +import java.util.Collections; public class WebAppStat { @@ -504,7 +505,7 @@ public class WebAppStat { public List> getSessionStatDataList() { List> sessionStatDataList = new ArrayList>(this.sessionStatMap.size()); - for (WebSessionStat sessionStat : this.sessionStatMap.values()) { + for (WebSessionStat sessionStat : Collections.unmodifiableCollection(this.sessionStatMap.values())) { Map sessionStatData = sessionStat.getStatData(); int runningCount = ((Number) sessionStatData.get("RunningCount")).intValue(); @@ -642,7 +643,6 @@ public class WebAppStat { } } else if (isLinux) { osLinuxCount.incrementAndGet(); - isAndroid = computeUserAgentAndroid(userAgent); } else if (userAgent.indexOf("Symbian") != -1) { osSymbianCount.incrementAndGet(); From 4654859ae4612d63be283ba9f79c7ae1ae130dab Mon Sep 17 00:00:00 2001 From: HadesLee Date: Fri, 21 Mar 2014 09:22:03 +0800 Subject: [PATCH 2/4] --- .../java/com/alibaba/druid/support/http/stat/WebAppStat.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java index 775d8eb83e..3034ae9cb7 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java @@ -505,6 +505,7 @@ public class WebAppStat { public List> getSessionStatDataList() { List> sessionStatDataList = new ArrayList>(this.sessionStatMap.size()); + //去除ConcurrentModificationException的异常 for (WebSessionStat sessionStat : Collections.unmodifiableCollection(this.sessionStatMap.values())) { Map sessionStatData = sessionStat.getStatData(); From 0a36a5bed94cc88167eccd81e0fc04c3f82fc6a7 Mon Sep 17 00:00:00 2001 From: hadeslee Date: Fri, 21 Mar 2014 09:24:15 +0800 Subject: [PATCH 3/4] Update WebAppStat.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 去除多余的注释 --- .../java/com/alibaba/druid/support/http/stat/WebAppStat.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java index 3034ae9cb7..775d8eb83e 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java @@ -505,7 +505,6 @@ public class WebAppStat { public List> getSessionStatDataList() { List> sessionStatDataList = new ArrayList>(this.sessionStatMap.size()); - //去除ConcurrentModificationException的异常 for (WebSessionStat sessionStat : Collections.unmodifiableCollection(this.sessionStatMap.values())) { Map sessionStatData = sessionStat.getStatData(); From 4770fce08c8e053b6ff57564c1facfc3d46aff63 Mon Sep 17 00:00:00 2001 From: junyu Date: Fri, 30 May 2014 09:28:17 +0800 Subject: [PATCH 4/4] fix #535 --- .../dialect/mysql/parser/MySqlExprParser.java | 4 ++ .../mysql/visitor/MySqlOutputVisitor.java | 5 ++ .../druid/sql/parser/SQLExprParser.java | 10 +++ .../bvt/sql/mysql/MySqlCreateTableTest52.java | 69 +++++++++++++++++++ 4 files changed, 88 insertions(+) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest52.java 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 ec4b3de137..e2b7dd26c5 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 @@ -253,6 +253,10 @@ public class MySqlExprParser extends SQLExprParser { } else if ("COLLATE".equalsIgnoreCase(lexer.stringVal())) { lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + if (lexer.token() != Token.IDENTIFIER) { throw new ParserException("syntax error"); } 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 d4d9d6033f..bf7327be01 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 @@ -389,6 +389,11 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV print(x.getCollate()); } } + + if (x.getCollate() != null) { + print(" COLLATE "); + print(x.getCollate()); + } return false; } 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 c9c5e43e08..c60beafe11 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -1371,7 +1371,17 @@ public class SQLExprParser extends SQLParser { lexer.nextToken(); } } + }else if(identifierEquals("COLLATE")){ + lexer.nextToken(); + + if (lexer.token() != Token.IDENTIFIER) { + throw new ParserException(); + } + + charType.setCollate(lexer.stringVal()); + lexer.nextToken(); } + return charType; } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest52.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest52.java new file mode 100644 index 0000000000..1c344af633 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest52.java @@ -0,0 +1,69 @@ +/* + * Copyright 1999-2011 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; + +import org.junit.Assert; + +import com.alibaba.druid.sql.MysqlTest; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; + +public class MySqlCreateTableTest52 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "CREATE TABLE `ins_ebay_auth` ("// + + "`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id',"// + + "`usr_id` int(10) NOT NULL COMMENT '外键，用户表',"// + + "`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效',"// + + "`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码',"// + + "`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名',"// + + "`create_time` datetime NOT NULL COMMENT '授权时间',"// + + "`invalid_time` datetime NOT NULL COMMENT '授权失效时间'," + "PRIMARY KEY (`auth_id`)"// + + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='INS_EBAY_AUTH';"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + SQLStatement stmt = parser.parseCreateTable(); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + 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()); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(7, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("ins_ebay_auth"))); + + String output = SQLUtils.toMySqlString(stmt); + Assert.assertEquals("CREATE TABLE `ins_ebay_auth` ("// + +"\n\t`auth_id` int(10) AUTO_INCREMENT NOT NULL COMMENT '主键id', " // + +"\n\t`usr_id` int(10) NOT NULL COMMENT '外键，用户表', "// + +"\n\t`status` char(1) COLLATE utf8_bin NOT NULL COMMENT '状态 0.有效?1.无效', "// + +"\n\t`ebay_token` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'eBay授权码', "// + +"\n\t`ebay_name` varchar(50) NOT NULL COMMENT 'eBay唯一名', "// + +"\n\t`create_time` datetime NOT NULL COMMENT '授权时间', "// + +"\n\t`invalid_time` datetime NOT NULL COMMENT '授权失效时间', "// + +"\n\tPRIMARY KEY (`auth_id`)" + +"\n) ENGINE = InnoDB CHARSET = utf8 COLLATE utf8_bin COMMENT = 'INS_EBAY_AUTH'", output); + } +}