You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/07/28 12:56:49 UTC
svn commit: r1366638 [1/2] - in /lucene/dev/branches/lucene3312:
lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/
lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/
lucene/benchmark/src/java/org/apache/lucene/benchmark/by...
Author: uschindler
Date: Sat Jul 28 10:56:46 2012
New Revision: 1366638
URL: http://svn.apache.org/viewvc?rev=1366638&view=rev
Log:
LUCENE-3312: Apply patch 8
Modified:
lucene/dev/branches/lucene3312/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java
lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java
lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java
lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java
lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java
lucene/dev/branches/lucene3312/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/Document.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
lucene/dev/branches/lucene3312/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
lucene/dev/branches/lucene3312/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
lucene/dev/branches/lucene3312/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java
lucene/dev/branches/lucene3312/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
lucene/dev/branches/lucene3312/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
lucene/dev/branches/lucene3312/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java
lucene/dev/branches/lucene3312/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java
lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java
lucene/dev/branches/lucene3312/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BCDIntField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BCDLongField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BCDStrField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BinaryField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BoolField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/ByteField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/CollationField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/CurrencyField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/DateField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/DoubleField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/FieldType.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/FloatField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/GeoHashField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/IntField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/LatLonType.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/LongField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/PointType.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/RandomSortField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/ShortField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/SortableDoubleField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/SortableFloatField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/SortableIntField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/SortableLongField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/StrField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/TextField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/TrieDateField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/TrieField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/UUIDField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/search/TestStressLucene.java
Modified: lucene/dev/branches/lucene3312/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java (original)
+++ lucene/dev/branches/lucene3312/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java Sat Jul 28 10:56:46 2012
@@ -21,6 +21,7 @@ import org.apache.lucene.analysis.BaseTo
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
@@ -80,7 +81,7 @@ public class UIMABaseAnalyzerTest extend
IndexSearcher indexSearcher = new IndexSearcher(directoryReader);
TopDocs result = indexSearcher.search(new MatchAllDocsQuery(), 10);
assertTrue(result.totalHits > 0);
- Document d = indexSearcher.doc(result.scoreDocs[0].doc);
+ StoredDocument d = indexSearcher.doc(result.scoreDocs[0].doc);
assertNotNull(d);
assertNotNull(d.getField("title"));
assertEquals(dummyTitle, d.getField("title").stringValue());
@@ -100,7 +101,7 @@ public class UIMABaseAnalyzerTest extend
directoryReader = DirectoryReader.open(dir);
indexSearcher = new IndexSearcher(directoryReader);
result = indexSearcher.search(new MatchAllDocsQuery(), 10);
- Document d1 = indexSearcher.doc(result.scoreDocs[1].doc);
+ StoredDocument d1 = indexSearcher.doc(result.scoreDocs[1].doc);
assertNotNull(d1);
assertNotNull(d1.getField("title"));
assertEquals(dogmasTitle, d1.getField("title").stringValue());
Modified: lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (original)
+++ lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java Sat Jul 28 10:56:46 2012
@@ -231,6 +231,7 @@ public class DocMaker implements Closeab
// Set ID_FIELD
FieldType ft = new FieldType(valType);
ft.setIndexed(true);
+ ft.setStored(true);
Field idField = ds.getField(ID_FIELD, ft);
int id;
Modified: lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java (original)
+++ lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java Sat Jul 28 10:56:46 2012
@@ -19,6 +19,7 @@ package org.apache.lucene.benchmark.byTa
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.IndexReader;
/**
@@ -26,5 +27,5 @@ import org.apache.lucene.index.IndexRead
*/
public abstract class BenchmarkHighlighter {
public abstract int doHighlight( IndexReader reader, int doc, String field,
- Document document, Analyzer analyzer, String text ) throws Exception ;
+ StoredDocument document, Analyzer analyzer, String text ) throws Exception ;
}
Modified: lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java (original)
+++ lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java Sat Jul 28 10:56:46 2012
@@ -28,10 +28,12 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.benchmark.byTask.feeds.QueryMaker;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.MultiFields;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.MultiTermQuery;
@@ -96,7 +98,7 @@ public abstract class ReadTask extends P
// optionally warm and add num docs traversed to count
if (withWarm()) {
- Document doc = null;
+ StoredDocument doc = null;
Bits liveDocs = MultiFields.getLiveDocs(reader);
for (int m = 0; m < reader.maxDoc(); m++) {
if (null == liveDocs || liveDocs.get(m)) {
@@ -142,7 +144,7 @@ public abstract class ReadTask extends P
System.out.println("numDocs() = " + reader.numDocs());
for(int i=0;i<hits.scoreDocs.length;i++) {
final int docID = hits.scoreDocs[i].doc;
- final Document doc = reader.document(docID);
+ final StoredDocument doc = reader.document(docID);
System.out.println(" " + i + ": doc=" + docID + " score=" + hits.scoreDocs[i].score + " " + printHitsField + " =" + doc.get(printHitsField));
}
}
@@ -163,7 +165,7 @@ public abstract class ReadTask extends P
int id = scoreDocs[m].doc;
res++;
if (retrieve) {
- Document document = retrieveDoc(reader, id);
+ StoredDocument document = retrieveDoc(reader, id);
res += document != null ? 1 : 0;
if (numHighlight > 0 && m < numHighlight) {
Collection<String> fieldsToHighlight = getFieldsToHighlight(document);
@@ -193,7 +195,7 @@ public abstract class ReadTask extends P
}
- protected Document retrieveDoc(IndexReader ir, int id) throws IOException {
+ protected StoredDocument retrieveDoc(IndexReader ir, int id) throws IOException {
return ir.document(id);
}
@@ -296,10 +298,10 @@ public abstract class ReadTask extends P
* @param document The Document
* @return A Collection of Field names (Strings)
*/
- protected Collection<String> getFieldsToHighlight(Document document) {
- List<IndexableField> fields = document.getFields();
+ protected Collection<String> getFieldsToHighlight(StoredDocument document) {
+ List<StorableField> fields = document.getFields();
Set<String> result = new HashSet<String>(fields.size());
- for (final IndexableField f : fields) {
+ for (final StorableField f : fields) {
result.add(f.name());
}
return result;
Modified: lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java (original)
+++ lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java Sat Jul 28 10:56:46 2012
@@ -21,6 +21,7 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.highlight.Highlighter;
@@ -101,7 +102,7 @@ public class SearchTravRetHighlightTask
return new BenchmarkHighlighter(){
@Override
public int doHighlight(IndexReader reader, int doc, String field,
- Document document, Analyzer analyzer, String text) throws Exception {
+ StoredDocument document, Analyzer analyzer, String text) throws Exception {
TokenStream ts = TokenSources.getAnyTokenStream(reader, doc, field, document, analyzer);
TextFragment[] frag = highlighter.getBestTextFragments(ts, text, mergeContiguous, maxFrags);
return frag != null ? frag.length : 0;
@@ -110,7 +111,7 @@ public class SearchTravRetHighlightTask
}
@Override
- protected Collection<String> getFieldsToHighlight(Document document) {
+ protected Collection<String> getFieldsToHighlight(StoredDocument document) {
Collection<String> result = super.getFieldsToHighlight(document);
//if stored is false, then result will be empty, in which case just get all the param fields
if (paramFields.isEmpty() == false && result.isEmpty() == false) {
Modified: lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java (original)
+++ lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java Sat Jul 28 10:56:46 2012
@@ -24,6 +24,7 @@ import java.util.StringTokenizer;
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.DocumentStoredFieldVisitor;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.IndexReader;
/**
@@ -54,7 +55,7 @@ public class SearchTravRetLoadFieldSelec
@Override
- protected Document retrieveDoc(IndexReader ir, int id) throws IOException {
+ protected StoredDocument retrieveDoc(IndexReader ir, int id) throws IOException {
if (fieldsToLoad == null) {
return ir.document(id);
} else {
Modified: lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java (original)
+++ lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java Sat Jul 28 10:56:46 2012
@@ -20,6 +20,7 @@ package org.apache.lucene.benchmark.byTa
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.vectorhighlight.FastVectorHighlighter;
@@ -99,7 +100,7 @@ public class SearchTravRetVectorHighligh
return new BenchmarkHighlighter(){
@Override
public int doHighlight(IndexReader reader, int doc, String field,
- Document document, Analyzer analyzer, String text) throws Exception {
+ StoredDocument document, Analyzer analyzer, String text) throws Exception {
final FieldQuery fq = highlighter.getFieldQuery( myq, reader);
String[] fragments = highlighter.getBestFragments(fq, reader, doc, field, fragSize, maxFrags);
return fragments != null ? fragments.length : 0;
@@ -108,7 +109,7 @@ public class SearchTravRetVectorHighligh
}
@Override
- protected Collection<String> getFieldsToHighlight(Document document) {
+ protected Collection<String> getFieldsToHighlight(StoredDocument document) {
Collection<String> result = super.getFieldsToHighlight(document);
//if stored is false, then result will be empty, in which case just get all the param fields
if (paramFields.isEmpty() == false && result.isEmpty() == false) {
Modified: lucene/dev/branches/lucene3312/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java (original)
+++ lucene/dev/branches/lucene3312/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java Sat Jul 28 10:56:46 2012
@@ -27,6 +27,7 @@ import org.apache.lucene.search.highligh
import org.apache.lucene.search.highlight.TokenSources;
import org.apache.lucene.search.Query;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.IndexReader;
import java.io.IOException;
@@ -44,8 +45,8 @@ public class CountingHighlighterTestTask
}
@Override
- protected Document retrieveDoc(IndexReader ir, int id) throws IOException {
- Document document = ir.document(id);
+ protected StoredDocument retrieveDoc(IndexReader ir, int id) throws IOException {
+ StoredDocument document = ir.document(id);
if (document != null) {
numDocsRetrieved++;
}
@@ -57,7 +58,7 @@ public class CountingHighlighterTestTask
highlighter = new Highlighter(new SimpleHTMLFormatter(), new QueryScorer(q));
return new BenchmarkHighlighter() {
@Override
- public int doHighlight(IndexReader reader, int doc, String field, Document document, Analyzer analyzer, String text) throws Exception {
+ public int doHighlight(IndexReader reader, int doc, String field, StoredDocument document, Analyzer analyzer, String text) throws Exception {
TokenStream ts = TokenSources.getAnyTokenStream(reader, doc, field, document, analyzer);
TextFragment[] frag = highlighter.getBestTextFragments(ts, text, mergeContiguous, maxFrags);
numHighlightedResults += frag != null ? frag.length : 0;
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/Document.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/Document.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/Document.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/Document.java Sat Jul 28 10:56:46 2012
@@ -124,7 +124,7 @@ public final class Document implements I
*/
public final BytesRef[] getBinaryValues(String name) {
final List<BytesRef> result = new ArrayList<BytesRef>();
- Iterator<StorableField> it = storedFieldsIterator();
+ Iterator<Field> it = storedFieldsIterator();
while (it.hasNext()) {
StorableField field = it.next();
@@ -149,7 +149,7 @@ public final class Document implements I
* @return a <code>byte[]</code> containing the binary field value or <code>null</code>
*/
public final BytesRef getBinaryValue(String name) {
- Iterator<StorableField> it = storedFieldsIterator();
+ Iterator<Field> it = storedFieldsIterator();
while (it.hasNext()) {
StorableField field = it.next();
@@ -224,7 +224,7 @@ public final class Document implements I
*/
public final String[] getValues(String name) {
List<String> result = new ArrayList<String>();
- Iterator<StorableField> it = storedFieldsIterator();
+ Iterator<Field> it = storedFieldsIterator();
while (it.hasNext()) {
StorableField field = it.next();
@@ -249,7 +249,7 @@ public final class Document implements I
* the actual numeric field instance back, use {@link #getField}.
*/
public final String get(String name) {
- Iterator<StorableField> it = storedFieldsIterator();
+ Iterator<Field> it = storedFieldsIterator();
while (it.hasNext()) {
StorableField field = it.next();
@@ -277,7 +277,7 @@ public final class Document implements I
@Override
public Iterable<? extends IndexableField> indexableFields() {
- Iterator<IndexableField> it = indexedFieldsIterator();
+ Iterator<Field> it = indexedFieldsIterator();
List<IndexableField> result = new ArrayList<IndexableField>();
while(it.hasNext()) {
@@ -289,7 +289,7 @@ public final class Document implements I
@Override
public Iterable<? extends StorableField> storableFields() {
- Iterator<StorableField> it = storedFieldsIterator();
+ Iterator<Field> it = storedFieldsIterator();
List<StorableField> result = new ArrayList<StorableField>();
while(it.hasNext()) {
@@ -299,8 +299,8 @@ public final class Document implements I
return result;
}
- public Iterator<StorableField> storedFieldsIterator() {
- return new FilterIterator<StorableField, Field>(fields.iterator()) {
+ public Iterator<Field> storedFieldsIterator() {
+ return new FilterIterator<Field>(fields.iterator()) {
@Override
protected boolean predicateFunction(Field field) {
return field.type.stored();
@@ -308,8 +308,8 @@ public final class Document implements I
};
}
- public Iterator<IndexableField> indexedFieldsIterator() {
- return new FilterIterator<IndexableField, Field>(fields.iterator()) {
+ public Iterator<Field> indexedFieldsIterator() {
+ return new FilterIterator<Field>(fields.iterator()) {
@Override
protected boolean predicateFunction(Field field) {
return field.type.indexed();
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java Sat Jul 28 10:56:46 2012
@@ -240,7 +240,7 @@ final class DocFieldProcessor extends Do
docState, fp.fieldInfo);
DocValuesConsumer consumer = docValuesConsumer.docValuesConsumer;
if (docValuesConsumer.compatibility == null) {
- consumer.add(docState.docID, (StorableField) field);
+ consumer.add(docState.docID, field);
docValuesConsumer.compatibility = new TypeCompatibility(dvType,
consumer.getValueSize());
} else if (docValuesConsumer.compatibility.isCompatible(dvType,
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java Sat Jul 28 10:56:46 2012
@@ -54,7 +54,7 @@ final class NormsConsumerPerField extend
StorableField field = norm.field();
// some similarity might not compute any norms
DocValuesConsumer consumer = getConsumer(norm.type());
- consumer.add(docState.docID, (StorableField) field);
+ consumer.add(docState.docID, field);
}
}
}
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java Sat Jul 28 10:56:46 2012
@@ -20,15 +20,15 @@ import java.util.NoSuchElementException;
* the License.
*/
-public abstract class FilterIterator<T, U extends T> implements Iterator<T> {
+public abstract class FilterIterator<T> implements Iterator<T> {
- private Iterator<U> iterator;
+ private Iterator<T> iterator;
private T next = null;
private boolean nextIsSet = false;
- protected abstract boolean predicateFunction(U field);
+ protected abstract boolean predicateFunction(T field);
- public FilterIterator(Iterator<U> baseIterator) {
+ public FilterIterator(Iterator<T> baseIterator) {
this.iterator = baseIterator;
}
@@ -56,7 +56,7 @@ public abstract class FilterIterator<T,
private boolean setNext() {
while (iterator.hasNext()) {
- U object = iterator.next();
+ T object = iterator.next();
if (predicateFunction(object)) {
next = object;
nextIsSet = true;
Modified: lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java Sat Jul 28 10:56:46 2012
@@ -192,11 +192,14 @@ public class TestIndexableField extends
@Override
public boolean hasNext() {
if (fieldUpto >= fieldCount) return false;
+
next = null;
- if (fieldUpto > 1)
+ if (fieldUpto == 0) {
+ fieldUpto = 1;
+ next = newStringField("id", ""+finalDocCount, Field.Store.YES);
+ } else {
next = new MyField(finalBaseCount + (fieldUpto++-1));
- else
- fieldUpto = 2;
+ }
if (next != null && next.fieldType().indexed()) return true;
else return this.hasNext();
Modified: lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java (original)
+++ lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java Sat Jul 28 10:56:46 2012
@@ -32,6 +32,7 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;
@@ -57,7 +58,7 @@ public class TokenSources {
* and get the vector from
* @param docId The docId to retrieve.
* @param field The field to retrieve on the document
- * @param doc The document to fall back on
+ * @param document The document to fall back on
* @param analyzer The analyzer to use for creating the TokenStream if the
* vector doesn't exist
* @return The {@link org.apache.lucene.analysis.TokenStream} for the
@@ -67,7 +68,7 @@ public class TokenSources {
*/
public static TokenStream getAnyTokenStream(IndexReader reader, int docId,
- String field, Document doc, Analyzer analyzer) throws IOException {
+ String field, StoredDocument document, Analyzer analyzer) throws IOException {
TokenStream ts = null;
Fields vectors = reader.getTermVectors(docId);
@@ -80,7 +81,7 @@ public class TokenSources {
// No token info stored so fall back to analyzing raw content
if (ts == null) {
- ts = getTokenStream(doc, field, analyzer);
+ ts = getTokenStream(document, field, analyzer);
}
return ts;
}
@@ -298,11 +299,11 @@ public class TokenSources {
// convenience method
public static TokenStream getTokenStream(IndexReader reader, int docId,
String field, Analyzer analyzer) throws IOException {
- Document doc = reader.document(docId);
+ StoredDocument doc = reader.document(docId);
return getTokenStream(doc, field, analyzer);
}
-
- public static TokenStream getTokenStream(Document doc, String field,
+
+ public static TokenStream getTokenStream(StoredDocument doc, String field,
Analyzer analyzer) {
String contents = doc.get(field);
if (contents == null) {
Modified: lucene/dev/branches/lucene3312/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/dev/branches/lucene3312/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Sat Jul 28 10:56:46 2012
@@ -37,6 +37,7 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.IntField;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DirectoryReader;
@@ -97,7 +98,7 @@ public class HighlighterTest extends Bas
for (int i = 0; i < hits.scoreDocs.length; i++) {
- Document doc = searcher.doc(hits.scoreDocs[i].doc);
+ StoredDocument doc = searcher.doc(hits.scoreDocs[i].doc);
String storedField = doc.get(FIELD_NAME);
TokenStream stream = TokenSources.getAnyTokenStream(searcher
@@ -1656,7 +1657,7 @@ public class HighlighterTest extends Bas
TopDocs hits = searcher.search(query, null, 10);
for( int i = 0; i < hits.totalHits; i++ ){
- Document doc = searcher.doc( hits.scoreDocs[i].doc );
+ StoredDocument doc = searcher.doc( hits.scoreDocs[i].doc );
String result = h.getBestFragment( a, "t_text1", doc.get( "t_text1" ));
if (VERBOSE) System.out.println("result:" + result);
assertEquals("more <B>random</B> words for second field", result);
Modified: lucene/dev/branches/lucene3312/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (original)
+++ lucene/dev/branches/lucene3312/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java Sat Jul 28 10:56:46 2012
@@ -119,11 +119,11 @@ public class TestBlockJoin extends Lucen
assertEquals(1, group.totalHits);
assertFalse(Float.isNaN(group.score));
- Document childDoc = s.doc(group.scoreDocs[0].doc);
+ StoredDocument childDoc = s.doc(group.scoreDocs[0].doc);
//System.out.println(" doc=" + group.scoreDocs[0].doc);
assertEquals("java", childDoc.get("skill"));
assertNotNull(group.groupValue);
- Document parentDoc = s.doc(group.groupValue);
+ StoredDocument parentDoc = s.doc(group.groupValue);
assertEquals("Lisa", parentDoc.get("name"));
@@ -247,7 +247,7 @@ public class TestBlockJoin extends Lucen
}
}
- private Document getParentDoc(IndexReader reader, Filter parents, int childDocID) throws IOException {
+ private StoredDocument getParentDoc(IndexReader reader, Filter parents, int childDocID) throws IOException {
final List<AtomicReaderContext> leaves = reader.getTopReaderContext().leaves();
final int subIndex = ReaderUtil.subIndex(childDocID, leaves);
final AtomicReaderContext leaf = leaves.get(subIndex);
@@ -563,7 +563,7 @@ public class TestBlockJoin extends Lucen
System.out.println("\nTEST: normal index gets " + results.totalHits + " hits");
final ScoreDoc[] hits = results.scoreDocs;
for(int hitIDX=0;hitIDX<hits.length;hitIDX++) {
- final Document doc = s.doc(hits[hitIDX].doc);
+ final StoredDocument doc = s.doc(hits[hitIDX].doc);
//System.out.println(" score=" + hits[hitIDX].score + " parentID=" + doc.get("parentID") + " childID=" + doc.get("childID") + " (docID=" + hits[hitIDX].doc + ")");
System.out.println(" parentID=" + doc.get("parentID") + " childID=" + doc.get("childID") + " (docID=" + hits[hitIDX].doc + ")");
FieldDoc fd = (FieldDoc) hits[hitIDX];
@@ -617,10 +617,10 @@ public class TestBlockJoin extends Lucen
}
assertNotNull(group.groupValue);
- final Document parentDoc = joinS.doc(group.groupValue);
+ final StoredDocument parentDoc = joinS.doc(group.groupValue);
System.out.println(" group parentID=" + parentDoc.get("parentID") + " (docID=" + group.groupValue + ")");
for(int hitIDX=0;hitIDX<group.scoreDocs.length;hitIDX++) {
- final Document doc = joinS.doc(group.scoreDocs[hitIDX].doc);
+ final StoredDocument doc = joinS.doc(group.scoreDocs[hitIDX].doc);
//System.out.println(" score=" + group.scoreDocs[hitIDX].score + " childID=" + doc.get("childID") + " (docID=" + group.scoreDocs[hitIDX].doc + ")");
System.out.println(" childID=" + doc.get("childID") + " child0=" + doc.get("child0") + " (docID=" + group.scoreDocs[hitIDX].doc + ")");
}
@@ -635,7 +635,7 @@ public class TestBlockJoin extends Lucen
TopDocs b = joinS.search(childJoinQuery, 10);
for (ScoreDoc hit : b.scoreDocs) {
Explanation explanation = joinS.explain(childJoinQuery, hit.doc);
- Document document = joinS.doc(hit.doc - 1);
+ StoredDocument document = joinS.doc(hit.doc - 1);
int childId = Integer.parseInt(document.get("childID"));
assertTrue(explanation.isMatch());
assertEquals(hit.score, explanation.getValue(), 0.0f);
@@ -763,7 +763,7 @@ public class TestBlockJoin extends Lucen
if (VERBOSE) {
System.out.println(" " + results2.totalHits + " totalHits:");
for(ScoreDoc sd : results2.scoreDocs) {
- final Document doc = s.doc(sd.doc);
+ final StoredDocument doc = s.doc(sd.doc);
System.out.println(" childID=" + doc.get("childID") + " parentID=" + doc.get("parentID") + " docID=" + sd.doc);
}
}
@@ -777,8 +777,8 @@ public class TestBlockJoin extends Lucen
if (VERBOSE) {
System.out.println(" " + joinResults2.totalHits + " totalHits:");
for(ScoreDoc sd : joinResults2.scoreDocs) {
- final Document doc = joinS.doc(sd.doc);
- final Document parentDoc = getParentDoc(joinR, parentsFilter, sd.doc);
+ final StoredDocument doc = joinS.doc(sd.doc);
+ final StoredDocument parentDoc = getParentDoc(joinR, parentsFilter, sd.doc);
System.out.println(" childID=" + doc.get("childID") + " parentID=" + parentDoc.get("parentID") + " docID=" + sd.doc);
}
}
@@ -798,8 +798,8 @@ public class TestBlockJoin extends Lucen
for(int hitCount=0;hitCount<results.scoreDocs.length;hitCount++) {
ScoreDoc hit = results.scoreDocs[hitCount];
ScoreDoc joinHit = joinResults.scoreDocs[hitCount];
- Document doc1 = r.document(hit.doc);
- Document doc2 = joinR.document(joinHit.doc);
+ StoredDocument doc1 = r.document(hit.doc);
+ StoredDocument doc2 = joinR.document(joinHit.doc);
assertEquals("hit " + hitCount + " differs",
doc1.get("childID"), doc2.get("childID"));
// don't compare scores -- they are expected to differ
@@ -826,14 +826,14 @@ public class TestBlockJoin extends Lucen
final GroupDocs<Integer> group = groupDocs[joinGroupUpto++];
final ScoreDoc[] groupHits = group.scoreDocs;
assertNotNull(group.groupValue);
- final Document parentDoc = joinR.document(group.groupValue);
+ final StoredDocument parentDoc = joinR.document(group.groupValue);
final String parentID = parentDoc.get("parentID");
//System.out.println("GROUP groupDoc=" + group.groupDoc + " parent=" + parentDoc);
assertNotNull(parentID);
assertTrue(groupHits.length > 0);
for(int hitIDX=0;hitIDX<groupHits.length;hitIDX++) {
- final Document nonJoinHit = r.document(hits[resultUpto++].doc);
- final Document joinHit = joinR.document(groupHits[hitIDX].doc);
+ final StoredDocument nonJoinHit = r.document(hits[resultUpto++].doc);
+ final StoredDocument joinHit = joinR.document(groupHits[hitIDX].doc);
assertEquals(parentID,
nonJoinHit.get("parentID"));
assertEquals(joinHit.get("childID"),
@@ -916,11 +916,11 @@ public class TestBlockJoin extends Lucen
final GroupDocs<Integer> group = jobResults.groups[0];
assertEquals(1, group.totalHits);
- Document childJobDoc = s.doc(group.scoreDocs[0].doc);
+ StoredDocument childJobDoc = s.doc(group.scoreDocs[0].doc);
//System.out.println(" doc=" + group.scoreDocs[0].doc);
assertEquals("java", childJobDoc.get("skill"));
assertNotNull(group.groupValue);
- Document parentDoc = s.doc(group.groupValue);
+ StoredDocument parentDoc = s.doc(group.groupValue);
assertEquals("Lisa", parentDoc.get("name"));
}
@@ -933,10 +933,10 @@ public class TestBlockJoin extends Lucen
final GroupDocs<Integer> qGroup = qualificationResults.groups[0];
assertEquals(1, qGroup.totalHits);
- Document childQualificationDoc = s.doc(qGroup.scoreDocs[0].doc);
+ StoredDocument childQualificationDoc = s.doc(qGroup.scoreDocs[0].doc);
assertEquals("maths", childQualificationDoc.get("qualification"));
assertNotNull(qGroup.groupValue);
- Document parentDoc = s.doc(qGroup.groupValue);
+ StoredDocument parentDoc = s.doc(qGroup.groupValue);
assertEquals("Lisa", parentDoc.get("name"));
Modified: lucene/dev/branches/lucene3312/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java (original)
+++ lucene/dev/branches/lucene3312/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java Sat Jul 28 10:56:46 2012
@@ -25,8 +25,8 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.IndexableFieldType;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.util.BytesRef;
/** Defers actually loading a field's value until you ask
@@ -38,7 +38,7 @@ public class LazyDocument {
private final int docID;
// null until first field is loaded
- private Document doc;
+ private StoredDocument doc;
private Map<Integer,Integer> fields = new HashMap<Integer,Integer>();
@@ -47,7 +47,7 @@ public class LazyDocument {
this.docID = docID;
}
- public IndexableField getField(FieldInfo fieldInfo) {
+ public StorableField getField(FieldInfo fieldInfo) {
Integer num = fields.get(fieldInfo.number);
if (num == null) {
num = 0;
@@ -59,7 +59,7 @@ public class LazyDocument {
return new LazyField(fieldInfo.name, num);
}
- private synchronized Document getDocument() {
+ private synchronized StoredDocument getDocument() {
if (doc == null) {
try {
doc = reader.document(docID);
@@ -71,7 +71,7 @@ public class LazyDocument {
return doc;
}
- private class LazyField implements IndexableField {
+ private class LazyField implements StorableField {
private String name;
private int num;
@@ -86,11 +86,6 @@ public class LazyDocument {
}
@Override
- public float boost() {
- return 1.0f;
- }
-
- @Override
public BytesRef binaryValue() {
if (num == 0) {
return getDocument().getField(name).binaryValue();
@@ -134,14 +129,5 @@ public class LazyDocument {
return getDocument().getFields(name)[num].fieldType();
}
}
-
- @Override
- public TokenStream tokenStream(Analyzer analyzer) throws IOException {
- if (num == 0) {
- return getDocument().getField(name).tokenStream(analyzer);
- } else {
- return getDocument().getFields(name)[num].tokenStream(analyzer);
- }
- }
}
}
Modified: lucene/dev/branches/lucene3312/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (original)
+++ lucene/dev/branches/lucene3312/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java Sat Jul 28 10:56:46 2012
@@ -19,6 +19,7 @@ package org.apache.lucene.index;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
@@ -68,7 +69,7 @@ public class TestMultiPassIndexSplitter
IndexReader ir;
ir = DirectoryReader.open(dirs[0]);
assertTrue(ir.numDocs() - NUM_DOCS / 3 <= 1); // rounding error
- Document doc = ir.document(0);
+ StoredDocument doc = ir.document(0);
assertEquals("0", doc.get("id"));
TermsEnum te = MultiFields.getTerms(ir, "id").iterator(null);
assertEquals(TermsEnum.SeekStatus.NOT_FOUND, te.seekCeil(new BytesRef("1")));
@@ -113,7 +114,7 @@ public class TestMultiPassIndexSplitter
IndexReader ir;
ir = DirectoryReader.open(dirs[0]);
assertTrue(ir.numDocs() - NUM_DOCS / 3 <= 1);
- Document doc = ir.document(0);
+ StoredDocument doc = ir.document(0);
assertEquals("0", doc.get("id"));
int start = ir.numDocs();
ir.close();
Modified: lucene/dev/branches/lucene3312/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java (original)
+++ lucene/dev/branches/lucene3312/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java Sat Jul 28 10:56:46 2012
@@ -22,10 +22,12 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.MultiFields;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
@@ -715,9 +717,9 @@ public final class MoreLikeThis {
// field does not store term vector info
if (vector == null) {
- Document d = ir.document(docNum);
- IndexableField fields[] = d.getFields(fieldName);
- for (IndexableField field : fields) {
+ StoredDocument d = ir.document(docNum);
+ StorableField[] fields = d.getFields(fieldName);
+ for (StorableField field : fields) {
final String stringValue = field.stringValue();
if (stringValue != null) {
addTermFrequencies(new StringReader(stringValue), termFreqMap, fieldName);
Modified: lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java (original)
+++ lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java Sat Jul 28 10:56:46 2012
@@ -23,6 +23,7 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -100,7 +101,7 @@ public class TestComplexPhraseQuery exte
TopDocs td = searcher.search(q, 10);
ScoreDoc[] sd = td.scoreDocs;
for (int i = 0; i < sd.length; i++) {
- Document doc = searcher.doc(sd[i].doc);
+ StoredDocument doc = searcher.doc(sd[i].doc);
String id = doc.get("id");
assertTrue(qString + "matched doc#" + id + " not expected", expecteds
.contains(id));
Modified: lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java (original)
+++ lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java Sat Jul 28 10:56:46 2012
@@ -24,6 +24,7 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.IntField;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
@@ -232,7 +233,7 @@ public class TestParser extends LuceneTe
System.out.println("=========" + qType + "============");
ScoreDoc[] scoreDocs = hits.scoreDocs;
for (int i = 0; i < Math.min(numDocs, hits.totalHits); i++) {
- Document ldoc = searcher.doc(scoreDocs[i].doc);
+ StoredDocument ldoc = searcher.doc(scoreDocs[i].doc);
System.out.println("[" + ldoc.get("date") + "]" + ldoc.get("contents"));
}
System.out.println();
Modified: lucene/dev/branches/lucene3312/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java (original)
+++ lucene/dev/branches/lucene3312/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java Sat Jul 28 10:56:46 2012
@@ -23,6 +23,7 @@ import java.util.HashSet;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.*;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
@@ -87,7 +88,7 @@ public class DuplicateFilterTest extends
ScoreDoc[] hits = searcher.search(tq, df, 1000).scoreDocs;
for (ScoreDoc hit : hits) {
- Document d = searcher.doc(hit.doc);
+ StoredDocument d = searcher.doc(hit.doc);
String url = d.get(KEY_FIELD);
assertFalse("No duplicate urls should be returned", results.contains(url));
results.add(url);
@@ -101,7 +102,7 @@ public class DuplicateFilterTest extends
boolean dupsFound = false;
for (ScoreDoc hit : hits) {
- Document d = searcher.doc(hit.doc);
+ StoredDocument d = searcher.doc(hit.doc);
String url = d.get(KEY_FIELD);
if (!dupsFound)
dupsFound = results.contains(url);
@@ -118,7 +119,7 @@ public class DuplicateFilterTest extends
assertTrue("Filtered searching should have found some matches", hits.length > 0);
for (ScoreDoc hit : hits) {
- Document d = searcher.doc(hit.doc);
+ StoredDocument d = searcher.doc(hit.doc);
String url = d.get(KEY_FIELD);
assertFalse("No duplicate urls should be returned", results.contains(url));
results.add(url);
@@ -132,7 +133,7 @@ public class DuplicateFilterTest extends
ScoreDoc[] hits = searcher.search(tq, df, 1000).scoreDocs;
assertTrue("Filtered searching should have found some matches", hits.length > 0);
for (ScoreDoc hit : hits) {
- Document d = searcher.doc(hit.doc);
+ StoredDocument d = searcher.doc(hit.doc);
String url = d.get(KEY_FIELD);
DocsEnum td = _TestUtil.docs(random(), reader,
KEY_FIELD,
@@ -156,7 +157,7 @@ public class DuplicateFilterTest extends
ScoreDoc[] hits = searcher.search(tq, df, 1000).scoreDocs;
assertTrue("Filtered searching should have found some matches", hits.length > 0);
for (ScoreDoc hit : hits) {
- Document d = searcher.doc(hit.doc);
+ StoredDocument d = searcher.doc(hit.doc);
String url = d.get(KEY_FIELD);
DocsEnum td = _TestUtil.docs(random(), reader,
KEY_FIELD,
Modified: lucene/dev/branches/lucene3312/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java (original)
+++ lucene/dev/branches/lucene3312/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java Sat Jul 28 10:56:46 2012
@@ -21,6 +21,7 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -88,7 +89,7 @@ public class FuzzyLikeThisQueryTest exte
TopDocs topDocs = searcher.search(flt, 1);
ScoreDoc[] sd = topDocs.scoreDocs;
assertTrue("score docs must match 1 doc", (sd != null) && (sd.length > 0));
- Document doc = searcher.doc(sd[0].doc);
+ StoredDocument doc = searcher.doc(sd[0].doc);
assertEquals("Should match most similar not most rare variant", "2", doc.get("id"));
}
@@ -104,7 +105,7 @@ public class FuzzyLikeThisQueryTest exte
TopDocs topDocs = searcher.search(flt, 1);
ScoreDoc[] sd = topDocs.scoreDocs;
assertTrue("score docs must match 1 doc", (sd != null) && (sd.length > 0));
- Document doc = searcher.doc(sd[0].doc);
+ StoredDocument doc = searcher.doc(sd[0].doc);
assertEquals("Should match most similar when using 2 words", "2", doc.get("id"));
}
@@ -119,7 +120,7 @@ public class FuzzyLikeThisQueryTest exte
TopDocs topDocs = searcher.search(flt, 1);
ScoreDoc[] sd = topDocs.scoreDocs;
assertTrue("score docs must match 1 doc", (sd != null) && (sd.length > 0));
- Document doc = searcher.doc(sd[0].doc);
+ StoredDocument doc = searcher.doc(sd[0].doc);
assertEquals("Should match most similar when using 2 words", "2", doc.get("id"));
}
Modified: lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java (original)
+++ lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java Sat Jul 28 10:56:46 2012
@@ -18,6 +18,7 @@
package org.apache.lucene.spatial;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.search.IndexSearcher;
@@ -130,11 +131,11 @@ public abstract class SpatialTestCase ex
protected static class SearchResult {
public float score;
- public Document document;
+ public StoredDocument document;
- public SearchResult(float score, Document document) {
+ public SearchResult(float score, StoredDocument storedDocument) {
this.score = score;
- this.document = document;
+ this.document = storedDocument;
}
@Override
Modified: lucene/dev/branches/lucene3312/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java (original)
+++ lucene/dev/branches/lucene3312/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java Sat Jul 28 10:56:46 2012
@@ -27,6 +27,7 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
import org.apache.lucene.collation.ICUCollationKeyAnalyzer;
+import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField;
@@ -210,7 +211,7 @@ public class ICUCollationField extends F
}
@Override
- public void write(TextResponseWriter writer, String name, IndexableField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
writer.writeStr(name, f.stringValue(), true);
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java Sat Jul 28 10:56:46 2012
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.regex.Pattern;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryparser.classic.ParseException;
@@ -342,7 +343,7 @@ public class MoreLikeThisHandler extends
public DocListAndSet getMoreLikeThis( int id, int start, int rows, List<Query> filters, List<InterestingTerm> terms, int flags ) throws IOException
{
- Document doc = reader.document(id);
+ StoredDocument doc = reader.document(id);
rawMLTQuery = mlt.like(id);
boostedMLTQuery = getBoostedQuery( rawMLTQuery );
if( terms != null ) {
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java Sat Jul 28 10:56:46 2012
@@ -28,6 +28,7 @@ import org.apache.lucene.analysis.util.T
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.*;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.search.DocIdSetIterator;
@@ -132,7 +133,7 @@ public class LukeRequestHandler extends
if( style != null && style != ShowStyle.DOC ) {
throw new SolrException(ErrorCode.BAD_REQUEST, "missing doc param for doc style");
}
- Document doc = null;
+ StoredDocument doc = null;
try {
doc = reader.document( docId );
}
@@ -169,7 +170,7 @@ public class LukeRequestHandler extends
/**
* @return a string representing a IndexableField's flags.
*/
- private static String getFieldFlags( IndexableField f )
+ private static String getFieldFlags( StorableField f )
{
IndexOptions opts = (f == null) ? null : f.fieldType().indexOptions();
@@ -238,7 +239,7 @@ public class LukeRequestHandler extends
return key;
}
- private static SimpleOrderedMap<Object> getDocumentFieldsInfo( Document doc, int docId, IndexReader reader,
+ private static SimpleOrderedMap<Object> getDocumentFieldsInfo( StoredDocument doc, int docId, IndexReader reader,
IndexSchema schema ) throws IOException
{
final CharsRef spare = new CharsRef();
@@ -342,13 +343,13 @@ public class LukeRequestHandler extends
if(sfield != null && sfield.indexed() ) {
// In the pre-4.0 days, this did a veeeery expensive range query. But we can be much faster now,
// so just do this all the time.
- Document doc = getFirstLiveDoc(reader, fieldName, terms);
+ StoredDocument doc = getFirstLiveDoc(reader, fieldName, terms);
if( doc != null ) {
// Found a document with this field
try {
- IndexableField fld = doc.getField( fieldName );
+ StorableField fld = doc.getField( fieldName );
if( fld != null ) {
fieldMap.add("index", getFieldFlags(fld));
}
@@ -376,7 +377,7 @@ public class LukeRequestHandler extends
// Just get a document with the term in it, the first one will do!
// Is there a better way to do this? Shouldn't actually be very costly
// to do it this way.
- private static Document getFirstLiveDoc(AtomicReader reader, String fieldName, Terms terms) throws IOException {
+ private static StoredDocument getFirstLiveDoc(AtomicReader reader, String fieldName, Terms terms) throws IOException {
DocsEnum docsEnum = null;
TermsEnum termsEnum = terms.iterator(null);
BytesRef text;
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java Sat Jul 28 10:56:46 2012
@@ -18,7 +18,9 @@ package org.apache.solr.handler.componen
*/
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.index.Term;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.client.solrj.SolrResponse;
@@ -169,7 +171,7 @@ public class RealTimeGetComponent extend
int docid = searcher.getFirstMatch(new Term(idField.getName(), idBytes));
if (docid < 0) continue;
- Document luceneDocument = searcher.doc(docid);
+ StoredDocument luceneDocument = searcher.doc(docid);
SolrDocument doc = toSolrDoc(luceneDocument, req.getSchema());
if( transformer != null ) {
transformer.transform(doc, docid);
@@ -236,7 +238,7 @@ public class RealTimeGetComponent extend
int docid = searcher.getFirstMatch(new Term(idField.getName(), idBytes));
if (docid < 0) return null;
- Document luceneDocument = searcher.doc(docid);
+ StoredDocument luceneDocument = searcher.doc(docid);
sid = toSolrInputDocument(luceneDocument, core.getSchema());
}
} finally {
@@ -248,9 +250,9 @@ public class RealTimeGetComponent extend
return sid;
}
- private static SolrInputDocument toSolrInputDocument(Document doc, IndexSchema schema) {
+ private static SolrInputDocument toSolrInputDocument(StoredDocument doc, IndexSchema schema) {
SolrInputDocument out = new SolrInputDocument();
- for( IndexableField f : doc.getFields() ) {
+ for( StorableField f : doc.getFields() ) {
String fname = f.name();
SchemaField sf = schema.getFieldOrNull(f.name());
Object val = null;
@@ -270,9 +272,9 @@ public class RealTimeGetComponent extend
}
- private static SolrDocument toSolrDoc(Document doc, IndexSchema schema) {
+ private static SolrDocument toSolrDoc(StoredDocument doc, IndexSchema schema) {
SolrDocument out = new SolrDocument();
- for( IndexableField f : doc.getFields() ) {
+ for( StorableField f : doc.getFields() ) {
// Make sure multivalued fields are represented as lists
Object existing = out.get(f.name());
if (existing == null) {
@@ -299,10 +301,10 @@ public class RealTimeGetComponent extend
List<IndexableField> fields = doc.getFields();
// copy the stored fields only
- Document out = new Document();
+ StoredDocument out = new StoredDocument();
for (IndexableField f : doc.getFields()) {
if (f.fieldType().stored()) {
- out.add(f);
+ out.add((StorableField) f);
}
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java Sat Jul 28 10:56:46 2012
@@ -33,7 +33,9 @@ import org.apache.lucene.analysis.TokenF
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.highlight.*;
import org.apache.lucene.search.vectorhighlight.BoundaryScanner;
@@ -391,7 +393,7 @@ public class DefaultSolrHighlighter exte
DocIterator iterator = docs.iterator();
for (int i = 0; i < docs.size(); i++) {
int docId = iterator.nextDoc();
- Document doc = searcher.doc(docId, fset);
+ StoredDocument doc = searcher.doc(docId, fset);
NamedList docSummaries = new SimpleOrderedMap();
for (String fieldName : fieldNames) {
fieldName = fieldName.trim();
@@ -423,7 +425,7 @@ public class DefaultSolrHighlighter exte
}
private void doHighlightingByHighlighter( Query query, SolrQueryRequest req, NamedList docSummaries,
- int docId, Document doc, String fieldName ) throws IOException {
+ int docId, StoredDocument doc, String fieldName ) throws IOException {
final SolrIndexSearcher searcher = req.getSearcher();
final IndexSchema schema = searcher.getSchema();
@@ -438,9 +440,9 @@ public class DefaultSolrHighlighter exte
// END: Hack
SolrParams params = req.getParams();
- IndexableField[] docFields = doc.getFields(fieldName);
+ StorableField[] docFields = doc.getFields(fieldName);
List<String> listFields = new ArrayList<String>();
- for (IndexableField field : docFields) {
+ for (StorableField field : docFields) {
listFields.add(field.stringValue());
}
@@ -545,7 +547,7 @@ public class DefaultSolrHighlighter exte
}
private void doHighlightingByFastVectorHighlighter( FastVectorHighlighter highlighter, FieldQuery fieldQuery,
- SolrQueryRequest req, NamedList docSummaries, int docId, Document doc,
+ SolrQueryRequest req, NamedList docSummaries, int docId, StoredDocument doc,
String fieldName ) throws IOException {
SolrParams params = req.getParams();
SolrFragmentsBuilder solrFb = getSolrFragmentsBuilder( fieldName, params );
@@ -563,12 +565,12 @@ public class DefaultSolrHighlighter exte
alternateField( docSummaries, params, doc, fieldName );
}
- private void alternateField( NamedList docSummaries, SolrParams params, Document doc, String fieldName ){
+ private void alternateField( NamedList docSummaries, SolrParams params, StoredDocument doc, String fieldName ){
String alternateField = params.getFieldParam(fieldName, HighlightParams.ALTERNATE_FIELD);
if (alternateField != null && alternateField.length() > 0) {
- IndexableField[] docFields = doc.getFields(alternateField);
+ StorableField[] docFields = doc.getFields(alternateField);
List<String> listFields = new ArrayList<String>();
- for (IndexableField field : docFields) {
+ for (StorableField field : docFields) {
if (field.binaryValue() == null)
listFields.add(field.stringValue());
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java Sat Jul 28 10:56:46 2012
@@ -20,7 +20,9 @@ import java.io.*;
import java.util.*;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.params.CommonParams;
@@ -90,7 +92,7 @@ public class BinaryResponseWriter implem
if( o instanceof IndexableField ) {
if(schema == null) schema = solrQueryRequest.getSchema();
- IndexableField f = (IndexableField)o;
+ StorableField f = (StorableField)o;
SchemaField sf = schema.getFieldOrNull(f.name());
try {
o = getValue(sf, f);
@@ -138,7 +140,7 @@ public class BinaryResponseWriter implem
context.iterator = ids.iterator();
for (int i = 0; i < sz; i++) {
int id = context.iterator.nextDoc();
- Document doc = searcher.doc(id, fnames);
+ StoredDocument doc = searcher.doc(id, fnames);
SolrDocument sdoc = getDoc(doc);
if( transformer != null ) {
transformer.transform(sdoc, id);
@@ -168,9 +170,9 @@ public class BinaryResponseWriter implem
writeResultsBody( ctx, codec );
}
- public SolrDocument getDoc(Document doc) {
+ public SolrDocument getDoc(StoredDocument doc) {
SolrDocument solrDoc = new SolrDocument();
- for (IndexableField f : doc) {
+ for (StorableField f : doc) {
String fieldName = f.name();
if( !returnFields.wantsField(fieldName) )
continue;
@@ -198,7 +200,7 @@ public class BinaryResponseWriter implem
return solrDoc;
}
- public Object getValue(SchemaField sf, IndexableField f) throws Exception {
+ public Object getValue(SchemaField sf, StorableField f) throws Exception {
FieldType ft = null;
if(sf != null) ft =sf.getType();
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java Sat Jul 28 10:56:46 2012
@@ -22,7 +22,9 @@ import java.io.Writer;
import java.util.*;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
@@ -123,8 +125,8 @@ public abstract class TextResponseWriter
} else if (val instanceof String) {
writeStr(name, val.toString(), true);
// micro-optimization... using toString() avoids a cast first
- } else if (val instanceof IndexableField) {
- IndexableField f = (IndexableField)val;
+ } else if (val instanceof StorableField) {
+ StorableField f = (StorableField)val;
SchemaField sf = schema.getFieldOrNull( f.name() );
if( sf != null ) {
sf.getType().write(this, name, f);
@@ -155,8 +157,8 @@ public abstract class TextResponseWriter
writeBool(name, val.toString());
} else if (val instanceof Date) {
writeDate(name,(Date)val);
- } else if (val instanceof Document) {
- SolrDocument doc = toSolrDocument( (Document)val );
+ } else if (val instanceof StoredDocument) {
+ SolrDocument doc = toSolrDocument( (StoredDocument)val );
DocTransformer transformer = returnFields.getTransformer();
if( transformer != null ) {
TransformContext context = new TransformContext();
@@ -224,10 +226,10 @@ public abstract class TextResponseWriter
writeEndDocumentList();
}
- public final SolrDocument toSolrDocument( Document doc )
+ public final SolrDocument toSolrDocument( StoredDocument doc )
{
SolrDocument out = new SolrDocument();
- for( IndexableField f : doc) {
+ for( StorableField f : doc.getFields()) {
// Make sure multivalued fields are represented as lists
Object existing = out.get(f.name());
if (existing == null) {
@@ -267,7 +269,7 @@ public abstract class TextResponseWriter
Set<String> fnames = fields.getLuceneFieldNames();
for (int i=0; i<sz; i++) {
int id = context.iterator.nextDoc();
- Document doc = context.searcher.doc(id, fnames);
+ StoredDocument doc = context.searcher.doc(id, fnames);
SolrDocument sdoc = toSolrDocument( doc );
if( transformer != null ) {
transformer.transform( sdoc, id);
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BCDIntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BCDIntField.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BCDIntField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BCDIntField.java Sat Jul 28 10:56:46 2012
@@ -20,7 +20,7 @@ package org.apache.solr.schema;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.SortField;
import org.apache.solr.search.QParser;
-import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.GeneralField;
import org.apache.solr.util.BCDUtils;
import org.apache.solr.response.TextResponseWriter;
@@ -46,13 +46,13 @@ public class BCDIntField extends Primiti
}
@Override
- public String toExternal(IndexableField f) {
+ public String toExternal(GeneralField f) {
return indexedToReadable(f.stringValue());
}
// Note, this can't return type 'Integer' because BCDStrField and BCDLong extend it
@Override
- public Object toObject(IndexableField f) {
+ public Object toObject(GeneralField f) {
return Integer.valueOf( toExternal(f) );
}
@@ -62,7 +62,7 @@ public class BCDIntField extends Primiti
}
@Override
- public void write(TextResponseWriter writer, String name, IndexableField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
writer.writeInt(name,toExternal(f));
}
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BCDLongField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BCDLongField.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BCDLongField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BCDLongField.java Sat Jul 28 10:56:46 2012
@@ -17,13 +17,13 @@
package org.apache.solr.schema;
-import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.GeneralField;
/**
*
*/
public class BCDLongField extends BCDIntField {
@Override
- public Long toObject(IndexableField f) {
+ public Long toObject(GeneralField f) {
return Long.valueOf( toExternal(f) );
}
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BCDStrField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BCDStrField.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BCDStrField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BCDStrField.java Sat Jul 28 10:56:46 2012
@@ -17,7 +17,7 @@
package org.apache.solr.schema;
-import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.GeneralField;
/**
*
*/
@@ -27,7 +27,7 @@ public class BCDStrField extends BCDIntF
* is not an integer, it will not survive the base10k conversion!
*/
@Override
- public String toObject(IndexableField f) {
+ public String toObject(GeneralField f) {
return toExternal(f);
}
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BinaryField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BinaryField.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BinaryField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BinaryField.java Sat Jul 28 10:56:46 2012
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.lucene.document.Field;
+import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BytesRef;
@@ -35,7 +36,7 @@ public class BinaryField extends FieldTy
}
@Override
- public void write(TextResponseWriter writer, String name, IndexableField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
writer.writeStr(name, toBase64String(toObject(f)), false);
}
@@ -46,12 +47,12 @@ public class BinaryField extends FieldTy
@Override
- public String toExternal(IndexableField f) {
+ public String toExternal(GeneralField f) {
return toBase64String(toObject(f));
}
@Override
- public ByteBuffer toObject(IndexableField f) {
+ public ByteBuffer toObject(GeneralField f) {
BytesRef bytes = f.binaryValue();
return ByteBuffer.wrap(bytes.bytes, bytes.offset, bytes.length);
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BoolField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BoolField.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BoolField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/BoolField.java Sat Jul 28 10:56:46 2012
@@ -18,7 +18,7 @@
package org.apache.solr.schema;
import org.apache.lucene.index.AtomicReaderContext;
-import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.GeneralField;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BytesRef;
@@ -112,12 +112,12 @@ public class BoolField extends Primitive
}
@Override
- public String toExternal(IndexableField f) {
+ public String toExternal(GeneralField f) {
return indexedToReadable(f.stringValue());
}
@Override
- public Boolean toObject(IndexableField f) {
+ public Boolean toObject(GeneralField f) {
return Boolean.valueOf( toExternal(f) );
}
@@ -146,7 +146,7 @@ public class BoolField extends Primitive
}
@Override
- public void write(TextResponseWriter writer, String name, IndexableField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
writer.writeBool(name, f.stringValue().charAt(0) == 'T');
}
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/ByteField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/ByteField.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/ByteField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/ByteField.java Sat Jul 28 10:56:46 2012
@@ -18,6 +18,7 @@ package org.apache.solr.schema;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.ByteFieldSource;
+import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.SortField;
@@ -65,7 +66,7 @@ public class ByteField extends Primitive
}
@Override
- public void write(TextResponseWriter writer, String name, IndexableField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
String s = f.stringValue();
// these values may be from a legacy lucene index, which may
@@ -90,7 +91,7 @@ public class ByteField extends Primitive
}
@Override
- public Byte toObject(IndexableField f) {
+ public Byte toObject(GeneralField f) {
return Byte.valueOf(toExternal(f));
}
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/CollationField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/CollationField.java?rev=1366638&r1=1366637&r2=1366638&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/CollationField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/CollationField.java Sat Jul 28 10:56:46 2012
@@ -31,6 +31,7 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
import org.apache.lucene.collation.CollationKeyAnalyzer;
+import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField;
@@ -185,7 +186,7 @@ public class CollationField extends Fiel
}
@Override
- public void write(TextResponseWriter writer, String name, IndexableField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
writer.writeStr(name, f.stringValue(), true);
}