You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/09/02 16:35:42 UTC
svn commit: r1379982 [5/5] - in /lucene/dev/trunk: ./ dev-tools/ lucene/
lucene/analysis/ lucene/analysis/common/
lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/
lucene/benchmark/
lucene/benchmark/src/java/org/apache/lucene/benchmark/byT...
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java?rev=1379982&r1=1379981&r2=1379982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java Sun Sep 2 14:35:35 2012
@@ -22,7 +22,10 @@ import java.util.HashMap;
import java.util.List;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StoredField;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
@@ -56,7 +59,7 @@ public class DocumentBuilder {
// might actually want to map it to something. If createField()
// returns null, then we don't store the field.
if (sfield.isPolyField()) {
- IndexableField[] fields = sfield.createFields(val, boost);
+ StorableField[] fields = sfield.createFields(val, boost);
if (fields.length > 0) {
if (!sfield.multiValued()) {
String oldValue = map.put(sfield.getName(), val);
@@ -66,12 +69,12 @@ public class DocumentBuilder {
}
}
// Add each field
- for (IndexableField field : fields) {
- doc.add(field);
+ for (StorableField field : fields) {
+ doc.add((Field) field);
}
}
} else {
- IndexableField field = sfield.createField(val, boost);
+ StorableField field = sfield.createField(val, boost);
if (field != null) {
if (!sfield.multiValued()) {
String oldValue = map.put(sfield.getName(), val);
@@ -81,7 +84,7 @@ public class DocumentBuilder {
}
}
}
- doc.add(field);
+ doc.add((Field) field);
}
}
@@ -190,13 +193,13 @@ public class DocumentBuilder {
private static void addField(Document doc, SchemaField field, Object val, float boost) {
if (field.isPolyField()) {
- IndexableField[] farr = field.getType().createFields(field, val, boost);
- for (IndexableField f : farr) {
- if (f != null) doc.add(f); // null fields are not added
+ StorableField[] farr = field.getType().createFields(field, val, boost);
+ for (StorableField f : farr) {
+ if (f != null) doc.add((Field) f); // null fields are not added
}
} else {
- IndexableField f = field.createField(val, boost);
- if (f != null) doc.add(f); // null fields are not added
+ StorableField f = field.createField(val, boost);
+ if (f != null) doc.add((Field) f); // null fields are not added
}
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java?rev=1379982&r1=1379981&r2=1379982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java Sun Sep 2 14:35:35 2012
@@ -19,6 +19,8 @@ package org.apache.solr.util;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.*;
@@ -332,7 +334,7 @@ public class SolrPluginUtils {
for (int i=0; i<docs.size(); i++) {
int id = iterator.nextDoc();
- Document doc = searcher.doc(id);
+ StoredDocument doc = searcher.doc(id);
String strid = schema.printableUniqueKey(doc);
explainList.add(strid, searcher.explain(query, id) );
@@ -848,10 +850,10 @@ public class SolrPluginUtils {
while (dit.hasNext()) {
int docid = dit.nextDoc();
- Document luceneDoc = searcher.doc(docid, fields);
+ StoredDocument luceneDoc = searcher.doc(docid, fields);
SolrDocument doc = new SolrDocument();
- for( IndexableField field : luceneDoc) {
+ for( StorableField field : luceneDoc) {
if (null == fields || fields.contains(field.name())) {
SchemaField sf = schema.getField( field.name() );
doc.addField( field.name(), sf.getType().toObject( field ) );
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java?rev=1379982&r1=1379981&r2=1379982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java Sun Sep 2 14:35:35 2012
@@ -33,6 +33,8 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.LogMergePolicy;
+import org.apache.lucene.index.StorableField;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.util.English;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
@@ -419,7 +421,7 @@ public class BasicFunctionalityTest exte
IndexSchema ischema = new IndexSchema(solrConfig, getSchemaFile(), null);
SchemaField f; // Solr field type
- IndexableField luf; // Lucene field
+ StorableField luf; // Lucene field
f = ischema.getField("test_basictv");
luf = f.createField("test", 0f);
@@ -621,7 +623,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().doc(dl.iterator().nextDoc());
+ StoredDocument 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")).getClass().getSimpleName().equals("LazyField"));
assertFalse( ((Field) d.getField("title")).getClass().getSimpleName().equals("LazyField"));
@@ -644,7 +646,7 @@ public class BasicFunctionalityTest exte
DocList dl = ((ResultContext) rsp.getValues().get("response")).docs;
DocIterator di = dl.iterator();
- Document d = req.getSearcher().doc(di.nextDoc());
+ StoredDocument d = req.getSearcher().doc(di.nextDoc());
// ensure field is lazy
assertTrue( (d.getField("test_hlt")).getClass().getSimpleName().equals("LazyField"));
assertFalse( (d.getField("title")).getClass().getSimpleName().equals("LazyField"));
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/CurrencyFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/CurrencyFieldTest.java?rev=1379982&r1=1379981&r2=1379982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/CurrencyFieldTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/CurrencyFieldTest.java Sun Sep 2 14:35:35 2012
@@ -17,6 +17,7 @@ package org.apache.solr.schema;
*/
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.core.SolrCore;
import org.junit.BeforeClass;
@@ -71,7 +72,7 @@ public class CurrencyFieldTest extends S
FieldType tmp = amount.getType();
assertTrue(tmp instanceof CurrencyField);
String currencyValue = "1.50,EUR";
- IndexableField[] fields = amount.createFields(currencyValue, 2);
+ StorableField[] fields = amount.createFields(currencyValue, 2);
assertEquals(fields.length, 3);
// First field is currency code, second is value, third is stored.
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java?rev=1379982&r1=1379981&r2=1379982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java Sun Sep 2 14:35:35 2012
@@ -19,6 +19,7 @@ package org.apache.solr.schema;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.util.DateMathParser;
@@ -207,7 +208,7 @@ public class DateFieldTest extends Lucen
public void testCreateField() {
int props = FieldProperties.INDEXED ^ FieldProperties.STORED;
SchemaField sf = new SchemaField( "test", f, props, null );
- IndexableField out = f.createField(sf, "1995-12-31T23:59:59Z", 1.0f );
+ StorableField out = f.createField(sf, "1995-12-31T23:59:59Z", 1.0f );
assertEquals(820454399000l, f.toObject( out ).getTime() );
out = f.createField(sf, new Date(820454399000l), 1.0f );
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java?rev=1379982&r1=1379981&r2=1379982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java Sun Sep 2 14:35:35 2012
@@ -18,6 +18,7 @@ package org.apache.solr.schema;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.StorableField;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
@@ -83,7 +84,7 @@ public class PolyFieldTest extends SolrT
assertEquals(pt.getDimension(), 2);
double[] xy = new double[]{35.0, -79.34};
String point = xy[0] + "," + xy[1];
- IndexableField[] fields = home.createFields(point, 2);
+ StorableField[] fields = home.createFields(point, 2);
assertEquals(fields.length, 3);//should be 3, we have a stored field
//first two fields contain the values, third is just stored and contains the original
for (int i = 0; i < 3; i++) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressLucene.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressLucene.java?rev=1379982&r1=1379981&r2=1379982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressLucene.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressLucene.java Sun Sep 2 14:35:35 2012
@@ -25,6 +25,7 @@ import org.apache.lucene.index.Directory
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
@@ -338,7 +339,7 @@ public class TestStressLucene extends Te
verbose("ERROR: Couldn't find a doc for id", id, "using reader",r);
}
assertTrue(docid >= 0); // we should have found the document, or it's tombstone
- Document doc = r.document(docid);
+ StoredDocument doc = r.document(docid);
long foundVal = Long.parseLong(doc.get(field));
if (foundVal < Math.abs(val)) {
verbose("ERROR: id",id,"model_val=",val," foundVal=",foundVal,"reader=",reader);