diff --git a/src/main/java/org/elasticsearch/common/recycler/RecyclerUtils.java b/src/main/java/org/elasticsearch/common/recycler/RecyclerUtils.java deleted file mode 100644 index 796319fb302..00000000000 --- a/src/main/java/org/elasticsearch/common/recycler/RecyclerUtils.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - -package org.elasticsearch.common.recycler; - -/** - */ -public final class RecyclerUtils { - - private RecyclerUtils() { - } - - // Borrowed from IOUtils#close - public static void release(Recycler.V... recyclers) { - Throwable th = null; - - for (Recycler.V recycler : recyclers) { - try { - if (recycler != null) { - recycler.release(); - } - } catch (Throwable t) { - if (th == null) { - th = t; - } - } - } - - if (th != null) { - throw new RuntimeException(th); - } - } - -} diff --git a/src/main/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQuery.java b/src/main/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQuery.java index a0c82a3171d..07696d74fac 100644 --- a/src/main/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQuery.java +++ b/src/main/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQuery.java @@ -30,11 +30,11 @@ import org.apache.lucene.util.BytesRef; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.common.bytes.HashedBytesArray; import org.elasticsearch.common.lease.Releasable; +import org.elasticsearch.common.lease.Releasables; import org.elasticsearch.common.lucene.docset.DocIdSets; import org.elasticsearch.common.lucene.search.ApplyAcceptedDocsFilter; import org.elasticsearch.common.lucene.search.Queries; import org.elasticsearch.common.recycler.Recycler; -import org.elasticsearch.common.recycler.RecyclerUtils; import org.elasticsearch.index.cache.id.IdReaderTypeCache; import org.elasticsearch.index.mapper.Uid; import org.elasticsearch.index.mapper.internal.UidFieldMapper; @@ -193,7 +193,7 @@ public class ChildrenConstantScoreQuery extends Query { @Override public boolean release() throws ElasticsearchException { - RecyclerUtils.release(collectedUids); + Releasables.release(collectedUids); return true; } diff --git a/src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java b/src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java index 1c9bbf9567e..8e325171f24 100644 --- a/src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java +++ b/src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java @@ -32,12 +32,12 @@ import org.apache.lucene.util.ToStringUtils; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.common.bytes.HashedBytesArray; import org.elasticsearch.common.lease.Releasable; +import org.elasticsearch.common.lease.Releasables; import org.elasticsearch.common.lucene.docset.DocIdSets; import org.elasticsearch.common.lucene.search.AndFilter; import org.elasticsearch.common.lucene.search.ApplyAcceptedDocsFilter; import org.elasticsearch.common.lucene.search.Queries; import org.elasticsearch.common.recycler.Recycler; -import org.elasticsearch.common.recycler.RecyclerUtils; import org.elasticsearch.index.cache.id.IdReaderTypeCache; import org.elasticsearch.index.mapper.Uid; import org.elasticsearch.index.mapper.internal.UidFieldMapper; @@ -252,7 +252,7 @@ public class ChildrenQuery extends Query { @Override public boolean release() throws ElasticsearchException { - RecyclerUtils.release(uidToScore, uidToCount); + Releasables.release(uidToScore, uidToCount); return true; } diff --git a/src/main/java/org/elasticsearch/index/search/child/ParentConstantScoreQuery.java b/src/main/java/org/elasticsearch/index/search/child/ParentConstantScoreQuery.java index 137f37edce7..ad1b9063138 100644 --- a/src/main/java/org/elasticsearch/index/search/child/ParentConstantScoreQuery.java +++ b/src/main/java/org/elasticsearch/index/search/child/ParentConstantScoreQuery.java @@ -28,12 +28,12 @@ import org.apache.lucene.util.Bits; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.common.bytes.HashedBytesArray; import org.elasticsearch.common.lease.Releasable; +import org.elasticsearch.common.lease.Releasables; import org.elasticsearch.common.lucene.docset.DocIdSets; import org.elasticsearch.common.lucene.search.ApplyAcceptedDocsFilter; import org.elasticsearch.common.lucene.search.NoopCollector; import org.elasticsearch.common.lucene.search.Queries; import org.elasticsearch.common.recycler.Recycler; -import org.elasticsearch.common.recycler.RecyclerUtils; import org.elasticsearch.index.cache.id.IdReaderTypeCache; import org.elasticsearch.search.internal.SearchContext; @@ -156,7 +156,7 @@ public class ParentConstantScoreQuery extends Query { @Override public boolean release() throws ElasticsearchException { - RecyclerUtils.release(parents); + Releasables.release(parents); return true; } diff --git a/src/main/java/org/elasticsearch/index/search/child/ParentQuery.java b/src/main/java/org/elasticsearch/index/search/child/ParentQuery.java index 25412c369fc..ca16931f219 100644 --- a/src/main/java/org/elasticsearch/index/search/child/ParentQuery.java +++ b/src/main/java/org/elasticsearch/index/search/child/ParentQuery.java @@ -29,12 +29,12 @@ import org.apache.lucene.util.ToStringUtils; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.common.bytes.HashedBytesArray; import org.elasticsearch.common.lease.Releasable; +import org.elasticsearch.common.lease.Releasables; import org.elasticsearch.common.lucene.docset.DocIdSets; import org.elasticsearch.common.lucene.search.ApplyAcceptedDocsFilter; import org.elasticsearch.common.lucene.search.NoopCollector; import org.elasticsearch.common.lucene.search.Queries; import org.elasticsearch.common.recycler.Recycler; -import org.elasticsearch.common.recycler.RecyclerUtils; import org.elasticsearch.index.cache.id.IdReaderTypeCache; import org.elasticsearch.search.internal.SearchContext; @@ -229,7 +229,7 @@ public class ParentQuery extends Query { @Override public boolean release() throws ElasticsearchException { - RecyclerUtils.release(uidToScore); + Releasables.release(uidToScore); return true; } } diff --git a/src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java b/src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java index a8c2d2424ab..8579bddd722 100644 --- a/src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java +++ b/src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java @@ -30,9 +30,9 @@ import org.elasticsearch.ElasticsearchIllegalStateException; import org.elasticsearch.cache.recycler.CacheRecycler; import org.elasticsearch.common.bytes.HashedBytesArray; import org.elasticsearch.common.lease.Releasable; +import org.elasticsearch.common.lease.Releasables; import org.elasticsearch.common.lucene.search.EmptyScorer; import org.elasticsearch.common.recycler.Recycler; -import org.elasticsearch.common.recycler.RecyclerUtils; import org.elasticsearch.search.internal.SearchContext; import java.io.IOException; @@ -206,10 +206,10 @@ public class TopChildrenQuery extends Query { ParentDoc[] _parentDocs = value.v().values().toArray(ParentDoc.class); Arrays.sort(_parentDocs, PARENT_DOC_COMP); parentDocs.v().put(keys[i], _parentDocs); - RecyclerUtils.release(value); + Releasables.release(value); } } - RecyclerUtils.release(parentDocsPerReader); + Releasables.release(parentDocsPerReader); return parentHitsResolved; } @@ -282,7 +282,7 @@ public class TopChildrenQuery extends Query { @Override public boolean release() throws ElasticsearchException { - RecyclerUtils.release(parentDocs); + Releasables.release(parentDocs); return true; }