diff --git a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java index a41ed39c0e..c253334784 100644 --- a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java +++ b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java @@ -453,7 +453,7 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean { sqlStat.decrementRunningCount(); sqlStat.addExecuteTime(statement.getLastExecuteType(), firstResult, nanos); statement.setLastExecuteTimeNano(nanos); - if ((!statement.isFirstResultSet()) && statement.getLastExecuteType() == StatementExecuteType.Execute) { + if ((!firstResult) && statement.getLastExecuteType() == StatementExecuteType.Execute) { try { int updateCount = statement.getUpdateCount(); sqlStat.addUpdateCount(updateCount); diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java index eade2148be..557ce66e51 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java @@ -18,7 +18,7 @@ package com.alibaba.druid.sql.ast.expr; import com.alibaba.druid.sql.ast.SQLExprImpl; import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.visitor.SQLASTVisitor; - +git import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java index 167379d49e..d633f0701e 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java @@ -584,11 +584,11 @@ public class SQLEvalVisitorUtils { String text = x.getValue(); long[] words = new long[text.length() / 64 + 1]; - for (int i = 0; i < text.length(); ++i) { + for (int i = text.length()-1; i >= 0 ; --i) { char ch = text.charAt(i); if (ch == '1') { int wordIndex = i >> 6; - words[wordIndex] |= (1L << i); + words[wordIndex] |= (1L << (text.length() - 1 - i)); } } @@ -600,7 +600,7 @@ public class SQLEvalVisitorUtils { byte[] bytes = new byte[words.length * 8]; for (int i = 0; i < words.length; ++i) { - Utils.putLong(bytes, i * 8, words[i]); + Utils.putLong(bytes, (words.length-1-i) * 8, words[i]); } val = new BigInteger(bytes); diff --git a/src/main/resources/support/http/resources/js/lang.js b/src/main/resources/support/http/resources/js/lang.js index 6b93f70f00..14ec3ae6b6 100644 --- a/src/main/resources/support/http/resources/js/lang.js +++ b/src/main/resources/support/http/resources/js/lang.js @@ -235,6 +235,7 @@ druid.lang = function() { 'SQLStatWhiteList':['SQL Stat - White List', 'SQL防御统计 - 白名单'], 'SQLStatBlackList':['SQL Stat - Black List', 'SQL防御统计 - 黑名单'], /**session-detail*/ + 'PrincipalOnly':['Principal Only', 'Principal过滤'], 'SESSIONID':['SESSIONID', 'SESSIONID'], 'UserAgent':['UserAgent', 'UserAgent'], 'Principal':['Principal', 'Principal'], diff --git a/src/main/resources/support/http/resources/websession.html b/src/main/resources/support/http/resources/websession.html index 7cacd2bdcd..ff1c848884 100644 --- a/src/main/resources/support/http/resources/websession.html +++ b/src/main/resources/support/http/resources/websession.html @@ -18,6 +18,11 @@ Web Session Stat View JSON API +