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 [8/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/solr/src/java/org/apache/solr/core/QuerySenderListener.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/core/QuerySenderListener.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/core/QuerySenderListener.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/core/QuerySenderListener.java Thu Aug 4 16:54:58 2011
@@ -65,7 +65,7 @@ public class QuerySenderListener extends
if (o instanceof DocList) {
DocList docs = (DocList)o;
for (DocIterator iter = docs.iterator(); iter.hasNext();) {
- newSearcher.doc2(iter.nextDoc());
+ newSearcher.doc(iter.nextDoc());
}
}
}
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/MoreLikeThisHandler.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/MoreLikeThisHandler.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/MoreLikeThisHandler.java Thu Aug 4 16:54:58 2011
@@ -29,7 +29,7 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryParser.ParseException;
@@ -342,7 +342,7 @@ public class MoreLikeThisHandler extends
public DocListAndSet getMoreLikeThis( int id, int start, int rows, List<Query> filters, List<InterestingTerm> terms, int flags ) throws IOException
{
- Document doc = reader.document2(id);
+ Document doc = reader.document(id);
rawMLTQuery = mlt.like(id);
boostedMLTQuery = getBoostedQuery( rawMLTQuery );
if( terms != null ) {
@@ -391,7 +391,7 @@ public class MoreLikeThisHandler extends
int id = iterator.nextDoc();
DocListAndSet sim = getMoreLikeThis( id, 0, rows, null, null, flags );
- String name = schema.printableUniqueKey( reader.document2( id ) );
+ String name = schema.printableUniqueKey( reader.document( id ) );
mlt.add(name, sim.docList);
}
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java Thu Aug 4 16:54:58 2011
@@ -33,8 +33,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.lucene.analysis.Analyzer;
-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.IndexReader;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.Term;
@@ -122,7 +122,7 @@ public class LukeRequestHandler extends
if( docId != null ) {
Document doc = null;
try {
- doc = reader.document2( docId );
+ doc = reader.document( docId );
}
catch( Exception ex ) {}
if( doc == null ) {
@@ -321,7 +321,7 @@ public class LukeRequestHandler extends
if( top.totalHits > 0 ) {
// Find a document with this field
try {
- Document doc = searcher.doc2( top.scoreDocs[0].doc );
+ Document doc = searcher.doc( top.scoreDocs[0].doc );
IndexableField fld = doc.getField( fieldName );
if( fld != null ) {
f.add( "index", getFieldFlags( fld ) );
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java Thu Aug 4 16:54:58 2011
@@ -80,7 +80,7 @@ public class MoreLikeThisComponent exten
int id = iterator.nextDoc();
int rows = p.getInt( MoreLikeThisParams.DOC_COUNT, 5 );
DocListAndSet sim = mltHelper.getMoreLikeThis( id, 0, rows, null, null, flags );
- String name = schema.printableUniqueKey( searcher.doc2( id ) );
+ String name = schema.printableUniqueKey( searcher.doc( id ) );
mlt.add(name, sim.docList);
if( dbg != null ){
@@ -92,7 +92,7 @@ public class MoreLikeThisComponent exten
DocIterator mltIte = sim.docList.iterator();
while( mltIte.hasNext() ){
int mltid = mltIte.nextDoc();
- String key = schema.printableUniqueKey( searcher.doc2( mltid ) );
+ String key = schema.printableUniqueKey( searcher.doc( mltid ) );
explains.add( key, searcher.explain( mltHelper.getRealMLTQuery(), mltid ) );
}
docDbg.add( "explain", explains );
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/handler/component/QueryComponent.java Thu Aug 4 16:54:58 2011
@@ -17,7 +17,7 @@
package org.apache.solr.handler.component;
-import org.apache.lucene.document2.Field;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.index.Term;
@@ -465,7 +465,7 @@ public class QueryComponent extends Sear
Sort sort = searcher.weightSort(rb.getSortSpec().getSort());
SortField[] sortFields = sort==null ? new SortField[]{SortField.FIELD_SCORE} : sort.getSort();
NamedList sortVals = new NamedList(); // order is important for the sort fields
- org.apache.lucene.document2.FieldType docft = new org.apache.lucene.document2.FieldType();
+ org.apache.lucene.document.FieldType docft = new org.apache.lucene.document.FieldType();
docft.setStored(true);
Field field = new Field("dummy", docft, ""); // a dummy Field
ReaderContext topReaderContext = searcher.getTopReaderContext();
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java Thu Aug 4 16:54:58 2011
@@ -32,7 +32,7 @@ import org.apache.lucene.analysis.Cachin
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.highlight.*;
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/BinaryResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/BinaryResponseWriter.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/BinaryResponseWriter.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/BinaryResponseWriter.java Thu Aug 4 16:54:58 2011
@@ -16,7 +16,7 @@
*/
package org.apache.solr.response;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexableField;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/CSVResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/CSVResponseWriter.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/CSVResponseWriter.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/CSVResponseWriter.java Thu Aug 4 16:54:58 2011
@@ -19,7 +19,7 @@ package org.apache.solr.response;
import org.apache.commons.csv.CSVPrinter;
import org.apache.commons.csv.CSVStrategy;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexableField;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/TextResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/TextResponseWriter.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/TextResponseWriter.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/TextResponseWriter.java Thu Aug 4 16:54:58 2011
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.io.Writer;
import java.util.*;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexableField;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BinaryField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BinaryField.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BinaryField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BinaryField.java Thu Aug 4 16:54:58 2011
@@ -20,7 +20,7 @@ package org.apache.solr.schema;
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.lucene.document2.Field;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BytesRef;
@@ -81,7 +81,7 @@ public class BinaryField extends FieldTy
len = buf.length;
}
- Field f = new org.apache.lucene.document2.BinaryField(field.getName(), buf, offset, len);
+ Field f = new org.apache.lucene.document.BinaryField(field.getName(), buf, offset, len);
f.setBoost(boost);
return f;
}
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/FieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/FieldType.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/FieldType.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/FieldType.java Thu Aug 4 16:54:58 2011
@@ -21,7 +21,7 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
-import org.apache.lucene.document2.Field;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
@@ -249,7 +249,7 @@ public abstract class FieldType extends
}
if (val==null) return null;
- org.apache.lucene.document2.FieldType newType = new org.apache.lucene.document2.FieldType();
+ org.apache.lucene.document.FieldType newType = new org.apache.lucene.document.FieldType();
newType.setIndexed(field.indexed());
newType.setTokenized(field.isTokenized());
newType.setStored(field.stored());
@@ -301,11 +301,11 @@ public abstract class FieldType extends
* Fields per SchemaField
* @param name The name of the field
* @param val The _internal_ value to index
- * @param type {@link org.apache.lucene.document2.FieldType}
+ * @param type {@link org.apache.lucene.document.FieldType}
* @param boost The boost value
* @return the {@link org.apache.lucene.index.IndexableField}.
*/
- protected IndexableField createField(String name, String val, org.apache.lucene.document2.FieldType type, float boost){
+ protected IndexableField createField(String name, String val, org.apache.lucene.document.FieldType type, float boost){
Field f = new Field(name, type, val);
f.setBoost(boost);
return f;
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/IndexSchema.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/IndexSchema.java Thu Aug 4 16:54:58 2011
@@ -260,7 +260,7 @@ public final class IndexSchema {
* @return null if this schema has no unique key field
* @see #printableUniqueKey
*/
- public IndexableField getUniqueKeyField(org.apache.lucene.document2.Document doc) {
+ public IndexableField getUniqueKeyField(org.apache.lucene.document.Document doc) {
return doc.getField(uniqueKeyFieldName); // this should return null if name is null
}
@@ -269,7 +269,7 @@ public final class IndexSchema {
* the specified Document
* @return null if this schema has no unique key field
*/
- public String printableUniqueKey(org.apache.lucene.document2.Document doc) {
+ public String printableUniqueKey(org.apache.lucene.document.Document doc) {
IndexableField f = doc.getField(uniqueKeyFieldName);
return f==null ? null : uniqueKeyFieldType.toExternal(f);
}
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/LatLonType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/LatLonType.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/LatLonType.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/LatLonType.java Thu Aug 4 16:54:58 2011
@@ -16,7 +16,7 @@ package org.apache.solr.schema;
* limitations under the License.
*/
-import org.apache.lucene.document2.FieldType;
+import org.apache.lucene.document.FieldType;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/PointType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/PointType.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/PointType.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/PointType.java Thu Aug 4 16:54:58 2011
@@ -87,7 +87,7 @@ public class PointType extends Coordinat
if (field.stored()) {
String storedVal = externalVal; // normalize or not?
- org.apache.lucene.document2.FieldType customType = new org.apache.lucene.document2.FieldType();
+ org.apache.lucene.document.FieldType customType = new org.apache.lucene.document.FieldType();
customType.setStored(true);
f[f.length - 1] = createField(field.getName(), storedVal, customType, boost);
}
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/TrieField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/TrieField.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/TrieField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/TrieField.java Thu Aug 4 16:54:58 2011
@@ -16,7 +16,7 @@
*/
package org.apache.solr.schema;
-import org.apache.lucene.document2.NumericField;
+import org.apache.lucene.document.NumericField;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.*;
import org.apache.lucene.search.cache.CachedArrayCreator;
@@ -407,8 +407,8 @@ public class TrieField extends FieldType
@Override
public String storedToIndexed(IndexableField f) {
final BytesRef bytes = new BytesRef(NumericUtils.BUF_SIZE_LONG);
- if (f instanceof org.apache.lucene.document2.NumericField) {
- final Number val = ((org.apache.lucene.document2.NumericField) f).numericValue();
+ if (f instanceof org.apache.lucene.document.NumericField) {
+ final Number val = ((org.apache.lucene.document.NumericField) f).numericValue();
if (val==null)
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Invalid field contents: "+f.name());
switch (type) {
@@ -477,14 +477,14 @@ public class TrieField extends FieldType
return null;
}
- org.apache.lucene.document2.FieldType ft = new org.apache.lucene.document2.FieldType();
+ org.apache.lucene.document.FieldType ft = new org.apache.lucene.document.FieldType();
ft.setStored(stored);
ft.setTokenized(true);
ft.setIndexed(indexed);
ft.setOmitNorms(field.omitNorms());
ft.setOmitTermFreqAndPositions(field.omitTf());
- final org.apache.lucene.document2.NumericField f = new org.apache.lucene.document2.NumericField(field.getName(), precisionStep, ft);
+ final org.apache.lucene.document.NumericField f = new org.apache.lucene.document.NumericField(field.getName(), precisionStep, ft);
switch (type) {
case INTEGER:
int i = (value instanceof Number)
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java Thu Aug 4 16:54:58 2011
@@ -17,10 +17,10 @@
package org.apache.solr.search;
-import org.apache.lucene.document2.Document;
-import org.apache.lucene.document2.FieldSelector;
-import org.apache.lucene.document2.FieldSelectorResult;
-import org.apache.lucene.document2.FieldSelectorVisitor;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.FieldSelector;
+import org.apache.lucene.document.FieldSelectorResult;
+import org.apache.lucene.document.FieldSelectorVisitor;
import org.apache.lucene.index.*;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.search.*;
@@ -403,7 +403,7 @@ public class SolrIndexSearcher extends I
* Retrieve the {@link Document} instance corresponding to the document id.
*/
@Override
- public Document doc2(int i) throws IOException {
+ public Document doc(int i) throws IOException {
return doc(i, (Set<String>)null);
}
@@ -432,7 +432,7 @@ public class SolrIndexSearcher extends I
}
if(!enableLazyFieldLoading || fields == null) {
- d = getIndexReader().document2(i);
+ d = getIndexReader().document(i);
} else {
final FieldSelectorVisitor visitor = new FieldSelectorVisitor(new SetNonLazyFieldSelector(fields));
getIndexReader().document(i, visitor);
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java Thu Aug 4 16:54:58 2011
@@ -24,9 +24,9 @@ import org.apache.lucene.index.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-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.search.spell.HighFrequencyDictionary;
import org.apache.lucene.search.spell.PlainTextDictionary;
import org.apache.lucene.store.RAMDirectory;
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/update/AddUpdateCommand.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/update/AddUpdateCommand.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/update/AddUpdateCommand.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/update/AddUpdateCommand.java Thu Aug 4 16:54:58 2011
@@ -17,7 +17,7 @@
package org.apache.solr.update;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.Term;
import org.apache.solr.common.SolrInputDocument;
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/update/DocumentBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/update/DocumentBuilder.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/update/DocumentBuilder.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/update/DocumentBuilder.java Thu Aug 4 16:54:58 2011
@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexableField;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrException;
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/update/UpdateHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/update/UpdateHandler.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/update/UpdateHandler.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/update/UpdateHandler.java Thu Aug 4 16:54:58 2011
@@ -21,7 +21,7 @@ package org.apache.solr.update;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.Term;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.Scorer;
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/util/SolrPluginUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/util/SolrPluginUtils.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/util/SolrPluginUtils.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/util/SolrPluginUtils.java Thu Aug 4 16:54:58 2011
@@ -17,7 +17,7 @@
package org.apache.solr.util;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.*;
@@ -335,7 +335,7 @@ public class SolrPluginUtils {
for (int i=0; i<docs.size(); i++) {
int id = iterator.nextDoc();
- Document doc = searcher.doc2(id);
+ Document doc = searcher.doc(id);
String strid = schema.printableUniqueKey(doc);
explainList.add(strid, searcher.explain(query, id) );
Modified: lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/BasicFunctionalityTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/BasicFunctionalityTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/BasicFunctionalityTest.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/BasicFunctionalityTest.java Thu Aug 4 16:54:58 2011
@@ -26,9 +26,9 @@ import java.util.Map;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.lucene.document2.FieldSelectorVisitor;
-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.document.FieldSelectorVisitor;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.LogMergePolicy;
import org.apache.solr.common.SolrException;
@@ -562,7 +562,7 @@ public class BasicFunctionalityTest exte
core.execute(core.getRequestHandler(req.getParams().get(CommonParams.QT)), req, rsp);
DocList dl = ((ResultContext) rsp.getValues().get("response")).docs;
- Document d = req.getSearcher().doc2(dl.iterator().nextDoc());
+ Document d = req.getSearcher().doc(dl.iterator().nextDoc());
// ensure field is not lazy, only works for Non-Numeric fields currently (if you change schema behind test, this may fail)
assertFalse( ((Field) d.getField("test_hlt")).lazy() );
assertFalse( ((Field) d.getField("title")).lazy() );
@@ -585,7 +585,7 @@ public class BasicFunctionalityTest exte
DocList dl = ((ResultContext) rsp.getValues().get("response")).docs;
DocIterator di = dl.iterator();
- Document d = req.getSearcher().doc2(di.nextDoc());
+ Document d = req.getSearcher().doc(di.nextDoc());
// ensure field is lazy
System.out.println(d.getField("test_hlt").getClass());
assertTrue( ((Field) d.getField("test_hlt")).lazy() );
Modified: lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java Thu Aug 4 16:54:58 2011
@@ -24,9 +24,9 @@ import java.util.Properties;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
-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.queryParser.ParseException;
Modified: lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/schema/DateFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/schema/DateFieldTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/schema/DateFieldTest.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/schema/DateFieldTest.java Thu Aug 4 16:54:58 2011
@@ -17,7 +17,7 @@
package org.apache.solr.schema;
-import org.apache.lucene.document2.Field;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.schema.DateField;
Modified: lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/search/TestSort.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/search/TestSort.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/search/TestSort.java Thu Aug 4 16:54:58 2011
@@ -18,10 +18,10 @@
package org.apache.solr.search;
import org.apache.lucene.analysis.core.SimpleAnalyzer;
-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.AtomicReaderContext;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
Modified: lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java Thu Aug 4 16:54:58 2011
@@ -18,10 +18,10 @@ package org.apache.solr.spelling;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
-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.IndexWriterConfig;
Modified: lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java Thu Aug 4 16:54:58 2011
@@ -16,10 +16,10 @@ package org.apache.solr.update;
* limitations under the License.
*/
-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.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.AbstractSolrTestCase;
Modified: lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/update/DocumentBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/update/DocumentBuilderTest.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/update/DocumentBuilderTest.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/update/DocumentBuilderTest.java Thu Aug 4 16:54:58 2011
@@ -17,7 +17,7 @@
package org.apache.solr.update;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
Modified: lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java Thu Aug 4 16:54:58 2011
@@ -17,9 +17,9 @@
package org.apache.solr.update;
-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.IndexableField;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.IndexSchema;
Modified: lucene/dev/branches/fieldtype/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java?rev=1153925&r1=1153924&r2=1153925&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java Thu Aug 4 16:54:58 2011
@@ -23,7 +23,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Set;
-import org.apache.lucene.document2.Document;
+import org.apache.lucene.document.Document;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrServerException;