From 49d84cb47f8f543ce1fb067267d6fafa71f9c479 Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Thu, 27 Mar 2014 15:48:12 +0100 Subject: [PATCH] [JAVA7 Upgrade] Move to Long.compare --- core-signatures.txt | 3 +++ .../common/util/CollectionUtils.java | 5 ++--- .../BytesRefOrdValComparator.java | 10 +++++----- .../fieldcomparator/LongValuesComparator.java | 2 +- .../LongValuesComparatorBase.java | 18 ++++-------------- .../blobstore/BlobStoreSnapshot.java | 2 +- .../bucket/histogram/Histogram.java | 13 ++++++------- .../significant/SignificantLongTerms.java | 2 +- .../bucket/terms/InternalOrder.java | 6 +++--- .../aggregations/bucket/terms/LongTerms.java | 3 +-- .../percentiles/tdigest/GroupRedBlackTree.java | 2 +- .../aggregations/support/FieldDataSource.java | 3 +-- 12 files changed, 29 insertions(+), 40 deletions(-) diff --git a/core-signatures.txt b/core-signatures.txt index c0ef4a3fb1b..6b3086bc3bc 100644 --- a/core-signatures.txt +++ b/core-signatures.txt @@ -44,3 +44,6 @@ java.lang.Object#notifyAll() @defaultMessage Beware of the behavior of this method on MIN_VALUE java.lang.Math#abs(int) java.lang.Math#abs(long) + +@defaultMessage Use Long.compare instead we are on Java7 +com.google.common.primitives.Longs#compare(long,long) \ No newline at end of file diff --git a/src/main/java/org/elasticsearch/common/util/CollectionUtils.java b/src/main/java/org/elasticsearch/common/util/CollectionUtils.java index 07d60a866b2..7bdd54a3e58 100644 --- a/src/main/java/org/elasticsearch/common/util/CollectionUtils.java +++ b/src/main/java/org/elasticsearch/common/util/CollectionUtils.java @@ -22,7 +22,6 @@ package org.elasticsearch.common.util; 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; import org.elasticsearch.common.Preconditions; @@ -52,7 +51,7 @@ public enum CollectionUtils { @Override protected int compare(int i, int j) { - return Longs.compare(array[i], array[j]); + return Long.compare(array[i], array[j]); } @Override @@ -62,7 +61,7 @@ public enum CollectionUtils { @Override protected int comparePivot(int j) { - return Longs.compare(pivot, array[j]); + return Long.compare(pivot, array[j]); } }.sort(0, len); diff --git a/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefOrdValComparator.java b/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefOrdValComparator.java index 605469b2bc1..250bd5807e7 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefOrdValComparator.java +++ b/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefOrdValComparator.java @@ -100,7 +100,7 @@ public final class BytesRefOrdValComparator extends NestedWrappableComparator { public int compare(int slot1, int slot2) { final long v1 = values[slot1]; final long v2 = values[slot2]; - return compare(v1, v2); + return Long.compare(v1, v2); } @Override diff --git a/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorBase.java b/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorBase.java index bfdda74c531..b01dffa43f1 100644 --- a/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorBase.java +++ b/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorBase.java @@ -43,22 +43,12 @@ abstract class LongValuesComparatorBase extends NumberComparat @Override public final int compareBottom(int doc) throws IOException { long v2 = sortMode.getRelevantValue(readerValues, doc, missingValue); - return compare(bottom, v2); + return Long.compare(bottom, v2); } @Override public int compareTop(int doc) throws IOException { - return compare(top.longValue(), sortMode.getRelevantValue(readerValues, doc, missingValue)); - } - - static final int compare(long left, long right) { - if (left > right) { - return 1; - } else if (left < right) { - return -1; - } else { - return 0; - } + return Long.compare(top.longValue(), sortMode.getRelevantValue(readerValues, doc, missingValue)); } @Override @@ -69,11 +59,11 @@ abstract class LongValuesComparatorBase extends NumberComparat @Override public int compareBottomMissing() { - return compare(bottom, missingValue); + return Long.compare(bottom, missingValue); } @Override public int compareTopMissing() { - return compare(top.longValue(), missingValue); + return Long.compare(top.longValue(), missingValue); } } diff --git a/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreSnapshot.java b/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreSnapshot.java index 9d451a045cb..604d59765c3 100644 --- a/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreSnapshot.java +++ b/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreSnapshot.java @@ -177,7 +177,7 @@ public class BlobStoreSnapshot implements Snapshot { */ @Override public int compareTo(Snapshot o) { - return Longs.compare(startTime, ((BlobStoreSnapshot) o).startTime); + return Long.compare(startTime, ((BlobStoreSnapshot) o).startTime); } /** diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java index 9ebf2284732..d0c2413bc57 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations.bucket.histogram; -import com.google.common.primitives.Longs; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation; @@ -72,23 +71,23 @@ public interface Histogram extends MultiBucketsAggregation { public static final Order KEY_ASC = new InternalOrder((byte) 1, "_key", true, new Comparator() { @Override public int compare(InternalHistogram.Bucket b1, InternalHistogram.Bucket b2) { - return Longs.compare(b1.key, b2.key); + return Long.compare(b1.key, b2.key); } }); public static final Order KEY_DESC = new InternalOrder((byte) 2, "_key", false, new Comparator() { @Override public int compare(InternalHistogram.Bucket b1, InternalHistogram.Bucket b2) { - return -Longs.compare(b1.key, b2.key); + return -Long.compare(b1.key, b2.key); } }); public static final Order COUNT_ASC = new InternalOrder((byte) 3, "_count", true, new Comparator() { @Override public int compare(InternalHistogram.Bucket b1, InternalHistogram.Bucket b2) { - int cmp = Longs.compare(b1.getDocCount(), b2.getDocCount()); + int cmp = Long.compare(b1.getDocCount(), b2.getDocCount()); if (cmp == 0) { - cmp = Longs.compare(b1.key, b2.key); + cmp = Long.compare(b1.key, b2.key); } return cmp; } @@ -98,9 +97,9 @@ public interface Histogram extends MultiBucketsAggregation { public static final Order COUNT_DESC = new InternalOrder((byte) 4, "_count", false, new Comparator() { @Override public int compare(InternalHistogram.Bucket b1, InternalHistogram.Bucket b2) { - int cmp = -Longs.compare(b1.getDocCount(), b2.getDocCount()); + int cmp = -Long.compare(b1.getDocCount(), b2.getDocCount()); if (cmp == 0) { - cmp = Longs.compare(b1.key, b2.key); + cmp = Long.compare(b1.key, b2.key); } return cmp; } diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java index b0626677d4b..88696736d2c 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java @@ -75,7 +75,7 @@ public class SignificantLongTerms extends InternalSignificantTerms { @Override int compareTerm(SignificantTerms.Bucket other) { - return Longs.compare(term, other.getKeyAsNumber().longValue()); + return Long.compare(term, other.getKeyAsNumber().longValue()); } @Override 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 index a315b1fe982..987fe8053c7 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalOrder.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalOrder.java @@ -45,7 +45,7 @@ class InternalOrder extends Terms.Order { public static final InternalOrder COUNT_DESC = new InternalOrder((byte) 1, "_count", false, new Comparator() { @Override public int compare(Terms.Bucket o1, Terms.Bucket o2) { - int cmp = - Longs.compare(o1.getDocCount(), o2.getDocCount()); + int cmp = - Long.compare(o1.getDocCount(), o2.getDocCount()); if (cmp == 0) { cmp = o1.compareTerm(o2); } @@ -60,7 +60,7 @@ class InternalOrder extends Terms.Order { @Override public int compare(Terms.Bucket o1, Terms.Bucket o2) { - int cmp = Longs.compare(o1.getDocCount(), o2.getDocCount()); + int cmp = Long.compare(o1.getDocCount(), o2.getDocCount()); if (cmp == 0) { cmp = o1.compareTerm(o2); } @@ -163,7 +163,7 @@ class InternalOrder extends Terms.Order { public int compare(Terms.Bucket o1, Terms.Bucket o2) { long v1 = ((SingleBucketAggregator) aggregator).bucketDocCount(((InternalTerms.Bucket) o1).bucketOrd); long v2 = ((SingleBucketAggregator) aggregator).bucketDocCount(((InternalTerms.Bucket) o2).bucketOrd); - return asc ? Longs.compare(v1, v2) : Longs.compare(v2, v1); + return asc ? Long.compare(v1, v2) : Long.compare(v2, v1); } }; } 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 index 40a4a27adb1..68e402c0909 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java +++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java @@ -18,7 +18,6 @@ */ 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.text.StringText; @@ -85,7 +84,7 @@ public class LongTerms extends InternalTerms { @Override int compareTerm(Terms.Bucket other) { - return Longs.compare(term, other.getKeyAsNumber().longValue()); + return Long.compare(term, other.getKeyAsNumber().longValue()); } } diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/GroupRedBlackTree.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/GroupRedBlackTree.java index 00829152408..ce9bc7508ba 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/GroupRedBlackTree.java +++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/GroupRedBlackTree.java @@ -57,7 +57,7 @@ public class GroupRedBlackTree extends RedBlackTree { final double centroid = mean(node); int cmp = Double.compare(tmpCentroid, centroid); if (cmp == 0) { - cmp = Longs.compare(tmpId, ids[node]); + cmp = Long.compare(tmpId, ids[node]); } return cmp; } diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/FieldDataSource.java b/src/main/java/org/elasticsearch/search/aggregations/support/FieldDataSource.java index 5d1152aefae..627d29709ed 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/support/FieldDataSource.java +++ b/src/main/java/org/elasticsearch/search/aggregations/support/FieldDataSource.java @@ -18,7 +18,6 @@ */ 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; @@ -630,7 +629,7 @@ public abstract class FieldDataSource { protected int compare(int i, int j) { final long l1 = array[i]; final long l2 = array[j]; - return Longs.compare(l1, l2); + return Long.compare(l1, l2); } };