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

Merge pull request #3685 from joshuayash/master

Browse Source 
fix typo: merg -> merge
This commit is contained in:
温绍锦
2020-06-27 22:39:07 +08:00
committed by GitHub
parent faf924cf7f 0d839edbf4
commit 2d096feee3
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java
+6 -6
View File
@@ -186,7 +186,7 @@ public final class DruidStatManagerFacade {
for (Object datasource : dataSources) {
Map<String, Object> wallStat = DruidDataSourceUtils.getWallStatMap(datasource);
map = mergWallStat(map, wallStat);
map = mergeWallStat(map, wallStat);
}
return map;
@@ -205,7 +205,7 @@ public final class DruidStatManagerFacade {
}
@SuppressWarnings({ "rawtypes", "unchecked" })
public static Map mergWallStat(Map mapA, Map mapB) {
public static Map mergeWallStat(Map mapA, Map mapB) {
if (mapA == null || mapA.size() == 0) {
return mapB;
}
@@ -236,7 +236,7 @@ public final class DruidStatManagerFacade {
String sql = (String) blackItem.get("sql");
Map<String, Object> oldItem = newSet.get(sql);
newSet.put(sql, mergWallStat(oldItem, blackItem));
newSet.put(sql, mergeWallStat(oldItem, blackItem));
}
Collection<Map<String, Object>> collectionB = (Collection<Map<String, Object>>) valueB;
@@ -247,12 +247,12 @@ public final class DruidStatManagerFacade {
String sql = (String) blackItem.get("sql");
Map<String, Object> oldItem = newSet.get(sql);
newSet.put(sql, mergWallStat(oldItem, blackItem));
newSet.put(sql, mergeWallStat(oldItem, blackItem));
}
newMap.put(key, newSet.values());
} else {
if (valueA instanceof Map && valueB instanceof Map) {
Object newValue = mergWallStat((Map) valueA, (Map) valueB);
Object newValue = mergeWallStat((Map) valueA, (Map) valueB);
newMap.put(key, newValue);
} else if (valueA instanceof Set && valueB instanceof Set) {
Set<Object> set = new HashSet<Object>();
@@ -305,7 +305,7 @@ public final class DruidStatManagerFacade {
String name = (String) mapB.get("name");
Map<String, Object> mapA = mapped.get(name);
Map<String, Object> mergedMap = mergWallStat(mapA, mapB);
Map<String, Object> mergedMap = mergeWallStat(mapA, mapB);
mergedList.add(mergedMap);
}
src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_statMap.java
+2 -2
View File
@@ -55,14 +55,14 @@ public class WallStatTest_statMap extends TestCase {
System.out.println(JSONUtils.toJSONString(statMapB));
System.out.println(JSONUtils.toJSONString(statMapC));
Map<String, Object> statMapMerged = DruidStatManagerFacade.mergWallStat(statMapA, statMapB);
Map<String, Object> statMapMerged = DruidStatManagerFacade.mergeWallStat(statMapA, statMapB);
System.out.println(JSONUtils.toJSONString(statMapMerged));
Assert.assertEquals(2L, statMapMerged.get("checkCount"));
Assert.assertEquals(21L, statMapMerged.get("violationEffectRowCount"));
Assert.assertEquals(2, ((Collection<Map<String, Object>>) statMapMerged.get("blackList")).size());
statMapMerged = DruidStatManagerFacade.mergWallStat(statMapMerged, statMapC);
statMapMerged = DruidStatManagerFacade.mergeWallStat(statMapMerged, statMapC);
System.out.println(JSONUtils.toJSONString(statMapMerged));
Assert.assertEquals(2, ((Collection<Map<String, Object>>) statMapMerged.get("blackList")).size());
Assert.assertEquals(33L, statMapMerged.get("violationEffectRowCount"));