diff --git a/server/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java b/server/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java index 6c6391052baab..05fa525972689 100644 --- a/server/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java +++ b/server/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java @@ -28,11 +28,6 @@ protected AbstractRecycler(Recycler.C c) { this.c = c; } - @Override - public V obtain() { - return obtain(-1); - } - @Override public void close() { // no-op by default diff --git a/server/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java b/server/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java index 0be8029176967..281e39e0c921e 100644 --- a/server/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java +++ b/server/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java @@ -22,7 +22,7 @@ public abstract class AbstractRecyclerC implements Recycler.C { @Override - public abstract T newInstance(int sizing); + public abstract T newInstance(); @Override public abstract void recycle(T value); diff --git a/server/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java b/server/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java index 4c22df2d08e23..04103c5e274d9 100644 --- a/server/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java +++ b/server/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java @@ -33,7 +33,7 @@ public class ConcurrentDequeRecycler extends DequeRecycler { final AtomicInteger size; public ConcurrentDequeRecycler(C c, int maxSize) { - super(c, ConcurrentCollections.newDeque(), maxSize); + super(c, ConcurrentCollections.newDeque(), maxSize); this.size = new AtomicInteger(); } @@ -45,8 +45,8 @@ public void close() { } @Override - public V obtain(int sizing) { - final V v = super.obtain(sizing); + public V obtain() { + final V v = super.obtain(); if (v.isRecycled()) { size.decrementAndGet(); } diff --git a/server/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java b/server/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java index 026711e231303..a40befe9d8191 100644 --- a/server/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java +++ b/server/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java @@ -47,10 +47,10 @@ public void close() { } @Override - public V obtain(int sizing) { + public V obtain() { final T v = deque.pollFirst(); if (v == null) { - return new DV(c.newInstance(sizing), false); + return new DV(c.newInstance(), false); } return new DV(v, true); } diff --git a/server/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java b/server/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java index 8646234b6e715..426185173e581 100644 --- a/server/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java +++ b/server/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java @@ -29,11 +29,6 @@ protected Recycler.V wrap(Recycler.V delegate) { return delegate; } - @Override - public Recycler.V obtain(int sizing) { - return wrap(getDelegate().obtain(sizing)); - } - @Override public Recycler.V obtain() { return wrap(getDelegate().obtain()); diff --git a/server/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java b/server/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java index d1bf59a92c630..865182b88e104 100644 --- a/server/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java +++ b/server/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java @@ -27,8 +27,8 @@ public NoneRecycler(C c) { } @Override - public V obtain(int sizing) { - return new NV<>(c.newInstance(sizing)); + public V obtain() { + return new NV<>(c.newInstance()); } @Override diff --git a/server/src/main/java/org/elasticsearch/common/recycler/Recycler.java b/server/src/main/java/org/elasticsearch/common/recycler/Recycler.java index 0cf7420af8562..161e6463423f3 100644 --- a/server/src/main/java/org/elasticsearch/common/recycler/Recycler.java +++ b/server/src/main/java/org/elasticsearch/common/recycler/Recycler.java @@ -34,7 +34,7 @@ interface Factory { interface C { /** Create a new empty instance of the given size. */ - T newInstance(int sizing); + T newInstance(); /** Recycle the data. This operation is called when the data structure is released. */ void recycle(T value); @@ -57,5 +57,4 @@ interface V extends Releasable { V obtain(); - V obtain(int sizing); } 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 ed41a69093fc8..3ea9d17c25f19 100644 --- a/server/src/main/java/org/elasticsearch/common/recycler/Recyclers.java +++ b/server/src/main/java/org/elasticsearch/common/recycler/Recyclers.java @@ -72,13 +72,6 @@ protected Recycler getDelegate() { return recycler; } - @Override - public Recycler.V obtain(int sizing) { - synchronized (lock) { - return super.obtain(sizing); - } - } - @Override public Recycler.V obtain() { synchronized (lock) { diff --git a/server/src/main/java/org/elasticsearch/common/util/PageCacheRecycler.java b/server/src/main/java/org/elasticsearch/common/util/PageCacheRecycler.java index 3cc2eacd3bec6..4ca408e044170 100644 --- a/server/src/main/java/org/elasticsearch/common/util/PageCacheRecycler.java +++ b/server/src/main/java/org/elasticsearch/common/util/PageCacheRecycler.java @@ -107,7 +107,7 @@ public PageCacheRecycler(Settings settings) { final int maxBytePageCount = (int) (bytesWeight * maxPageCount / totalWeight); bytePage = build(type, maxBytePageCount, availableProcessors, new AbstractRecyclerC() { @Override - public byte[] newInstance(int sizing) { + public byte[] newInstance() { return new byte[BYTE_PAGE_SIZE]; } @Override @@ -119,7 +119,7 @@ public void recycle(byte[] value) { final int maxIntPageCount = (int) (intsWeight * maxPageCount / totalWeight); intPage = build(type, maxIntPageCount, availableProcessors, new AbstractRecyclerC() { @Override - public int[] newInstance(int sizing) { + public int[] newInstance() { return new int[INT_PAGE_SIZE]; } @Override @@ -131,7 +131,7 @@ public void recycle(int[] value) { final int maxLongPageCount = (int) (longsWeight * maxPageCount / totalWeight); longPage = build(type, maxLongPageCount, availableProcessors, new AbstractRecyclerC() { @Override - public long[] newInstance(int sizing) { + public long[] newInstance() { return new long[LONG_PAGE_SIZE]; } @Override @@ -143,7 +143,7 @@ public void recycle(long[] value) { final int maxObjectPageCount = (int) (objectsWeight * maxPageCount / totalWeight); objectPage = build(type, maxObjectPageCount, availableProcessors, new AbstractRecyclerC() { @Override - public Object[] newInstance(int sizing) { + public Object[] newInstance() { return new Object[OBJECT_PAGE_SIZE]; } @Override diff --git a/server/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java b/server/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java index 8bd0e3c652e4f..be7799fcd6c67 100644 --- a/server/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java +++ b/server/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java @@ -36,7 +36,7 @@ public abstract class AbstractRecyclerTestCase extends ESTestCase { protected static final Recycler.C RECYCLER_C = new AbstractRecyclerC() { @Override - public byte[] newInstance(int sizing) { + public byte[] newInstance() { byte[] value = new byte[10]; // "fresh" is intentionally not 0 to ensure we covered this code path Arrays.fill(value, FRESH);