You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by ha...@apache.org on 2018/04/28 02:34:28 UTC
[incubator-skywalking] 01/01: Fix #1127 Comparison method violates
its general contract
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch bug/topNSorting
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 15e8b5e2bea2ec253e85016fd998cdcabaf799df
Author: hanahmily <ha...@gmail.com>
AuthorDate: Sat Apr 28 10:33:49 2018 +0800
Fix #1127 Comparison method violates its general contract
---
.../apm/collector/storage/es/dao/ui/ApplicationMetricEsUIDAO.java | 2 +-
.../apm/collector/storage/es/dao/ui/InstanceMetricEsUIDAO.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMetricEsUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMetricEsUIDAO.java
index ced6850..0fc5d87 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMetricEsUIDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMetricEsUIDAO.java
@@ -78,7 +78,7 @@ public class ApplicationMetricEsUIDAO extends EsDAO implements IApplicationMetri
applicationThroughputList.add(applicationThroughput);
});
- applicationThroughputList.sort((first, second) -> first.getCpm() > second.getCpm() ? -1 : 1);
+ applicationThroughputList.sort((first, second) -> Integer.compare(second.getCpm(), first.getCpm()));
if (applicationThroughputList.size() <= topN) {
return applicationThroughputList;
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/InstanceMetricEsUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/InstanceMetricEsUIDAO.java
index 8982ba6..7cee039 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/InstanceMetricEsUIDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/InstanceMetricEsUIDAO.java
@@ -84,7 +84,7 @@ public class InstanceMetricEsUIDAO extends EsDAO implements IInstanceMetricUIDAO
appServerInfoList.add(appServerInfo);
});
- appServerInfoList.sort((first, second) -> first.getCpm() > second.getCpm() ? -1 : 1);
+ appServerInfoList.sort((first, second) -> Integer.compare(second.getCpm(), first.getCpm()));
if (appServerInfoList.size() <= topN) {
return appServerInfoList;
} else {
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.