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/02 02:37:47 UTC
svn commit: r1152985 [3/3] - in /lucene/dev/branches/fieldtype:
lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/
lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/
lucene/contrib/memory/src/java/org/apache...
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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 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.doc(h[i].doc).get(ID_FIELD);
+ String resID = s.doc2(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().document(aSd.doc).get(ID_FIELD);
+ String id = s.getIndexReader().document2(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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 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.doc(h[i].doc).get(ID_FIELD);
+ String resID = s.doc2(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().document(sd[i].doc).get(ID_FIELD);
+ String id = s.getIndexReader().document2(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/payloads/PayloadHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java?rev=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -22,8 +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.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document2.Document;
+import org.apache.lucene.document2.Field;
+import org.apache.lucene.document2.TextField;
import org.apache.lucene.util.English;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.index.IndexReader;
@@ -122,9 +123,9 @@ public class PayloadHelper {
// writer.infoStream = System.out;
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
- doc.add(new Field(FIELD, English.intToEnglish(i), Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field(MULTI_FIELD, English.intToEnglish(i) + " " + English.intToEnglish(i), Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field(NO_PAYLOAD_FIELD, English.intToEnglish(i), Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(new Field(FIELD, TextField.TYPE_STORED, English.intToEnglish(i)));
+ doc.add(new Field(MULTI_FIELD, TextField.TYPE_STORED, English.intToEnglish(i) + " " + English.intToEnglish(i)));
+ doc.add(new Field(NO_PAYLOAD_FIELD, TextField.TYPE_STORED, English.intToEnglish(i)));
writer.addDocument(doc);
}
reader = IndexReader.open(writer, true);
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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -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.document(docID).get("docid"));
+ assertEquals("" + docID, reader.document2(docID).get("docid"));
}
reader.close();
dir.close();
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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -20,7 +20,7 @@ package org.apache.lucene.benchmark.byTa
import java.util.Date;
import java.util.Properties;
-import org.apache.lucene.document.DateTools;
+import org.apache.lucene.document2.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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -211,7 +211,7 @@ public class DocMaker {
// Set ID_FIELD
FieldType ft = new FieldType(valType);
- ft.setIndexed(false);
+ ft.setIndexed(true);
Field idField = ds.getField(ID_FIELD, ft);
int id;
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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 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.doc(0).get(storedField));
+ assertEquals("Wrong field value", storedField, searcher.doc2(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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 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.document.DateTools;
+import org.apache.lucene.document2.DateTools;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -24,8 +24,9 @@ import java.util.Iterator;
import java.util.List;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document2.Document;
+import org.apache.lucene.document2.Field;
+import org.apache.lucene.document2.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -387,7 +388,7 @@ public class SpellChecker implements jav
SuggestWord sugWord = new SuggestWord();
for (int i = 0; i < stop; i++) {
- sugWord.string = indexSearcher.doc(hits[i].doc).get(F_WORD); // get orig word
+ sugWord.string = indexSearcher.doc2(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)) {
@@ -606,9 +607,7 @@ public class SpellChecker implements jav
Document doc = new Document();
// the word field is never queried on... its indexed so it can be quickly
// checked for rebuild (and stored for retrieval). Doesn't need norms or TF/pos
- Field f = new Field(F_WORD, text, Field.Store.YES, Field.Index.NOT_ANALYZED);
- f.setOmitTermFreqAndPositions(true);
- f.setOmitNorms(true);
+ Field f = new Field(F_WORD, StringField.TYPE_STORED, text);
doc.add(f); // orig term
addGram(text, doc, ng1, ng2);
return doc;
@@ -621,21 +620,17 @@ public class SpellChecker implements jav
String end = null;
for (int i = 0; i < len - ng + 1; i++) {
String gram = text.substring(i, i + ng);
- doc.add(new Field(key, gram, Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(new StringField(key, gram));
if (i == 0) {
// only one term possible in the startXXField, TF/pos and norms aren't needed.
- Field startField = new Field("start" + ng, gram, Field.Store.NO, Field.Index.NOT_ANALYZED);
- startField.setOmitTermFreqAndPositions(true);
- startField.setOmitNorms(true);
+ Field startField = new StringField("start" + ng, gram);
doc.add(startField);
}
end = gram;
}
if (end != null) { // may not be present if len==ng1
// only one term possible in the endXXField, TF/pos and norms aren't needed.
- Field endField = new Field("end" + ng, end, Field.Store.NO, Field.Index.NOT_ANALYZED);
- endField.setOmitTermFreqAndPositions(true);
- endField.setOmitNorms(true);
+ Field endField = new StringField("end" + ng, end);
doc.add(endField);
}
}
Modified: lucene/dev/branches/fieldtype/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java (original)
+++ lucene/dev/branches/fieldtype/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java Tue Aug 2 00:37:20 2011
@@ -27,7 +27,6 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
import org.apache.lucene.collation.ICUCollationKeyAnalyzer;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField;
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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 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.doc(iter.nextDoc());
+ newSearcher.doc2(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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -29,7 +29,7 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
-import org.apache.lucene.document.Document;
+import org.apache.lucene.document2.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.document(id);
+ Document doc = reader.document2(id);
rawMLTQuery = mlt.like(id);
boostedMLTQuery = getBoostedQuery( rawMLTQuery );
if( terms != null ) {
@@ -353,7 +353,7 @@ public class MoreLikeThisHandler extends
realMLTQuery = new BooleanQuery();
realMLTQuery.add(boostedMLTQuery, BooleanClause.Occur.MUST);
realMLTQuery.add(
- new TermQuery(new Term(uniqueKeyField.getName(), uniqueKeyField.getType().storedToIndexed(doc.getFieldable(uniqueKeyField.getName())))),
+ new TermQuery(new Term(uniqueKeyField.getName(), uniqueKeyField.getType().storedToIndexed(doc.getField(uniqueKeyField.getName())))),
BooleanClause.Occur.MUST_NOT);
DocListAndSet results = new DocListAndSet();
@@ -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.document( id ) );
+ String name = schema.printableUniqueKey( reader.document2( 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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -33,9 +33,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Fieldable;
+import org.apache.lucene.document2.Document;
+import org.apache.lucene.document2.Field;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.FieldsEnum;
@@ -121,7 +122,7 @@ public class LukeRequestHandler extends
if( docId != null ) {
Document doc = null;
try {
- doc = reader.document( docId );
+ doc = reader.document2( docId );
}
catch( Exception ex ) {}
if( doc == null ) {
@@ -164,19 +165,19 @@ public class LukeRequestHandler extends
/**
* @return a string representing a Fieldable's flags.
*/
- private static String getFieldFlags( Fieldable f )
+ private static String getFieldFlags( IndexableField f )
{
StringBuilder flags = new StringBuilder();
- flags.append( (f != null && f.isIndexed()) ? FieldFlag.INDEXED.getAbbreviation() : '-' );
- flags.append( (f != null && f.isTokenized()) ? FieldFlag.TOKENIZED.getAbbreviation() : '-' );
- flags.append( (f != null && f.isStored()) ? FieldFlag.STORED.getAbbreviation() : '-' );
+ flags.append( (f != null && f.indexed()) ? FieldFlag.INDEXED.getAbbreviation() : '-' );
+ flags.append( (f != null && f.tokenized()) ? FieldFlag.TOKENIZED.getAbbreviation() : '-' );
+ flags.append( (f != null && f.stored()) ? FieldFlag.STORED.getAbbreviation() : '-' );
flags.append( (false) ? FieldFlag.MULTI_VALUED.getAbbreviation() : '-' ); // SchemaField Specific
- flags.append( (f != null && f.isTermVectorStored()) ? FieldFlag.TERM_VECTOR_STORED.getAbbreviation() : '-' );
- flags.append( (f != null && f.isStoreOffsetWithTermVector()) ? FieldFlag.TERM_VECTOR_OFFSET.getAbbreviation() : '-' );
- flags.append( (f != null && f.isStorePositionWithTermVector()) ? FieldFlag.TERM_VECTOR_POSITION.getAbbreviation() : '-' );
- flags.append( (f != null && f.getOmitNorms()) ? FieldFlag.OMIT_NORMS.getAbbreviation() : '-' );
- flags.append( (f != null && f.isLazy()) ? FieldFlag.LAZY.getAbbreviation() : '-' );
- flags.append( (f != null && f.isBinary()) ? FieldFlag.BINARY.getAbbreviation() : '-' );
+ flags.append( (f != null && f.storeTermVectors()) ? FieldFlag.TERM_VECTOR_STORED.getAbbreviation() : '-' );
+ flags.append( (f != null && f.storeTermVectorOffsets()) ? FieldFlag.TERM_VECTOR_OFFSET.getAbbreviation() : '-' );
+ flags.append( (f != null && f.storeTermVectorPositions()) ? FieldFlag.TERM_VECTOR_POSITION.getAbbreviation() : '-' );
+ flags.append( (f != null && f.omitNorms()) ? FieldFlag.OMIT_NORMS.getAbbreviation() : '-' );
+ flags.append( (f != null && ((Field) f).lazy()) ? FieldFlag.LAZY.getAbbreviation() : '-' );
+ flags.append( (f != null && f.binaryValue(null)!=null) ? FieldFlag.BINARY.getAbbreviation() : '-' );
flags.append( (false) ? FieldFlag.SORT_MISSING_FIRST.getAbbreviation() : '-' ); // SchemaField Specific
flags.append( (false) ? FieldFlag.SORT_MISSING_LAST.getAbbreviation() : '-' ); // SchemaField Specific
return flags.toString();
@@ -236,7 +237,7 @@ public class LukeRequestHandler extends
final CharsRef spare = new CharsRef();
SimpleOrderedMap<Object> finfo = new SimpleOrderedMap<Object>();
for( Object o : doc.getFields() ) {
- Fieldable fieldable = (Fieldable)o;
+ Field fieldable = (Field)o;
SimpleOrderedMap<Object> f = new SimpleOrderedMap<Object>();
SchemaField sfield = schema.getFieldOrNull( fieldable.name() );
@@ -257,11 +258,11 @@ public class LukeRequestHandler extends
if (bytes != null) {
f.add( "binary", Base64.byteArrayToBase64(bytes.bytes, bytes.offset, bytes.length));
}
- f.add( "boost", fieldable.getBoost() );
+ f.add( "boost", fieldable.boost() );
f.add( "docFreq", t.text()==null ? 0 : reader.docFreq( t ) ); // this can be 0 for non-indexed fields
// If we have a term vector, return that
- if( fieldable.isTermVectorStored() ) {
+ if( fieldable.storeTermVectors() ) {
try {
TermFreqVector v = reader.getTermFreqVector( docId, fieldable.name() );
if( v != null ) {
@@ -320,8 +321,8 @@ public class LukeRequestHandler extends
if( top.totalHits > 0 ) {
// Find a document with this field
try {
- Document doc = searcher.doc( top.scoreDocs[0].doc );
- Fieldable fld = doc.getFieldable( fieldName );
+ Document doc = searcher.doc2( 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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 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.doc( id ) );
+ String name = schema.printableUniqueKey( searcher.doc2( 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.doc( mltid ) );
+ String key = schema.printableUniqueKey( searcher.doc2( 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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -17,7 +17,7 @@
package org.apache.solr.handler.component;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document2.Field;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext;
import org.apache.lucene.index.Term;
@@ -465,7 +465,9 @@ 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
- Field field = new Field("dummy", "", Field.Store.YES, Field.Index.NO); // a dummy Field
+ org.apache.lucene.document2.FieldType docft = new org.apache.lucene.document2.FieldType();
+ docft.setStored(true);
+ Field field = new Field("dummy", docft, ""); // a dummy Field
ReaderContext topReaderContext = searcher.getTopReaderContext();
AtomicReaderContext[] leaves = ReaderUtil.leaves(topReaderContext);
AtomicReaderContext currentLeaf = null;
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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -19,8 +19,8 @@ package org.apache.solr.response;
import org.apache.commons.csv.CSVPrinter;
import org.apache.commons.csv.CSVStrategy;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Fieldable;
+import org.apache.lucene.document2.Document;
+import org.apache.lucene.index.IndexableField;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrException;
@@ -146,7 +146,7 @@ class CSVWriter extends TextResponseWrit
CSVSharedBufPrinter mvPrinter; // printer used to encode multiple values in a single CSV value
// used to collect values
- List<Fieldable> values = new ArrayList<Fieldable>(1); // low starting amount in case there are many fields
+ List<IndexableField> values = new ArrayList<IndexableField>(1); // low starting amount in case there are many fields
int tmp;
}
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/JSONResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/JSONResponseWriter.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/JSONResponseWriter.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/response/JSONResponseWriter.java Tue Aug 2 00:37:20 2011
@@ -26,7 +26,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import org.apache.lucene.document.Fieldable;
+import org.apache.lucene.index.IndexableField;
import org.apache.lucene.util.StringHelper;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.params.CommonParams;
@@ -303,10 +303,10 @@ class JSONWriter extends TextResponseWri
protected static class MultiValueField {
final SchemaField sfield;
- final ArrayList<Fieldable> fields;
- MultiValueField(SchemaField sfield, Fieldable firstVal) {
+ final ArrayList<IndexableField> fields;
+ MultiValueField(SchemaField sfield, IndexableField firstVal) {
this.sfield = sfield;
- this.fields = new ArrayList<Fieldable>(4);
+ this.fields = new ArrayList<IndexableField>(4);
this.fields.add(firstVal);
}
}
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BCDIntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BCDIntField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BCDIntField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BCDIntField.java Tue Aug 2 00:37:20 2011
@@ -20,7 +20,6 @@ package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ValueSource;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.solr.util.BCDUtils;
import org.apache.solr.response.TextResponseWriter;
@@ -56,20 +55,11 @@ public class BCDIntField extends FieldTy
return indexedToReadable(f.stringValue());
}
- @Override
- public String toExternal(Fieldable f) {
- return indexedToReadable(f.stringValue());
- }
-
// Note, this can't return type 'Integer' because BCDStrField and BCDLong extend it
@Override
public Object toObject(IndexableField f) {
return Integer.valueOf( toExternal(f) );
}
- @Override
- public Object toObject(Fieldable f) {
- return Integer.valueOf( toExternal(f) );
- }
@Override
public String indexedToReadable(String indexedForm) {
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BCDLongField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BCDLongField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BCDLongField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BCDLongField.java Tue Aug 2 00:37:20 2011
@@ -17,7 +17,6 @@
package org.apache.solr.schema;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
/**
*
@@ -27,8 +26,4 @@ public class BCDLongField extends BCDInt
public Long toObject(IndexableField f) {
return Long.valueOf( toExternal(f) );
}
- @Override
- public Long toObject(Fieldable f) {
- return Long.valueOf( toExternal(f) );
- }
}
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BCDStrField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BCDStrField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BCDStrField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BCDStrField.java Tue Aug 2 00:37:20 2011
@@ -17,7 +17,6 @@
package org.apache.solr.schema;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
/**
*
@@ -31,8 +30,4 @@ public class BCDStrField extends BCDIntF
public String toObject(IndexableField f) {
return toExternal(f);
}
- @Override
- public String toObject(Fieldable f) {
- return toExternal(f);
- }
}
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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -20,7 +20,6 @@ package org.apache.solr.schema;
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.document2.Field;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.SortField;
@@ -50,22 +49,12 @@ public class BinaryField extends FieldTy
public String toExternal(IndexableField f) {
return toBase64String(toObject(f));
}
- @Override
- public String toExternal(Fieldable f) {
- return toBase64String(toObject(f));
- }
@Override
public ByteBuffer toObject(IndexableField f) {
BytesRef bytes = f.binaryValue(null);
return ByteBuffer.wrap(bytes.bytes, bytes.offset, bytes.length);
}
-
- @Override
- public ByteBuffer toObject(Fieldable f) {
- BytesRef bytes = f.binaryValue(null);
- return ByteBuffer.wrap(bytes.bytes, bytes.offset, bytes.length);
- }
@Override
public IndexableField createField(SchemaField field, Object val, float boost) {
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BoolField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BoolField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BoolField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/BoolField.java Tue Aug 2 00:37:20 2011
@@ -31,7 +31,6 @@ import org.apache.solr.search.function.*
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.document.Fieldable;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.analysis.SolrAnalyzer;
@@ -118,19 +117,11 @@ public class BoolField extends FieldType
public String toExternal(IndexableField f) {
return indexedToReadable(f.stringValue());
}
- @Override
- public String toExternal(Fieldable f) {
- return indexedToReadable(f.stringValue());
- }
@Override
public Boolean toObject(IndexableField f) {
return Boolean.valueOf( toExternal(f) );
}
- @Override
- public Boolean toObject(Fieldable f) {
- return Boolean.valueOf( toExternal(f) );
- }
@Override
public Object toObject(SchemaField sf, BytesRef term) {
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/ByteField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/ByteField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/ByteField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/ByteField.java Tue Aug 2 00:37:20 2011
@@ -16,7 +16,6 @@ package org.apache.solr.schema;
* limitations under the License.
*/
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.cache.ByteValuesCreator;
@@ -78,7 +77,7 @@ public class ByteField extends FieldType
}
@Override
- public Byte toObject(Fieldable f) {
+ public Byte toObject(IndexableField f) {
return Byte.valueOf(toExternal(f));
}
}
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/CollationField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/CollationField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/CollationField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/CollationField.java Tue Aug 2 00:37:20 2011
@@ -31,7 +31,6 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
import org.apache.lucene.collation.CollationKeyAnalyzer;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField;
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/DateField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/DateField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/DateField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/DateField.java Tue Aug 2 00:37:20 2011
@@ -17,7 +17,6 @@
package org.apache.solr.schema;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.Query;
@@ -211,25 +210,12 @@ public class DateField extends FieldType
public String toExternal(IndexableField f) {
return indexedToReadable(f.stringValue());
}
- @Override
- public String toExternal(Fieldable f) {
- return indexedToReadable(f.stringValue());
- }
public Date toObject(String indexedForm) throws java.text.ParseException {
return parseDate(indexedToReadable(indexedForm));
}
@Override
- public Date toObject(Fieldable f) {
- try {
- return parseDate( toExternal(f) );
- }
- catch( ParseException ex ) {
- throw new RuntimeException( ex );
- }
- }
- @Override
public Date toObject(IndexableField f) {
try {
return parseDate( toExternal(f) );
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/DoubleField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/DoubleField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/DoubleField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/DoubleField.java Tue Aug 2 00:37:20 2011
@@ -17,7 +17,6 @@
package org.apache.solr.schema;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.cache.CachedArrayCreator;
@@ -82,8 +81,4 @@ public class DoubleField extends FieldTy
public Double toObject(IndexableField f) {
return Double.valueOf(toExternal(f));
}
- @Override
- public Double toObject(Fieldable f) {
- return Double.valueOf(toExternal(f));
- }
}
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/ExternalFileField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/ExternalFileField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/ExternalFileField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/ExternalFileField.java Tue Aug 2 00:37:20 2011
@@ -17,7 +17,6 @@
package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.FileFloatSource;
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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -21,7 +21,6 @@ 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.document.Fieldable;
import org.apache.lucene.document2.Field;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.Term;
@@ -263,7 +262,7 @@ public abstract class FieldType extends
return createField(field.getName(), val, newType, boost);
}
- protected Fieldable createField(String name, String val, org.apache.lucene.document.Field.Store storage, org.apache.lucene.document.Field.Index index,
+ /*protected Fieldable createField(String name, String val, org.apache.lucene.document.Field.Store storage, org.apache.lucene.document.Field.Index index,
org.apache.lucene.document.Field.TermVector vec, boolean omitNorms, boolean omitTFPos, float boost){
org.apache.lucene.document.Field f = new org.apache.lucene.document.Field(name,
val,
@@ -295,7 +294,7 @@ public abstract class FieldType extends
getFieldIndex(field, val), getFieldTermVec(field, val), field.omitNorms(),
field.omitTf(), boost);
}
-
+ */
/**
* Create the field from native Lucene parts. Mostly intended for use by FieldTypes outputing multiple
@@ -326,30 +325,6 @@ public abstract class FieldType extends
IndexableField f = createField( field, value, boost);
return f==null ? new IndexableField[]{} : new IndexableField[]{f};
}
-
- /* Helpers for field construction */
- protected org.apache.lucene.document.Field.TermVector getFieldTermVec(SchemaField field,
- String internalVal) {
- org.apache.lucene.document.Field.TermVector ftv = org.apache.lucene.document.Field.TermVector.NO;
- if (field.storeTermPositions() && field.storeTermOffsets())
- ftv = org.apache.lucene.document.Field.TermVector.WITH_POSITIONS_OFFSETS;
- else if (field.storeTermPositions())
- ftv = org.apache.lucene.document.Field.TermVector.WITH_POSITIONS;
- else if (field.storeTermOffsets())
- ftv = org.apache.lucene.document.Field.TermVector.WITH_OFFSETS;
- else if (field.storeTermVector())
- ftv = org.apache.lucene.document.Field.TermVector.YES;
- return ftv;
- }
- protected org.apache.lucene.document.Field.Store getFieldStore(SchemaField field,
- String internalVal) {
- return field.stored() ? org.apache.lucene.document.Field.Store.YES : org.apache.lucene.document.Field.Store.NO;
- }
- protected org.apache.lucene.document.Field.Index getFieldIndex(SchemaField field,
- String internalVal) {
- return field.indexed() ? (isTokenized() ? org.apache.lucene.document.Field.Index.ANALYZED :
- org.apache.lucene.document.Field.Index.NOT_ANALYZED) : org.apache.lucene.document.Field.Index.NO;
- }
/**
* Convert an external value (from XML update command or from query string)
@@ -367,24 +342,18 @@ public abstract class FieldType extends
* value
* @see #toInternal
*/
- public String toExternal(Fieldable f) {
+ public String toExternal(IndexableField f) {
// currently used in writing XML of the search result (but perhaps
// a more efficient toXML(IndexableField f, Writer w) should be used
// in the future.
return f.stringValue();
}
- public String toExternal(IndexableField f) {
- return f.stringValue();
- }
/**
* Convert the stored-field format to an external object.
* @see #toInternal
* @since solr 1.3
*/
- public Object toObject(Fieldable f) {
- return toExternal(f); // by default use the string
- }
public Object toObject(IndexableField f) {
return toExternal(f); // by default use the string
}
@@ -408,25 +377,17 @@ public abstract class FieldType extends
}
/** Given the stored field, return the human readable representation */
- public String storedToReadable(Fieldable f) {
- return toExternal(f);
- }
- /** Given the stored field, return the human readable representation */
public String storedToReadable(IndexableField f) {
return toExternal(f);
}
/** Given the stored field, return the indexed form */
- public String storedToIndexed(Fieldable f) {
+ public String storedToIndexed(IndexableField f) {
// right now, the transformation of single valued fields like SortableInt
// is done when the Field is created, not at analysis time... this means
// that the indexed form is the same as the stored field form.
return f.stringValue();
}
- /** Given the stored field, return the indexed form */
- public String storedToIndexed(IndexableField f) {
- return f.stringValue();
- }
/** Given the readable value, return the term value that will match it. */
public String readableToIndexed(String val) {
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/FloatField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/FloatField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/FloatField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/FloatField.java Tue Aug 2 00:37:20 2011
@@ -23,7 +23,6 @@ import org.apache.lucene.search.cache.Fl
import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.FloatFieldSource;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.solr.response.TextResponseWriter;
@@ -79,8 +78,4 @@ public class FloatField extends FieldTyp
public Float toObject(IndexableField f) {
return Float.valueOf( toExternal(f) );
}
- @Override
- public Float toObject(Fieldable f) {
- return Float.valueOf( toExternal(f) );
- }
}
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/GeoHashField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/GeoHashField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/GeoHashField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/GeoHashField.java Tue Aug 2 00:37:20 2011
@@ -17,7 +17,6 @@
package org.apache.solr.schema;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField;
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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -19,7 +19,6 @@ package org.apache.solr.schema;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.DefaultSimilarity;
import org.apache.lucene.search.IndexSearcher;
@@ -264,23 +263,16 @@ public final class IndexSchema {
public IndexableField getUniqueKeyField(org.apache.lucene.document2.Document doc) {
return doc.getField(uniqueKeyFieldName); // this should return null if name is null
}
- public Fieldable getUniqueKeyField(org.apache.lucene.document.Document doc) {
- return doc.getField(uniqueKeyFieldName); // this should return null if name is null
- }
/**
* The printable value of the Unique Key field for
* the specified Document
* @return null if this schema has no unique key field
*/
- public String printableUniqueKey(org.apache.lucene.document.Document doc) {
- Fieldable f = doc.getFieldable(uniqueKeyFieldName);
- return f==null ? null : uniqueKeyFieldType.toExternal(f);
- }
public String printableUniqueKey(org.apache.lucene.document2.Document doc) {
IndexableField f = doc.getField(uniqueKeyFieldName);
return f==null ? null : uniqueKeyFieldType.toExternal(f);
- }
+ }
private SchemaField getIndexedField(String fname) {
SchemaField f = getFields().get(fname);
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/IntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/IntField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/IntField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/IntField.java Tue Aug 2 00:37:20 2011
@@ -23,7 +23,6 @@ import org.apache.lucene.search.cache.In
import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.IntFieldSource;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.solr.response.TextResponseWriter;
@@ -79,8 +78,4 @@ public class IntField extends FieldType
public Integer toObject(IndexableField f) {
return Integer.valueOf( toExternal(f) );
}
- @Override
- public Integer toObject(Fieldable f) {
- return Integer.valueOf( 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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -16,7 +16,6 @@ package org.apache.solr.schema;
* limitations under the License.
*/
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.document2.FieldType;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.IndexReader;
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/LongField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/LongField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/LongField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/LongField.java Tue Aug 2 00:37:20 2011
@@ -17,7 +17,6 @@
package org.apache.solr.schema;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.cache.CachedArrayCreator;
@@ -81,8 +80,4 @@ public class LongField extends FieldType
public Long toObject(IndexableField f) {
return Long.valueOf( toExternal(f) );
}
- @Override
- public Long toObject(Fieldable f) {
- return Long.valueOf( toExternal(f) );
- }
}
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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -17,8 +17,6 @@
package org.apache.solr.schema;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/RandomSortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/RandomSortField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/RandomSortField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/RandomSortField.java Tue Aug 2 00:37:20 2011
@@ -20,7 +20,6 @@ package org.apache.solr.schema;
import java.io.IOException;
import java.util.Map;
-import org.apache.lucene.document.Fieldable;
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/SchemaField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SchemaField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SchemaField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SchemaField.java Tue Aug 2 00:37:20 2011
@@ -19,7 +19,6 @@ package org.apache.solr.schema;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.SortField;
import org.apache.solr.search.QParser;
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/ShortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/ShortField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/ShortField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/ShortField.java Tue Aug 2 00:37:20 2011
@@ -16,7 +16,6 @@ package org.apache.solr.schema;
* limitations under the License.
*/
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.cache.CachedArrayCreator;
@@ -84,9 +83,5 @@ public class ShortField extends FieldTyp
public Short toObject(IndexableField f) {
return Short.valueOf(toExternal(f));
}
- @Override
- public Short toObject(Fieldable f) {
- return Short.valueOf(toExternal(f));
- }
}
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SortableDoubleField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SortableDoubleField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SortableDoubleField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SortableDoubleField.java Tue Aug 2 00:37:20 2011
@@ -27,7 +27,6 @@ import org.apache.solr.search.function.V
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.DocValues;
import org.apache.solr.search.function.StringIndexDocValues;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexableField;
import org.apache.solr.util.NumberUtils;
@@ -66,10 +65,6 @@ public class SortableDoubleField extends
public String toExternal(IndexableField f) {
return indexedToReadable(f.stringValue());
}
- @Override
- public String toExternal(Fieldable f) {
- return indexedToReadable(f.stringValue());
- }
@Override
public Double toObject(IndexableField f) {
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SortableFloatField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SortableFloatField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SortableFloatField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SortableFloatField.java Tue Aug 2 00:37:20 2011
@@ -27,7 +27,6 @@ import org.apache.solr.search.function.V
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.DocValues;
import org.apache.solr.search.function.StringIndexDocValues;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexableField;
import org.apache.solr.util.NumberUtils;
@@ -66,19 +65,11 @@ public class SortableFloatField extends
public String toExternal(IndexableField f) {
return indexedToReadable(f.stringValue());
}
- @Override
- public String toExternal(Fieldable f) {
- return indexedToReadable(f.stringValue());
- }
@Override
public Float toObject(IndexableField f) {
return NumberUtils.SortableStr2float(f.stringValue());
}
- @Override
- public Float toObject(Fieldable f) {
- return NumberUtils.SortableStr2float(f.stringValue());
- }
@Override
public String indexedToReadable(String indexedForm) {
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SortableIntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SortableIntField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SortableIntField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SortableIntField.java Tue Aug 2 00:37:20 2011
@@ -27,7 +27,6 @@ import org.apache.solr.search.function.V
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.DocValues;
import org.apache.solr.search.function.StringIndexDocValues;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexableField;
import org.apache.solr.util.NumberUtils;
@@ -69,10 +68,6 @@ public class SortableIntField extends Fi
public String toExternal(IndexableField f) {
return indexedToReadable(f.stringValue());
}
- @Override
- public String toExternal(Fieldable f) {
- return indexedToReadable(f.stringValue());
- }
@Override
public String indexedToReadable(String indexedForm) {
@@ -90,10 +85,6 @@ public class SortableIntField extends Fi
public Integer toObject(IndexableField f) {
return NumberUtils.SortableStr2int(f.stringValue(), 0, 3);
}
- @Override
- public Integer toObject(Fieldable f) {
- return NumberUtils.SortableStr2int(f.stringValue(), 0, 3);
- }
@Override
public void write(TextResponseWriter writer, String name, IndexableField f) throws IOException {
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SortableLongField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SortableLongField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SortableLongField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/SortableLongField.java Tue Aug 2 00:37:20 2011
@@ -27,7 +27,6 @@ import org.apache.solr.search.function.V
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.DocValues;
import org.apache.solr.search.function.StringIndexDocValues;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexableField;
import org.apache.solr.util.NumberUtils;
@@ -83,15 +82,6 @@ public class SortableLongField extends F
public Long toObject(IndexableField f) {
return NumberUtils.SortableStr2long(f.stringValue(),0,5);
}
- @Override
- public String toExternal(Fieldable f) {
- return indexedToReadable(f.stringValue());
- }
-
- @Override
- public Long toObject(Fieldable f) {
- return NumberUtils.SortableStr2long(f.stringValue(),0,5);
- }
@Override
public void write(TextResponseWriter writer, String name, IndexableField f) throws IOException {
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/StrField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/StrField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/StrField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/StrField.java Tue Aug 2 00:37:20 2011
@@ -18,7 +18,6 @@
package org.apache.solr.schema;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.response.TextResponseWriter;
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/TextField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/TextField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/TextField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/TextField.java Tue Aug 2 00:37:20 2011
@@ -31,7 +31,6 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.CachingTokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser;
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/TrieDateField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/TrieDateField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/TrieDateField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/TrieDateField.java Tue Aug 2 00:37:20 2011
@@ -20,7 +20,6 @@ package org.apache.solr.schema;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.QParser;
import org.apache.solr.response.TextResponseWriter;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.Query;
@@ -49,10 +48,6 @@ public class TrieDateField extends DateF
public Date toObject(IndexableField f) {
return (Date) wrappedField.toObject(f);
}
- @Override
- public Date toObject(Fieldable f) {
- return (Date) wrappedField.toObject(f);
- }
@Override
public Object toObject(SchemaField sf, BytesRef term) {
@@ -96,10 +91,6 @@ public class TrieDateField extends DateF
public String storedToReadable(IndexableField f) {
return wrappedField.storedToReadable(f);
}
- @Override
- public String storedToReadable(Fieldable f) {
- return wrappedField.storedToReadable(f);
- }
@Override
public String readableToIndexed(String val) {
@@ -115,10 +106,6 @@ public class TrieDateField extends DateF
public String toExternal(IndexableField f) {
return wrappedField.toExternal(f);
}
- @Override
- public String toExternal(Fieldable f) {
- return wrappedField.toExternal(f);
- }
@Override
public String indexedToReadable(String _indexedForm) {
@@ -134,10 +121,6 @@ public class TrieDateField extends DateF
public String storedToIndexed(IndexableField f) {
return wrappedField.storedToIndexed(f);
}
- @Override
- public String storedToIndexed(Fieldable f) {
- return wrappedField.storedToIndexed(f);
- }
@Override
public IndexableField createField(SchemaField field, Object value, float 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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -16,8 +16,7 @@
*/
package org.apache.solr.schema;
-import org.apache.lucene.document.Fieldable;
-import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document2.NumericField;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.*;
import org.apache.lucene.search.cache.CachedArrayCreator;
@@ -103,34 +102,8 @@ public class TrieField extends FieldType
@Override
public Object toObject(IndexableField f) {
- if (f instanceof org.apache.lucene.document2.NumericField) {
- final Number val = ((org.apache.lucene.document2.NumericField) f).numericValue();
- if (val==null) return badFieldString(f);
- return (type == TrieTypes.DATE) ? new Date(val.longValue()) : val;
- } else {
- // the following code is "deprecated" and only to support pre-3.2 indexes using the old BinaryField encoding:
- final BytesRef bytes = f.binaryValue(null);
- if (bytes==null) return badFieldString(f);
- switch (type) {
- case INTEGER:
- return toInt(bytes.bytes);
- case FLOAT:
- return Float.intBitsToFloat(toInt(bytes.bytes));
- case LONG:
- return toLong(bytes.bytes);
- case DOUBLE:
- return Double.longBitsToDouble(toLong(bytes.bytes));
- case DATE:
- return new Date(toLong(bytes.bytes));
- default:
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unknown type for trie field: " + f.name());
- }
- }
- }
- @Override
- public Object toObject(Fieldable f) {
if (f instanceof NumericField) {
- final Number val = ((NumericField) f).getNumericValue();
+ final Number val = ((NumericField) f).numericValue();
if (val==null) return badFieldString(f);
return (type == TrieTypes.DATE) ? new Date(val.longValue()) : val;
} else {
@@ -318,10 +291,6 @@ public class TrieField extends FieldType
public String storedToReadable(IndexableField f) {
return toExternal(f);
}
- @Override
- public String storedToReadable(Fieldable f) {
- return toExternal(f);
- }
@Override
public String readableToIndexed(String val) {
@@ -364,10 +333,6 @@ public class TrieField extends FieldType
String s = f.stringValue();
return "ERROR:SCHEMA-INDEX-MISMATCH,stringValue="+s;
}
- static String badFieldString(Fieldable f) {
- String s = f.stringValue();
- return "ERROR:SCHEMA-INDEX-MISMATCH,stringValue="+s;
- }
@Override
public String toExternal(IndexableField f) {
@@ -375,12 +340,6 @@ public class TrieField extends FieldType
? dateField.toExternal((Date) toObject(f))
: toObject(f).toString();
}
- @Override
- public String toExternal(Fieldable f) {
- return (type == TrieTypes.DATE)
- ? dateField.toExternal((Date) toObject(f))
- : toObject(f).toString();
- }
@Override
public String indexedToReadable(String _indexedForm) {
@@ -506,67 +465,6 @@ public class TrieField extends FieldType
}
return bytes.utf8ToString();
}
- @Override
- public String storedToIndexed(Fieldable f) {
- final BytesRef bytes = new BytesRef(NumericUtils.BUF_SIZE_LONG);
- if (f instanceof NumericField) {
- final Number val = ((NumericField) f).getNumericValue();
- if (val==null)
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Invalid field contents: "+f.name());
- switch (type) {
- case INTEGER:
- NumericUtils.intToPrefixCoded(val.intValue(), 0, bytes);
- break;
- case FLOAT:
- NumericUtils.intToPrefixCoded(NumericUtils.floatToSortableInt(val.floatValue()), 0, bytes);
- break;
- case LONG: //fallthrough!
- case DATE:
- NumericUtils.longToPrefixCoded(val.longValue(), 0, bytes);
- break;
- case DOUBLE:
- NumericUtils.longToPrefixCoded(NumericUtils.doubleToSortableLong(val.doubleValue()), 0, bytes);
- break;
- default:
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unknown type for trie field: " + f.name());
- }
- } else {
- // the following code is "deprecated" and only to support pre-3.2 indexes using the old BinaryField encoding:
- final BytesRef bytesRef = f.binaryValue(null);
- if (bytesRef==null)
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Invalid field contents: "+f.name());
- switch (type) {
- case INTEGER:
- NumericUtils.intToPrefixCoded(toInt(bytesRef.bytes), 0, bytes);
- break;
- case FLOAT: {
- // WARNING: Code Duplication! Keep in sync with o.a.l.util.NumericUtils!
- // copied from NumericUtils to not convert to/from float two times
- // code in next 2 lines is identical to: int v = NumericUtils.floatToSortableInt(Float.intBitsToFloat(toInt(arr)));
- int v = toInt(bytesRef.bytes);
- if (v<0) v ^= 0x7fffffff;
- NumericUtils.intToPrefixCoded(v, 0, bytes);
- break;
- }
- case LONG: //fallthrough!
- case DATE:
- NumericUtils.longToPrefixCoded(toLong(bytesRef.bytes), 0, bytes);
- break;
- case DOUBLE: {
- // WARNING: Code Duplication! Keep in sync with o.a.l.util.NumericUtils!
- // copied from NumericUtils to not convert to/from double two times
- // code in next 2 lines is identical to: long v = NumericUtils.doubleToSortableLong(Double.longBitsToDouble(toLong(arr)));
- long v = toLong(bytesRef.bytes);
- if (v<0) v ^= 0x7fffffffffffffffL;
- NumericUtils.longToPrefixCoded(v, 0, bytes);
- break;
- }
- default:
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unknown type for trie field: " + f.name());
- }
- }
- return bytes.utf8ToString();
- }
@Override
public IndexableField createField(SchemaField field, Object value, float boost) {
Modified: lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/UUIDField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/UUIDField.java?rev=1152985&r1=1152984&r2=1152985&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/UUIDField.java (original)
+++ lucene/dev/branches/fieldtype/solr/src/java/org/apache/solr/schema/UUIDField.java Tue Aug 2 00:37:20 2011
@@ -22,7 +22,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.UUID;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.SortField;
import org.apache.solr.common.SolrException;
@@ -92,8 +91,4 @@ public class UUIDField extends StrField
public UUID toObject(IndexableField f) {
return UUID.fromString(f.stringValue());
}
- @Override
- public UUID toObject(Fieldable f) {
- return UUID.fromString(f.stringValue());
- }
}
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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -24,8 +24,9 @@ import org.apache.lucene.index.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document2.Document;
+import org.apache.lucene.document2.Field;
+import org.apache.lucene.document2.TextField;
import org.apache.lucene.search.spell.HighFrequencyDictionary;
import org.apache.lucene.search.spell.PlainTextDictionary;
import org.apache.lucene.store.RAMDirectory;
@@ -100,7 +101,7 @@ public class FileBasedSpellChecker exten
for (String s : lines) {
Document d = new Document();
- d.add(new Field(WORD_FIELD_NAME, s, Field.Store.NO, Field.Index.ANALYZED));
+ d.add(new TextField(WORD_FIELD_NAME, s));
writer.addDocument(d);
}
writer.optimize();
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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.document2.Document;
import org.apache.lucene.index.IndexableField;
import org.apache.solr.common.SolrDocument;
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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -26,7 +26,7 @@ import java.util.Map;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.lucene.document.FieldSelectorVisitor;
+import org.apache.lucene.document2.FieldSelectorVisitor;
import org.apache.lucene.document2.Document;
import org.apache.lucene.document2.Field;
import org.apache.lucene.index.IndexableField;
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=1152985&r1=1152984&r2=1152985&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 Tue Aug 2 00:37:20 2011
@@ -23,7 +23,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Set;
-import org.apache.lucene.document.Document;
+import org.apache.lucene.document2.Document;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrServerException;