You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/12/15 19:03:07 UTC
svn commit: r1645711 - in /lucene/dev/trunk:
lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/
lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/
lucene/codecs/src/java/org/apache/lucene/codecs/bloom/
lucene/codecs/src/java/org/ap...
Author: rmuir
Date: Mon Dec 15 18:03:05 2014
New Revision: 1645711
URL: http://svn.apache.org/r1645711
Log:
LUCENE-6104: simplify internals of Lucene50NormsProducer
Modified:
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesProducer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsProducer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUFilterCache.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Accountable.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Accountables.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/fst/FST.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java
lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java Mon Dec 15 18:03:05 2014
@@ -854,7 +854,7 @@ public class BlockTermsReader extends Fi
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
if (indexReader != null) {
resources.add(Accountables.namedAccountable("term index", indexReader));
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java Mon Dec 15 18:03:05 2014
@@ -262,7 +262,7 @@ public class FixedGapTermsIndexReader ex
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
if (termOffsets != null) {
resources.add(Accountables.namedAccountable("term lengths", termOffsets));
@@ -303,7 +303,7 @@ public class FixedGapTermsIndexReader ex
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("field", fields);
}
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java Mon Dec 15 18:03:05 2014
@@ -165,7 +165,7 @@ public class VariableGapTermsIndexReader
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (fst == null) {
return Collections.emptyList();
} else {
@@ -208,7 +208,7 @@ public class VariableGapTermsIndexReader
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("field", fields);
}
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java Mon Dec 15 18:03:05 2014
@@ -234,7 +234,7 @@ public final class OrdsBlockTreeTermsRea
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
resources.addAll(Accountables.namedAccountables("field", fields));
resources.add(Accountables.namedAccountable("delegate", postingsReader));
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java Mon Dec 15 18:03:05 2014
@@ -174,7 +174,7 @@ final class OrdsFieldReader extends Term
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (index == null) {
return Collections.emptyList();
} else {
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java Mon Dec 15 18:03:05 2014
@@ -407,7 +407,7 @@ public final class BloomFilteringPosting
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
resources.addAll(Accountables.namedAccountables("field", bloomsByFieldName));
if (delegateFieldsProducer != null) {
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java Mon Dec 15 18:03:05 2014
@@ -259,7 +259,7 @@ class DirectDocValuesProducer extends Do
}
@Override
- public synchronized Iterable<? extends Accountable> getChildResources() {
+ public synchronized Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
resources.addAll(Accountables.namedAccountables("numeric field", numericInstances));
resources.addAll(Accountables.namedAccountables("binary field", binaryInstances));
@@ -661,7 +661,7 @@ class DirectDocValuesProducer extends Do
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
if (address != null) {
resources.add(Accountables.namedAccountable("addresses", RamUsageEstimator.sizeOf(address)));
@@ -700,7 +700,7 @@ class DirectDocValuesProducer extends Do
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return docToOrd.getChildResources();
}
@@ -724,7 +724,7 @@ class DirectDocValuesProducer extends Do
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
if (docToAddress != null) {
resources.add(Accountables.namedAccountable("addresses", docToAddress));
@@ -753,7 +753,7 @@ class DirectDocValuesProducer extends Do
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
if (docToOrdAddress != null) {
resources.add(Accountables.namedAccountable("addresses", docToOrdAddress));
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java Mon Dec 15 18:03:05 2014
@@ -162,7 +162,7 @@ public final class DirectPostingsFormat
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("field", fields);
}
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java Mon Dec 15 18:03:05 2014
@@ -288,7 +288,7 @@ public class FSTOrdTermsReader extends F
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (index == null) {
return Collections.emptyList();
} else {
@@ -865,7 +865,7 @@ public class FSTOrdTermsReader extends F
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
resources.addAll(Accountables.namedAccountables("field", fields));
resources.add(Accountables.namedAccountable("delegate", postingsReader));
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java Mon Dec 15 18:03:05 2014
@@ -191,7 +191,7 @@ public class FSTTermsReader extends Fiel
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (dict == null) {
return Collections.emptyList();
} else {
@@ -763,7 +763,7 @@ public class FSTTermsReader extends Fiel
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
resources.addAll(Accountables.namedAccountables("field", fields));
resources.add(Accountables.namedAccountable("delegate", postingsReader));
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java Mon Dec 15 18:03:05 2014
@@ -296,7 +296,7 @@ class MemoryDocValuesProducer extends Do
}
@Override
- public synchronized Iterable<? extends Accountable> getChildResources() {
+ public synchronized Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
resources.addAll(Accountables.namedAccountables("numeric field", numericInfo));
resources.addAll(Accountables.namedAccountables("pagedbytes field", pagedBytesInstances));
@@ -799,7 +799,7 @@ class MemoryDocValuesProducer extends Do
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
if (addresses != null) {
resources.add(Accountables.namedAccountable("addresses", addresses));
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java Mon Dec 15 18:03:05 2014
@@ -958,7 +958,7 @@ public final class MemoryPostingsFormat
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (fst == null) {
return Collections.emptyList();
} else {
@@ -1033,7 +1033,7 @@ public final class MemoryPostingsFormat
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("field", fields);
}
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java Mon Dec 15 18:03:05 2014
@@ -595,7 +595,7 @@ class SimpleTextFieldsReader extends Fie
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (fst == null) {
return Collections.emptyList();
} else {
@@ -700,7 +700,7 @@ class SimpleTextFieldsReader extends Fie
}
@Override
- public synchronized Iterable<? extends Accountable> getChildResources() {
+ public synchronized Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("field", termsCache);
}
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java Mon Dec 15 18:03:05 2014
@@ -82,7 +82,7 @@ public class SimpleTextNormsFormat exten
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return impl.getChildResources();
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsReader.java Mon Dec 15 18:03:05 2014
@@ -281,7 +281,7 @@ public final class BlockTreeTermsReader
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
resources.addAll(Accountables.namedAccountables("field", fields));
resources.add(Accountables.namedAccountable("delegate", postingsReader));
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java Mon Dec 15 18:03:05 2014
@@ -186,7 +186,7 @@ public final class FieldReader extends T
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (index == null) {
return Collections.emptyList();
} else {
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java Mon Dec 15 18:03:05 2014
@@ -22,6 +22,7 @@ import static org.apache.lucene.util.Bit
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.apache.lucene.index.CorruptIndexException;
@@ -188,7 +189,7 @@ public final class CompressingStoredFiel
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
long docBaseDeltaBytes = RamUsageEstimator.shallowSizeOf(docBasesDeltas);
@@ -203,7 +204,7 @@ public final class CompressingStoredFiel
}
resources.add(Accountables.namedAccountable("start pointer deltas", startPointerDeltaBytes));
- return resources;
+ return Collections.unmodifiableList(resources);
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java Mon Dec 15 18:03:05 2014
@@ -611,7 +611,7 @@ public final class CompressingStoredFiel
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.singleton(Accountables.namedAccountable("stored field index", indexReader));
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java Mon Dec 15 18:03:05 2014
@@ -1074,7 +1074,7 @@ public final class CompressingTermVector
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.singleton(Accountables.namedAccountable("term vector index", indexReader));
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesProducer.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesProducer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesProducer.java Mon Dec 15 18:03:05 2014
@@ -382,7 +382,7 @@ class Lucene50DocValuesProducer extends
}
@Override
- public synchronized Iterable<? extends Accountable> getChildResources() {
+ public synchronized Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
resources.addAll(Accountables.namedAccountables("addresses field", addressInstances));
resources.addAll(Accountables.namedAccountables("ord index field", ordIndexInstances));
@@ -872,7 +872,7 @@ class Lucene50DocValuesProducer extends
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
resources.add(Accountables.namedAccountable("term bytes", terms));
resources.add(Accountables.namedAccountable("term addresses", termAddresses));
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsProducer.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsProducer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsProducer.java Mon Dec 15 18:03:05 2014
@@ -18,7 +18,10 @@ package org.apache.lucene.codecs.lucene5
*/
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
@@ -61,8 +64,7 @@ class Lucene50NormsProducer extends Norm
private final IndexInput data;
// ram instances we have already loaded
- final Map<String,NumericDocValues> instances = new HashMap<>();
- final Map<String,Accountable> instancesInfo = new HashMap<>();
+ final Map<String,Norms> instances = new HashMap<>();
private final AtomicLong ramBytesUsed;
private final AtomicInteger activeCount = new AtomicInteger();
@@ -76,7 +78,6 @@ class Lucene50NormsProducer extends Norm
norms.putAll(original.norms);
data = original.data.clone();
instances.putAll(original.instances);
- instancesInfo.putAll(original.instancesInfo);
ramBytesUsed = new AtomicLong(original.ramBytesUsed.get());
activeCount.set(original.activeCount.get());
maxDoc = original.maxDoc;
@@ -168,15 +169,13 @@ class Lucene50NormsProducer extends Norm
@Override
public synchronized NumericDocValues getNorms(FieldInfo field) throws IOException {
- NumericDocValues instance = instances.get(field.name);
+ Norms instance = instances.get(field.name);
if (instance == null) {
- LoadedNorms loaded = loadNorms(norms.get(field.name));
- instance = loaded.norms;
+ instance = loadNorms(norms.get(field.name));
if (!merging) {
instances.put(field.name, instance);
activeCount.incrementAndGet();
- ramBytesUsed.addAndGet(loaded.ramBytesUsed);
- instancesInfo.put(field.name, loaded.info);
+ ramBytesUsed.addAndGet(instance.ramBytesUsed());
}
}
return instance;
@@ -188,8 +187,8 @@ class Lucene50NormsProducer extends Norm
}
@Override
- public synchronized Iterable<? extends Accountable> getChildResources() {
- return Accountables.namedAccountables("field", instancesInfo);
+ public synchronized Iterable<Accountable> getChildResources() {
+ return Accountables.namedAccountables("field", instances);
}
@Override
@@ -197,44 +196,74 @@ class Lucene50NormsProducer extends Norm
CodecUtil.checksumEntireFile(data);
}
- private LoadedNorms loadNorms(NormsEntry entry) throws IOException {
- LoadedNorms instance = new LoadedNorms();
+ private Norms loadNorms(NormsEntry entry) throws IOException {
switch(entry.format) {
case CONST_COMPRESSED: {
final long v = entry.offset;
- instance.info = Accountables.namedAccountable("constant", 8);
- instance.ramBytesUsed = 8;
- instance.norms = new NumericDocValues() {
+ return new Norms() {
@Override
public long get(int docID) {
return v;
}
+
+ @Override
+ public long ramBytesUsed() {
+ return 8;
+ }
+
+ @Override
+ public String toString() {
+ return "constant";
+ }
};
- break;
}
case UNCOMPRESSED: {
data.seek(entry.offset);
final byte bytes[] = new byte[entry.count];
data.readBytes(bytes, 0, bytes.length);
- instance.info = Accountables.namedAccountable("byte array", bytes.length);
- instance.ramBytesUsed = RamUsageEstimator.sizeOf(bytes);
- instance.norms = new NumericDocValues() {
+ return new Norms() {
@Override
public long get(int docID) {
return bytes[docID];
}
+
+ @Override
+ public long ramBytesUsed() {
+ return RamUsageEstimator.sizeOf(bytes);
+ }
+
+ @Override
+ public String toString() {
+ return "byte array";
+ }
};
- break;
}
case DELTA_COMPRESSED: {
data.seek(entry.offset);
int packedIntsVersion = data.readVInt();
int blockSize = data.readVInt();
final BlockPackedReader reader = new BlockPackedReader(data, packedIntsVersion, blockSize, entry.count, false);
- instance.info = Accountables.namedAccountable("delta compressed", reader);
- instance.ramBytesUsed = reader.ramBytesUsed();
- instance.norms = reader;
- break;
+ return new Norms() {
+ @Override
+ public long get(int docID) {
+ return reader.get(docID);
+ }
+
+ @Override
+ public long ramBytesUsed() {
+ return reader.ramBytesUsed();
+ }
+
+ @Override
+ public Iterable<Accountable> getChildResources() {
+ return Collections.singleton(reader);
+ }
+
+ @Override
+ public String toString() {
+ return "delta compressed";
+ }
+ };
}
case TABLE_COMPRESSED: {
data.seek(entry.offset);
@@ -256,15 +285,27 @@ class Lucene50NormsProducer extends Norm
}
final PackedInts.Reader ordsReader = PackedInts.getReaderNoHeader(data, PackedInts.Format.byId(formatID), packedIntsVersion, entry.count, bitsPerValue);
- instance.info = Accountables.namedAccountable("table compressed", ordsReader);
- instance.ramBytesUsed = RamUsageEstimator.sizeOf(decode) + ordsReader.ramBytesUsed();
- instance.norms = new NumericDocValues() {
+ return new Norms() {
@Override
public long get(int docID) {
return decode[(int)ordsReader.get(docID)];
}
+
+ @Override
+ public long ramBytesUsed() {
+ return RamUsageEstimator.sizeOf(decode) + ordsReader.ramBytesUsed();
+ }
+
+ @Override
+ public Iterable<Accountable> getChildResources() {
+ return Collections.singleton(ordsReader);
+ }
+
+ @Override
+ public String toString() {
+ return "table compressed";
+ }
};
- break;
}
case INDIRECT: {
data.seek(entry.offset);
@@ -272,12 +313,9 @@ class Lucene50NormsProducer extends Norm
int packedIntsVersion = data.readVInt();
int blockSize = data.readVInt();
final MonotonicBlockPackedReader live = MonotonicBlockPackedReader.of(data, packedIntsVersion, blockSize, entry.count, false);
- LoadedNorms nestedInstance = loadNorms(entry.nested);
- instance.ramBytesUsed = live.ramBytesUsed() + nestedInstance.ramBytesUsed;
- instance.info = Accountables.namedAccountable("indirect -> " + nestedInstance.info, instance.ramBytesUsed);
- final NumericDocValues values = nestedInstance.norms;
+ final Norms nestedInstance = loadNorms(entry.nested);
final int upperBound = entry.count-1;
- instance.norms = new NumericDocValues() {
+ return new Norms() {
@Override
public long get(int docID) {
int low = 0;
@@ -291,13 +329,30 @@ class Lucene50NormsProducer extends Norm
} else if (doc > docID) {
high = mid - 1;
} else {
- return values.get(mid);
+ return nestedInstance.get(mid);
}
}
return common;
}
+
+ @Override
+ public long ramBytesUsed() {
+ return live.ramBytesUsed() + nestedInstance.ramBytesUsed();
+ }
+
+ @Override
+ public Iterable<Accountable> getChildResources() {
+ List<Accountable> children = new ArrayList<>();
+ children.add(Accountables.namedAccountable("keys", live));
+ children.add(Accountables.namedAccountable("values", nestedInstance));
+ return Collections.unmodifiableList(children);
+ }
+
+ @Override
+ public String toString() {
+ return "indirect";
+ }
};
- break;
}
case PATCHED_BITSET: {
data.seek(entry.offset);
@@ -310,21 +365,35 @@ class Lucene50NormsProducer extends Norm
int doc = (int) live.get(i);
set.set(doc);
}
- LoadedNorms nestedInstance = loadNorms(entry.nested);
- instance.ramBytesUsed = set.ramBytesUsed() + nestedInstance.ramBytesUsed;
- instance.info = Accountables.namedAccountable("patched bitset -> " + nestedInstance.info, instance.ramBytesUsed);
- final NumericDocValues values = nestedInstance.norms;
- instance.norms = new NumericDocValues() {
+ Norms nestedInstance = loadNorms(entry.nested);
+ return new Norms() {
@Override
public long get(int docID) {
if (set.get(docID)) {
- return values.get(docID);
+ return nestedInstance.get(docID);
} else {
return common;
}
}
+
+ @Override
+ public long ramBytesUsed() {
+ return set.ramBytesUsed() + nestedInstance.ramBytesUsed();
+ }
+
+ @Override
+ public Iterable<Accountable> getChildResources() {
+ List<Accountable> children = new ArrayList<>();
+ children.add(Accountables.namedAccountable("keys", set));
+ children.add(Accountables.namedAccountable("values", nestedInstance));
+ return Collections.unmodifiableList(children);
+ }
+
+ @Override
+ public String toString() {
+ return "patched bitset";
+ }
};
- break;
}
case PATCHED_TABLE: {
data.seek(entry.offset);
@@ -344,11 +413,9 @@ class Lucene50NormsProducer extends Norm
}
final PackedInts.Reader ordsReader = PackedInts.getReaderNoHeader(data, PackedInts.Format.byId(formatID), packedIntsVersion, entry.count, bitsPerValue);
- final LoadedNorms nestedInstance = loadNorms(entry.nested);
- instance.ramBytesUsed = RamUsageEstimator.sizeOf(decode) + ordsReader.ramBytesUsed() + nestedInstance.ramBytesUsed;
- instance.info = Accountables.namedAccountable("patched table -> " + nestedInstance.info, instance.ramBytesUsed);
- final NumericDocValues values = nestedInstance.norms;
- instance.norms = new NumericDocValues() {
+ final Norms nestedInstance = loadNorms(entry.nested);
+
+ return new Norms() {
@Override
public long get(int docID) {
int ord = (int)ordsReader.get(docID);
@@ -356,16 +423,32 @@ class Lucene50NormsProducer extends Norm
// doing a try/catch here eliminates a seemingly unavoidable branch in hotspot...
return decode[ord];
} catch (IndexOutOfBoundsException e) {
- return values.get(docID);
+ return nestedInstance.get(docID);
}
}
+
+ @Override
+ public long ramBytesUsed() {
+ return RamUsageEstimator.sizeOf(decode) + ordsReader.ramBytesUsed() + nestedInstance.ramBytesUsed();
+ }
+
+ @Override
+ public Iterable<Accountable> getChildResources() {
+ List<Accountable> children = new ArrayList<>();
+ children.add(Accountables.namedAccountable("common", ordsReader));
+ children.add(Accountables.namedAccountable("uncommon", nestedInstance));
+ return Collections.unmodifiableList(children);
+ }
+
+ @Override
+ public String toString() {
+ return "patched table";
+ }
};
- break;
}
default:
throw new AssertionError();
}
- return instance;
}
@Override
@@ -380,10 +463,7 @@ class Lucene50NormsProducer extends Norm
NormsEntry nested;
}
- static class LoadedNorms {
- NumericDocValues norms;
- long ramBytesUsed;
- Accountable info;
+ static abstract class Norms extends NumericDocValues implements Accountable {
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java Mon Dec 15 18:03:05 2014
@@ -330,7 +330,7 @@ public abstract class PerFieldDocValuesF
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("format", formats);
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java Mon Dec 15 18:03:05 2014
@@ -302,7 +302,7 @@ public abstract class PerFieldPostingsFo
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("format", formats);
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java Mon Dec 15 18:03:05 2014
@@ -638,7 +638,7 @@ public class MultiDocValues {
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
resources.add(Accountables.namedAccountable("global ord deltas", globalOrdDeltas));
resources.add(Accountables.namedAccountable("first segments", firstSegments));
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java Mon Dec 15 18:03:05 2014
@@ -159,7 +159,7 @@ class SegmentDocValuesProducer extends D
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
for (Accountable producer : dvProducers) {
resources.add(Accountables.namedAccountable("delegate", producer));
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java Mon Dec 15 18:03:05 2014
@@ -500,7 +500,7 @@ public final class SegmentReader extends
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
ensureOpen();
List<Accountable> resources = new ArrayList<>();
resources.add(Accountables.namedAccountable("postings", core.fields));
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java Mon Dec 15 18:03:05 2014
@@ -159,7 +159,7 @@ public class CachingWrapperFilter extend
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
// Sync to pull the current set of values:
synchronized (cache) {
// no need to clone, Accountable#namedAccountables already copies the data
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java Mon Dec 15 18:03:05 2014
@@ -70,7 +70,7 @@ public abstract class FilteredDocIdSet e
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return _innerSet.getChildResources();
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUFilterCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUFilterCache.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUFilterCache.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUFilterCache.java Mon Dec 15 18:03:05 2014
@@ -261,7 +261,7 @@ public class LRUFilterCache implements F
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
synchronized (this) {
return Accountables.namedAccountables("segment", cache);
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java Mon Dec 15 18:03:05 2014
@@ -260,7 +260,7 @@ public class NRTCachingDirectory extends
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.singleton(Accountables.namedAccountable("cache", cache));
}
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java Mon Dec 15 18:03:05 2014
@@ -143,7 +143,7 @@ public class RAMDirectory extends BaseDi
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("file", fileMap);
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java Mon Dec 15 18:03:05 2014
@@ -193,7 +193,7 @@ public class RAMOutputStream extends Ind
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.singleton(Accountables.namedAccountable("file", file));
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Accountable.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Accountable.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Accountable.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Accountable.java Mon Dec 15 18:03:05 2014
@@ -36,7 +36,7 @@ public interface Accountable {
* The result should be a point-in-time snapshot (to avoid race conditions).
* @see Accountables
*/
- default Iterable<? extends Accountable> getChildResources() {
+ default Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Accountables.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Accountables.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Accountables.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Accountables.java Mon Dec 15 18:03:05 2014
@@ -128,8 +128,8 @@ public class Accountables {
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- return children;
+ public Iterable<Accountable> getChildResources() {
+ return (Iterable<Accountable>) children;
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/fst/FST.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/fst/FST.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/fst/FST.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/fst/FST.java Mon Dec 15 18:03:05 2014
@@ -445,7 +445,7 @@ public final class FST<T> implements Acc
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
if (packed) {
resources.add(Accountables.namedAccountable("node ref to address", nodeRefToAddress));
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java Mon Dec 15 18:03:05 2014
@@ -161,7 +161,7 @@ public class CachedOrdinalsReader extend
}
@Override
- public synchronized Iterable<? extends Accountable> getChildResources() {
+ public synchronized Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("segment", ordsCache);
}
}
Modified: lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java (original)
+++ lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java Mon Dec 15 18:03:05 2014
@@ -90,7 +90,7 @@ public class BitDocIdSetCachingWrapperFi
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return filter.getChildResources();
}
Modified: lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java Mon Dec 15 18:03:05 2014
@@ -603,7 +603,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
resources.add(Accountables.namedAccountable("term bytes", bytes));
resources.add(Accountables.namedAccountable("ord -> term", termOrdToBytesOffset));
@@ -746,7 +746,7 @@ class FieldCacheImpl implements FieldCac
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
resources.add(Accountables.namedAccountable("term bytes", bytes));
resources.add(Accountables.namedAccountable("addresses", docToOffset));
Modified: lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java Mon Dec 15 18:03:05 2014
@@ -232,7 +232,7 @@ public final class VersionBlockTreeTerms
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
resources.addAll(Accountables.namedAccountables("field", fields));
resources.add(Accountables.namedAccountable("delegate", postingsReader));
Modified: lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java Mon Dec 15 18:03:05 2014
@@ -163,7 +163,7 @@ final class VersionFieldReader extends T
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (index == null) {
return Collections.emptyList();
} else {
Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java Mon Dec 15 18:03:05 2014
@@ -730,7 +730,7 @@ public class AnalyzingInfixSuggester ext
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
try {
if (searcherMgr != null) {
Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java Mon Dec 15 18:03:05 2014
@@ -262,7 +262,7 @@ public class AnalyzingSuggester extends
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (fst == null) {
return Collections.emptyList();
} else {
Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java Mon Dec 15 18:03:05 2014
@@ -213,7 +213,7 @@ public class FreeTextSuggester extends L
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (fst == null) {
return Collections.emptyList();
} else {
Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java Mon Dec 15 18:03:05 2014
@@ -315,7 +315,7 @@ public class FSTCompletionLookup extends
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
List<Accountable> resources = new ArrayList<>();
if (normalCompletion != null) {
resources.add(Accountables.namedAccountable("fst", normalCompletion.getFST()));
Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java Mon Dec 15 18:03:05 2014
@@ -301,7 +301,7 @@ public class WFSTCompletionLookup extend
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (fst == null) {
return Collections.emptyList();
} else {
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java Mon Dec 15 18:03:05 2014
@@ -290,8 +290,8 @@ public class AssertingDocValuesFormat ex
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- Iterable<? extends Accountable> res = in.getChildResources();
+ public Iterable<Accountable> getChildResources() {
+ Iterable<Accountable> res = in.getChildResources();
TestUtil.checkIterator(res.iterator());
return res;
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java Mon Dec 15 18:03:05 2014
@@ -112,8 +112,8 @@ public class AssertingNormsFormat extend
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- Iterable<? extends Accountable> res = in.getChildResources();
+ public Iterable<Accountable> getChildResources() {
+ Iterable<Accountable> res = in.getChildResources();
TestUtil.checkIterator(res.iterator());
return res;
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java Mon Dec 15 18:03:05 2014
@@ -100,8 +100,8 @@ public final class AssertingPostingsForm
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- Iterable<? extends Accountable> res = in.getChildResources();
+ public Iterable<Accountable> getChildResources() {
+ Iterable<Accountable> res = in.getChildResources();
TestUtil.checkIterator(res.iterator());
return res;
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java Mon Dec 15 18:03:05 2014
@@ -85,8 +85,8 @@ public class AssertingStoredFieldsFormat
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- Iterable<? extends Accountable> res = in.getChildResources();
+ public Iterable<Accountable> getChildResources() {
+ Iterable<Accountable> res = in.getChildResources();
TestUtil.checkIterator(res.iterator());
return res;
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java Mon Dec 15 18:03:05 2014
@@ -84,8 +84,8 @@ public class AssertingTermVectorsFormat
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- Iterable<? extends Accountable> res = in.getChildResources();
+ public Iterable<Accountable> getChildResources() {
+ Iterable<Accountable> res = in.getChildResources();
TestUtil.checkIterator(res.iterator());
return res;
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java Mon Dec 15 18:03:05 2014
@@ -98,7 +98,7 @@ public final class RAMOnlyPostingsFormat
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("field", fieldToTerms);
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java Mon Dec 15 18:03:05 2014
@@ -241,7 +241,7 @@ public abstract class BaseBitSetTestCase
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Collections.emptyList();
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java Mon Dec 15 18:03:05 2014
@@ -342,7 +342,7 @@ public class SuggestComponent extends Se
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("field", suggesters);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java?rev=1645711&r1=1645710&r2=1645711&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java Mon Dec 15 18:03:05 2014
@@ -213,7 +213,7 @@ public class SolrSuggester implements Ac
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return lookup.getChildResources();
}