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:27 UTC
[incubator-skywalking] branch bug/topNSorting created (now 15e8b5e)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch bug/topNSorting
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
at 15e8b5e Fix #1127 Comparison method violates its general contract
This branch includes the following new commits:
new 15e8b5e Fix #1127 Comparison method violates its general contract
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.
[incubator-skywalking] 01/01: Fix #1127 Comparison method violates
its general contract
Posted by ha...@apache.org.
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.