You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2023/07/31 03:23:57 UTC
[skywalking] 01/01: Fix BooleanMatch and BooleanNotEqualMatch doing Boolean comparison.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch fix
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 204e1cae994787277b074bde3691faabd2311849
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Jul 31 11:23:48 2023 +0800
Fix BooleanMatch and BooleanNotEqualMatch doing Boolean comparison.
---
docs/en/changes/changes.md | 3 ++-
.../oap/server/core/analysis/metrics/expression/BooleanMatch.java | 2 +-
.../server/core/analysis/metrics/expression/BooleanNotEqualMatch.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 9573743e9f..12bc77562a 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -57,7 +57,8 @@
* Add component ID for Lock (ID=5016).
* [Breaking change] Adjust the structure of hooks in the `alarm-settings.yml`. Support multiple configs for each hook types and specifying the hooks in the alarm rule.
* Bump up Armeria to 1.24.3.
-* Apply MQE on APISIX, AWS_EKS, AWS_GATEWAY and AWS_S3 layer UI templates
+* Apply MQE on APISIX, AWS_EKS, AWS_GATEWAY and AWS_S3 layer UI templates.
+* Fix BooleanMatch and BooleanNotEqualMatch doing Boolean comparison.
#### UI
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/BooleanMatch.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/BooleanMatch.java
index ca7eb68d9d..8dc0852521 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/BooleanMatch.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/BooleanMatch.java
@@ -23,7 +23,7 @@ import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Boolean
@BooleanValueFilterMatcher
public class BooleanMatch {
public boolean match(Boolean left, Boolean right) {
- return left == right;
+ return left.equals(right);
}
public boolean match(boolean left, boolean right) {
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/BooleanNotEqualMatch.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/BooleanNotEqualMatch.java
index d23ad79007..88c777dacd 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/BooleanNotEqualMatch.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/BooleanNotEqualMatch.java
@@ -23,7 +23,7 @@ import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Boolean
@BooleanValueFilterMatcher
public class BooleanNotEqualMatch {
public boolean match(Boolean left, Boolean right) {
- return left != right;
+ return !left.equals(right);
}
public boolean match(boolean left, boolean right) {