lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hoss...@apache.org
Subject svn commit: r949891 - in /lucene/solr/branches/branch-1.4: ./ src/java/org/apache/solr/handler/ src/java/org/apache/solr/request/ src/java/org/apache/solr/update/ src/test/org/apache/solr/ src/test/test-files/solr/conf/
Date Mon, 31 May 2010 23:32:24 GMT
Author: hossman
Date: Mon May 31 23:32:24 2010
New Revision: 949891

URL: http://svn.apache.org/viewvc?rev=949891&view=rev
Log:
merging r883388 from solr/branches/branch-1.5-dev for SOLR-1580

Modified:
    lucene/solr/branches/branch-1.4/   (props changed)
    lucene/solr/branches/branch-1.4/CHANGES.txt
    lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
  (props changed)
    lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/DumpRequestHandler.java
  (props changed)
    lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
  (props changed)
    lucene/solr/branches/branch-1.4/src/java/org/apache/solr/request/RawResponseWriter.java
  (props changed)
    lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/SolrIndexWriter.java
    lucene/solr/branches/branch-1.4/src/test/org/apache/solr/BasicFunctionalityTest.java
    lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig.xml

Propchange: lucene/solr/branches/branch-1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:32:24 2010
@@ -1 +1 @@
-/lucene/solr/trunk:881642,881906,882838,883178,883566,884393,891596,891889,898119,903271,909705,911245,919871,925898
+/lucene/solr/trunk:881642,881906,882838,883178,883388,883566,884393,891596,891889,898119,903271,909705,911245,919871,925898

Modified: lucene/solr/branches/branch-1.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/CHANGES.txt?rev=949891&r1=949890&r2=949891&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/CHANGES.txt (original)
+++ lucene/solr/branches/branch-1.4/CHANGES.txt Mon May 31 23:32:24 2010
@@ -72,6 +72,9 @@ Bug Fixes
   retrieved from ContentStreams are not closed in various places, resulting
   in file descriptor leaks.
   (Christoff Brill, Mark Miller)
+  
+* SOLR-1580: Solr Configuration ignores 'mergeFactor' parameter, always 
+  uses Lucene default. (Lance Norskog via Mark Miller)
 
 * SOLR-1777: fieldTypes with sortMissingLast=true or sortMissingFirst=true can
   result in incorrectly sorted results.  (yonik)

Propchange: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:32:24 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java:881642,881906,882838,883178,883566,884393,891596,891889,898119,903271,906553,909705,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java:881642,881906,882838,883178,883388,883566,884393,891596,891889,898119,903271,906553,909705,911245,919871,925898

Propchange: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/DumpRequestHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:32:24 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java:881642,881906,882838,883178,883566,884393,891596,891889,898119,903271,906553,909705,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java:881642,881906,882838,883178,883388,883566,884393,891596,891889,898119,903271,906553,909705,911245,919871,925898

Propchange: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:32:24 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java:881642,881906,882838,883178,883566,884393,891596,891889,898119,903271,906553,909705,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java:881642,881906,882838,883178,883388,883566,884393,891596,891889,898119,903271,906553,909705,911245,919871,925898

Propchange: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/request/RawResponseWriter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:32:24 2010
@@ -1,2 +1,2 @@
-/lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java:881642,881906,882838,883178,883566,884393,891596,891889,898119,903271,909705,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java:881642,881906,882838,883178,883388,883566,884393,891596,891889,898119,903271,909705,911245,919871,925898
 /lucene/solr/trunk/src/java/org/apache/solr/response/RawResponseWriter.java:906553

Modified: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/SolrIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/SolrIndexWriter.java?rev=949891&r1=949890&r2=949891&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/SolrIndexWriter.java (original)
+++ lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/SolrIndexWriter.java Mon
May 31 23:32:24 2010
@@ -86,8 +86,9 @@ public class SolrIndexWriter extends Ind
 
       if (getMergePolicy() instanceof LogMergePolicy) {
         setUseCompoundFile(config.useCompoundFile);
+        if (config.mergeFactor != -1) { setMergeFactor(config.mergeFactor); }
       } else  {
-        log.warn("Use of compound file format cannot be configured if merge policy is not
an instance " +
+        log.warn("Use of compound file format or mergefactor cannot be configured if merge
policy is not an instance " +
                 "of LogMergePolicy. The configured policy's defaults will be used.");
       }
 

Modified: lucene/solr/branches/branch-1.4/src/test/org/apache/solr/BasicFunctionalityTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/test/org/apache/solr/BasicFunctionalityTest.java?rev=949891&r1=949890&r2=949891&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/src/test/org/apache/solr/BasicFunctionalityTest.java (original)
+++ lucene/solr/branches/branch-1.4/src/test/org/apache/solr/BasicFunctionalityTest.java Mon
May 31 23:32:24 2010
@@ -30,6 +30,7 @@ import org.apache.solr.core.SolrCore;
 import org.apache.solr.search.*;
 import org.apache.solr.handler.*;
 import org.apache.solr.request.*;
+import org.apache.solr.update.SolrIndexWriter;
 import org.apache.solr.util.*;
 import org.apache.solr.schema.*;
 
@@ -112,6 +113,11 @@ public class BasicFunctionalityTest exte
   }
 
   public void testSomeStuff() throws Exception {
+	// test merge factor picked up
+	SolrCore core = h.getCore();
+	SolrIndexWriter writer = new SolrIndexWriter("testWriter",core.getNewIndexDir(), core.getDirectoryFactory(),
false, core.getSchema(), core.getSolrConfig().mainIndexConfig, core.getDeletionPolicy());
+	assertEquals("Mergefactor was not picked up", writer.getMergeFactor(), 8);
+	  
     lrf.args.put("version","2.0");
     assertQ("test query on empty index",
             req("qlkciyopsbgzyvkylsjhchghjrdf")

Modified: lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig.xml?rev=949891&r1=949890&r2=949891&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig.xml (original)
+++ lucene/solr/branches/branch-1.4/src/test/test-files/solr/conf/solrconfig.xml Mon May 31
23:32:24 2010
@@ -102,7 +102,7 @@
   <mainIndex>
     <!-- lucene options specific to the main on-disk lucene index -->
     <useCompoundFile>false</useCompoundFile>
-    <mergeFactor>10</mergeFactor>
+    <mergeFactor>8</mergeFactor>
     <!-- for better multi-segment testing, we are using slower
     indexing properties of maxBufferedDocs=10 and LogDocMergePolicy.
     -->



Mime
View raw message