From 66773d22d1be92e6e84784e0117259c695bc52d9 Mon Sep 17 00:00:00 2001 From: Armin Braun Date: Tue, 5 Mar 2019 20:45:23 +0100 Subject: [PATCH] Remove Dead Code in o.e.util package * None of this code is used so we should delete it, we can always bring it back if needed --- .../common/recycler/Recyclers.java | 40 +------ .../common/util/AbstractPagedHashMap.java | 4 - .../elasticsearch/common/util/BitArray.java | 2 - .../common/util/CollectionUtils.java | 102 ------------------ .../common/util/LongObjectPagedHashMap.java | 4 - .../concurrent/ConcurrentHashMapLong.java | 5 - .../util/concurrent/ConcurrentMapLong.java | 2 - .../util/concurrent/EsThreadPoolExecutor.java | 14 --- .../QueueResizingEsThreadPoolExecutor.java | 7 -- .../common/util/concurrent/ThreadContext.java | 4 - .../elasticsearch/common/util/set/Sets.java | 4 +- 11 files changed, 5 insertions(+), 183 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/common/recycler/Recyclers.java b/server/src/main/java/org/elasticsearch/common/recycler/Recyclers.java index b19f569481db1..ed41a69093fc8 100644 --- a/server/src/main/java/org/elasticsearch/common/recycler/Recyclers.java +++ b/server/src/main/java/org/elasticsearch/common/recycler/Recyclers.java @@ -51,41 +51,7 @@ public static Recycler deque(Recycler.C c, int limit) { * Return a recycler based on a deque. */ public static Recycler.Factory dequeFactory(final Recycler.C c, final int limit) { - return new Recycler.Factory() { - @Override - public Recycler build() { - return deque(c, limit); - } - }; - } - - /** - * Wrap two recyclers and forward to calls to smallObjectRecycler when size < minSize and to - * defaultRecycler otherwise. - */ - public static Recycler sizing(final Recycler defaultRecycler, final Recycler smallObjectRecycler, final int minSize) { - return new FilterRecycler() { - - @Override - protected Recycler getDelegate() { - return defaultRecycler; - } - - @Override - public Recycler.V obtain(int sizing) { - if (sizing > 0 && sizing < minSize) { - return smallObjectRecycler.obtain(sizing); - } - return super.obtain(sizing); - } - - @Override - public void close() { - defaultRecycler.close(); - smallObjectRecycler.close(); - } - - }; + return () -> deque(c, limit); } /** @@ -107,14 +73,14 @@ protected Recycler getDelegate() { } @Override - public org.elasticsearch.common.recycler.Recycler.V obtain(int sizing) { + public Recycler.V obtain(int sizing) { synchronized (lock) { return super.obtain(sizing); } } @Override - public org.elasticsearch.common.recycler.Recycler.V obtain() { + public Recycler.V obtain() { synchronized (lock) { return super.obtain(); } diff --git a/server/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java b/server/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java index b075721a1c953..db76d767b7b90 100644 --- a/server/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java +++ b/server/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java @@ -37,10 +37,6 @@ static long hash(long value) { return BitMixer.mix64(value); } - static long hash(double value) { - return hash(Double.doubleToLongBits(value)); - } - final BigArrays bigArrays; final float maxLoadFactor; long size, maxSize; diff --git a/server/src/main/java/org/elasticsearch/common/util/BitArray.java b/server/src/main/java/org/elasticsearch/common/util/BitArray.java index 54fa4a669de29..225dbf04e37b6 100644 --- a/server/src/main/java/org/elasticsearch/common/util/BitArray.java +++ b/server/src/main/java/org/elasticsearch/common/util/BitArray.java @@ -21,8 +21,6 @@ import org.elasticsearch.common.lease.Releasable; import org.elasticsearch.common.lease.Releasables; -import org.elasticsearch.common.util.BigArrays; -import org.elasticsearch.common.util.LongArray; /** * A bit array that is implemented using a growing {@link LongArray} diff --git a/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java b/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java index a93664b517f84..94c5bfc008819 100644 --- a/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java +++ b/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java @@ -37,7 +37,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.IdentityHashMap; -import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -48,96 +47,6 @@ /** Collections-related utility methods. */ public class CollectionUtils { - public static void sort(final long[] array, int len) { - new IntroSorter() { - - long pivot; - - @Override - protected void swap(int i, int j) { - final long tmp = array[i]; - array[i] = array[j]; - array[j] = tmp; - } - - @Override - protected int compare(int i, int j) { - return Long.compare(array[i], array[j]); - } - - @Override - protected void setPivot(int i) { - pivot = array[i]; - } - - @Override - protected int comparePivot(int j) { - return Long.compare(pivot, array[j]); - } - - }.sort(0, len); - } - - public static void sort(final float[] array, int len) { - new IntroSorter() { - - float pivot; - - @Override - protected void swap(int i, int j) { - final float tmp = array[i]; - array[i] = array[j]; - array[j] = tmp; - } - - @Override - protected int compare(int i, int j) { - return Float.compare(array[i], array[j]); - } - - @Override - protected void setPivot(int i) { - pivot = array[i]; - } - - @Override - protected int comparePivot(int j) { - return Float.compare(pivot, array[j]); - } - - }.sort(0, len); - } - - public static void sort(final double[] array, int len) { - new IntroSorter() { - - double pivot; - - @Override - protected void swap(int i, int j) { - final double tmp = array[i]; - array[i] = array[j]; - array[j] = tmp; - } - - @Override - protected int compare(int i, int j) { - return Double.compare(array[i], array[j]); - } - - @Override - protected void setPivot(int i) { - pivot = array[i]; - } - - @Override - protected int comparePivot(int j) { - return Double.compare(pivot, array[j]); - } - - }.sort(0, len); - } - /** * Checks if the given array contains any elements. * @@ -405,17 +314,6 @@ public static ArrayList newSingletonArrayList(E element) { return new ArrayList<>(Collections.singletonList(element)); } - public static LinkedList newLinkedList(Iterable elements) { - if (elements == null) { - throw new NullPointerException("elements"); - } - LinkedList linkedList = new LinkedList<>(); - for (E element : elements) { - linkedList.add(element); - } - return linkedList; - } - public static List> eagerPartition(List list, int size) { if (list == null) { throw new NullPointerException("list"); diff --git a/server/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java b/server/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java index a79e8d88be68a..42faec680bbf5 100644 --- a/server/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java +++ b/server/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java @@ -35,10 +35,6 @@ public class LongObjectPagedHashMap extends AbstractPagedHashMap implements I private LongArray keys; private ObjectArray values; - public LongObjectPagedHashMap(BigArrays bigArrays) { - this(16, bigArrays); - } - public LongObjectPagedHashMap(long capacity, BigArrays bigArrays) { this(capacity, DEFAULT_MAX_LOAD_FACTOR, bigArrays); } diff --git a/server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java index 32e3a00c07413..f44c8b6b22d31 100644 --- a/server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java +++ b/server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java @@ -47,11 +47,6 @@ public T put(long key, T value) { return map.put(key, value); } - @Override - public T putIfAbsent(long key, T value) { - return map.putIfAbsent(key, value); - } - // MAP DELEGATION @Override diff --git a/server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java index 85482ad670380..5d50e2700777d 100644 --- a/server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java +++ b/server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java @@ -28,6 +28,4 @@ public interface ConcurrentMapLong extends ConcurrentMap { T remove(long key); T put(long key, T value); - - T putIfAbsent(long key, T value); } diff --git a/server/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java index 4bb82e5a01157..dafbc8f835117 100644 --- a/server/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java +++ b/server/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java @@ -59,20 +59,6 @@ final String getName() { this.contextHolder = contextHolder; } - public void shutdown(ShutdownListener listener) { - synchronized (monitor) { - if (this.listener != null) { - throw new IllegalStateException("Shutdown was already called on this thread pool"); - } - if (isTerminated()) { - listener.onTerminated(); - } else { - this.listener = listener; - } - } - shutdown(); - } - @Override protected synchronized void terminated() { super.terminated(); diff --git a/server/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java index 0a546ed15346f..14d1ad5b64638 100644 --- a/server/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java +++ b/server/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java @@ -124,13 +124,6 @@ static int calculateL(final double lambda, final long targetedResponseTimeNanos) return Math.toIntExact((long)(lambda * targetedResponseTimeNanos)); } - /** - * Returns the current queue capacity - */ - public int getCurrentCapacity() { - return workQueue.capacity(); - } - /** * Returns the exponentially weighted moving average of the task execution time */ diff --git a/server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java index 0c150317dabab..01e2384377728 100644 --- a/server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java +++ b/server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java @@ -580,10 +580,6 @@ private ThreadContextStruct putTransient(String key, Object value) { return new ThreadContextStruct(requestHeaders, responseHeaders, newTransient, isSystemContext); } - boolean isEmpty() { - return requestHeaders.isEmpty() && responseHeaders.isEmpty() && transientHeaders.isEmpty(); - } - private ThreadContextStruct copyHeaders(Iterable> headers) { Map newHeaders = new HashMap<>(); for (Map.Entry header : headers) { diff --git a/server/src/main/java/org/elasticsearch/common/util/set/Sets.java b/server/src/main/java/org/elasticsearch/common/util/set/Sets.java index 02d534552100c..950d6433510bf 100644 --- a/server/src/main/java/org/elasticsearch/common/util/set/Sets.java +++ b/server/src/main/java/org/elasticsearch/common/util/set/Sets.java @@ -68,7 +68,7 @@ public static Set newConcurrentHashSet() { public static boolean haveEmptyIntersection(Set left, Set right) { Objects.requireNonNull(left); Objects.requireNonNull(right); - return !left.stream().anyMatch(k -> right.contains(k)); + return left.stream().noneMatch(right::contains); } /** @@ -157,6 +157,6 @@ public static Set intersection(Set set1, Set set2) { left = set2; right = set1; } - return left.stream().filter(o -> right.contains(o)).collect(Collectors.toSet()); + return left.stream().filter(right::contains).collect(Collectors.toSet()); } }