You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2011/08/04 18:55:57 UTC
svn commit: r1153925 [7/8] - in /lucene/dev/branches/fieldtype:
lucene/contrib/demo/src/java/org/apache/lucene/demo/
lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/
lucene/contrib/highlighter/src/java/org/apache/lucene/search/ve...
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java Thu Aug 4 16:54:58 2011
@@ -12,8 +12,8 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.StringField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StringField;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSearchWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSearchWithThreads.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSearchWithThreads.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSearchWithThreads.java Thu Aug 4 16:54:58 2011
@@ -20,9 +20,9 @@ package org.apache.lucene.search;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSetNorm.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSetNorm.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSetNorm.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSetNorm.java Thu Aug 4 16:54:58 2011
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.*;
+import org.apache.lucene.document.*;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexWriter;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSimilarity.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSimilarity.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSimilarity.java Thu Aug 4 16:54:58 2011
@@ -28,8 +28,8 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.search.Explanation.IDFExplanation;
/** Similarity unit test.
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSimilarityProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSimilarityProvider.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSimilarityProvider.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSimilarityProvider.java Thu Aug 4 16:54:58 2011
@@ -18,9 +18,9 @@ package org.apache.lucene.search;
*/
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java Thu Aug 4 16:54:58 2011
@@ -20,10 +20,10 @@ package org.apache.lucene.search;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSort.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSort.java Thu Aug 4 16:54:58 2011
@@ -25,11 +25,11 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.StringField;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
@@ -352,7 +352,7 @@ public class TestSort extends LuceneTest
int lastDocId = 0;
boolean fail = false;
for (int x = 0; x < n; ++x) {
- Document doc2 = searcher.doc2(result[x].doc);
+ Document doc2 = searcher.doc(result[x].doc);
IndexableField[] v = doc2.getFields("tracer");
IndexableField[] v2 = doc2.getFields("tracer2");
for (int j = 0; j < v.length; ++j) {
@@ -958,7 +958,7 @@ public class TestSort extends LuceneTest
StringBuilder buff = new StringBuilder(10);
int n = result.length;
for (int i=0; i<n; ++i) {
- Document doc = searcher.doc2(result[i].doc);
+ Document doc = searcher.doc(result[i].doc);
IndexableField[] v = doc.getFields("tracer");
for (int j=0; j<v.length; ++j) {
buff.append (v[j].stringValue());
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java Thu Aug 4 16:54:58 2011
@@ -19,8 +19,8 @@ package org.apache.lucene.search;
import java.util.List;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java Thu Aug 4 16:54:58 2011
@@ -21,7 +21,7 @@ import java.io.*;
import java.util.*;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.*;
+import org.apache.lucene.document.*;
import org.apache.lucene.index.*;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.search.BooleanClause.Occur;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java Thu Aug 4 16:54:58 2011
@@ -25,10 +25,10 @@ import java.util.Set;
import org.apache.lucene.analysis.*;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.StringField;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.Terms;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermScorer.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermScorer.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermScorer.java Thu Aug 4 16:54:58 2011
@@ -22,9 +22,9 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermVectors.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermVectors.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTermVectors.java Thu Aug 4 16:54:58 2011
@@ -21,10 +21,10 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.*;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java Thu Aug 4 16:54:58 2011
@@ -21,8 +21,8 @@ import java.io.IOException;
import java.util.BitSet;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java Thu Aug 4 16:54:58 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java Thu Aug 4 16:54:58 2011
@@ -17,7 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.search.BooleanClause.Occur;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestWildcard.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestWildcard.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestWildcard.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestWildcard.java Thu Aug 4 16:54:58 2011
@@ -20,8 +20,8 @@ package org.apache.lucene.search;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java Thu Aug 4 16:54:58 2011
@@ -23,9 +23,9 @@ import java.text.NumberFormat;
import java.util.Locale;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.StringField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/cache/TestEntryCreators.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/cache/TestEntryCreators.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/cache/TestEntryCreators.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/cache/TestEntryCreators.java Thu Aug 4 16:54:58 2011
@@ -23,9 +23,9 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.search.FieldCache.*;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java Thu Aug 4 16:54:58 2011
@@ -19,10 +19,10 @@ package org.apache.lucene.search.functio
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.store.Directory;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestCustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestCustomScoreQuery.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestCustomScoreQuery.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestCustomScoreQuery.java Thu Aug 4 16:54:58 2011
@@ -305,7 +305,7 @@ public class TestCustomScoreQuery extend
log("doc = "+doc);
- float fieldScore = expectedFieldScore(s.getIndexReader().document2(doc).get(ID_FIELD));
+ float fieldScore = expectedFieldScore(s.getIndexReader().document(doc).get(ID_FIELD));
log("fieldScore = " + fieldScore);
assertTrue("fieldScore should not be 0", fieldScore > 0);
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestFieldScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestFieldScoreQuery.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestFieldScoreQuery.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestFieldScoreQuery.java Thu Aug 4 16:54:58 2011
@@ -86,7 +86,7 @@ public class TestFieldScoreQuery extends
assertEquals("All docs should be matched!",N_DOCS,h.length);
String prevID = "ID"+(N_DOCS+1); // greater than all ids of docs in this test
for (int i=0; i<h.length; i++) {
- String resID = s.doc2(h[i].doc).get(ID_FIELD);
+ String resID = s.doc(h[i].doc).get(ID_FIELD);
log(i+". score="+h[i].score+" - "+resID);
log(s.explain(q,h[i].doc));
assertTrue("res id "+resID+" should be < prev res id "+prevID, resID.compareTo(prevID)<0);
@@ -134,7 +134,7 @@ public class TestFieldScoreQuery extends
for (ScoreDoc aSd : sd) {
float score = aSd.score;
log(s.explain(q, aSd.doc));
- String id = s.getIndexReader().document2(aSd.doc).get(ID_FIELD);
+ String id = s.getIndexReader().document(aSd.doc).get(ID_FIELD);
float expectedScore = expectedFieldScore(id); // "ID7" --> 7.0
assertEquals("score of " + id + " shuould be " + expectedScore + " != " + score, expectedScore, score, TEST_SCORE_TOLERANCE_DELTA);
}
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestOrdValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestOrdValues.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestOrdValues.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestOrdValues.java Thu Aug 4 16:54:58 2011
@@ -78,7 +78,7 @@ public class TestOrdValues extends Funct
: "IC"; // smaller than all ids of docs in this test ("ID0001", etc.)
for (int i = 0; i < h.length; i++) {
- String resID = s.doc2(h[i].doc).get(ID_FIELD);
+ String resID = s.doc(h[i].doc).get(ID_FIELD);
log(i + ". score=" + h[i].score + " - " + resID);
log(s.explain(q, h[i].doc));
if (inOrder) {
@@ -123,7 +123,7 @@ public class TestOrdValues extends Funct
ScoreDoc sd[] = td.scoreDocs;
for (int i = 0; i < sd.length; i++) {
float score = sd[i].score;
- String id = s.getIndexReader().document2(sd[i].doc).get(ID_FIELD);
+ String id = s.getIndexReader().document(sd[i].doc).get(ID_FIELD);
log("-------- " + i + ". Explain doc " + id);
log(s.explain(q, sd[i].doc));
float expectedScore = N_DOCS - i;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestValueSource.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestValueSource.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/function/TestValueSource.java Thu Aug 4 16:54:58 2011
@@ -23,7 +23,7 @@ import org.apache.lucene.search.*;
import org.apache.lucene.analysis.*;
import org.apache.lucene.index.*;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.document2.*;
+import org.apache.lucene.document.*;
public class TestValueSource extends LuceneTestCase {
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java Thu Aug 4 16:54:58 2011
@@ -22,9 +22,9 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Payload;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.util.English;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.index.IndexReader;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java Thu Aug 4 16:54:58 2011
@@ -24,9 +24,9 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Payload;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java Thu Aug 4 16:54:58 2011
@@ -43,10 +43,10 @@ import org.apache.lucene.index.Payload;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.TextField;
-import org.apache.lucene.document2.Field;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import java.io.Reader;
import java.io.IOException;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java Thu Aug 4 16:54:58 2011
@@ -31,9 +31,9 @@ import org.apache.lucene.analysis.TokenF
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Payload;
import org.apache.lucene.index.RandomIndexWriter;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java Thu Aug 4 16:54:58 2011
@@ -21,9 +21,9 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java Thu Aug 4 16:54:58 2011
@@ -18,8 +18,8 @@ package org.apache.lucene.search.spans;
*/
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java Thu Aug 4 16:54:58 2011
@@ -30,9 +30,9 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.IndexReader;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java Thu Aug 4 16:54:58 2011
@@ -20,8 +20,8 @@ package org.apache.lucene.search.spans;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java Thu Aug 4 16:54:58 2011
@@ -17,9 +17,9 @@ package org.apache.lucene.search.spans;
* limitations under the License.
*/
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.TextField;
-import org.apache.lucene.document2.Field;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java Thu Aug 4 16:54:58 2011
@@ -37,10 +37,10 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.StringField;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.ReaderUtil;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java Thu Aug 4 16:54:58 2011
@@ -24,10 +24,10 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenFilter;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.StringField;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -165,7 +165,7 @@ public class TestSpansAdvanced extends L
int id = topdocs.scoreDocs[i].doc;
float score = topdocs.scoreDocs[i].score;
- Document doc = s.doc2(id);
+ Document doc = s.doc(id);
assertEquals(expectedIds[i], doc.get(FIELD_ID));
boolean scoreEq = Math.abs(expectedScores[i] - score) < tolerance;
if (!scoreEq) {
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java Thu Aug 4 16:54:58 2011
@@ -27,8 +27,8 @@ import java.util.List;
import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestLockFactory.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestLockFactory.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestLockFactory.java Thu Aug 4 16:54:58 2011
@@ -24,8 +24,8 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestMultiMMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestMultiMMap.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestMultiMMap.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestMultiMMap.java Thu Aug 4 16:54:58 2011
@@ -21,9 +21,9 @@ import java.io.File;
import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.StringField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.util.LuceneTestCase;
@@ -80,7 +80,7 @@ public class TestMultiMMap extends Lucen
int numAsserts = atLeast(100);
for (int i = 0; i < numAsserts; i++) {
int docID = random.nextInt(numDocs);
- assertEquals("" + docID, reader.document2(docID).get("docid"));
+ assertEquals("" + docID, reader.document(docID).get("docid"));
}
reader.close();
dir.close();
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java Thu Aug 4 16:54:58 2011
@@ -26,9 +26,9 @@ import java.io.ByteArrayOutputStream;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.StringField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -88,7 +88,7 @@ public class TestRAMDirectory extends Lu
// search for all documents
for (int i = 0; i < docsToAdd; i++) {
- Document doc = searcher.doc2(i);
+ Document doc = searcher.doc(i);
assertTrue(doc.getField("content") != null);
}
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestWindowsMMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestWindowsMMap.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestWindowsMMap.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/store/TestWindowsMMap.java Thu Aug 4 16:54:58 2011
@@ -23,8 +23,8 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java Thu Aug 4 16:54:58 2011
@@ -17,8 +17,8 @@ package org.apache.lucene.util;
*/
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.StringField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiReader;
Modified: lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java (original)
+++ lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java Thu Aug 4 16:54:58 2011
@@ -28,7 +28,7 @@ import java.io.Writer;
import java.util.*;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
Modified: lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java (original)
+++ lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java Thu Aug 4 16:54:58 2011
@@ -3,8 +3,8 @@ package org.apache.lucene.analysis.core;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.standard.ClassicAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
Modified: lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java (original)
+++ lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java Thu Aug 4 16:54:58 2011
@@ -22,10 +22,10 @@ import java.io.StringReader;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.StringField;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
Modified: lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java (original)
+++ lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java Thu Aug 4 16:54:58 2011
@@ -25,8 +25,8 @@ import org.apache.lucene.analysis.BaseTo
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
Modified: lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java (original)
+++ lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java Thu Aug 4 16:54:58 2011
@@ -28,9 +28,9 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.core.LetterTokenizer;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.analysis.core.WhitespaceTokenizer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
Modified: lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java (original)
+++ lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java Thu Aug 4 16:54:58 2011
@@ -27,9 +27,9 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (original)
+++ lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java Thu Aug 4 16:54:58 2011
@@ -27,10 +27,10 @@ import org.apache.lucene.analysis.standa
import org.apache.lucene.analysis.standard.StandardTokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.TermPositionVector;
Modified: lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/collation/CollationTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/collation/CollationTestBase.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/collation/CollationTestBase.java (original)
+++ lucene/dev/branches/fieldtype/modules/analysis/common/src/test/org/apache/lucene/collation/CollationTestBase.java Thu Aug 4 16:54:58 2011
@@ -37,11 +37,11 @@ import org.apache.lucene.search.TermRang
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.StringField;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IndexableBinaryStringTools;
import org.apache.lucene.util.LuceneTestCase;
@@ -249,7 +249,7 @@ public abstract class CollationTestBase
StringBuilder buff = new StringBuilder(10);
int n = result.length;
for (int i = 0 ; i < n ; ++i) {
- Document doc = searcher.doc2(result[i].doc);
+ Document doc = searcher.doc(result[i].doc);
IndexableField[] v = doc.getFields("tracer");
for (int j = 0 ; j < v.length ; ++j) {
buff.append(v[j].stringValue());
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocData.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocData.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocData.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocData.java Thu Aug 4 16:54:58 2011
@@ -20,7 +20,7 @@ package org.apache.lucene.benchmark.byTa
import java.util.Date;
import java.util.Properties;
-import org.apache.lucene.document2.DateTools;
+import org.apache.lucene.document.DateTools;
/** Output of parsing (e.g. HTML parsing) of an input document. */
public class DocData {
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java Thu Aug 4 16:54:58 2011
@@ -32,12 +32,12 @@ import java.text.ParsePosition;
import org.apache.lucene.benchmark.byTask.utils.Config;
import org.apache.lucene.benchmark.byTask.utils.Format;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.NumericField;
-import org.apache.lucene.document2.StringField;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
/**
* Creates {@link Document} objects. Uses a {@link ContentSource} to generate
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java Thu Aug 4 16:54:58 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.benchmark.byTa
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.benchmark.byTask.feeds.DocMaker;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
/**
* Add a document, optionally with of a certain size.
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java Thu Aug 4 16:54:58 2011
@@ -18,7 +18,7 @@ package org.apache.lucene.benchmark.byTa
*/
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
public abstract class BenchmarkHighlighter {
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java Thu Aug 4 16:54:58 2011
@@ -27,7 +27,7 @@ import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.benchmark.byTask.feeds.QueryMaker;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.MultiFields;
@@ -99,7 +99,7 @@ public abstract class ReadTask extends P
Bits delDocs = MultiFields.getDeletedDocs(reader);
for (int m = 0; m < reader.maxDoc(); m++) {
if (null == delDocs || ! delDocs.get(m)) {
- doc = reader.document2(m);
+ doc = reader.document(m);
res += (doc == null ? 0 : 1);
}
}
@@ -144,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.document2(docID);
+ final Document doc = reader.document(docID);
System.out.println(" " + i + ": doc=" + docID + " score=" + hits.scoreDocs[i].score + " " + printHitsField + " =" + doc.get(printHitsField));
}
}
@@ -197,7 +197,7 @@ public abstract class ReadTask extends P
protected Document retrieveDoc(IndexReader ir, int id) throws IOException {
- return ir.document2(id);
+ return ir.document(id);
}
/**
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java Thu Aug 4 16:54:58 2011
@@ -25,8 +25,8 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.benchmark.byTask.feeds.DocMaker;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.NumericField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.NumericField;
import org.apache.lucene.index.IndexableField;
/**
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java Thu Aug 4 16:54:58 2011
@@ -20,7 +20,7 @@ package org.apache.lucene.benchmark.byTa
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.benchmark.byTask.PerfRunData;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.highlight.Highlighter;
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java Thu Aug 4 16:54:58 2011
@@ -22,8 +22,8 @@ import java.util.Set;
import java.util.StringTokenizer;
import org.apache.lucene.benchmark.byTask.PerfRunData;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.index.Document2StoredFieldVisitor;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.index.DocumentStoredFieldVisitor;
import org.apache.lucene.index.DocumentStoredFieldVisitor;
import org.apache.lucene.index.IndexReader;
@@ -57,9 +57,9 @@ public class SearchTravRetLoadFieldSelec
@Override
protected Document retrieveDoc(IndexReader ir, int id) throws IOException {
if (fieldsToLoad == null) {
- return ir.document2(id);
+ return ir.document(id);
} else {
- Document2StoredFieldVisitor visitor = new Document2StoredFieldVisitor(fieldsToLoad);
+ DocumentStoredFieldVisitor visitor = new DocumentStoredFieldVisitor(fieldsToLoad);
ir.document(id, visitor);
return visitor.getDocument();
}
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java Thu Aug 4 16:54:58 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.benchmark.byTa
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.benchmark.byTask.PerfRunData;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.vectorhighlight.FastVectorHighlighter;
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java Thu Aug 4 16:54:58 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.benchmark.byTa
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.benchmark.byTask.feeds.DocMaker;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexWriter;
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java Thu Aug 4 16:54:58 2011
@@ -31,8 +31,8 @@ import org.apache.lucene.benchmark.byTas
import org.apache.lucene.benchmark.byTask.feeds.DocMaker;
import org.apache.lucene.benchmark.byTask.utils.Config;
import org.apache.lucene.benchmark.byTask.utils.StreamUtils;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexableField;
/**
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java Thu Aug 4 16:54:58 2011
@@ -25,7 +25,7 @@ import java.util.Properties;
import org.apache.lucene.benchmark.byTask.feeds.DocMaker;
import org.apache.lucene.benchmark.byTask.feeds.NoMoreDataException;
import org.apache.lucene.benchmark.byTask.utils.Config;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
/**
* Extract the downloaded Wikipedia dump into separate files for indexing.
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java Thu Aug 4 16:54:58 2011
@@ -29,7 +29,7 @@ import org.apache.lucene.benchmark.byTas
import org.apache.lucene.benchmark.byTask.tasks.CreateIndexTask;
import org.apache.lucene.benchmark.byTask.tasks.TaskSequence;
import org.apache.lucene.benchmark.byTask.utils.Config;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermQuery;
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java Thu Aug 4 16:54:58 2011
@@ -148,7 +148,7 @@ public class LineDocSourceTest extends B
if (storedField==null) {
storedField = DocMaker.BODY_FIELD; // added to all docs and satisfies field-name == value
}
- assertEquals("Wrong field value", storedField, searcher.doc2(0).get(storedField));
+ assertEquals("Wrong field value", storedField, searcher.doc(0).get(storedField));
searcher.close();
}
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java Thu Aug 4 16:54:58 2011
@@ -29,7 +29,7 @@ import java.util.Properties;
import org.apache.lucene.benchmark.byTask.feeds.TrecDocParser.ParsePathType;
import org.apache.lucene.benchmark.byTask.utils.Config;
-import org.apache.lucene.document2.DateTools;
+import org.apache.lucene.document.DateTools;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java Thu Aug 4 16:54:58 2011
@@ -26,7 +26,7 @@ import org.apache.lucene.search.highligh
import org.apache.lucene.search.highlight.QueryScorer;
import org.apache.lucene.search.highlight.TokenSources;
import org.apache.lucene.search.Query;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import java.io.IOException;
@@ -45,7 +45,7 @@ public class CountingHighlighterTestTask
@Override
protected Document retrieveDoc(IndexReader ir, int id) throws IOException {
- Document document = ir.document2(id);
+ Document document = ir.document(id);
if (document != null) {
numDocsRetrieved++;
}
Modified: lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java (original)
+++ lucene/dev/branches/fieldtype/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java Thu Aug 4 16:54:58 2011
@@ -32,9 +32,9 @@ import org.apache.lucene.benchmark.byTas
import org.apache.lucene.benchmark.byTask.feeds.DocMaker;
import org.apache.lucene.benchmark.byTask.utils.Config;
import org.apache.lucene.benchmark.byTask.utils.StreamUtils.Type;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.StringField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
/** Tests the functionality of {@link WriteLineDocTask}. */
public class WriteLineDocTaskTest extends BenchmarkTestCase {
Modified: lucene/dev/branches/fieldtype/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html (original)
+++ lucene/dev/branches/fieldtype/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html Thu Aug 4 16:54:58 2011
@@ -90,7 +90,7 @@ field fall into a single group.</p>
CachingCollector cachedCollector = CachingCollector.create(c1, cacheScores, maxCacheRAMMB);
s.search(new TermQuery(new Term("content", searchTerm)), cachedCollector);
- Collection<SearchGroup<BytesRef>> topGroups = c1.getTopGroups(groupOffset, fillFields);
+ Collection<SearchGroup<BytesRef>> topGroups = c1.getTopGroups(groupOffset, fillFields);
if (topGroups == null) {
// No groups matched
Modified: lucene/dev/branches/fieldtype/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupsCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupsCollectorTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupsCollectorTest.java (original)
+++ lucene/dev/branches/fieldtype/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupsCollectorTest.java Thu Aug 4 16:54:58 2011
@@ -18,10 +18,10 @@ package org.apache.lucene.search.groupin
*/
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
Modified: lucene/dev/branches/fieldtype/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (original)
+++ lucene/dev/branches/fieldtype/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java Thu Aug 4 16:54:58 2011
@@ -18,12 +18,12 @@
package org.apache.lucene.search.grouping;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.FieldType;
-import org.apache.lucene.document2.NumericField;
-import org.apache.lucene.document2.StringField;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/fieldtype/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java (original)
+++ lucene/dev/branches/fieldtype/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java Thu Aug 4 16:54:58 2011
@@ -24,9 +24,9 @@ import java.util.Iterator;
import java.util.List;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.StringField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -388,7 +388,7 @@ public class SpellChecker implements jav
SuggestWord sugWord = new SuggestWord();
for (int i = 0; i < stop; i++) {
- sugWord.string = indexSearcher.doc2(hits[i].doc).get(F_WORD); // get orig word
+ sugWord.string = indexSearcher.doc(hits[i].doc).get(F_WORD); // get orig word
// don't suggest a word for itself, that would be silly
if (sugWord.string.equals(word)) {
Modified: lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java (original)
+++ lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java Thu Aug 4 16:54:58 2011
@@ -19,9 +19,9 @@ package org.apache.lucene.search.spell;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.Field;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java (original)
+++ lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java Thu Aug 4 16:54:58 2011
@@ -22,8 +22,8 @@ import java.util.Iterator;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.store.Directory;
Modified: lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java (original)
+++ lucene/dev/branches/fieldtype/modules/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java Thu Aug 4 16:54:58 2011
@@ -27,8 +27,8 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.TextField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;