You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2015/01/02 17:25:17 UTC
svn commit: r1649074 [2/2] - 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/...
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=1649074&r1=1649073&r2=1649074&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 Fri Jan 2 16:25:16 2015
@@ -18,6 +18,7 @@ package org.apache.lucene.codecs.asserti
*/
import java.io.IOException;
+import java.util.Collection;
import org.apache.lucene.codecs.TermVectorsFormat;
import org.apache.lucene.codecs.TermVectorsReader;
@@ -85,9 +86,9 @@ public class AssertingTermVectorsFormat
}
@Override
- public Iterable<Accountable> getChildResources() {
- Iterable<Accountable> res = in.getChildResources();
- TestUtil.checkIterator(res.iterator());
+ public Collection<Accountable> getChildResources() {
+ Collection<Accountable> res = in.getChildResources();
+ TestUtil.checkReadOnly(res);
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=1649074&r1=1649073&r2=1649074&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 Fri Jan 2 16:25:16 2015
@@ -19,6 +19,7 @@ package org.apache.lucene.codecs.ramonly
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
@@ -98,7 +99,7 @@ public final class RAMOnlyPostingsFormat
}
@Override
- public Iterable<Accountable> getChildResources() {
+ public Collection<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=1649074&r1=1649073&r2=1649074&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 Fri Jan 2 16:25:16 2015
@@ -18,6 +18,7 @@ package org.apache.lucene.util;
*/
import java.io.IOException;
+import java.util.Collection;
import java.util.Collections;
import org.apache.lucene.search.DocIdSet;
@@ -299,7 +300,7 @@ public abstract class BaseBitSetTestCase
}
@Override
- public Iterable<Accountable> getChildResources() {
+ public Collection<Accountable> getChildResources() {
return Collections.emptyList();
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java?rev=1649074&r1=1649073&r2=1649074&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java Fri Jan 2 16:25:16 2015
@@ -30,6 +30,8 @@ import java.nio.file.FileSystem;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -198,7 +200,48 @@ public final class TestUtil {
// ok
}
}
-
+
+ /**
+ * Checks that the provided collection is read-only.
+ * @see #checkIterator(Iterator)
+ */
+ public static <T> void checkReadOnly(Collection<T> coll) {
+ int size = 0;
+ for (Iterator<?> it = coll.iterator(); it.hasNext(); ) {
+ it.next();
+ size += 1;
+ }
+ if (size != coll.size()) {
+ throw new AssertionError("broken collection, reported size is "
+ + coll.size() + " but iterator has " + size + " elements: " + coll);
+ }
+
+ if (coll.isEmpty() == false) {
+ try {
+ coll.remove(coll.iterator().next());
+ throw new AssertionError("broken collection (supports remove): " + coll);
+ } catch (UnsupportedOperationException e) {
+ // ok
+ }
+ }
+
+ try {
+ coll.add(null);
+ throw new AssertionError("broken collection (supports add): " + coll);
+ } catch (UnsupportedOperationException e) {
+ // ok
+ }
+
+ try {
+ coll.addAll(Collections.singleton(null));
+ throw new AssertionError("broken collection (supports addAll): " + coll);
+ } catch (UnsupportedOperationException e) {
+ // ok
+ }
+
+ checkIterator(coll.iterator());
+ }
+
public static void syncConcurrentMerges(IndexWriter writer) {
syncConcurrentMerges(writer.getConfig().getMergeScheduler());
}
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=1649074&r1=1649073&r2=1649074&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 Fri Jan 2 16:25:16 2015
@@ -342,7 +342,7 @@ public class SuggestComponent extends Se
}
@Override
- public Iterable<Accountable> getChildResources() {
+ public Collection<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=1649074&r1=1649073&r2=1649074&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 Fri Jan 2 16:25:16 2015
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -213,7 +214,7 @@ public class SolrSuggester implements Ac
}
@Override
- public Iterable<Accountable> getChildResources() {
+ public Collection<Accountable> getChildResources() {
return lookup.getChildResources();
}