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 2012/08/13 04:44:43 UTC
svn commit: r1372246 [2/2] - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/benchmark/
lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/ lucene/core/
lucene/core/src/java/org/apache/lucene/codecs/
lucene/core/src/java/org/apache/lucen...
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java?rev=1372246&r1=1372245&r2=1372246&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java Mon Aug 13 02:44:41 2012
@@ -19,6 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -124,13 +125,13 @@ public class TestTermVectors extends Luc
assertEquals(4, v.size());
String[] expectedFields = new String[]{"a", "b", "c", "x"};
int[] expectedPositions = new int[]{1, 2, 0};
- FieldsEnum fieldsEnum = v.iterator();
+ Iterator<String> fieldsEnum = v.iterator();
for(int i=0;i<expectedFields.length;i++) {
assertEquals(expectedFields[i], fieldsEnum.next());
assertEquals(3, v.terms(expectedFields[i]).size());
DocsAndPositionsEnum dpEnum = null;
- Terms terms = fieldsEnum.terms();
+ Terms terms = v.terms(expectedFields[i]);
assertNotNull(terms);
TermsEnum termsEnum = terms.iterator(null);
assertEquals("content", termsEnum.next().utf8ToString());
@@ -251,11 +252,11 @@ public class TestTermVectors extends Luc
writer.close();
IndexSearcher knownSearcher = newSearcher(reader);
knownSearcher.setSimilarity(new DefaultSimilarity());
- FieldsEnum fields = MultiFields.getFields(knownSearcher.reader).iterator();
+ Fields fields = MultiFields.getFields(knownSearcher.reader);
DocsEnum docs = null;
- while(fields.next() != null) {
- Terms terms = fields.terms();
+ for (String fieldName : fields) {
+ Terms terms = fields.terms(fieldName);
assertNotNull(terms); // NOTE: kinda sketchy assumptions, but ideally we would fix fieldsenum api...
TermsEnum termsEnum = terms.iterator(null);
Modified: lucene/dev/branches/branch_4x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1372246&r1=1372245&r2=1372246&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/branches/branch_4x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Mon Aug 13 02:44:41 2012
@@ -25,6 +25,7 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.NoSuchElementException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
@@ -42,7 +43,6 @@ import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.Fields;
-import org.apache.lucene.index.FieldsEnum;
import org.apache.lucene.index.OrdTermState;
import org.apache.lucene.index.StoredFieldVisitor;
import org.apache.lucene.index.TermState;
@@ -718,22 +718,27 @@ public class MemoryIndex {
private class MemoryFields extends Fields {
@Override
- public FieldsEnum iterator() {
- return new FieldsEnum() {
+ public Iterator<String> iterator() {
+ return new Iterator<String>() {
int upto = -1;
@Override
public String next() {
upto++;
if (upto >= sortedFields.length) {
- return null;
+ throw new NoSuchElementException();
}
return sortedFields[upto].getKey();
}
@Override
- public Terms terms() {
- return MemoryFields.this.terms(sortedFields[upto].getKey());
+ public boolean hasNext() {
+ return upto+1 < sortedFields.length;
+ }
+
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException();
}
};
}
Modified: lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java?rev=1372246&r1=1372245&r2=1372246&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java (original)
+++ lucene/dev/branches/branch_4x/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java Mon Aug 13 02:44:41 2012
@@ -25,7 +25,6 @@ import org.apache.lucene.index.MultiFiel
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.ReaderUtil;
import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.index.FieldsEnum;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.search.DocIdSetIterator;
@@ -133,16 +132,10 @@ public class HighFreqTerms {
throw new RuntimeException("no fields found for this index");
}
tiq = new TermStatsQueue(numTerms);
- FieldsEnum fieldsEnum = fields.iterator();
- while (true) {
- field = fieldsEnum.next();
- if (field != null) {
- Terms terms = fieldsEnum.terms();
- if (terms != null) {
- tiq.fill(field, terms.iterator(null));
- }
- } else {
- break;
+ for (String fieldName : fields) {
+ Terms terms = fields.terms(fieldName);
+ if (terms != null) {
+ tiq.fill(fieldName, terms.iterator(null));
}
}
}
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java?rev=1372246&r1=1372245&r2=1372246&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java Mon Aug 13 02:44:41 2012
@@ -19,6 +19,7 @@ package org.apache.lucene.codecs.asserti
import java.io.IOException;
import java.util.Comparator;
+import java.util.Iterator;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
@@ -30,7 +31,6 @@ import org.apache.lucene.codecs.lucene40
import org.apache.lucene.index.AssertingAtomicReader;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.FieldsEnum;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.SegmentWriteState;
import org.apache.lucene.index.Terms;
@@ -70,10 +70,10 @@ public class AssertingPostingsFormat ext
}
@Override
- public FieldsEnum iterator() throws IOException {
- FieldsEnum iterator = in.iterator();
+ public Iterator<String> iterator() {
+ Iterator<String> iterator = in.iterator();
assert iterator != null;
- return new AssertingAtomicReader.AssertingFieldsEnum(iterator);
+ return iterator;
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java?rev=1372246&r1=1372245&r2=1372246&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java Mon Aug 13 02:44:41 2012
@@ -39,7 +39,6 @@ import org.apache.lucene.index.DocsAndPo
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.FieldsEnum;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.SegmentWriteState;
@@ -50,6 +49,7 @@ import org.apache.lucene.store.IndexOutp
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.UnmodifiableIterator;
/** Stores all postings data in RAM, but writes a small
* token (header + single int) to identify which "slot" the
@@ -112,8 +112,8 @@ public class RAMOnlyPostingsFormat exten
}
@Override
- public FieldsEnum iterator() {
- return new RAMFieldsEnum(this);
+ public Iterator<String> iterator() {
+ return new UnmodifiableIterator<String>(fieldToTerms.keySet().iterator());
}
@Override
@@ -303,33 +303,6 @@ public class RAMOnlyPostingsFormat exten
}
}
- // Classes for reading from the postings state
- static class RAMFieldsEnum extends FieldsEnum {
- private final RAMPostings postings;
- private final Iterator<String> it;
- private String current;
-
- public RAMFieldsEnum(RAMPostings postings) {
- this.postings = postings;
- this.it = postings.fieldToTerms.keySet().iterator();
- }
-
- @Override
- public String next() {
- if (it.hasNext()) {
- current = it.next();
- } else {
- current = null;
- }
- return current;
- }
-
- @Override
- public Terms terms() {
- return postings.fieldToTerms.get(current);
- }
- }
-
static class RAMTermsEnum extends TermsEnum {
Iterator<String> it;
String current;
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java?rev=1372246&r1=1372245&r2=1372246&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java Mon Aug 13 02:44:41 2012
@@ -1,6 +1,7 @@
package org.apache.lucene.index;
import java.io.IOException;
+import java.util.Iterator;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.util.Bits;
@@ -60,10 +61,10 @@ public class AssertingAtomicReader exten
}
@Override
- public FieldsEnum iterator() throws IOException {
- FieldsEnum fieldsEnum = super.iterator();
- assert fieldsEnum != null;
- return new AssertingFieldsEnum(fieldsEnum);
+ public Iterator<String> iterator() {
+ Iterator<String> iterator = super.iterator();
+ assert iterator != null;
+ return iterator;
}
@Override
@@ -74,21 +75,6 @@ public class AssertingAtomicReader exten
}
/**
- * Wraps a FieldsEnum but with additional asserts
- */
- public static class AssertingFieldsEnum extends FilterFieldsEnum {
- public AssertingFieldsEnum(FieldsEnum in) {
- super(in);
- }
-
- @Override
- public Terms terms() throws IOException {
- Terms terms = super.terms();
- return terms == null ? null : new AssertingTerms(terms);
- }
- }
-
- /**
* Wraps a Terms but with additional asserts
*/
public static class AssertingTerms extends FilterTerms {
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java?rev=1372246&r1=1372245&r2=1372246&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java Mon Aug 13 02:44:41 2012
@@ -19,6 +19,8 @@ package org.apache.lucene.index;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
import java.util.Set;
public final class FieldFilterAtomicReader extends FilterAtomicReader {
@@ -125,15 +127,16 @@ public final class FieldFilterAtomicRead
}
private class FieldFilterFields extends FilterFields {
+
public FieldFilterFields(Fields in) {
super(in);
}
@Override
- public int size() throws IOException {
+ public int size() {
// TODO: add faster implementation!
int c = 0;
- final FieldsEnum it = iterator();
+ final Iterator<String> it = iterator();
while (it.next() != null) {
c++;
}
@@ -141,16 +144,46 @@ public final class FieldFilterAtomicRead
}
@Override
- public FieldsEnum iterator() throws IOException {
- return new FilterFieldsEnum(super.iterator()) {
+ public Iterator<String> iterator() {
+ final Iterator<String> in = super.iterator();
+ return new Iterator<String>() {
+ String cached = null;
+
+ @Override
+ public String next() {
+ if (cached != null) {
+ String next = cached;
+ cached = null;
+ return next;
+ } else {
+ String next = doNext();
+ if (next == null) {
+ throw new NoSuchElementException();
+ } else {
+ return next;
+ }
+ }
+ }
+
@Override
- public String next() throws IOException {
- String f;
- while ((f = super.next()) != null) {
- if (hasField(f)) return f;
+ public boolean hasNext() {
+ return cached != null || (cached = doNext()) != null;
+ }
+
+ private String doNext() {
+ while (in.hasNext()) {
+ String field = in.next();
+ if (hasField(field)) {
+ return field;
+ }
}
return null;
- }
+ }
+
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
};
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java?rev=1372246&r1=1372245&r2=1372246&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java Mon Aug 13 02:44:41 2012
@@ -16,7 +16,6 @@ import java.util.Map.Entry;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.Fields;
-import org.apache.lucene.index.FieldsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.StoredFieldVisitor;
import org.apache.lucene.index.Terms;
@@ -318,10 +317,8 @@ public class TermVectorComponent extends
} else {
// extract all fields
final Fields vectors = reader.getTermVectors(docId);
- final FieldsEnum fieldsEnum = vectors.iterator();
- String field;
- while((field = fieldsEnum.next()) != null) {
- Terms terms = fieldsEnum.terms();
+ for (String field : vectors) {
+ Terms terms = vectors.terms(field);
if (terms != null) {
termsEnum = terms.iterator(termsEnum);
mapOneVector(docNL, allFields, reader, docId, termsEnum, field);