Cutover to Guava's Longs.compare.

jpountz · jpountz · commit 6be2066bd300 · 2014-01-10T12:34:29.000+01:00
diff --git a/src/main/java/org/elasticsearch/common/util/CollectionUtils.java b/src/main/java/org/elasticsearch/common/util/CollectionUtils.java
@@ -22,6 +22,7 @@
 import com.carrotsearch.hppc.DoubleArrayList;
 import com.carrotsearch.hppc.FloatArrayList;
 import com.carrotsearch.hppc.LongArrayList;
+import com.google.common.primitives.Longs;
 import org.apache.lucene.util.IntroSorter;
 
 /** Collections-related utility methods. */
@@ -46,7 +47,7 @@ protected void swap(int i, int j) {
 
             @Override
             protected int compare(int i, int j) {
-                return Comparators.compare(array[i], array[j]);
+                return Longs.compare(array[i], array[j]);
             }
 
             @Override
@@ -56,7 +57,7 @@ protected void setPivot(int i) {
 
             @Override
             protected int comparePivot(int j) {
-                return Comparators.compare(pivot, array[j]);
+                return Longs.compare(pivot, array[j]);
             }
 
         }.sort(0, len);
diff --git a/src/main/java/org/elasticsearch/common/util/Comparators.java b/src/main/java/org/elasticsearch/common/util/Comparators.java
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/Bucket.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/Bucket.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.search.aggregations.bucket;
 
 import org.elasticsearch.ElasticsearchIllegalArgumentException;
-import org.elasticsearch.common.util.Comparators;
 import org.elasticsearch.search.aggregations.Aggregations;
 import org.elasticsearch.search.aggregations.metrics.MetricsAggregation;
 
@@ -76,7 +75,7 @@ public String valueName() {
         public int compare(B b1, B b2) {
             double v1 = value(b1);
             double v2 = value(b2);
-            return Comparators.compare(v1, v2, asc);
+            return asc ? Double.compare(v1, v2) : Double.compare(v2, v1);
         }
 
         private double value(B bucket) {
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramBase.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramBase.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.search.aggregations.bucket.histogram;
 
-import org.elasticsearch.common.util.Comparators;
+import com.google.common.primitives.Longs;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.search.aggregations.Aggregation;
 
@@ -62,23 +62,23 @@ static abstract class Order implements ToXContent {
         public static final Order KEY_ASC = new InternalOrder((byte) 1, "_key", true, new Comparator<HistogramBase.Bucket>() {
             @Override
             public int compare(HistogramBase.Bucket b1, HistogramBase.Bucket b2) {
-                return Comparators.compare(b1.getKey(), b2.getKey());
+                return Longs.compare(b1.getKey(), b2.getKey());
             }
         });
 
         public static final Order KEY_DESC = new InternalOrder((byte) 2, "_key", false, new Comparator<HistogramBase.Bucket>() {
             @Override
             public int compare(HistogramBase.Bucket b1, HistogramBase.Bucket b2) {
-                return - Comparators.compare(b1.getKey(), b2.getKey());
+                return - Longs.compare(b1.getKey(), b2.getKey());
             }
         });
 
         public static final Order COUNT_ASC = new InternalOrder((byte) 3, "_count", true, new Comparator<HistogramBase.Bucket>() {
             @Override
             public int compare(HistogramBase.Bucket b1, HistogramBase.Bucket b2) {
-                int cmp = Comparators.compare(b1.getDocCount(), b2.getDocCount());
+                int cmp = Longs.compare(b1.getDocCount(), b2.getDocCount());
                 if (cmp == 0) {
-                    cmp = Comparators.compare(b1.getKey(), b2.getKey());
+                    cmp = Longs.compare(b1.getKey(), b2.getKey());
                 }
                 return cmp;
             }
@@ -88,9 +88,9 @@ public int compare(HistogramBase.Bucket b1, HistogramBase.Bucket b2) {
         public static final Order COUNT_DESC = new InternalOrder((byte) 4, "_count", false, new Comparator<HistogramBase.Bucket>() {
             @Override
             public int compare(HistogramBase.Bucket b1, HistogramBase.Bucket b2) {
-                int cmp = - Comparators.compare(b1.getDocCount(), b2.getDocCount());
+                int cmp = - Longs.compare(b1.getDocCount(), b2.getDocCount());
                 if (cmp == 0) {
-                    cmp = Comparators.compare(b1.getKey(), b2.getKey());
+                    cmp = Longs.compare(b1.getKey(), b2.getKey());
                 }
                 return cmp;
             }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalOrder.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalOrder.java
@@ -19,9 +19,9 @@
 
 package org.elasticsearch.search.aggregations.bucket.terms;
 
+import com.google.common.primitives.Longs;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.util.Comparators;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.search.aggregations.AggregationExecutionException;
 import org.elasticsearch.search.aggregations.Aggregator;
@@ -42,7 +42,7 @@ class InternalOrder extends Terms.Order {
     public static final InternalOrder COUNT_DESC = new InternalOrder((byte) 1, "_count", false, new Comparator<Terms.Bucket>() {
         @Override
         public int compare(Terms.Bucket o1, Terms.Bucket o2) {
-            int cmp = - Comparators.compare(o1.getDocCount(), o2.getDocCount());
+            int cmp = - Longs.compare(o1.getDocCount(), o2.getDocCount());
             if (cmp == 0) {
                 cmp = o1.compareTerm(o2);
             }
@@ -57,7 +57,7 @@ public int compare(Terms.Bucket o1, Terms.Bucket o2) {
 
         @Override
         public int compare(Terms.Bucket o1, Terms.Bucket o2) {
-            int cmp = Comparators.compare(o1.getDocCount(), o2.getDocCount());
+            int cmp = Longs.compare(o1.getDocCount(), o2.getDocCount());
             if (cmp == 0) {
                 cmp = o1.compareTerm(o2);
             }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java
@@ -20,12 +20,12 @@
 package org.elasticsearch.search.aggregations.bucket.terms;
 
 import com.carrotsearch.hppc.LongObjectOpenHashMap;
+import com.google.common.primitives.Longs;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.recycler.Recycler;
 import org.elasticsearch.common.text.StringText;
 import org.elasticsearch.common.text.Text;
-import org.elasticsearch.common.util.Comparators;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.search.aggregations.AggregationStreams;
 import org.elasticsearch.search.aggregations.InternalAggregation;
@@ -82,7 +82,7 @@ public Number getKeyAsNumber() {
 
         @Override
         int compareTerm(Terms.Bucket other) {
-            return Comparators.compare(term, other.getKeyAsNumber().longValue());
+            return Longs.compare(term, other.getKeyAsNumber().longValue());
         }
     }
 
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.search.aggregations.bucket.terms;
 
 import org.elasticsearch.common.text.Text;
-import org.elasticsearch.common.util.Comparators;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.Aggregator;
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/FieldDataSource.java b/src/main/java/org/elasticsearch/search/aggregations/support/FieldDataSource.java
@@ -19,14 +19,14 @@
 
 package org.elasticsearch.search.aggregations.support;
 
+import com.google.common.primitives.Longs;
 import org.apache.lucene.index.AtomicReaderContext;
 import org.apache.lucene.util.ArrayUtil;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefHash;
 import org.apache.lucene.util.InPlaceMergeSorter;
 import org.elasticsearch.common.lucene.ReaderContextAware;
 import org.elasticsearch.common.util.CollectionUtils;
-import org.elasticsearch.common.util.Comparators;
 import org.elasticsearch.index.fielddata.*;
 import org.elasticsearch.index.fielddata.AtomicFieldData.Order;
 import org.elasticsearch.script.SearchScript;
@@ -633,7 +633,7 @@ protected void swap(int i, int j) {
                     protected int compare(int i, int j) {
                         final long l1 = array[i];
                         final long l2 = array[j];
-                        return Comparators.compare(l1, l2);
+                        return Longs.compare(l1, l2);
                     }
                 };
 
