fix issue: MetricInfo compareTo method logic bug cause some metric info missing from the TreeSet

greenlaw110 · greenlaw110 · commit 1b0f12066231 · 2016-03-29T02:43:06.000+11:00
diff --git a/src/main/java/act/metric/MetricInfo.java b/src/main/java/act/metric/MetricInfo.java
@@ -49,7 +49,7 @@ public long getMsAvg() {
 
     @Override
     public int hashCode() {
-        return $.hc(name, ns);
+        return $.hc(name);
     }
 
     @Override
@@ -59,7 +59,7 @@ public boolean equals(Object obj) {
         }
         if (obj instanceof MetricInfo) {
             MetricInfo that = (MetricInfo) obj;
-            return ns == that.ns & $.eq(name, that.name);
+            return $.eq(name, that.name);
         }
         return false;
     }
@@ -75,7 +75,7 @@ public int compareTo(MetricInfo metricInfo) {
         if (l < 0) {
             return -1;
         } else if (l == 0) {
-            return 0;
+            return metricInfo.name.compareTo(name);
         } else {
             return 1;
         }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public long getMsAvg() {`
`49`	`49`
`50`	`50`	`@Override`
`51`	`51`	`public int hashCode() {`
`52`		`- return $.hc(name, ns);`
	`52`	`+ return $.hc(name);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
`@@ -59,7 +59,7 @@ public boolean equals(Object obj) {`
`59`	`59`	`}`
`60`	`60`	`if (obj instanceof MetricInfo) {`
`61`	`61`	`MetricInfo that = (MetricInfo) obj;`
`62`		`- return ns == that.ns & $.eq(name, that.name);`
	`62`	`+ return $.eq(name, that.name);`
`63`	`63`	`}`
`64`	`64`	`return false;`
`65`	`65`	`}`
`@@ -75,7 +75,7 @@ public int compareTo(MetricInfo metricInfo) {`
`75`	`75`	`if (l < 0) {`
`76`	`76`	`return -1;`
`77`	`77`	`} else if (l == 0) {`
`78`		`- return 0;`
	`78`	`+ return metricInfo.name.compareTo(name);`
`79`	`79`	`} else {`
`80`	`80`	`return 1;`
`81`	`81`	`}`