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/08/13 16:06:09 UTC
svn commit: r1372427 [2/3] - 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...
Modified: lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java Mon Aug 13 14:06:05 2012
@@ -32,7 +32,6 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DocIdSetIterator;
@@ -251,7 +250,7 @@ public class TestStressIndexing2 extends
Iterator<Document> iter = docs.values().iterator();
while (iter.hasNext()) {
Document d = iter.next();
- ArrayList<IndexableField> fields = new ArrayList<IndexableField>();
+ ArrayList<Field> fields = new ArrayList<Field>();
fields.addAll(d.getFields());
// put fields in same order each time
Collections.sort(fields, fieldNameComparator);
Modified: lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java Mon Aug 13 14:06:05 2012
@@ -30,7 +30,6 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
Modified: lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java Mon Aug 13 14:06:05 2012
@@ -18,11 +18,11 @@ package org.apache.lucene.search;
*/
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
import org.junit.AfterClass;
Modified: lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java Mon Aug 13 14:06:05 2012
@@ -25,9 +25,9 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.document.DateTools;
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.StoredDocument;
import org.apache.lucene.store.Directory;
/**
Modified: lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java Mon Aug 13 14:06:05 2012
@@ -22,7 +22,6 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
@@ -30,6 +29,7 @@ import org.apache.lucene.index.Norm;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.Similarity;
Modified: lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java Mon Aug 13 14:06:05 2012
@@ -23,13 +23,13 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.FloatField;
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;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.store.Directory;
Modified: lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java Mon Aug 13 14:06:05 2012
@@ -23,13 +23,13 @@ import org.apache.lucene.document.Double
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.LongField;
-import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.store.Directory;
Modified: lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java Mon Aug 13 14:06:05 2012
@@ -74,7 +74,7 @@ public class TestPhraseQuery extends Luc
Document doc = new Document();
doc.add(newTextField("field", "one two three four five", Field.Store.YES));
doc.add(newTextField("repeated", "this is a repeated field - first part", Field.Store.YES));
- IndexableField repeatedField = newTextField("repeated", "second part of a repeated field", Field.Store.YES);
+ Field repeatedField = newTextField("repeated", "second part of a repeated field", Field.Store.YES);
doc.add(repeatedField);
doc.add(newTextField("palindrome", "one two three two one", Field.Store.YES));
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestSort.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestSort.java Mon Aug 13 14:06:05 2012
@@ -38,7 +38,6 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.FloatDocValuesField;
import org.apache.lucene.document.PackedLongDocValuesField;
import org.apache.lucene.document.SortedBytesDocValuesField;
-import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.document.StraightBytesDocValuesField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
@@ -52,6 +51,7 @@ import org.apache.lucene.index.Indexable
import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.StorableField;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.FieldValueHitQueue.Entry;
Modified: lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java Mon Aug 13 14:06:05 2012
@@ -20,7 +20,6 @@ package org.apache.lucene.search.spans;
import java.io.IOException;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -29,6 +28,7 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.*;
import org.apache.lucene.search.similarities.DefaultSimilarity;
Modified: lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java Mon Aug 13 14:06:05 2012
@@ -21,7 +21,6 @@ import java.io.File;
import java.io.IOException;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -30,6 +29,7 @@ import org.apache.lucene.index.Directory
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.util.English;
Modified: lucene/dev/branches/lucene3312/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java (original)
+++ lucene/dev/branches/lucene3312/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java Mon Aug 13 14:06:05 2012
@@ -27,9 +27,9 @@ import java.util.Date;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
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.StoredDocument;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
Modified: lucene/dev/branches/lucene3312/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java (original)
+++ lucene/dev/branches/lucene3312/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java Mon Aug 13 14:06:05 2012
@@ -36,12 +36,12 @@ import org.apache.lucene.analysis.standa
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.queryparser.xml.CorePlusExtensionsParser;
import org.apache.lucene.queryparser.xml.QueryTemplateManager;
import org.apache.lucene.search.IndexSearcher;
Modified: lucene/dev/branches/lucene3312/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (original)
+++ lucene/dev/branches/lucene3312/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java Mon Aug 13 14:06:05 2012
@@ -594,7 +594,7 @@ public class TestGrouping extends Lucene
Document doc = new Document();
docs.add(doc);
if (groupValue.group != null) {
- doc.add(newStringField("group", groupValue.group.utf8ToString(), Field.Store.NO));
+ doc.add(newStringField("group", groupValue.group.utf8ToString(), Field.Store.YES));
}
doc.add(newStringField("sort1", groupValue.sort1.utf8ToString(), Field.Store.NO));
doc.add(newStringField("sort2", groupValue.sort2.utf8ToString(), Field.Store.NO));
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -32,10 +32,10 @@ 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;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.DocIdSetIterator;
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -37,12 +37,12 @@ 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;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -27,6 +27,7 @@ import org.apache.lucene.index.FieldInfo
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexableFieldType;
import org.apache.lucene.index.StorableField;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.util.BytesRef;
/** Defers actually loading a field's value until you ask
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -19,7 +19,6 @@ 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;
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -22,12 +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.StoredDocument;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -23,10 +23,10 @@ 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;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -24,11 +24,11 @@ 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;
import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.search.DisjunctionMaxQuery;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -23,7 +23,6 @@ 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;
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -21,9 +21,9 @@ 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.StoredDocument;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
Modified: lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java (original)
+++ lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java Mon Aug 13 14:06:05 2012
@@ -19,6 +19,8 @@ package org.apache.lucene.spatial;
import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.shape.Shape;
+
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.queries.function.ValueSource;
@@ -97,7 +99,7 @@ public abstract class SpatialStrategy {
*
* @return Not null nor will it have null elements.
*/
- public abstract IndexableField[] createIndexableFields(Shape shape);
+ public abstract Field[] createIndexableFields(Shape shape);
/**
* The value source yields a number that is proportional to the distance between the query shape and indexed data.
Modified: lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java (original)
+++ lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java Mon Aug 13 14:06:05 2012
@@ -92,11 +92,11 @@ public class BBoxStrategy extends Spatia
//---------------------------------
@Override
- public IndexableField[] createIndexableFields(Shape shape) {
+ public Field[] createIndexableFields(Shape shape) {
Rectangle bbox = shape.getBoundingBox();
FieldType doubleFieldType = new FieldType(DoubleField.TYPE_NOT_STORED);
doubleFieldType.setNumericPrecisionStep(precisionStep);
- IndexableField[] fields = new IndexableField[5];
+ Field[] fields = new Field[5];
fields[0] = new DoubleField(field_minX, bbox.getMinX(), doubleFieldType);
fields[1] = new DoubleField(field_maxX, bbox.getMaxX(), doubleFieldType);
fields[2] = new DoubleField(field_minY, bbox.getMinY(), doubleFieldType);
Modified: lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java (original)
+++ lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java Mon Aug 13 14:06:05 2012
@@ -63,7 +63,7 @@ public abstract class PrefixTreeStrategy
}
@Override
- public IndexableField[] createIndexableFields(Shape shape) {
+ public Field[] createIndexableFields(Shape shape) {
int detailLevel = grid.getMaxLevelForPrecision(shape,distErrPct);
List<Node> cells = grid.getNodes(shape, detailLevel, true);//true=intermediates cells
//If shape isn't a point, add a full-resolution center-point so that
@@ -79,7 +79,7 @@ public abstract class PrefixTreeStrategy
// http://code.google.com/p/lucene-spatial-playground/issues/detail?id=4
Field field = new Field(getFieldName(), new CellTokenStream(cells.iterator()), FIELD_TYPE);
- return new IndexableField[]{field};
+ return new Field[]{field};
}
/* Indexed, tokenized, not stored. */
Modified: lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java (original)
+++ lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java Mon Aug 13 14:06:05 2012
@@ -24,6 +24,7 @@ import com.spatial4j.core.shape.Point;
import com.spatial4j.core.shape.Rectangle;
import com.spatial4j.core.shape.Shape;
import org.apache.lucene.document.DoubleField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.queries.function.FunctionQuery;
@@ -77,12 +78,12 @@ public class TwoDoublesStrategy extends
}
@Override
- public IndexableField[] createIndexableFields(Shape shape) {
+ public Field[] createIndexableFields(Shape shape) {
if( shape instanceof Point ) {
Point point = (Point)shape;
FieldType doubleFieldType = new FieldType(DoubleField.TYPE_NOT_STORED);
doubleFieldType.setNumericPrecisionStep(precisionStep);
- IndexableField[] f = new IndexableField[2];
+ Field[] f = new Field[2];
f[0] = new DoubleField(fieldNameX, point.getX(), doubleFieldType);
f[1] = new DoubleField(fieldNameY, point.getY(), doubleFieldType);
return f;
@@ -90,7 +91,7 @@ public class TwoDoublesStrategy extends
if( !ignoreIncompatibleGeometry ) {
throw new IllegalArgumentException( "TwoDoublesStrategy can not index: "+shape );
}
- return new IndexableField[0]; // nothing (solr does not support null)
+ return new Field[0]; // nothing (solr does not support null)
}
@Override
Modified: lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java (original)
+++ lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java Mon Aug 13 14:06:05 2012
@@ -194,7 +194,7 @@ public class PortedSolr3Test extends Str
private Document newDoc(String id, Shape shape) {
Document doc = new Document();
doc.add(new StringField("id", id, Field.Store.YES));
- for (IndexableField f : strategy.createIndexableFields(shape)) {
+ for (Field f : strategy.createIndexableFields(shape)) {
doc.add(f);
}
if (storeShape)
Modified: lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java (original)
+++ lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java Mon Aug 13 14:06:05 2012
@@ -124,7 +124,7 @@ public class SpatialExample extends Luce
//Potentially more than one shape in this field is supported by some
// strategies; see the javadocs of the SpatialStrategy impl to see.
for (Shape shape : shapes) {
- for (IndexableField f : strategy.createIndexableFields(shape)) {
+ for (Field f : strategy.createIndexableFields(shape)) {
doc.add(f);
}
//store it too; the format is up to you
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -18,9 +18,9 @@
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.index.StoredDocument;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
Modified: lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java (original)
+++ lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java Mon Aug 13 14:06:05 2012
@@ -85,7 +85,7 @@ public abstract class StrategyTestCase e
document.add(new StringField("id", data.id, Field.Store.YES));
document.add(new StringField("name", data.name, Field.Store.YES));
Shape shape = ctx.readShape(data.shape);
- for (IndexableField f : strategy.createIndexableFields(shape)) {
+ for (Field f : strategy.createIndexableFields(shape)) {
document.add(f);
}
if (storeShape)
Modified: lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java (original)
+++ lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java Mon Aug 13 14:06:05 2012
@@ -154,7 +154,7 @@ public class TestRecursivePrefixTreeStra
private Document newDoc(String id, Shape shape) {
Document doc = new Document();
doc.add(new StringField("id", id, Field.Store.YES));
- for (IndexableField f : strategy.createIndexableFields(shape)) {
+ for (Field f : strategy.createIndexableFields(shape)) {
doc.add(f);
}
if (storeShape)
Modified: lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java (original)
+++ lucene/dev/branches/lucene3312/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java Mon Aug 13 14:06:05 2012
@@ -46,7 +46,7 @@ public class TestTermQueryPrefixGridStra
Document losAngeles = new Document();
losAngeles.add(new StringField("name", "Los Angeles", Field.Store.YES));
- for (IndexableField field : prefixGridStrategy.createIndexableFields(point)) {
+ for (Field field : prefixGridStrategy.createIndexableFields(point)) {
losAngeles.add(field);
}
losAngeles.add(new StoredField(prefixGridStrategy.getFieldName(), ctx.toString(point)));
Modified: lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java (original)
+++ lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java Mon Aug 13 14:06:05 2012
@@ -27,7 +27,6 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DirectoryReader;
@@ -36,6 +35,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.StorableField;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
Modified: lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java (original)
+++ lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java Mon Aug 13 14:06:05 2012
@@ -29,7 +29,6 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.StoredDocument;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
Modified: lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Mon Aug 13 14:06:05 2012
@@ -29,7 +29,6 @@ import java.util.concurrent.atomic.Atomi
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.search.IndexSearcher;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.search.Query;
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -29,6 +29,7 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.collation.ICUCollationKeyAnalyzer;
import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TermRangeQuery;
@@ -211,7 +212,7 @@ public class ICUCollationField extends F
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, StorableField 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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -30,8 +30,8 @@ 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.StoredDocument;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.*;
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -28,7 +28,6 @@ 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;
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -18,9 +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.StoredDocument;
import org.apache.lucene.index.Term;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.client.solrj.SolrResponse;
@@ -298,7 +298,6 @@ public class RealTimeGetComponent extend
private static SolrDocument toSolrDoc(SolrInputDocument sdoc, IndexSchema schema) {
// TODO: do something more performant than this double conversion
Document doc = DocumentBuilder.toDocument(sdoc, schema);
- List<IndexableField> fields = doc.getFields();
// copy the stored fields only
StoredDocument out = new StoredDocument();
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -33,9 +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.index.StoredDocument;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.highlight.*;
import org.apache.lucene.search.vectorhighlight.BoundaryScanner;
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -20,9 +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.index.StoredDocument;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.params.CommonParams;
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -22,9 +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.index.StoredDocument;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -21,6 +21,7 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.search.SortField;
import org.apache.solr.search.QParser;
import org.apache.lucene.index.GeneralField;
+import org.apache.lucene.index.StorableField;
import org.apache.solr.util.BCDUtils;
import org.apache.solr.response.TextResponseWriter;
@@ -46,13 +47,13 @@ public class BCDIntField extends Primiti
}
@Override
- public String toExternal(GeneralField f) {
+ public String toExternal(StorableField f) {
return indexedToReadable(f.stringValue());
}
// Note, this can't return type 'Integer' because BCDStrField and BCDLong extend it
@Override
- public Object toObject(GeneralField f) {
+ public Object toObject(StorableField f) {
return Integer.valueOf( toExternal(f) );
}
@@ -62,7 +63,7 @@ public class BCDIntField extends Primiti
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, StorableField 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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -17,13 +17,13 @@
package org.apache.solr.schema;
-import org.apache.lucene.index.GeneralField;
+import org.apache.lucene.index.StorableField;
/**
*
*/
public class BCDLongField extends BCDIntField {
@Override
- public Long toObject(GeneralField f) {
+ public Long toObject(StorableField 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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -17,7 +17,7 @@
package org.apache.solr.schema;
-import org.apache.lucene.index.GeneralField;
+import org.apache.lucene.index.StorableField;
/**
*
*/
@@ -27,7 +27,7 @@ public class BCDStrField extends BCDIntF
* is not an integer, it will not survive the base10k conversion!
*/
@Override
- public String toObject(GeneralField f) {
+ public String toObject(StorableField 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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -23,6 +23,7 @@ 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.index.StorableField;
import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.util.Base64;
@@ -36,7 +37,7 @@ public class BinaryField extends FieldTy
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, StorableField f) throws IOException {
writer.writeStr(name, toBase64String(toObject(f)), false);
}
@@ -47,18 +48,18 @@ public class BinaryField extends FieldTy
@Override
- public String toExternal(GeneralField f) {
+ public String toExternal(StorableField f) {
return toBase64String(toObject(f));
}
@Override
- public ByteBuffer toObject(GeneralField f) {
+ public ByteBuffer toObject(StorableField f) {
BytesRef bytes = f.binaryValue();
return ByteBuffer.wrap(bytes.bytes, bytes.offset, bytes.length);
}
@Override
- public IndexableField createField(SchemaField field, Object val, float boost) {
+ public StorableField createField(SchemaField field, Object val, float boost) {
if (val == null) return null;
if (!field.stored()) {
log.trace("Ignoring unstored binary field: " + field);
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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -19,6 +19,7 @@ package org.apache.solr.schema;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.GeneralField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BytesRef;
@@ -112,12 +113,12 @@ public class BoolField extends Primitive
}
@Override
- public String toExternal(GeneralField f) {
+ public String toExternal(StorableField f) {
return indexedToReadable(f.stringValue());
}
@Override
- public Boolean toObject(GeneralField f) {
+ public Boolean toObject(StorableField f) {
return Boolean.valueOf( toExternal(f) );
}
@@ -146,7 +147,7 @@ public class BoolField extends Primitive
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, StorableField 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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -20,6 +20,7 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.valuesource.ByteFieldSource;
import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.search.SortField;
import org.apache.solr.response.TextResponseWriter;
@@ -66,7 +67,7 @@ public class ByteField extends Primitive
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, StorableField f) throws IOException {
String s = f.stringValue();
// these values may be from a legacy lucene index, which may
@@ -91,7 +92,7 @@ public class ByteField extends Primitive
}
@Override
- public Byte toObject(GeneralField f) {
+ public Byte toObject(StorableField 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=1372427&r1=1372426&r2=1372427&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 Mon Aug 13 14:06:05 2012
@@ -33,6 +33,7 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.collation.CollationKeyAnalyzer;
import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TermRangeQuery;
@@ -186,7 +187,7 @@ public class CollationField extends Fiel
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, StorableField f) throws IOException {
writer.writeStr(name, f.stringValue(), true);
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/CurrencyField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/CurrencyField.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/CurrencyField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/CurrencyField.java Mon Aug 13 14:06:05 2012
@@ -19,6 +19,7 @@ package org.apache.solr.schema;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.Query;
@@ -132,10 +133,10 @@ public class CurrencyField extends Field
}
@Override
- public IndexableField[] createFields(SchemaField field, Object externalVal, float boost) {
+ public StorableField[] createFields(SchemaField field, Object externalVal, float boost) {
CurrencyValue value = CurrencyValue.parse(externalVal.toString(), defaultCurrency);
- IndexableField[] f = new IndexableField[field.stored() ? 3 : 2];
+ StorableField[] f = new StorableField[field.stored() ? 3 : 2];
SchemaField amountField = getAmountField(field);
f[0] = amountField.createField(String.valueOf(value.getAmount()), amountField.indexed() && !amountField.omitNorms() ? boost : 1F);
SchemaField currencyField = getCurrencyField(field);
@@ -238,12 +239,8 @@ public class CurrencyField extends Field
}
}
- public void write(XMLWriter xmlWriter, String name, IndexableField field) throws IOException {
- xmlWriter.writeStr(name, field.stringValue(), false);
- }
-
@Override
- public void write(TextResponseWriter writer, String name, GeneralField field) throws IOException {
+ public void write(TextResponseWriter writer, String name, StorableField field) throws IOException {
writer.writeStr(name, field.stringValue(), false);
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/DateField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/DateField.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/DateField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/DateField.java Mon Aug 13 14:06:05 2012
@@ -20,6 +20,7 @@ package org.apache.solr.schema;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.queries.function.docvalues.DocTermsIndexDocValues;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField;
@@ -189,7 +190,7 @@ public class DateField extends Primitive
}
}
- public IndexableField createField(SchemaField field, Object value, float boost) {
+ public StorableField createField(SchemaField field, Object value, float boost) {
// Convert to a string before indexing
if(value instanceof Date) {
value = toInternal( (Date)value ) + Z;
@@ -214,7 +215,7 @@ public class DateField extends Primitive
}
@Override
- public String toExternal(GeneralField f) {
+ public String toExternal(StorableField f) {
return indexedToReadable(f.stringValue());
}
@@ -223,7 +224,7 @@ public class DateField extends Primitive
}
@Override
- public Date toObject(GeneralField f) {
+ public Date toObject(StorableField f) {
try {
return parseDate( toExternal(f) );
}
@@ -238,7 +239,7 @@ public class DateField extends Primitive
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, StorableField f) throws IOException {
writer.writeDate(name, toExternal(f));
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/DoubleField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/DoubleField.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/DoubleField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/DoubleField.java Mon Aug 13 14:06:05 2012
@@ -21,6 +21,7 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.valuesource.DoubleFieldSource;
import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.search.SortField;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser;
@@ -63,7 +64,7 @@ public class DoubleField extends Primiti
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, StorableField f) throws IOException {
String s = f.stringValue();
// these values may be from a legacy lucene index, which may
@@ -89,7 +90,7 @@ public class DoubleField extends Primiti
@Override
- public Double toObject(GeneralField f) {
+ public Double toObject(StorableField f) {
return Double.valueOf(toExternal(f));
}
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java Mon Aug 13 14:06:05 2012
@@ -20,6 +20,7 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.search.SortField;
import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.solr.search.function.FileFloatSource;
import org.apache.solr.search.QParser;
import org.apache.solr.response.TextResponseWriter;
@@ -82,7 +83,7 @@ public class ExternalFileField extends F
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, StorableField f) throws IOException {
throw new UnsupportedOperationException();
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/FieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/FieldType.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/FieldType.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/FieldType.java Mon Aug 13 14:06:05 2012
@@ -237,7 +237,7 @@ public abstract class FieldType extends
*
*
*/
- public IndexableField createField(SchemaField field, Object value, float boost) {
+ public StorableField createField(SchemaField field, Object value, float boost) {
if (!field.indexed() && !field.stored()) {
if (log.isTraceEnabled())
log.trace("Ignoring unindexed/unstored field: " + field);
@@ -274,7 +274,7 @@ public abstract class FieldType extends
* @param boost The boost value
* @return the {@link org.apache.lucene.index.IndexableField}.
*/
- protected IndexableField createField(String name, String val, org.apache.lucene.document.FieldType type, float boost){
+ protected StorableField createField(String name, String val, org.apache.lucene.document.FieldType type, float boost){
Field f = new Field(name, val, type);
f.setBoost(boost);
return f;
@@ -290,9 +290,9 @@ public abstract class FieldType extends
* @see #createField(SchemaField, Object, float)
* @see #isPolyField()
*/
- public IndexableField[] createFields(SchemaField field, Object value, float boost) {
- IndexableField f = createField( field, value, boost);
- return f==null ? new IndexableField[]{} : new IndexableField[]{f};
+ public StorableField[] createFields(SchemaField field, Object value, float boost) {
+ StorableField f = createField( field, value, boost);
+ return f==null ? new StorableField[]{} : new StorableField[]{f};
}
protected IndexOptions getIndexOptions(SchemaField field,
String internalVal) {
@@ -321,7 +321,7 @@ public abstract class FieldType extends
* value
* @see #toInternal
*/
- public String toExternal(GeneralField f) {
+ public String toExternal(StorableField f) {
// currently used in writing XML of the search result (but perhaps
// a more efficient toXML(IndexableField f, Writer w) should be used
// in the future.
@@ -333,14 +333,14 @@ public abstract class FieldType extends
* @see #toInternal
* @since solr 1.3
*/
- public Object toObject(GeneralField f) {
+ public Object toObject(StorableField f) {
return toExternal(f); // by default use the string
}
public Object toObject(SchemaField sf, BytesRef term) {
final CharsRef ref = new CharsRef(term.length);
indexedToReadable(term, ref);
- final IndexableField f = createField(sf, ref.toString(), 1.0f);
+ final StorableField f = createField(sf, ref.toString(), 1.0f);
return toObject(f);
}
@@ -356,12 +356,12 @@ public abstract class FieldType extends
}
/** Given the stored field, return the human readable representation */
- public String storedToReadable(IndexableField f) {
+ public String storedToReadable(StorableField f) {
return toExternal(f);
}
/** Given the stored field, return the indexed form */
- public String storedToIndexed(GeneralField f) {
+ public String storedToIndexed(StorableField f) {
// right now, the transformation of single valued fields like SortableInt
// is done when the Field is created, not at analysis time... this means
// that the indexed form is the same as the stored field form.
@@ -530,7 +530,7 @@ public abstract class FieldType extends
/**
* calls back to TextResponseWriter to write the field value
*/
- public abstract void write(TextResponseWriter writer, String name, GeneralField f) throws IOException;
+ public abstract void write(TextResponseWriter writer, String name, StorableField f) throws IOException;
/**
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/FloatField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/FloatField.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/FloatField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/FloatField.java Mon Aug 13 14:06:05 2012
@@ -23,6 +23,7 @@ import org.apache.lucene.search.SortFiel
import org.apache.solr.search.QParser;
import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
@@ -61,7 +62,7 @@ public class FloatField extends Primitiv
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, StorableField f) throws IOException {
String s = f.stringValue();
// these values may be from a legacy lucene index, which may
@@ -86,7 +87,7 @@ public class FloatField extends Primitiv
}
@Override
- public Float toObject(GeneralField f) {
+ public Float toObject(StorableField f) {
return Float.valueOf( toExternal(f) );
}
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/GeoHashField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/GeoHashField.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/GeoHashField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/GeoHashField.java Mon Aug 13 14:06:05 2012
@@ -21,6 +21,7 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.valuesource.LiteralValueSource;
import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField;
import com.spatial4j.core.context.ParseUtils;
@@ -74,14 +75,14 @@ public class GeoHashField extends FieldT
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f)
+ public void write(TextResponseWriter writer, String name, StorableField f)
throws IOException {
writer.writeStr(name, toExternal(f), false);
}
@Override
- public String toExternal(GeneralField f) {
+ public String toExternal(StorableField f) {
Point p = GeohashUtils.decode(f.stringValue(),ctx);
return p.getY() + "," + p.getX();
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/IndexSchema.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/IndexSchema.java Mon Aug 13 14:06:05 2012
@@ -21,10 +21,10 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.AnalyzerWrapper;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.StorableField;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.util.Version;
import org.apache.lucene.analysis.util.ResourceLoader;
-import org.apache.lucene.document.StoredDocument;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.util.DOMUtil;
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/IntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/IntField.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/IntField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/IntField.java Mon Aug 13 14:06:05 2012
@@ -23,6 +23,7 @@ import org.apache.lucene.search.SortFiel
import org.apache.solr.search.QParser;
import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
@@ -61,7 +62,7 @@ public class IntField extends PrimitiveF
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, StorableField f) throws IOException {
String s = f.stringValue();
// these values may be from a legacy lucene index, which may
@@ -86,7 +87,7 @@ public class IntField extends PrimitiveF
}
@Override
- public Integer toObject(GeneralField f) {
+ public Integer toObject(StorableField f) {
return Integer.valueOf( toExternal(f) );
}
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/LatLonType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/LatLonType.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/LatLonType.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/LatLonType.java Mon Aug 13 14:06:05 2012
@@ -21,6 +21,7 @@ import org.apache.lucene.index.GeneralFi
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.VectorValueSource;
@@ -61,10 +62,10 @@ public class LatLonType extends Abstract
}
@Override
- public IndexableField[] createFields(SchemaField field, Object value, float boost) {
+ public StorableField[] createFields(SchemaField field, Object value, float boost) {
String externalVal = value.toString();
//we could have tileDiff + 3 fields (two for the lat/lon, one for storage)
- IndexableField[] f = new IndexableField[(field.indexed() ? 2 : 0) + (field.stored() ? 1 : 0)];
+ StorableField[] f = new StorableField[(field.indexed() ? 2 : 0) + (field.stored() ? 1 : 0)];
if (field.indexed()) {
int i = 0;
double[] latLon;
@@ -245,7 +246,7 @@ public class LatLonType extends Abstract
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, StorableField f) throws IOException {
writer.writeStr(name, f.stringValue(), false);
}
@@ -259,7 +260,7 @@ public class LatLonType extends Abstract
//It never makes sense to create a single field, so make it impossible to happen
@Override
- public IndexableField createField(SchemaField field, Object value, float boost) {
+ public StorableField createField(SchemaField field, Object value, float boost) {
throw new UnsupportedOperationException("LatLonType uses multiple fields. field=" + field.getName());
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/LongField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/LongField.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/LongField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/LongField.java Mon Aug 13 14:06:05 2012
@@ -21,6 +21,7 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.valuesource.LongFieldSource;
import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.search.SortField;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser;
@@ -63,7 +64,7 @@ public class LongField extends Primitive
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, StorableField f) throws IOException {
String s = f.stringValue();
// these values may be from a legacy lucene index, which may
@@ -88,7 +89,7 @@ public class LongField extends Primitive
}
@Override
- public Long toObject(GeneralField f) {
+ public Long toObject(StorableField f) {
return Long.valueOf( toExternal(f) );
}
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/PointType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/PointType.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/PointType.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/PointType.java Mon Aug 13 14:06:05 2012
@@ -22,6 +22,7 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.valuesource.VectorValueSource;
import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
@@ -70,7 +71,7 @@ public class PointType extends Coordinat
}
@Override
- public IndexableField[] createFields(SchemaField field, Object value, float boost) {
+ public StorableField[] createFields(SchemaField field, Object value, float boost) {
String externalVal = value.toString();
String[] point = new String[0];
try {
@@ -80,7 +81,7 @@ public class PointType extends Coordinat
}
// TODO: this doesn't currently support polyFields as sub-field types
- IndexableField[] f = new IndexableField[ (field.indexed() ? dimension : 0) + (field.stored() ? 1 : 0) ];
+ StorableField[] f = new StorableField[ (field.indexed() ? dimension : 0) + (field.stored() ? 1 : 0) ];
if (field.indexed()) {
for (int i=0; i<dimension; i++) {
@@ -116,12 +117,12 @@ public class PointType extends Coordinat
*
*/
@Override
- public IndexableField createField(SchemaField field, Object value, float boost) {
+ public StorableField createField(SchemaField field, Object value, float boost) {
throw new UnsupportedOperationException("PointType uses multiple fields. field=" + field.getName());
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException {
+ public void write(TextResponseWriter writer, String name, StorableField f) throws IOException {
writer.writeStr(name, f.stringValue(), false);
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java Mon Aug 13 14:06:05 2012
@@ -30,6 +30,7 @@ import org.apache.lucene.analysis.Tokeni
import org.apache.lucene.document.Field;
import org.apache.lucene.index.GeneralField;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.search.SortField;
import org.apache.lucene.util.AttributeSource;
import org.apache.lucene.util.AttributeSource.State;
@@ -100,9 +101,9 @@ public class PreAnalyzedField extends Fi
}
@Override
- public IndexableField createField(SchemaField field, Object value,
+ public StorableField createField(SchemaField field, Object value,
float boost) {
- IndexableField f = null;
+ StorableField f = null;
try {
f = fromString(field, String.valueOf(value), boost);
} catch (Exception e) {
@@ -118,7 +119,7 @@ public class PreAnalyzedField extends Fi
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f)
+ public void write(TextResponseWriter writer, String name, StorableField f)
throws IOException {
writer.writeStr(name, f.stringValue(), true);
}
@@ -165,7 +166,7 @@ public class PreAnalyzedField extends Fi
}
- public IndexableField fromString(SchemaField field, String val, float boost) throws Exception {
+ public StorableField fromString(SchemaField field, String val, float boost) throws Exception {
if (val == null || val.trim().length() == 0) {
return null;
}
Modified: lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/RandomSortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/RandomSortField.java?rev=1372427&r1=1372426&r2=1372427&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/RandomSortField.java (original)
+++ lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/RandomSortField.java Mon Aug 13 14:06:05 2012
@@ -25,6 +25,7 @@ import org.apache.lucene.index.Indexable
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.ReaderUtil;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
@@ -98,7 +99,7 @@ public class RandomSortField extends Fie
}
@Override
- public void write(TextResponseWriter writer, String name, GeneralField f) throws IOException { }
+ public void write(TextResponseWriter writer, String name, StorableField f) throws IOException { }
private static FieldComparatorSource randomComparatorSource = new FieldComparatorSource() {