You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ry...@apache.org on 2007/07/02 17:57:04 UTC
svn commit: r552521 - in /lucene/solr/trunk:
client/java/solrj/test/org/apache/solr/client/solrj/
src/java/org/apache/solr/common/ src/test/org/apache/solr/common/
src/test/org/apache/solr/update/
Author: ryan
Date: Mon Jul 2 08:57:03 2007
New Revision: 552521
URL: http://svn.apache.org/viewvc?view=rev&rev=552521
Log:
SOLR-280 -- changing SolrInputField to take float rather then Float. this will avoid autoboxing, if you don't want to define the boost, use one of the wrapper functions that default to 1.0
Modified:
lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
lucene/solr/trunk/src/java/org/apache/solr/common/SolrInputDocument.java
lucene/solr/trunk/src/java/org/apache/solr/common/SolrInputField.java
lucene/solr/trunk/src/test/org/apache/solr/common/SolrDocumentTest.java
lucene/solr/trunk/src/test/org/apache/solr/update/DocumentBuilderTest.java
Modified: lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTestBase.java?view=diff&rev=552521&r1=552520&r2=552521
==============================================================================
--- lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTestBase.java (original)
+++ lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTestBase.java Mon Jul 2 08:57:03 2007
@@ -64,8 +64,8 @@
// Now add something...
SolrInputDocument doc = new SolrInputDocument();
String docID = "1112211111";
- doc.addField( "id", docID, null );
- doc.addField( "name", "my name!", null );
+ doc.addField( "id", docID, 1.0f );
+ doc.addField( "name", "my name!", 1.0f );
Assert.assertEquals( null, doc.getField("foo") );
Assert.assertTrue(doc.getField("name").getValue() != null );
@@ -91,28 +91,28 @@
// Now add a few docs for facet testing...
List<SolrInputDocument> docs = new ArrayList<SolrInputDocument>();
SolrInputDocument doc2 = new SolrInputDocument();
- doc2.addField( "id", "2", null );
- doc2.addField( "inStock", true, null );
- doc2.addField( "price", 2, null );
- doc2.addField( "timestamp", new java.util.Date(), null );
+ doc2.addField( "id", "2", 1.0f );
+ doc2.addField( "inStock", true, 1.0f );
+ doc2.addField( "price", 2, 1.0f );
+ doc2.addField( "timestamp", new java.util.Date(), 1.0f );
docs.add(doc2);
SolrInputDocument doc3 = new SolrInputDocument();
- doc3.addField( "id", "3", null );
- doc3.addField( "inStock", false, null );
- doc3.addField( "price", 3, null );
- doc3.addField( "timestamp", new java.util.Date(), null );
+ doc3.addField( "id", "3", 1.0f );
+ doc3.addField( "inStock", false, 1.0f );
+ doc3.addField( "price", 3, 1.0f );
+ doc3.addField( "timestamp", new java.util.Date(), 1.0f );
docs.add(doc3);
SolrInputDocument doc4 = new SolrInputDocument();
- doc4.addField( "id", "4", null );
- doc4.addField( "inStock", true, null );
- doc4.addField( "price", 4, null );
- doc4.addField( "timestamp", new java.util.Date(), null );
+ doc4.addField( "id", "4", 1.0f );
+ doc4.addField( "inStock", true, 1.0f );
+ doc4.addField( "price", 4, 1.0f );
+ doc4.addField( "timestamp", new java.util.Date(), 1.0f );
docs.add(doc4);
SolrInputDocument doc5 = new SolrInputDocument();
- doc5.addField( "id", "5", null );
- doc5.addField( "inStock", false, null );
- doc5.addField( "price", 5, null );
- doc5.addField( "timestamp", new java.util.Date(), null );
+ doc5.addField( "id", "5", 1.0f );
+ doc5.addField( "inStock", false, 1.0f );
+ doc5.addField( "price", 5, 1.0f );
+ doc5.addField( "timestamp", new java.util.Date(), 1.0f );
docs.add(doc5);
upres = server.add( docs );
@@ -171,7 +171,7 @@
SolrInputDocument[] doc = new SolrInputDocument[3];
for( int i=0; i<3; i++ ) {
doc[i] = new SolrInputDocument();
- doc[i].setField( "id", i + " & 222", null );
+ doc[i].setField( "id", i + " & 222", 1.0f );
}
String id = (String) doc[0].getField( "id" ).getFirstValue();
Modified: lucene/solr/trunk/src/java/org/apache/solr/common/SolrInputDocument.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/common/SolrInputDocument.java?view=diff&rev=552521&r1=552520&r2=552521
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/common/SolrInputDocument.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/common/SolrInputDocument.java Mon Jul 2 08:57:03 2007
@@ -21,7 +21,6 @@
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Map;
-import java.util.Set;
import java.util.Collection;
/**
@@ -85,7 +84,7 @@
*/
public void addField(String name, Object value)
{
- addField(name, value, null);
+ addField(name, value, 1.0f );
}
/** Get the first value for a field.
@@ -132,10 +131,10 @@
*/
public void setField(String name, Object value)
{
- setField(name, value, null);
+ setField(name, value, 1.0f );
}
- public void setField(String name, Object value, Float boost )
+ public void setField(String name, Object value, float boost )
{
SolrInputField field = new SolrInputField( name );
_fields.put( name, field );
@@ -151,7 +150,7 @@
/**
* Remove all fields and boosts from the document
*/
- public void addField(String name, Object value, Float boost )
+ public void addField(String name, Object value, float boost )
{
SolrInputField field = _fields.get( name );
if( field == null || field.value == null ) {
Modified: lucene/solr/trunk/src/java/org/apache/solr/common/SolrInputField.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/common/SolrInputField.java?view=diff&rev=552521&r1=552520&r2=552521
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/common/SolrInputField.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/common/SolrInputField.java Mon Jul 2 08:57:03 2007
@@ -43,8 +43,8 @@
/**
* Set the value for a field. Arrays will be converted to a collection.
*/
- public void setValue(Object v, Float b) {
- boost = (b==null) ? 1.0f : b.floatValue();
+ public void setValue(Object v, float b) {
+ boost = b;
if( v instanceof Object[] ) {
Object[] arr = (Object[])v;
@@ -64,7 +64,7 @@
* will be added individually
*/
@SuppressWarnings("unchecked")
- public void addValue(Object v, Float b) {
+ public void addValue(Object v, float b) {
if( value == null ) {
setValue(v, b);
return;
@@ -74,9 +74,7 @@
// on multi-value fields even though lucene indexing does not support this.
// To keep behavior consistent with what happens in the lucene index, we accumulate
// the product of all boosts specified for this field.
- if( b != null ) {
- boost *= b.floatValue();
- }
+ boost *= b;
Collection<Object> vals = null;
if( value instanceof Collection ) {
Modified: lucene/solr/trunk/src/test/org/apache/solr/common/SolrDocumentTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/common/SolrDocumentTest.java?view=diff&rev=552521&r1=552520&r2=552521
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/common/SolrDocumentTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/common/SolrDocumentTest.java Mon Jul 2 08:57:03 2007
@@ -127,8 +127,8 @@
SolrInputDocument doc = new SolrInputDocument();
doc.setRemoveDuplicateFieldValues( "f1", true );
doc.setRemoveDuplicateFieldValues( "f2", false );
- doc.addField( "f1", c0, null );
- doc.addField( "f2", c0, null );
+ doc.addField( "f1", c0, 1.0f );
+ doc.addField( "f2", c0, 1.0f );
assertEquals( 3, doc.getField("f1").getValueCount() );
assertEquals( 5, doc.getField("f2").getValueCount() );
@@ -145,9 +145,9 @@
// Set up a simple document
SolrInputDocument doc = new SolrInputDocument();
for( int i=0; i<5; i++ ) {
- doc.addField( "f", fval0, null );
- doc.addField( "f", fval1, null );
- doc.addField( "f", fval2, null );
+ doc.addField( "f", fval0, 1.0f );
+ doc.addField( "f", fval1, 1.0f );
+ doc.addField( "f", fval2, 1.0f );
}
assertEquals( (3*5), doc.getField("f").getValueCount() );
@@ -160,9 +160,9 @@
doc.removeField( "f" );
doc.setRemoveDuplicateFieldValues( "f", true );
for( int i=0; i<5; i++ ) {
- doc.addField( "f", fval0, null );
- doc.addField( "f", fval1, null );
- doc.addField( "f", fval2, null );
+ doc.addField( "f", fval0, 1.0f );
+ doc.addField( "f", fval1, 1.0f );
+ doc.addField( "f", fval2, 1.0f );
}
assertEquals( (3), doc.getField("f").getValueCount() );
}
Modified: lucene/solr/trunk/src/test/org/apache/solr/update/DocumentBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/update/DocumentBuilderTest.java?view=diff&rev=552521&r1=552520&r2=552521
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/update/DocumentBuilderTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/update/DocumentBuilderTest.java Mon Jul 2 08:57:03 2007
@@ -40,7 +40,7 @@
// undefined field
try {
SolrInputDocument doc = new SolrInputDocument();
- doc.setField( "unknown field", 12345, null );
+ doc.setField( "unknown field", 12345, 1.0f );
DocumentBuilder.toDocument( doc, core.getSchema() );
fail( "should throw an error" );
}