Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

improve wall filter

Browse Source
This commit is contained in:
wenshao
2013-04-05 12:49:25 +08:00
parent d268227242
commit 9ea3434bc4
12 changed files with 324 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlReplaceStatement.java
+26 -10
View File
@@ -21,27 +21,43 @@ import java.util.List;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
import com.alibaba.druid.sql.ast.statement.SQLInsertStatement.ValuesClause;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
public class MySqlReplaceStatement extends MySqlStatementImpl {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
private boolean lowPriority = false;
private boolean delayed = false;
private boolean lowPriority = false;
private boolean delayed = false;
private SQLName tableName;
private final List<SQLExpr> columns = new ArrayList<SQLExpr>();
private List<ValuesClause> valuesList = new ArrayList<ValuesClause>();
private SQLQueryExpr query;
private SQLExprTableSource tableSource;
private final List<SQLExpr> columns = new ArrayList<SQLExpr>();
private List<ValuesClause> valuesList = new ArrayList<ValuesClause>();
private SQLQueryExpr query;
public SQLName getTableName() {
return tableName;
if (tableSource == null) {
return null;
}
return (SQLName) tableSource.getExpr();
}
public void setTableName(SQLName tableName) {
this.tableName = tableName;
this.setTableSource(new SQLExprTableSource(tableName));
}
public SQLExprTableSource getTableSource() {
return tableSource;
}
public void setTableSource(SQLExprTableSource tableSource) {
if (tableSource != null) {
tableSource.setParent(this);
}
this.tableSource = tableSource;
}
public List<SQLExpr> getColumns() {
@@ -79,7 +95,7 @@ public class MySqlReplaceStatement extends MySqlStatementImpl {
public void accept0(MySqlASTVisitor visitor) {
if (visitor.visit(this)) {
acceptChild(visitor, tableName);
acceptChild(visitor, tableSource);
acceptChild(visitor, columns);
acceptChild(visitor, valuesList);
acceptChild(visitor, query);
src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java
+16 -3
View File
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -30,6 +31,7 @@ import java.util.concurrent.atomic.AtomicLong;
import com.alibaba.druid.VERSION;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils;
import com.alibaba.druid.support.http.stat.WebAppStatManager;
import com.alibaba.druid.support.spring.stat.SpringStatManager;
import com.alibaba.druid.util.DruidDataSourceUtils;
@@ -195,6 +197,7 @@ public final class DruidStatManagerFacade {
return mapA;
}
Map<String, Object> newMap = new LinkedHashMap<String, Object>();
for (Object item : mapB.entrySet()) {
Map.Entry entry = (Map.Entry) item;
String key = (String) entry.getKey();
@@ -202,16 +205,26 @@ public final class DruidStatManagerFacade {
Object valueA = mapA.get(key);
if (valueA == null) {
mapA.put(key, valueB);
newMap.put(key, valueB);
} else if (valueB == null) {
newMap.put(key, valueA);
} else {
if (valueA instanceof Map && valueB instanceof Map) {
Object newValue = mergWallStat((Map)valueA, (Map)valueB);
mapA.put(key, newValue);
newMap.put(key, newValue);
} else if (valueA instanceof Set && valueB instanceof Set) {
Set<Object> set = new HashSet<Object>();
set.addAll((Set) valueA);
set.addAll((Set) valueB);
newMap.put(key, set);
} else {
Object sum = SQLEvalVisitorUtils.add(valueA, valueB);
newMap.put(key, sum);
}
}
}
return null;
return newMap;
}
public List<Map<String, Object>> getSqlStatDataList(Object datasource) {
src/main/java/com/alibaba/druid/wall/WallSqlTableStat.java
+16 -3
View File
@@ -26,6 +26,19 @@ public class WallSqlTableStat {
private int createCount;
private int alterCount;
private int dropCount;
private int replaceCount;
public int getReplaceCount() {
return replaceCount;
}
public int incrementReplaceCount() {
return replaceCount++;
}
public void addReplaceCount(int value) {
this.replaceCount+= value;
}
public int getSelectCount() {
return selectCount;
@@ -34,7 +47,7 @@ public class WallSqlTableStat {
public void incrementSelectCount() {
this.selectCount++;
}
public void addSelectCount(int value) {
this.selectCount += value;
}
@@ -46,7 +59,7 @@ public class WallSqlTableStat {
public void incrementSelectIntoCount() {
this.selectIntoCount++;
}
public void addSelectIntoCount(int value) {
this.selectIntoCount += value;
}
@@ -58,7 +71,7 @@ public class WallSqlTableStat {
public void incrementInsertCount() {
this.insertCount++;
}
public void addInsertCount(int value) {
this.insertCount += value;
}
src/main/java/com/alibaba/druid/wall/WallTableStat.java
+17 -1
View File
@@ -32,6 +32,7 @@ public class WallTableStat {
private volatile long createCount;
private volatile long alterCount;
private volatile long dropCount;
private volatile long replaceCount;
final static AtomicLongFieldUpdater<WallTableStat> selectCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class,
"selectCount");
@@ -51,6 +52,8 @@ public class WallTableStat {
"alterCount");
final static AtomicLongFieldUpdater<WallTableStat> dropCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class,
"dropCount");
final static AtomicLongFieldUpdater<WallTableStat> replaceCountUpdater = AtomicLongFieldUpdater.newUpdater(WallTableStat.class,
"replaceCount");
public WallTableStat(){
@@ -91,6 +94,10 @@ public class WallTableStat {
public long getDropCount() {
return dropCount;
}
public long getReplaceCount() {
return replaceCount;
}
public void addSqlTableStat(WallSqlTableStat stat) {
{
@@ -147,6 +154,12 @@ public class WallTableStat {
dropCountUpdater.addAndGet(this, val);
}
}
{
long val = stat.getReplaceCount();
if (val > 0) {
replaceCountUpdater.addAndGet(this, val);
}
}
}
public String toString() {
@@ -155,7 +168,7 @@ public class WallTableStat {
return JSONUtils.toJSONString(map);
}
public Map<String, Object> toMap() {
Map<String, Object> map = new LinkedHashMap<String, Object>();
return toMap(map);
@@ -186,6 +199,9 @@ public class WallTableStat {
if (truncateCount > 0) {
map.put("truncateCount", truncateCount);
}
if (replaceCount > 0) {
map.put("replaceCount", replaceCount);
}
return map;
}
}
src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java
+6
View File
@@ -47,6 +47,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStateme
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlDeleteStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlDropTableStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlReplaceStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectGroupBy;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock.Limit;
@@ -342,4 +343,9 @@ public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisi
public boolean visit(SQLSetStatement x) {
return false;
}
@Override
public boolean visit(MySqlReplaceStatement x) {
return true;
}
}
src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java
+2
View File
@@ -872,6 +872,8 @@ public class WallVisitorUtils {
tableStat.incrementDeleteCount();
} else if (parent instanceof SQLUpdateStatement) {
tableStat.incrementUpdateCount();
} else if (parent instanceof MySqlReplaceStatement) {
tableStat.incrementReplaceCount();
}
}
}
src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest35.java
+45
View File
@@ -0,0 +1,45 @@
/*
* 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.filter.wall;
import junit.framework.TestCase;
import org.junit.Assert;
import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.druid.wall.WallProvider;
import com.alibaba.druid.wall.spi.MySqlWallProvider;
/**
* SQLServerWallTest
*
* @author RaymondXiu
* @version 1.0, 2012-3-18
* @see
*/
public class MySqlWallTest35 extends TestCase {
public void test_true() throws Exception {
WallProvider provider = new MySqlWallProvider();
Assert.assertTrue(provider.checkValid(//
"REPLACE INTO `test2tb` VALUES " + //
"('51', '6714105741', '亦美珊不掉正品隐形文胸安全硅胶文胸 小胸聚拢比基尼<span class=H>游泳</span>衣泳装', 'http://img03.taobaocdn.com/bao/uploaded/i3/16011019585534199/T1cnlaXA8bXXXXXXXX_!!0-item_pic.jpg', 'liqiang198163', 'c', '25.00', '20.00', '1000.00', '76', '529', '4.86', '4.91', '4.90', '0.00', '4.80', '2878', '77', '12', '15');")); //
Assert.assertEquals(1, provider.getTableStat("test2tb").getReplaceCount());
System.out.println(JSONUtils.toJSONString(provider.getStatsMap()));
}
}
src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_statMap.java
+51
View File
@@ -0,0 +1,51 @@
package com.alibaba.druid.bvt.filter.wall;
import java.util.Map;
import junit.framework.TestCase;
import org.junit.Assert;
import com.alibaba.druid.stat.DruidStatManagerFacade;
import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.druid.wall.WallContext;
import com.alibaba.druid.wall.WallProvider;
import com.alibaba.druid.wall.spi.MySqlWallProvider;
public class WallStatTest_statMap extends TestCase {
protected void setUp() throws Exception {
WallContext.clearContext();
}
protected void tearDown() throws Exception {
WallContext.clearContext();
}
public void testMySql() throws Exception {
WallProvider providerA = new MySqlWallProvider();
{
String sql = "select * from t where len(fname) = 1";
Assert.assertTrue(providerA.checkValid(sql));
}
WallProvider providerB = new MySqlWallProvider();
{
String sql = "select * from t where len(fname) = 2";
Assert.assertTrue(providerB.checkValid(sql));
}
Map<String, Object> statMapA = providerA.getStatsMap();
Map<String, Object> statMapB = providerB.getStatsMap();
System.out.println(JSONUtils.toJSONString(statMapA));
System.out.println(JSONUtils.toJSONString(statMapB));
Map<String, Object> statMapMerged = DruidStatManagerFacade.mergWallStat(statMapA, statMapB);
System.out.println(JSONUtils.toJSONString(statMapMerged));
Assert.assertEquals(2L, statMapMerged.get("checkCount"));
}
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest10.java
+69
View File
@@ -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 java.util.List;
import org.junit.Assert;
import com.alibaba.druid.sql.MysqlTest;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor;
import com.alibaba.druid.stat.TableStat;
import com.alibaba.druid.stat.TableStat.Column;
public class MySqlCreateTableTest10 extends MysqlTest {
public void test_0() throws Exception {
String sql = "create table TACCOUNT (" + //
" ID varchar(36) not null," + //
" ACCOUNT varchar(100) not null," + //
" account_money double precision," + //
" NAME varchar(100) not null," + //
" TYPE integer," + //
" primary key (ID)" + //
" )";
MySqlStatementParser parser = new MySqlStatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
SQLCreateTableStatement stmt = (SQLCreateTableStatement) statementList.get(0);
print(statementList);
Assert.assertEquals(1, statementList.size());
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(5, visitor.getColumns().size());
Assert.assertEquals(0, visitor.getConditions().size());
Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("TACCOUNT")));
Assert.assertTrue(visitor.getColumns().contains(new Column("TACCOUNT", "ID")));
Assert.assertTrue(visitor.getColumns().contains(new Column("TACCOUNT", "ACCOUNT")));
Assert.assertTrue(visitor.getColumns().contains(new Column("TACCOUNT", "account_money")));
Assert.assertTrue(visitor.getColumns().contains(new Column("TACCOUNT", "NAME")));
Assert.assertTrue(visitor.getColumns().contains(new Column("TACCOUNT", "TYPE")));
}
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlShowFieldsTest.java
+57
View File
@@ -0,0 +1,57 @@
/*
* 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 java.util.List;
import junit.framework.Assert;
import com.alibaba.druid.sql.MysqlTest;
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;
import com.alibaba.druid.stat.TableStat.Column;
public class MySqlShowFieldsTest extends MysqlTest {
public void test_0() throws Exception {
String sql = "SHOW FIELDS FROM `schema_migrations`";
MySqlStatementParser parser = new MySqlStatementParser(sql);
List<SQLStatement> statementList = parser.parseStatementList();
SQLStatement statemen = statementList.get(0);
print(statementList);
Assert.assertEquals(1, statementList.size());
MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor();
statemen.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(0, visitor.getTables().size());
Assert.assertEquals(0, visitor.getColumns().size());
Assert.assertEquals(0, visitor.getConditions().size());
// Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_price")));
// Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store")));
}
}
src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest3.java
+18
View File
@@ -0,0 +1,18 @@
package com.alibaba.druid.bvt.support.json;
import java.util.LinkedHashMap;
import java.util.Map;
import junit.framework.TestCase;
import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.druid.util.IOUtils;
public class JSONParserTest3 extends TestCase {
public void test_parse() throws Exception {
String text = IOUtils.readFromResource("bvt/sonar-sql.json");
Map<String, Object> result = (Map<String, Object>)JSONUtils.parse(text);
LinkedHashMap wallStats = (LinkedHashMap) result.get("Content");
System.out.println(wallStats.get("blackList"));
}
}
src/test/resources/bvt/sonar-sql.json
+1
View File
File diff suppressed because one or more lines are too long