You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2013/06/14 21:31:36 UTC
svn commit: r1493225 [2/2] - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/benchmark/
lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/
lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/ lucene/core/
lucene/core/src/...
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java?rev=1493225&r1=1493224&r2=1493225&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java Fri Jun 14 19:31:34 2013
@@ -272,7 +272,7 @@ class DocHelper {
public static SegmentInfoPerCommit writeDoc(Random random, Directory dir, Analyzer analyzer, Similarity similarity, Document doc) throws IOException {
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig( /* LuceneTestCase.newIndexWriterConfig(random, */
TEST_VERSION_CURRENT, analyzer).setSimilarity(similarity == null ? IndexSearcher.getDefaultSimilarity() : similarity));
- //writer.setUseCompoundFile(false);
+ //writer.setNoCFSRatio(0.0);
writer.addDocument(doc);
writer.commit();
SegmentInfoPerCommit info = writer.newestSegment();
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1493225&r1=1493224&r2=1493225&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Fri Jun 14 19:31:34 2013
@@ -808,6 +808,7 @@ public abstract class LuceneTestCase ext
if (rarely(r)) {
c.setMergedSegmentWarmer(new SimpleMergedSegmentWarmer(c.getInfoStream()));
}
+ c.setUseCompoundFile(r.nextBoolean());
c.setReaderPooling(r.nextBoolean());
c.setReaderTermsIndexDivisor(_TestUtil.nextInt(r, 1, 4));
return c;
@@ -831,19 +832,28 @@ public abstract class LuceneTestCase ext
public static LogMergePolicy newLogMergePolicy(Random r) {
LogMergePolicy logmp = r.nextBoolean() ? new LogDocMergePolicy() : new LogByteSizeMergePolicy();
- logmp.setUseCompoundFile(r.nextBoolean());
logmp.setCalibrateSizeByDeletes(r.nextBoolean());
if (rarely(r)) {
logmp.setMergeFactor(_TestUtil.nextInt(r, 2, 9));
} else {
logmp.setMergeFactor(_TestUtil.nextInt(r, 10, 50));
}
- logmp.setUseCompoundFile(r.nextBoolean());
- logmp.setNoCFSRatio(0.1 + r.nextDouble()*0.8);
+ configureRandom(r, logmp);
+ return logmp;
+ }
+
+ private static void configureRandom(Random r, MergePolicy mergePolicy) {
+ if (r.nextBoolean()) {
+ mergePolicy.setNoCFSRatio(0.1 + r.nextDouble()*0.8);
+ } else {
+ mergePolicy.setNoCFSRatio(r.nextBoolean() ? 1.0 : 0.0);
+ }
+
if (rarely()) {
- logmp.setMaxCFSSegmentSizeMB(0.2 + r.nextDouble() * 2.0);
+ mergePolicy.setMaxCFSSegmentSizeMB(0.2 + r.nextDouble() * 2.0);
+ } else {
+ mergePolicy.setMaxCFSSegmentSizeMB(Double.POSITIVE_INFINITY);
}
- return logmp;
}
public static TieredMergePolicy newTieredMergePolicy(Random r) {
@@ -867,29 +877,25 @@ public abstract class LuceneTestCase ext
} else {
tmp.setSegmentsPerTier(_TestUtil.nextInt(r, 10, 50));
}
- tmp.setUseCompoundFile(r.nextBoolean());
- tmp.setNoCFSRatio(0.1 + r.nextDouble()*0.8);
- if (rarely()) {
- tmp.setMaxCFSSegmentSizeMB(0.2 + r.nextDouble() * 2.0);
- }
+ configureRandom(r, tmp);
tmp.setReclaimDeletesWeight(r.nextDouble()*4);
return tmp;
}
- public static LogMergePolicy newLogMergePolicy(boolean useCFS) {
- LogMergePolicy logmp = newLogMergePolicy();
- logmp.setUseCompoundFile(useCFS);
+ public static MergePolicy newLogMergePolicy(boolean useCFS) {
+ MergePolicy logmp = newLogMergePolicy();
+ logmp.setNoCFSRatio(useCFS ? 1.0 : 0.0);
return logmp;
}
- public static LogMergePolicy newLogMergePolicy(boolean useCFS, int mergeFactor) {
+ public static MergePolicy newLogMergePolicy(boolean useCFS, int mergeFactor) {
LogMergePolicy logmp = newLogMergePolicy();
- logmp.setUseCompoundFile(useCFS);
+ logmp.setNoCFSRatio(useCFS ? 1.0 : 0.0);
logmp.setMergeFactor(mergeFactor);
return logmp;
}
- public static LogMergePolicy newLogMergePolicy(int mergeFactor) {
+ public static MergePolicy newLogMergePolicy(int mergeFactor) {
LogMergePolicy logmp = newLogMergePolicy();
logmp.setMergeFactor(mergeFactor);
return logmp;
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java?rev=1493225&r1=1493224&r2=1493225&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java Fri Jun 14 19:31:34 2013
@@ -260,17 +260,6 @@ public class _TestUtil {
}
}
- // NOTE: only works for TMP and LMP!!
- public static void setUseCompoundFile(MergePolicy mp, boolean v) {
- if (mp instanceof TieredMergePolicy) {
- ((TieredMergePolicy) mp).setUseCompoundFile(v);
- } else if (mp instanceof LogMergePolicy) {
- ((LogMergePolicy) mp).setUseCompoundFile(v);
- } else {
- throw new IllegalArgumentException("cannot set compound file for MergePolicy " + mp);
- }
- }
-
/** start and end are BOTH inclusive */
public static int nextInt(Random r, int start, int end) {
return RandomInts.randomIntBetween(r, start, end);
@@ -762,12 +751,12 @@ public class _TestUtil {
if (mp instanceof LogMergePolicy) {
LogMergePolicy lmp = (LogMergePolicy) mp;
lmp.setMergeFactor(Math.min(5, lmp.getMergeFactor()));
- lmp.setUseCompoundFile(true);
+ lmp.setNoCFSRatio(1.0);
} else if (mp instanceof TieredMergePolicy) {
TieredMergePolicy tmp = (TieredMergePolicy) mp;
tmp.setMaxMergeAtOnce(Math.min(5, tmp.getMaxMergeAtOnce()));
tmp.setSegmentsPerTier(Math.min(5, tmp.getSegmentsPerTier()));
- tmp.setUseCompoundFile(true);
+ tmp.setNoCFSRatio(1.0);
}
MergeScheduler ms = w.getConfig().getMergeScheduler();
if (ms instanceof ConcurrentMergeScheduler) {
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=1493225&r1=1493224&r2=1493225&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 Jun 14 19:31:34 2013
@@ -217,14 +217,14 @@ public class SolrIndexConfig {
if (maxMergeDocs != -1)
logMergePolicy.setMaxMergeDocs(maxMergeDocs);
- logMergePolicy.setUseCompoundFile(useCompoundFile);
+ logMergePolicy.setNoCFSRatio(useCompoundFile ? 1.0 : 0.0);
if (mergeFactor != -1)
logMergePolicy.setMergeFactor(mergeFactor);
} else if (policy instanceof TieredMergePolicy) {
TieredMergePolicy tieredMergePolicy = (TieredMergePolicy) policy;
- tieredMergePolicy.setUseCompoundFile(useCompoundFile);
+ tieredMergePolicy.setNoCFSRatio(useCompoundFile ? 1.0 : 0.0);
if (mergeFactor != -1) {
tieredMergePolicy.setMaxMergeAtOnce(mergeFactor);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java?rev=1493225&r1=1493224&r2=1493225&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java Fri Jun 14 19:31:34 2013
@@ -39,8 +39,6 @@ public class TestMergePolicyConfig exten
// mp-specific setter
assertEquals(19, tieredMP.getMaxMergeAtOnceExplicit());
- // make sure we apply compoundFile and mergeFactor
- assertEquals(false, tieredMP.getUseCompoundFile());
assertEquals(7, tieredMP.getMaxMergeAtOnce());
// make sure we overrode segmentsPerTier (split from maxMergeAtOnce out of mergeFactor)