You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2014/12/16 12:11:51 UTC
svn commit: r1645921 [1/2] - in /lucene/dev/branches/lucene2878: ./ lucene/
lucene/analysis/
lucene/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/
lucene/codecs/ lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/
lucene/co...
Author: romseygeek
Date: Tue Dec 16 11:11:50 2014
New Revision: 1645921
URL: http://svn.apache.org/r1645921
Log:
merge trunk
Modified:
lucene/dev/branches/lucene2878/ (props changed)
lucene/dev/branches/lucene2878/lucene/ (props changed)
lucene/dev/branches/lucene2878/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene2878/lucene/analysis/ (props changed)
lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary$fst.dat
lucene/dev/branches/lucene2878/lucene/codecs/ (props changed)
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
lucene/dev/branches/lucene2878/lucene/core/ (props changed)
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsReader.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesProducer.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsProducer.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/FilterCachingPolicy.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/LRUFilterCache.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/UsageTrackingFilterCachingPolicy.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/Accountable.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/Accountables.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/fst/FST.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/fst/package.html
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestLRUFilterCache.java
lucene/dev/branches/lucene2878/lucene/facet/ (props changed)
lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java
lucene/dev/branches/lucene2878/lucene/join/ (props changed)
lucene/dev/branches/lucene2878/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java
lucene/dev/branches/lucene2878/lucene/misc/ (props changed)
lucene/dev/branches/lucene2878/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java
lucene/dev/branches/lucene2878/lucene/sandbox/ (props changed)
lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java
lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java
lucene/dev/branches/lucene2878/lucene/suggest/ (props changed)
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java
lucene/dev/branches/lucene2878/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/lucene2878/solr/ (props changed)
lucene/dev/branches/lucene2878/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene2878/solr/README.txt (contents, props changed)
lucene/dev/branches/lucene2878/solr/build.xml (contents, props changed)
lucene/dev/branches/lucene2878/solr/core/ (props changed)
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/util/SimplePostTool.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/cloud/TestModifyConfFiles.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java
lucene/dev/branches/lucene2878/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
lucene/dev/branches/lucene2878/solr/solrj/ (props changed)
lucene/dev/branches/lucene2878/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
lucene/dev/branches/lucene2878/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
Modified: lucene/dev/branches/lucene2878/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/CHANGES.txt?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene2878/lucene/CHANGES.txt Tue Dec 16 11:11:50 2014
@@ -380,6 +380,9 @@ Documentation
* LUCENE-6057: Improve Sort(SortField) docs (Martin Braun via Mike McCandless)
+* LUCENE-6112: Fix compile error in FST package example code
+ (Tomoko Uchida via Koji Sekiguchi)
+
Tests
* LUCENE-5957: Add option for tests to not randomize codec
Modified: lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary$fst.dat
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary%24fst.dat?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java Tue Dec 16 11:11:50 2014
@@ -406,7 +406,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/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java Tue Dec 16 11:11:50 2014
@@ -161,7 +161,7 @@ public final class DirectPostingsFormat
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("field", fields);
}
Modified: lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java Tue Dec 16 11:11:50 2014
@@ -287,7 +287,7 @@ public class FSTOrdTermsReader extends F
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (index == null) {
return Collections.emptyList();
} else {
@@ -860,7 +860,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/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java Tue Dec 16 11:11:50 2014
@@ -190,7 +190,7 @@ public class FSTTermsReader extends Fiel
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (dict == null) {
return Collections.emptyList();
} else {
@@ -758,7 +758,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/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java Tue Dec 16 11:11:50 2014
@@ -295,7 +295,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));
@@ -798,7 +798,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/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java Tue Dec 16 11:11:50 2014
@@ -1003,7 +1003,7 @@ public final class MemoryPostingsFormat
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (fst == null) {
return Collections.emptyList();
} else {
@@ -1078,7 +1078,7 @@ public final class MemoryPostingsFormat
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("field", fields);
}
Modified: lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java Tue Dec 16 11:11:50 2014
@@ -642,7 +642,7 @@ class SimpleTextFieldsReader extends Fie
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
if (fst == null) {
return Collections.emptyList();
} else {
@@ -747,7 +747,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/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsReader.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java Tue Dec 16 11:11:50 2014
@@ -1082,7 +1082,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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesProducer.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesProducer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesProducer.java Tue Dec 16 11:11:50 2014
@@ -381,7 +381,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));
@@ -871,7 +871,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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsProducer.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsProducer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsProducer.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/FilterCachingPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/FilterCachingPolicy.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/FilterCachingPolicy.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/FilterCachingPolicy.java Tue Dec 16 11:11:50 2014
@@ -38,7 +38,7 @@ public interface FilterCachingPolicy {
public static final FilterCachingPolicy ALWAYS_CACHE = new FilterCachingPolicy() {
@Override
- public void onCache(Filter filter) {}
+ public void onUse(Filter filter) {}
@Override
public boolean shouldCache(Filter filter, LeafReaderContext context, DocIdSet set) throws IOException {
@@ -78,7 +78,7 @@ public interface FilterCachingPolicy {
}
@Override
- public void onCache(Filter filter) {}
+ public void onUse(Filter filter) {}
@Override
public boolean shouldCache(Filter filter, LeafReaderContext context, DocIdSet set) throws IOException {
@@ -89,10 +89,10 @@ public interface FilterCachingPolicy {
};
- /** Callback that is called on every call to {@link FilterCache#doCache}.
+ /** Callback that is called every time that a cached filter is used.
* This is typically useful if the policy wants to track usage statistics
* in order to make decisions. */
- void onCache(Filter filter);
+ void onUse(Filter filter);
/** Whether the given {@link DocIdSet} should be cached on a given segment.
* This method will be called on each leaf context to know if the filter
Modified: lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/LRUFilterCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/LRUFilterCache.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/LRUFilterCache.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/LRUFilterCache.java Tue Dec 16 11:11:50 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);
}
@@ -339,6 +339,10 @@ public class LRUFilterCache implements F
@Override
public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) throws IOException {
+ if (context.ord == 0) {
+ policy.onUse(in);
+ }
+
DocIdSet set = get(in, context);
if (set == null) {
// do not apply acceptDocs yet, we want the cached filter to not take them into account
Modified: lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/UsageTrackingFilterCachingPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/UsageTrackingFilterCachingPolicy.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/UsageTrackingFilterCachingPolicy.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/UsageTrackingFilterCachingPolicy.java Tue Dec 16 11:11:50 2014
@@ -103,7 +103,7 @@ public final class UsageTrackingFilterCa
}
@Override
- public void onCache(Filter filter) {
+ public void onUse(Filter filter) {
// Using the filter hash codes might help keep memory usage a bit lower
// since some filters might have non-negligible memory usage?
recentlyUsedFilters.add(filter.hashCode());
Modified: lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/Accountable.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/Accountable.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/Accountable.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/Accountable.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/Accountables.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/Accountables.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/Accountables.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/Accountables.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/fst/FST.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/fst/FST.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/fst/FST.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/fst/FST.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/fst/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/fst/package.html?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/fst/package.html (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/fst/package.html Tue Dec 16 11:11:50 2014
@@ -46,7 +46,7 @@ FST Construction example:
PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
Builder<Long> builder = new Builder<Long>(INPUT_TYPE.BYTE1, outputs);
BytesRef scratchBytes = new BytesRef();
- IntsRef scratchInts = new IntsRef();
+ IntsRefBuilder scratchInts = new IntsRefBuilder();
for (int i = 0; i < inputValues.length; i++) {
scratchBytes.copyChars(inputValues[i]);
builder.add(Util.toIntsRef(scratchBytes, scratchInts), outputValues[i]);
Modified: lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestLRUFilterCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestLRUFilterCache.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestLRUFilterCache.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestLRUFilterCache.java Tue Dec 16 11:11:50 2014
@@ -22,6 +22,7 @@ import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -49,7 +50,7 @@ public class TestLRUFilterCache extends
private static final FilterCachingPolicy NEVER_CACHE = new FilterCachingPolicy() {
@Override
- public void onCache(Filter filter) {}
+ public void onUse(Filter filter) {}
@Override
public boolean shouldCache(Filter filter, LeafReaderContext context, DocIdSet set) throws IOException {
@@ -398,6 +399,62 @@ public class TestLRUFilterCache extends
reader.close();
w.close();
+ dir.close();
+ }
+
+ public void testOnUse() throws IOException {
+ final LRUFilterCache filterCache = new LRUFilterCache(1 + random().nextInt(5), 1 + random().nextInt(1000));
+
+ Directory dir = newDirectory();
+ final RandomIndexWriter w = new RandomIndexWriter(random(), dir);
+
+ Document doc = new Document();
+ StringField f = new StringField("color", "", Store.NO);
+ doc.add(f);
+ final int numDocs = atLeast(10);
+ for (int i = 0; i < numDocs; ++i) {
+ f.setStringValue(RandomPicks.randomFrom(random(), Arrays.asList("red", "blue", "green", "yellow")));
+ w.addDocument(doc);
+ if (random().nextBoolean()) {
+ w.getReader().close();
+ }
+ }
+ final DirectoryReader reader = w.getReader();
+ final IndexSearcher searcher = new IndexSearcher(reader);
+
+ final Map<Filter, Integer> actualCounts = new HashMap<>();
+ final Map<Filter, Integer> expectedCounts = new HashMap<>();
+
+ final FilterCachingPolicy countingPolicy = new FilterCachingPolicy() {
+
+ @Override
+ public boolean shouldCache(Filter filter, LeafReaderContext context, DocIdSet set) throws IOException {
+ return random().nextBoolean();
+ }
+
+ @Override
+ public void onUse(Filter filter) {
+ expectedCounts.put(filter, 1 + expectedCounts.getOrDefault(filter, 0));
+ }
+ };
+
+ Filter[] filters = new Filter[10 + random().nextInt(10)];
+ Filter[] cachedFilters = new Filter[filters.length];
+ for (int i = 0; i < filters.length; ++i) {
+ filters[i] = new QueryWrapperFilter(new TermQuery(new Term("color", RandomPicks.randomFrom(random(), Arrays.asList("red", "blue", "green", "yellow")))));
+ cachedFilters[i] = filterCache.doCache(filters[i], countingPolicy);
+ }
+
+ for (int i = 0; i < 20; ++i) {
+ final int idx = random().nextInt(filters.length);
+ searcher.search(new ConstantScoreQuery(cachedFilters[idx]), 1);
+ actualCounts.put(filters[idx], 1 + actualCounts.getOrDefault(filters[idx], 0));
+ }
+
+ assertEquals(actualCounts, expectedCounts);
+
+ reader.close();
+ w.close();
dir.close();
}
Modified: lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java (original)
+++ lucene/dev/branches/lucene2878/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java Tue Dec 16 11:11:50 2014
@@ -90,7 +90,7 @@ public class BitDocIdSetCachingWrapperFi
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return filter.getChildResources();
}
Modified: lucene/dev/branches/lucene2878/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java (original)
+++ lucene/dev/branches/lucene2878/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java (original)
+++ lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java (original)
+++ lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java (original)
+++ lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java (original)
+++ lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java (original)
+++ lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java (original)
+++ lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java (original)
+++ lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java Tue Dec 16 11:11:50 2014
@@ -99,8 +99,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/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java (original)
+++ lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java (original)
+++ lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java Tue Dec 16 11:11:50 2014
@@ -97,7 +97,7 @@ public final class RAMOnlyPostingsFormat
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
+ public Iterable<Accountable> getChildResources() {
return Accountables.namedAccountables("field", fieldToTerms);
}
Modified: lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java (original)
+++ lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java Tue Dec 16 11:11:50 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/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Tue Dec 16 11:11:50 2014
@@ -430,7 +430,7 @@ public abstract class LuceneTestCase ext
public static final FilterCachingPolicy MAYBE_CACHE_POLICY = new FilterCachingPolicy() {
@Override
- public void onCache(Filter filter) {}
+ public void onUse(Filter filter) {}
@Override
public boolean shouldCache(Filter filter, LeafReaderContext context, DocIdSet set) throws IOException {
Modified: lucene/dev/branches/lucene2878/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/solr/CHANGES.txt?rev=1645921&r1=1645920&r2=1645921&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene2878/solr/CHANGES.txt Tue Dec 16 11:11:50 2014
@@ -298,9 +298,9 @@ Bug Fixes
* SOLR-6721: ZkController.ensureReplicaInLeaderInitiatedRecovery puts replica
in local map before writing to ZK. (shalin)
-* SOLR-6679: Remove suggester component from stock solrconfig.xml since
+* SOLR-6679: Disabled suggester component from techproduct solrconfig.xml since
it caused long startup times on lage indexes even when it wasn't used.
- (yonik)
+ (yonik, hossman)
* SOLR-6738: Admin UI - Escape Data on Plugins-View (steffkes)
@@ -492,6 +492,12 @@ Other Changes
* SOLR-6826: fieldType capitalization is not consistent with the rest of case-sensitive field names.
(Alexandre Rafalovitch via Erick Erickson)
+* SOLR-6849: HttpSolrServer.RemoteSolrException reports the URL of the remote
+ host where the exception occurred. (Alan Woodward)
+
+* SOLR-6852: SimplePostTool no longer defaults to collection1 making core/collection/update URL
+ mandatory. (Anshum Gupta)
+
================== 4.10.3 ==================
Bug Fixes