You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2012/11/16 23:09:33 UTC
svn commit: r1410598 - in /lucene/dev/branches/branch_4x/solr/core/src:
java/org/apache/solr/update/SolrIndexConfig.java
test/org/apache/solr/core/TestConfig.java
Author: yonik
Date: Fri Nov 16 22:09:32 2012
New Revision: 1410598
URL: http://svn.apache.org/viewvc?rev=1410598&view=rev
Log:
SOLR-4074: default ramBufferSizeMB to 100
Modified:
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestConfig.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java?rev=1410598&r1=1410597&r2=1410598&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java Fri Nov 16 22:09:32 2012
@@ -74,7 +74,7 @@ public class SolrIndexConfig {
maxMergeDocs = -1;
maxIndexingThreads = IndexWriterConfig.DEFAULT_MAX_THREAD_STATES;
mergeFactor = -1;
- ramBufferSizeMB = luceneVersion.onOrAfter(Version.LUCENE_36) ? 32 : 16;
+ ramBufferSizeMB = 100;
writeLockTimeout = -1;
lockType = luceneVersion.onOrAfter(Version.LUCENE_36) ?
LOCK_TYPE_NATIVE :
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestConfig.java?rev=1410598&r1=1410597&r2=1410598&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestConfig.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestConfig.java Fri Nov 16 22:09:32 2012
@@ -94,7 +94,7 @@ public class TestConfig extends SolrTest
@Test
public void testLucene23Upgrades() throws Exception {
double bufferSize = solrConfig.indexConfig.ramBufferSizeMB;
- assertTrue(bufferSize + " does not equal: " + 32, bufferSize == 32);
+ assertTrue(bufferSize + " does not equal: " + 100, bufferSize == 100);
String mergePolicy = solrConfig.indexConfig.mergePolicyInfo.className;
assertEquals(TieredMergePolicy.class.getName(), mergePolicy);
String mergeSched = solrConfig.indexConfig.mergeSchedulerInfo.className;
@@ -140,7 +140,7 @@ public class TestConfig extends SolrTest
public void testDefaults() throws Exception {
SolrConfig sc = new SolrConfig(new SolrResourceLoader("solr/collection1"), "solrconfig-basic.xml", null);
SolrIndexConfig sic = sc.indexConfig;
- assertTrue("default ramBufferSizeMB should be 32", sic.ramBufferSizeMB == 32);
+ assertTrue("default ramBufferSizeMB should be 100", sic.ramBufferSizeMB == 100);
assertTrue("default useCompoundFile should be false", sic.useCompoundFile == false);
assertTrue("default LockType should be native", sic.lockType.equals(SolrIndexConfig.LOCK_TYPE_NATIVE));
}