svn commit: r548094 - in /lucene/solr/trunk/src: java/org/apache/solr/common/SolrInputDocument.java test/org/apache/solr/common/SolrDocumentTest.java

[ry...@apache.org]

Author: ryan
Date: Sun Jun 17 11:37:28 2007
New Revision: 548094

URL: http://svn.apache.org/viewvc?view=rev&rev=548094
Log:
* Changed setKeepDuplicateFieldValues to setRemoveDuplicateFieldValues
* made sure the tests deal with duplicate values on one field, but not the other

http://www.nabble.com/Re%3A-svn-commit%3A-r547493---in--lucene-solr-trunk%3A-.--src-java-org-apache-solr-common--src-java-org-apache-solr-schema--src-java-org-apache-solr-update--src-test-org-apache-solr-common--p11159518.html

Modified:
    lucene/solr/trunk/src/java/org/apache/solr/common/SolrInputDocument.java
    lucene/solr/trunk/src/test/org/apache/solr/common/SolrDocumentTest.java

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=548094&r1=548093&r2=548094
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/common/SolrInputDocument.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/common/SolrInputDocument.java Sun Jun 17 11:37:28 2007
@@ -29,7 +29,7 @@
  * match those specified in schema.xml 
  * 
  * By default, this will keep every field value added to the document.  To only
- * keep distinct values, use setKeepDuplicateFieldValues( "fieldname", false);
+ * keep distinct values, use setRemoveDuplicateFieldValues( "fieldname", true );
  *
  * @author ryan
  * @version $Id$
@@ -38,7 +38,7 @@
 public class SolrInputDocument extends SolrDocument
 {
   private Map<String,Float> _boost = null;
-  private Map<String,Boolean> _keepDuplicates = null;
+  private Map<String,Boolean> _removeDuplicates = null;
  
    /**
    * Return a base collection to manage the fields for a given value.  If
@@ -49,7 +49,7 @@
   @Override
   protected Collection<Object> getEmptyCollection( String name )
   {
-    if( _keepDuplicates == null || Boolean.TRUE == _keepDuplicates.get( name )) {
+    if( _removeDuplicates == null || Boolean.FALSE == _removeDuplicates.get( name )) {
       return new ArrayList<Object>();
     }
     return new LinkedHashSet<Object>();  // keep the order? -- perhaps HashSet?
@@ -65,8 +65,8 @@
     if( _boost != null ) {
       _boost.clear();
     }
-    if(_keepDuplicates != null ) {
-      _keepDuplicates.clear();
+    if(_removeDuplicates != null ) {
+      _removeDuplicates.clear();
     }
   }
   
@@ -125,22 +125,22 @@
    * 
    * NOTE: this must be called before adding any values to the given field.
    */
-  public void setKeepDuplicateFieldValues( String name, boolean v )
+  public void setRemoveDuplicateFieldValues( String name, boolean v )
   {
     if( this.getFieldValues( name ) != null ) {
       // If it was not distinct and changed to distinct, we could, but this seems like a better rule
       throw new RuntimeException( "You can't change a fields distinctness after it is initialized." );
     }
     
-    if( _keepDuplicates == null ) {
-      if( v == true ) {
-        // we only care about 'false'  we don't need to make a map unless 
+    if( _removeDuplicates == null ) {
+      if( v == false ) {
+        // we only care about 'true'  we don't need to make a map unless 
         // something does not want multiple values
         return; 
       }
-      _keepDuplicates = new HashMap<String, Boolean>();
+      _removeDuplicates = new HashMap<String, Boolean>();
     }
-    _keepDuplicates.put( name, v );
+    _removeDuplicates.put( name, v );
   }
 
 }

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=548094&r1=548093&r2=548094
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/common/SolrDocumentTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/common/SolrDocumentTest.java Sun Jun 17 11:37:28 2007
@@ -132,11 +132,15 @@
     c0.add( "ccc" );
     
     SolrInputDocument doc = new SolrInputDocument();
-    doc.setKeepDuplicateFieldValues( null, false );
-    doc.addField( "v", c0 );
-    assertEquals( 3, doc.getFieldValues("v").size() );
-    
-    assertEquals( "[aaa, bbb, ccc]", doc.getFieldValues( "v" ).toString() );
+    doc.setRemoveDuplicateFieldValues( "f1", true );
+    doc.setRemoveDuplicateFieldValues( "f2", false );
+    doc.addField( "f1", c0 );
+    doc.addField( "f2", c0 );
+    assertEquals( 3, doc.getFieldValues("f1").size() );
+    assertEquals( 5, doc.getFieldValues("f2").size() );
+
+    assertEquals( "[aaa, bbb, ccc]", doc.getFieldValues( "f1" ).toString() );
+    assertEquals( "[aaa, bbb, aaa, aaa, ccc]", doc.getFieldValues( "f2" ).toString() );
   }
  
   public void testDuplicate() 
@@ -155,13 +159,13 @@
     assertEquals( (3*5), doc.getFieldValues("f").size() );
     
     try {
-      doc.setKeepDuplicateFieldValues( "f", false );
+      doc.setRemoveDuplicateFieldValues( "f", true );
       fail( "can't change distinct for an existing field" );
     }
     catch( Exception ex ) {}
     
     doc.removeFields( "f" );
-    doc.setKeepDuplicateFieldValues( "f", false );
+    doc.setRemoveDuplicateFieldValues( "f", true );
     for( int i=0; i<5; i++ ) {
       doc.addField( "f", fval0 );
       doc.addField( "f", fval1 );