You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/12/30 22:14:18 UTC
svn commit: r1225920 [1/2] - in /lucene/dev/trunk: lucene/
lucene/src/test-framework/java/org/apache/lucene/analysis/
lucene/src/test-framework/java/org/apache/lucene/search/
lucene/src/test-framework/java/org/apache/lucene/store/
lucene/src/test-frame...
Author: rmuir
Date: Fri Dec 30 21:14:15 2011
New Revision: 1225920
URL: http://svn.apache.org/viewvc?rev=1225920&view=rev
Log:
LUCENE-3667: make tests reasonable if you dont have a supercomputer
Added:
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRandomStoredFields.java (with props)
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/core/MockFSDirectoryFactory.java (with props)
Modified:
lucene/dev/trunk/lucene/build.xml
lucene/dev/trunk/lucene/common-build.xml
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenizer.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/pulsing/Test10KPulsings.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCompoundFile.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDuelingCodecs.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressNRT.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCache.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestShardSearching.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestLockFactory.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java
lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandlerRandom.java
lucene/dev/trunk/modules/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
lucene/dev/trunk/solr/common-build.xml
lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/conf/solrconfig-icucollate.xml
lucene/dev/trunk/solr/contrib/clustering/src/test-files/clustering/solr/conf/solrconfig.xml
lucene/dev/trunk/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/conf/dataimport-solrconfig.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/contentstream-solrconfig.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-nodatasource-solrconfig.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-solrconfig.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilderThreaded.java
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
lucene/dev/trunk/solr/contrib/extraction/src/test-files/extraction/solr/conf/solrconfig.xml
lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/solr/conf/solrconfig.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/bad_solrconfig.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-SOLR-749.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-basic.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-delpolicy2.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-lazywriter.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-master.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-master1.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-master2.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-master3.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-mergepolicy.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-repeater.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-slave.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-slave1.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-tlog.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-xinclude.xml
lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig_codec.xml
lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java
lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/conf/solrconfig-slave1.xml
lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/shared/conf/solrconfig.xml
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Fri Dec 30 21:14:15 2011
@@ -150,14 +150,10 @@
<target name="junit-backwards-parallel" unless="tests.sequential">
<parallel threadsPerProcessor="${tests.threadspercpu}">
- <backwards-test-macro threadNum="1" threadTotal="8"/>
- <backwards-test-macro threadNum="2" threadTotal="8"/>
- <backwards-test-macro threadNum="3" threadTotal="8"/>
- <backwards-test-macro threadNum="4" threadTotal="8"/>
- <backwards-test-macro threadNum="5" threadTotal="8"/>
- <backwards-test-macro threadNum="6" threadTotal="8"/>
- <backwards-test-macro threadNum="7" threadTotal="8"/>
- <backwards-test-macro threadNum="8" threadTotal="8"/>
+ <backwards-test-macro threadNum="1" threadTotal="4"/>
+ <backwards-test-macro threadNum="2" threadTotal="4"/>
+ <backwards-test-macro threadNum="3" threadTotal="4"/>
+ <backwards-test-macro threadNum="4" threadTotal="4"/>
</parallel>
</target>
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Fri Dec 30 21:14:15 2011
@@ -654,14 +654,10 @@
<target name="junit-parallel" unless="tests.sequential">
<parallel threadsPerProcessor="${tests.threadspercpu}">
- <test-macro threadNum="1" threadTotal="8"/>
- <test-macro threadNum="2" threadTotal="8"/>
- <test-macro threadNum="3" threadTotal="8"/>
- <test-macro threadNum="4" threadTotal="8"/>
- <test-macro threadNum="5" threadTotal="8"/>
- <test-macro threadNum="6" threadTotal="8"/>
- <test-macro threadNum="7" threadTotal="8"/>
- <test-macro threadNum="8" threadTotal="8"/>
+ <test-macro threadNum="1" threadTotal="4"/>
+ <test-macro threadNum="2" threadTotal="4"/>
+ <test-macro threadNum="3" threadTotal="4"/>
+ <test-macro threadNum="4" threadTotal="4"/>
</parallel>
</target>
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenizer.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenizer.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenizer.java Fri Dec 30 21:14:15 2011
@@ -48,9 +48,9 @@ public class MockTokenizer extends Token
public static final CharacterRunAutomaton KEYWORD =
new CharacterRunAutomaton(new RegExp(".*").toAutomaton());
/** Acts like LetterTokenizer. */
- // the ugly regex below is Unicode 5.2 [:Letter:]
+ // the ugly regex below is incomplete Unicode 5.2 [:Letter:]
public static final CharacterRunAutomaton SIMPLE =
- new CharacterRunAutomaton(new RegExp("[A-Za-zªµºÃ-ÃÃ-öø-ËË-ËË -ˤˬˮͰ-ʹͶͷͺ-ͽÎÎ-ÎÎÎ-ΡΣ-ϵϷ-ÒÒ-Ô¥Ô±-ÕÕÕ¡-Ö×-תװ-ײء-Ùٮٯٱ-ÛÛÛ¥Û¦Û®Û¯Ûº-Û¼Û¿ÜÜ-ܯÝ-Þ¥Þ±ß-ߪߴߵߺà -à à à ¤à ¨à¤-हऽà¥à¥-ॡॱॲॹ-ॿà¦
-à¦à¦à¦à¦-নপ-রলশ-হঽà§à§à§à§-à§¡à§°à§±à¨
-à¨à¨à¨à¨-ਨਪ-ਰਲਲ਼ਵਸ਼ਸਹà©-à©à©à©²-à©´àª
-àªàª-àªàª-નપ-રલળવ-હઽà«à« à«¡à¬
-à¬à¬à¬à¬-ନପ-ରଲଳଵ-ହଽààà-à¡à±à®à®
-à®à®-à®à®-à®à®à®à®à®à®à®£à®¤à®¨-பà®
®-ஹà¯à°
-à°à°-à°à°-నప-ళవ-హఽà±à±à± ౡà²
-à²à²-à²à²-ನಪ-ಳವ-ಹಽà³à³ ೡà´
-à´à´-à´à´-നപ-ഹഽൠൡൺ-ൿà¶
-à¶à¶-නඳ-රලà·-à·à¸-ะาำà¹-à¹àºàºàºàºàºàºàºàº-àºàº-àºàº¡-ຣລວສຫàº-ະາຳຽà»-à»à»à»à»à¼à½-à½à½-ཬà¾-à¾á-áªá¿á-áá-áá¡á¥á¦á®-á°áµ-ááá -á
á-áºá¼á-áá-áá-ááá-áá -áá-áá-á°á²-áµá¸-á¾áá-á
á-áá-áá-áá-áá-áá -á´á-á¬á¯-á¿á-áá -áª
á-áá-áá -á±á-áá -á¬á®-á°á-á³ááá -á¡·á¢-ᢨᢪᢰ-ᣵá¤-á¤á¥-á¥á¥°-ᥴá¦-ᦫá§-á§á¨-á¨á¨ -á©áª§á¬
-ᬳá
-áá®-ᮠᮮᮯá°-á°£á±-á±á±-ᱽᳩ-ᳬᳮ-á³±á´-á¶¿á¸-á¼á¼-á¼á¼ -á½
á½-á½á½-á½á½á½á½á½-á½½á¾-á¾´á¾¶-ᾼιá¿-á¿á¿-á¿á¿-á¿á¿-á¿á¿ -Ῥῲ-á¿´á¿¶-ῼâ±â¿â-ââââ-âââ-ââ¤â¦â¨âª-ââ¯-â¹â¼-â¿â
-â
â
âââ°-Ⱞⰰ-â±â± -ⳤⳫ-â³®â´-ⴥⴰ-ⵥⵯâ¶-â¶â¶ -ⶦⶨ-ⶮⶰ-ⶶⶸ-â¶¾â·-â·â·-â·â·-â·â·-â·â¸¯ã
ãã±-ãµã»�
�¼ã-ãã-ãã¡-ãºã¼-ã¿ã
-ãã±-ãã -ã·ã°-ã¿ã-ä¶µä¸-é¿ê-êê-ê½ê-êê-êêªê«ê-êê¢-ê®ê¿-êê -ê¥ê-êê¢-êêêê»-ê ê -ê
ê -ê ê -ê ¢ê¡-ꡳê¢-ꢳꣲ-ꣷꣻê¤-ꤥꤰ-ê¥ê¥ -ꥼê¦-ꦲê§ê¨-ꨨê©-ê©ê©-ê©ê© -ꩶꩺêª-ꪯꪱꪵꪶꪹ-ꪽê«ê«ê«-ê«ê¯-ꯢê°-í£í°-íí-í»ï¤-ï¨ï¨°-ï©ï©°-ï«ï¬-ï¬ï¬-ï¬ï¬ï¬-ﬨשׁ-זּטּ-לּמּïïïïï-ï®±ï¯-ï´½ïµ-ï¶ï¶-ï·ï·°-ﷻﹰ-ï¹´ï¹¶-ﻼA-Zï½-ï½ï½¦-ï¾¾ï¿-ï¿ï¿-ï¿ï¿-ï¿ï¿-ï¿ð-ðð-ð¦ð¨-�
�ºð¼ð½ð¿-ðð-ðð-ðºð-ðð -ðð-ðð°-ðð-ðð-ðð -ðð-ðð-ðð -ð
ð ð -ð µð ·ð ¸ð ¼ð ¿-ð¡ð¤-ð¤ð¤ -ð¤¹ð¨ð¨-ð¨ð¨-ð¨ð¨-ð¨³ð© -ð©¼ð¬-ð¬µð-ðð -ð²ð°-ð±ð-ð¯ð-ð®ð-ð®ð-ðð-ðððð¢ð¥ð¦ð©-ð¬ð®-ð¹ð»ð½-ðð
-ð
ð-ðð-ðð-ðð-ð¹ð»-ð¾ð-ððð-ðð-ð¥ð¨-ðð-ðð-ðºð¼-ðð-ð´ð¶-ðð-ð®ð°-ðð-ð¨ð�
�ª-ðð-ðð -ðªðª-ð«´ð¯ -ð¯¨]+").toAutomaton());
+ new CharacterRunAutomaton(new RegExp("[A-Za-zªµºÃ-ÃÃ-öø-Z]+").toAutomaton());
private final CharacterRunAutomaton runAutomaton;
private final boolean lowerCase;
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java Fri Dec 30 21:14:15 2011
@@ -28,6 +28,7 @@ import junit.framework.Assert;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.store.Directory;
+import org.apache.lucene.util.LuceneTestCase;
public class CheckHits {
@@ -177,7 +178,7 @@ public class CheckHits {
Assert.assertEquals(query.toString(defaultFieldName), correct, actual);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random, query,searcher, LuceneTestCase.rarely(random));
}
/** Tests that a Hits has an expected order of documents */
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java Fri Dec 30 21:14:15 2011
@@ -105,7 +105,7 @@ public class QueryUtils {
public static void check(Random random, Query q1, IndexSearcher s) {
check(random, q1, s, true);
}
- private static void check(Random random, Query q1, IndexSearcher s, boolean wrap) {
+ public static void check(Random random, Query q1, IndexSearcher s, boolean wrap) {
try {
check(q1);
if (s!=null) {
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/store/MockDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/store/MockDirectoryWrapper.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/store/MockDirectoryWrapper.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/store/MockDirectoryWrapper.java Fri Dec 30 21:14:15 2011
@@ -156,7 +156,10 @@ public class MockDirectoryWrapper extend
if (crashed)
throw new IOException("cannot sync after crash");
unSyncedFiles.removeAll(names);
- delegate.sync(names);
+ if (LuceneTestCase.rarely(randomState) || delegate instanceof NRTCachingDirectory) {
+ // don't wear out our hardware so much in tests.
+ delegate.sync(names);
+ }
}
@Override
Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java Fri Dec 30 21:14:15 2011
@@ -686,7 +686,7 @@ public abstract class LuceneTestCase ext
}
}
- private final static int THREAD_STOP_GRACE_MSEC = 50;
+ private final static int THREAD_STOP_GRACE_MSEC = 10;
// jvm-wide list of 'rogue threads' we found, so they only get reported once.
private final static IdentityHashMap<Thread,Boolean> rogueThreads = new IdentityHashMap<Thread,Boolean>();
@@ -898,10 +898,10 @@ public abstract class LuceneTestCase ext
if (r.nextBoolean()) {
if (rarely(r)) {
// crazy value
- c.setMaxBufferedDocs(_TestUtil.nextInt(r, 2, 7));
+ c.setMaxBufferedDocs(_TestUtil.nextInt(r, 2, 15));
} else {
// reasonable value
- c.setMaxBufferedDocs(_TestUtil.nextInt(r, 8, 1000));
+ c.setMaxBufferedDocs(_TestUtil.nextInt(r, 16, 1000));
}
}
if (r.nextBoolean()) {
@@ -914,15 +914,21 @@ public abstract class LuceneTestCase ext
}
}
if (r.nextBoolean()) {
- c.setIndexerThreadPool(new ThreadAffinityDocumentsWriterThreadPool(_TestUtil.nextInt(r, 1, 20)));
+ if (rarely(r)) {
+ // crazy value
+ c.setIndexerThreadPool(new ThreadAffinityDocumentsWriterThreadPool(_TestUtil.nextInt(r, 5, 20)));
+ } else {
+ // reasonable value
+ c.setIndexerThreadPool(new ThreadAffinityDocumentsWriterThreadPool(_TestUtil.nextInt(r, 1, 4)));
+ }
}
- if (r.nextBoolean()) {
- c.setMergePolicy(newTieredMergePolicy());
+ if (rarely(r)) {
+ c.setMergePolicy(new MockRandomMergePolicy(r));
} else if (r.nextBoolean()) {
- c.setMergePolicy(newLogMergePolicy());
+ c.setMergePolicy(newTieredMergePolicy());
} else {
- c.setMergePolicy(new MockRandomMergePolicy(r));
+ c.setMergePolicy(newLogMergePolicy());
}
c.setReaderPooling(r.nextBoolean());
@@ -943,9 +949,9 @@ public abstract class LuceneTestCase ext
logmp.setUseCompoundFile(r.nextBoolean());
logmp.setCalibrateSizeByDeletes(r.nextBoolean());
if (rarely(r)) {
- logmp.setMergeFactor(_TestUtil.nextInt(r, 2, 4));
+ logmp.setMergeFactor(_TestUtil.nextInt(r, 2, 9));
} else {
- logmp.setMergeFactor(_TestUtil.nextInt(r, 5, 50));
+ logmp.setMergeFactor(_TestUtil.nextInt(r, 10, 50));
}
return logmp;
}
@@ -953,16 +959,24 @@ public abstract class LuceneTestCase ext
public static TieredMergePolicy newTieredMergePolicy(Random r) {
TieredMergePolicy tmp = new TieredMergePolicy();
if (rarely(r)) {
- tmp.setMaxMergeAtOnce(_TestUtil.nextInt(r, 2, 4));
- tmp.setMaxMergeAtOnceExplicit(_TestUtil.nextInt(r, 2, 4));
+ tmp.setMaxMergeAtOnce(_TestUtil.nextInt(r, 2, 9));
+ tmp.setMaxMergeAtOnceExplicit(_TestUtil.nextInt(r, 2, 9));
} else {
- tmp.setMaxMergeAtOnce(_TestUtil.nextInt(r, 5, 50));
- tmp.setMaxMergeAtOnceExplicit(_TestUtil.nextInt(r, 5, 50));
+ tmp.setMaxMergeAtOnce(_TestUtil.nextInt(r, 10, 50));
+ tmp.setMaxMergeAtOnceExplicit(_TestUtil.nextInt(r, 10, 50));
+ }
+ if (rarely(r)) {
+ tmp.setMaxMergedSegmentMB(0.2 + r.nextDouble() * 2.0);
+ } else {
+ tmp.setMaxMergedSegmentMB(r.nextDouble() * 100);
}
- tmp.setMaxMergedSegmentMB(0.2 + r.nextDouble() * 2.0);
tmp.setFloorSegmentMB(0.2 + r.nextDouble() * 2.0);
tmp.setForceMergeDeletesPctAllowed(0.0 + r.nextDouble() * 30.0);
- tmp.setSegmentsPerTier(_TestUtil.nextInt(r, 2, 20));
+ if (rarely(r)) {
+ tmp.setSegmentsPerTier(_TestUtil.nextInt(r, 2, 20));
+ } else {
+ tmp.setSegmentsPerTier(_TestUtil.nextInt(r, 10, 50));
+ }
tmp.setUseCompoundFile(r.nextBoolean());
tmp.setNoCFSRatio(0.1 + r.nextDouble()*0.8);
tmp.setReclaimDeletesWeight(r.nextDouble()*4);
@@ -1216,7 +1230,7 @@ public abstract class LuceneTestCase ext
* with one that returns null for getSequentialSubReaders.
*/
public static IndexSearcher newSearcher(IndexReader r, boolean maybeWrap) throws IOException {
- if (random.nextBoolean()) {
+ if (usually()) {
if (maybeWrap && rarely()) {
r = new SlowMultiReaderWrapper(r);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java Fri Dec 30 21:14:15 2011
@@ -302,7 +302,7 @@ public class TestSurrogates extends Luce
for(int f=0;f<numField;f++) {
String field = "f" + f;
- final int numTerms = atLeast(1000);
+ final int numTerms = atLeast(200);
final Set<String> uniqueTerms = new HashSet<String>();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java Fri Dec 30 21:14:15 2011
@@ -55,32 +55,43 @@ import org.apache.lucene.store.IndexInpu
import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
public class TestTermInfosReaderIndex extends LuceneTestCase {
- private static final int NUMBER_OF_DOCUMENTS = 1000;
- private static final int NUMBER_OF_FIELDS = 100;
- private TermInfosReaderIndex index;
- private Directory directory;
- private SegmentTermEnum termEnum;
- private int indexDivisor;
- private int termIndexInterval;
- private IndexReader reader;
- private List<Term> sampleTerms;
+ private static int NUMBER_OF_DOCUMENTS;
+ private static int NUMBER_OF_FIELDS;
+ private static TermInfosReaderIndex index;
+ private static Directory directory;
+ private static SegmentTermEnum termEnum;
+ private static int indexDivisor;
+ private static int termIndexInterval;
+ private static IndexReader reader;
+ private static List<Term> sampleTerms;
/** we will manually instantiate preflex-rw here */
@BeforeClass
- public static void beforeClass() {
+ public static void beforeClass() throws Exception {
LuceneTestCase.PREFLEX_IMPERSONATION_IS_ACTIVE = true;
- }
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
+ IndexWriterConfig config = newIndexWriterConfig(TEST_VERSION_CURRENT,
+ new MockAnalyzer(random, MockTokenizer.KEYWORD, false));
+
+ termIndexInterval = config.getTermIndexInterval();
indexDivisor = _TestUtil.nextInt(random, 1, 10);
+ NUMBER_OF_DOCUMENTS = atLeast(100);
+ NUMBER_OF_FIELDS = atLeast(Math.max(10, 3*termIndexInterval*indexDivisor/NUMBER_OF_DOCUMENTS));
+
directory = newDirectory();
- termIndexInterval = populate(directory);
+
+ config.setCodec(new PreFlexRWCodec());
+ // turn off compound file, this test will open some index files directly.
+ LogMergePolicy mp = newLogMergePolicy();
+ mp.setUseCompoundFile(false);
+ config.setMergePolicy(mp);
+
+
+ populate(directory, config);
IndexReader r0 = IndexReader.open(directory);
SegmentReader r = (SegmentReader) r0.getSequentialSubReaders()[0];
@@ -102,15 +113,18 @@ public class TestTermInfosReaderIndex ex
reader = IndexReader.open(directory);
sampleTerms = sample(reader,1000);
-
}
- @Override
- public void tearDown() throws Exception {
+ @AfterClass
+ public static void afterClass() throws Exception {
termEnum.close();
reader.close();
directory.close();
- super.tearDown();
+ termEnum = null;
+ reader = null;
+ directory = null;
+ index = null;
+ sampleTerms = null;
}
public void testSeekEnum() throws CorruptIndexException, IOException {
@@ -141,7 +155,7 @@ public class TestTermInfosReaderIndex ex
}
}
- private List<Term> sample(IndexReader reader, int size) throws IOException {
+ private static List<Term> sample(IndexReader reader, int size) throws IOException {
List<Term> sample = new ArrayList<Term>();
Random random = new Random();
FieldsEnum fieldsEnum = MultiFields.getFields(reader).iterator();
@@ -166,22 +180,13 @@ public class TestTermInfosReaderIndex ex
private Term findTermThatWouldBeAtIndex(SegmentTermEnum termEnum, int index) throws IOException {
int termPosition = index * termIndexInterval * indexDivisor;
for (int i = 0; i < termPosition; i++) {
- if (!termEnum.next()) {
- fail("Should not have run out of terms.");
- }
+ // TODO: this test just uses random terms, so this is always possible
+ assumeTrue("ran out of terms.", termEnum.next());
}
return termEnum.term();
}
- private int populate(Directory directory) throws CorruptIndexException, LockObtainFailedException, IOException {
- IndexWriterConfig config = newIndexWriterConfig(TEST_VERSION_CURRENT,
- new MockAnalyzer(random, MockTokenizer.KEYWORD, false));
- config.setCodec(new PreFlexRWCodec());
- // turn off compound file, this test will open some index files directly.
- LogMergePolicy mp = newLogMergePolicy();
- mp.setUseCompoundFile(false);
- config.setMergePolicy(mp);
-
+ private static void populate(Directory directory, IndexWriterConfig config) throws CorruptIndexException, LockObtainFailedException, IOException {
RandomIndexWriter writer = new RandomIndexWriter(random, directory, config);
for (int i = 0; i < NUMBER_OF_DOCUMENTS; i++) {
Document document = new Document();
@@ -192,10 +197,9 @@ public class TestTermInfosReaderIndex ex
}
writer.forceMerge(1);
writer.close();
- return config.getTermIndexInterval();
}
- private String getText() {
+ private static String getText() {
return Long.toString(random.nextLong(),Character.MAX_RADIX);
}
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/pulsing/Test10KPulsings.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/pulsing/Test10KPulsings.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/pulsing/Test10KPulsings.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/codecs/pulsing/Test10KPulsings.java Fri Dec 30 21:14:15 2011
@@ -47,6 +47,7 @@ import org.apache.lucene.util._TestUtil;
*
* @lucene.experimental
*/
+@LuceneTestCase.Nightly
public class Test10KPulsings extends LuceneTestCase {
public void test10kPulsed() throws Exception {
// we always run this test with pulsing codec.
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Fri Dec 30 21:14:15 2011
@@ -23,7 +23,9 @@ import java.io.IOException;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -52,6 +54,8 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.Constants;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
/*
Verify we can read the pre-4.0 file format, do searches
@@ -94,7 +98,7 @@ public class TestBackwardsCompatibility
}
*/
- final String[] oldNames = {"30.cfs",
+ final static String[] oldNames = {"30.cfs",
"30.nocfs",
"31.cfs",
"31.nocfs",
@@ -120,10 +124,34 @@ public class TestBackwardsCompatibility
"29.nocfs",
};
- final String[] oldSingleSegmentNames = {"31.optimized.cfs",
+ final static String[] oldSingleSegmentNames = {"31.optimized.cfs",
"31.optimized.nocfs",
};
+ static Map<String,Directory> oldIndexDirs;
+
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ List<String> names = new ArrayList<String>(oldNames.length + oldSingleSegmentNames.length);
+ names.addAll(Arrays.asList(oldNames));
+ names.addAll(Arrays.asList(oldSingleSegmentNames));
+ oldIndexDirs = new HashMap<String,Directory>();
+ for (String name : names) {
+ File dir = _TestUtil.getTempDir(name);
+ File dataFile = new File(TestBackwardsCompatibility.class.getResource("index." + name + ".zip").toURI());
+ _TestUtil.unzip(dataFile, dir);
+ oldIndexDirs.put(name, newFSDirectory(dir));
+ }
+ }
+
+ @AfterClass
+ public static void afterClass() throws Exception {
+ for (Directory d : oldIndexDirs.values()) {
+ d.close();
+ }
+ oldIndexDirs = null;
+ }
+
/** This test checks that *only* IndexFormatTooOldExceptions are thrown when you open and operate on too old indexes! */
public void testUnsupportedOldIndexes() throws Exception {
for(int i=0;i<unsupportedNames.length;i++) {
@@ -183,48 +211,35 @@ public class TestBackwardsCompatibility
}
public void testFullyMergeOldIndex() throws Exception {
- for(int i=0;i<oldNames.length;i++) {
+ for (String name : oldNames) {
if (VERBOSE) {
- System.out.println("\nTEST: index=" + oldNames[i]);
+ System.out.println("\nTEST: index=" + name);
}
- File oldIndxeDir = _TestUtil.getTempDir(oldNames[i]);
- _TestUtil.unzip(getDataFile("index." + oldNames[i] + ".zip"), oldIndxeDir);
- Directory dir = newFSDirectory(oldIndxeDir);
-
+ Directory dir = newDirectory(oldIndexDirs.get(name));
IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random)));
w.forceMerge(1);
w.close();
dir.close();
- _TestUtil.rmDir(oldIndxeDir);
}
}
public void testAddOldIndexes() throws IOException {
for (String name : oldNames) {
- File oldIndxeDir = _TestUtil.getTempDir(name);
- _TestUtil.unzip(getDataFile("index." + name + ".zip"), oldIndxeDir);
- Directory dir = newFSDirectory(oldIndxeDir);
-
Directory targetDir = newDirectory();
IndexWriter w = new IndexWriter(targetDir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random)));
- w.addIndexes(dir);
+ w.addIndexes(oldIndexDirs.get(name));
w.close();
- dir.close();
targetDir.close();
- _TestUtil.rmDir(oldIndxeDir);
}
}
public void testAddOldIndexesReader() throws IOException {
for (String name : oldNames) {
- File oldIndxeDir = _TestUtil.getTempDir(name);
- _TestUtil.unzip(getDataFile("index." + name + ".zip"), oldIndxeDir);
- Directory dir = newFSDirectory(oldIndxeDir);
- IndexReader reader = IndexReader.open(dir);
+ IndexReader reader = IndexReader.open(oldIndexDirs.get(name));
Directory targetDir = newDirectory();
IndexWriter w = new IndexWriter(targetDir, newIndexWriterConfig(
@@ -233,39 +248,32 @@ public class TestBackwardsCompatibility
w.close();
reader.close();
- dir.close();
targetDir.close();
- _TestUtil.rmDir(oldIndxeDir);
}
}
public void testSearchOldIndex() throws IOException {
- for(int i=0;i<oldNames.length;i++) {
- File oldIndxeDir = _TestUtil.getTempDir(oldNames[i]);
- _TestUtil.unzip(getDataFile("index." + oldNames[i] + ".zip"), oldIndxeDir);
- searchIndex(oldIndxeDir, oldNames[i]);
- _TestUtil.rmDir(oldIndxeDir);
+ for (String name : oldNames) {
+ searchIndex(oldIndexDirs.get(name), name);
}
}
public void testIndexOldIndexNoAdds() throws IOException {
- for(int i=0;i<oldNames.length;i++) {
- File oldIndxeDir = _TestUtil.getTempDir(oldNames[i]);
- _TestUtil.unzip(getDataFile("index." + oldNames[i] + ".zip"), oldIndxeDir);
- changeIndexNoAdds(random, oldIndxeDir);
- _TestUtil.rmDir(oldIndxeDir);
+ for (String name : oldNames) {
+ Directory dir = newDirectory(oldIndexDirs.get(name));
+ changeIndexNoAdds(random, dir);
+ dir.close();
}
}
public void testIndexOldIndex() throws IOException {
- for(int i=0;i<oldNames.length;i++) {
+ for (String name : oldNames) {
if (VERBOSE) {
- System.out.println("TEST: oldName=" + oldNames[i]);
+ System.out.println("TEST: oldName=" + name);
}
- File oldIndxeDir = _TestUtil.getTempDir(oldNames[i]);
- _TestUtil.unzip(getDataFile("index." + oldNames[i] + ".zip"), oldIndxeDir);
- changeIndexWithAdds(random, oldIndxeDir, oldNames[i]);
- _TestUtil.rmDir(oldIndxeDir);
+ Directory dir = newDirectory(oldIndexDirs.get(name));
+ changeIndexWithAdds(random, dir, name);
+ dir.close();
}
}
@@ -278,11 +286,10 @@ public class TestBackwardsCompatibility
}
}
- public void searchIndex(File indexDir, String oldName) throws IOException {
+ public void searchIndex(Directory dir, String oldName) throws IOException {
//QueryParser parser = new QueryParser("contents", new MockAnalyzer(random));
//Query query = parser.parse("handle:1");
- Directory dir = newFSDirectory(indexDir);
IndexReader reader = IndexReader.open(dir);
IndexSearcher searcher = new IndexSearcher(reader);
@@ -314,7 +321,7 @@ public class TestBackwardsCompatibility
}
Terms tfv = reader.getTermVectors(i).terms("utf8");
- assertNotNull("docID=" + i + " index=" + indexDir.getName(), tfv);
+ assertNotNull("docID=" + i + " index=" + oldName, tfv);
} else
// Only ID 7 is deleted
assertEquals(7, i);
@@ -337,7 +344,6 @@ public class TestBackwardsCompatibility
assertEquals(34, hits.length);
reader.close();
- dir.close();
}
private int compare(String name, String v) {
@@ -346,9 +352,7 @@ public class TestBackwardsCompatibility
return v0 - v1;
}
- public void changeIndexWithAdds(Random random, File oldIndexDir, String origOldName) throws IOException {
-
- Directory dir = newFSDirectory(oldIndexDir);
+ public void changeIndexWithAdds(Random random, Directory dir, String origOldName) throws IOException {
// open writer
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.APPEND));
// add 10 docs
@@ -388,14 +392,9 @@ public class TestBackwardsCompatibility
doTestHits(hits, 44, searcher.getIndexReader());
assertEquals("wrong first document", "21", d.get("id"));
reader.close();
-
- dir.close();
}
- public void changeIndexNoAdds(Random random, File oldIndexDir) throws IOException {
-
- Directory dir = newFSDirectory(oldIndexDir);
-
+ public void changeIndexNoAdds(Random random, Directory dir) throws IOException {
// make sure searching sees right # hits
IndexReader reader = IndexReader.open(dir);
IndexSearcher searcher = new IndexSearcher(reader);
@@ -416,8 +415,6 @@ public class TestBackwardsCompatibility
assertEquals("wrong number of hits", 34, hits.length);
doTestHits(hits, 34, searcher.getIndexReader());
reader.close();
-
- dir.close();
}
public File createIndex(String dirName, boolean doCFS, boolean fullyMerged) throws IOException {
@@ -576,10 +573,8 @@ public class TestBackwardsCompatibility
// flex: test basics of TermsEnum api on non-flex index
public void testNextIntoWrongField() throws Exception {
- for(int i=0;i<oldNames.length;i++) {
- File oldIndexDir = _TestUtil.getTempDir(oldNames[i]);
- _TestUtil.unzip(getDataFile("index." + oldNames[i] + ".zip"), oldIndexDir);
- Directory dir = newFSDirectory(oldIndexDir);
+ for (String name : oldNames) {
+ Directory dir = oldIndexDirs.get(name);
IndexReader r = IndexReader.open(dir);
TermsEnum terms = MultiFields.getFields(r).terms("content").iterator(null);
BytesRef t = terms.next();
@@ -615,17 +610,13 @@ public class TestBackwardsCompatibility
assertNull(terms.next());
r.close();
- dir.close();
- _TestUtil.rmDir(oldIndexDir);
}
}
public void testNumericFields() throws Exception {
- for(int i=0;i<oldNames.length;i++) {
+ for (String name : oldNames) {
- File oldIndexDir = _TestUtil.getTempDir(oldNames[i]);
- _TestUtil.unzip(getDataFile("index." + oldNames[i] + ".zip"), oldIndexDir);
- Directory dir = newFSDirectory(oldIndexDir);
+ Directory dir = oldIndexDirs.get(name);
IndexReader reader = IndexReader.open(dir);
IndexSearcher searcher = new IndexSearcher(reader);
@@ -660,8 +651,6 @@ public class TestBackwardsCompatibility
}
reader.close();
- dir.close();
- _TestUtil.rmDir(oldIndexDir);
}
}
@@ -691,9 +680,7 @@ public class TestBackwardsCompatibility
if (VERBOSE) {
System.out.println("testUpgradeOldIndex: index=" +name);
}
- File oldIndxeDir = _TestUtil.getTempDir(name);
- _TestUtil.unzip(getDataFile("index." + name + ".zip"), oldIndxeDir);
- Directory dir = newFSDirectory(oldIndxeDir);
+ Directory dir = newDirectory(oldIndexDirs.get(name));
new IndexUpgrader(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, null), false)
.upgrade();
@@ -701,7 +688,6 @@ public class TestBackwardsCompatibility
checkAllSegmentsUpgraded(dir);
dir.close();
- _TestUtil.rmDir(oldIndxeDir);
}
}
@@ -710,9 +696,7 @@ public class TestBackwardsCompatibility
if (VERBOSE) {
System.out.println("testUpgradeOldSingleSegmentIndexWithAdditions: index=" +name);
}
- File oldIndxeDir = _TestUtil.getTempDir(name);
- _TestUtil.unzip(getDataFile("index." + name + ".zip"), oldIndxeDir);
- Directory dir = newFSDirectory(oldIndxeDir);
+ Directory dir = newDirectory(oldIndexDirs.get(name));
assertEquals("Original index must be single segment", 1, getNumberOfSegments(dir));
@@ -752,7 +736,6 @@ public class TestBackwardsCompatibility
origSegCount, segCount);
dir.close();
- _TestUtil.rmDir(oldIndxeDir);
}
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCompoundFile.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCompoundFile.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCompoundFile.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCompoundFile.java Fri Dec 30 21:14:15 2011
@@ -773,7 +773,7 @@ public class TestCompoundFile extends Lu
public void testManySubFiles() throws IOException {
final Directory d = newFSDirectory(_TestUtil.getTempDir("CFSManySubFiles"));
- final int FILE_COUNT = 10000;
+ final int FILE_COUNT = atLeast(500);
for(int fileIdx=0;fileIdx<FILE_COUNT;fileIdx++) {
IndexOutput out = d.createOutput("file." + fileIdx, newIOContext(random));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDuelingCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDuelingCodecs.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDuelingCodecs.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDuelingCodecs.java Fri Dec 30 21:14:15 2011
@@ -92,7 +92,7 @@ public class TestDuelingCodecs extends L
RandomIndexWriter leftWriter = new RandomIndexWriter(new Random(seed), leftDir, leftConfig);
RandomIndexWriter rightWriter = new RandomIndexWriter(new Random(seed), rightDir, rightConfig);
- int numdocs = atLeast(500);
+ int numdocs = atLeast(100);
createRandomIndex(numdocs, leftWriter, seed);
createRandomIndex(numdocs, rightWriter, seed);
@@ -134,7 +134,7 @@ public class TestDuelingCodecs extends L
*/
public void testEquals() throws Exception {
assertReaderStatistics(leftReader, rightReader);
- assertFields(MultiFields.getFields(leftReader), MultiFields.getFields(rightReader));
+ assertFields(MultiFields.getFields(leftReader), MultiFields.getFields(rightReader), true);
assertNorms(leftReader, rightReader);
assertStoredFields(leftReader, rightReader);
assertTermVectors(leftReader, rightReader);
@@ -160,7 +160,7 @@ public class TestDuelingCodecs extends L
/**
* Fields api equivalency
*/
- public void assertFields(Fields leftFields, Fields rightFields) throws Exception {
+ public void assertFields(Fields leftFields, Fields rightFields, boolean deep) throws Exception {
// Fields could be null if there are no postings,
// but then it must be null for both
if (leftFields == null || rightFields == null) {
@@ -176,7 +176,7 @@ public class TestDuelingCodecs extends L
String field;
while ((field = leftEnum.next()) != null) {
assertEquals(info, field, rightEnum.next());
- assertTerms(leftEnum.terms(), rightEnum.terms());
+ assertTerms(leftEnum.terms(), rightEnum.terms(), deep);
}
assertNull(rightEnum.next());
}
@@ -197,7 +197,7 @@ public class TestDuelingCodecs extends L
/**
* Terms api equivalency
*/
- public void assertTerms(Terms leftTerms, Terms rightTerms) throws Exception {
+ public void assertTerms(Terms leftTerms, Terms rightTerms, boolean deep) throws Exception {
if (leftTerms == null || rightTerms == null) {
assertNull(info, leftTerms);
assertNull(info, rightTerms);
@@ -210,15 +210,17 @@ public class TestDuelingCodecs extends L
assertTermsEnum(leftTermsEnum, rightTermsEnum, true);
// TODO: test seeking too
- int numIntersections = atLeast(3);
- for (int i = 0; i < numIntersections; i++) {
- String re = AutomatonTestUtil.randomRegexp(random);
- CompiledAutomaton automaton = new CompiledAutomaton(new RegExp(re, RegExp.NONE).toAutomaton());
- if (automaton.type == CompiledAutomaton.AUTOMATON_TYPE.NORMAL) {
- // TODO: test start term too
- TermsEnum leftIntersection = leftTerms.intersect(automaton, null);
- TermsEnum rightIntersection = rightTerms.intersect(automaton, null);
- assertTermsEnum(leftIntersection, rightIntersection, rarely());
+ if (deep) {
+ int numIntersections = atLeast(3);
+ for (int i = 0; i < numIntersections; i++) {
+ String re = AutomatonTestUtil.randomRegexp(random);
+ CompiledAutomaton automaton = new CompiledAutomaton(new RegExp(re, RegExp.NONE).toAutomaton());
+ if (automaton.type == CompiledAutomaton.AUTOMATON_TYPE.NORMAL) {
+ // TODO: test start term too
+ TermsEnum leftIntersection = leftTerms.intersect(automaton, null);
+ TermsEnum rightIntersection = rightTerms.intersect(automaton, null);
+ assertTermsEnum(leftIntersection, rightIntersection, rarely());
+ }
}
}
}
@@ -511,7 +513,7 @@ public class TestDuelingCodecs extends L
for (int i = 0; i < leftReader.maxDoc(); i++) {
Fields leftFields = leftReader.getTermVectors(i);
Fields rightFields = rightReader.getTermVectors(i);
- assertFields(leftFields, rightFields);
+ assertFields(leftFields, rightFields, rarely());
}
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java Fri Dec 30 21:14:15 2011
@@ -416,7 +416,8 @@ public class TestIndexWriter extends Luc
public void testDiverseDocs() throws IOException {
MockDirectoryWrapper dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setRAMBufferSizeMB(0.5));
- for(int i=0;i<3;i++) {
+ int n = atLeast(1);
+ for(int i=0;i<n;i++) {
// First, docs where every term is unique (heavy on
// Posting instances)
for(int j=0;j<100;j++) {
@@ -455,7 +456,7 @@ public class TestIndexWriter extends Luc
IndexReader reader = IndexReader.open(dir);
IndexSearcher searcher = new IndexSearcher(reader);
ScoreDoc[] hits = searcher.search(new TermQuery(new Term("field", "aaa")), null, 1000).scoreDocs;
- assertEquals(300, hits.length);
+ assertEquals(n*100, hits.length);
reader.close();
dir.close();
@@ -737,104 +738,6 @@ public class TestIndexWriter extends Luc
dir.close();
}
- public void testNoWaitClose() throws Throwable {
- Directory directory = newDirectory();
-
- final Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_STORED);
- customType.setTokenized(false);
-
- Field idField = newField("id", "", customType);
- doc.add(idField);
-
- for(int pass=0;pass<2;pass++) {
- if (VERBOSE) {
- System.out.println("TEST: pass=" + pass);
- }
-
- IndexWriterConfig conf = newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random)).
- setOpenMode(OpenMode.CREATE).
- setMaxBufferedDocs(2).
- setMergePolicy(newLogMergePolicy());
- if (pass == 2) {
- conf.setMergeScheduler(new SerialMergeScheduler());
- }
-
- IndexWriter writer = new IndexWriter(directory, conf);
- ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(100);
-
- for(int iter=0;iter<10;iter++) {
- if (VERBOSE) {
- System.out.println("TEST: iter=" + iter);
- }
- for(int j=0;j<199;j++) {
- idField.setValue(Integer.toString(iter*201+j));
- writer.addDocument(doc);
- }
-
- int delID = iter*199;
- for(int j=0;j<20;j++) {
- writer.deleteDocuments(new Term("id", Integer.toString(delID)));
- delID += 5;
- }
-
- // Force a bunch of merge threads to kick off so we
- // stress out aborting them on close:
- ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
-
- final IndexWriter finalWriter = writer;
- final ArrayList<Throwable> failure = new ArrayList<Throwable>();
- Thread t1 = new Thread() {
- @Override
- public void run() {
- boolean done = false;
- while(!done) {
- for(int i=0;i<100;i++) {
- try {
- finalWriter.addDocument(doc);
- } catch (AlreadyClosedException e) {
- done = true;
- break;
- } catch (NullPointerException e) {
- done = true;
- break;
- } catch (Throwable e) {
- e.printStackTrace(System.out);
- failure.add(e);
- done = true;
- break;
- }
- }
- Thread.yield();
- }
-
- }
- };
-
- if (failure.size() > 0) {
- throw failure.get(0);
- }
-
- t1.start();
-
- writer.close(false);
- t1.join();
-
- // Make sure reader can read
- IndexReader reader = IndexReader.open(directory);
- reader.close();
-
- // Reopen
- writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.APPEND).setMergePolicy(newLogMergePolicy()));
- }
- writer.close();
- }
-
- directory.close();
- }
-
-
// LUCENE-1084: test unlimited field length
public void testUnlimitedMaxFieldLength() throws IOException {
Directory dir = newDirectory();
@@ -1613,102 +1516,6 @@ public class TestIndexWriter extends Luc
dir.close();
}
- public void testRandomStoredFields() throws IOException {
- Directory dir = newDirectory();
- Random rand = random;
- RandomIndexWriter w = new RandomIndexWriter(rand, dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMaxBufferedDocs(_TestUtil.nextInt(rand, 5, 20)));
- //w.w.setUseCompoundFile(false);
- final int docCount = atLeast(200);
- final int fieldCount = _TestUtil.nextInt(rand, 1, 5);
-
- final List<Integer> fieldIDs = new ArrayList<Integer>();
-
- FieldType customType = new FieldType(TextField.TYPE_STORED);
- customType.setTokenized(false);
- Field idField = newField("id", "", customType);
-
- for(int i=0;i<fieldCount;i++) {
- fieldIDs.add(i);
- }
-
- final Map<String,Document> docs = new HashMap<String,Document>();
-
- if (VERBOSE) {
- System.out.println("TEST: build index docCount=" + docCount);
- }
-
- FieldType customType2 = new FieldType();
- customType2.setStored(true);
- for(int i=0;i<docCount;i++) {
- Document doc = new Document();
- doc.add(idField);
- final String id = ""+i;
- idField.setValue(id);
- docs.put(id, doc);
- if (VERBOSE) {
- System.out.println("TEST: add doc id=" + id);
- }
-
- for(int field: fieldIDs) {
- final String s;
- if (rand.nextInt(4) != 3) {
- s = _TestUtil.randomUnicodeString(rand, 1000);
- doc.add(newField("f"+field, s, customType2));
- } else {
- s = null;
- }
- }
- w.addDocument(doc);
- if (rand.nextInt(50) == 17) {
- // mixup binding of field name -> Number every so often
- Collections.shuffle(fieldIDs);
- }
- if (rand.nextInt(5) == 3 && i > 0) {
- final String delID = ""+rand.nextInt(i);
- if (VERBOSE) {
- System.out.println("TEST: delete doc id=" + delID);
- }
- w.deleteDocuments(new Term("id", delID));
- docs.remove(delID);
- }
- }
-
- if (VERBOSE) {
- System.out.println("TEST: " + docs.size() + " docs in index; now load fields");
- }
- if (docs.size() > 0) {
- String[] idsList = docs.keySet().toArray(new String[docs.size()]);
-
- for(int x=0;x<2;x++) {
- IndexReader r = w.getReader();
- IndexSearcher s = newSearcher(r);
-
- if (VERBOSE) {
- System.out.println("TEST: cycle x=" + x + " r=" + r);
- }
-
- int num = atLeast(1000);
- for(int iter=0;iter<num;iter++) {
- String testID = idsList[rand.nextInt(idsList.length)];
- if (VERBOSE) {
- System.out.println("TEST: test id=" + testID);
- }
- TopDocs hits = s.search(new TermQuery(new Term("id", testID)), 1);
- assertEquals(1, hits.totalHits);
- Document doc = r.document(hits.scoreDocs[0].doc);
- Document docExp = docs.get(testID);
- for(int i=0;i<fieldCount;i++) {
- assertEquals("doc " + testID + ", field f" + fieldCount + " is wrong", docExp.get("f"+i), doc.get("f"+i));
- }
- }
- r.close();
- w.forceMerge(1);
- }
- }
- w.close();
- dir.close();
- }
-
public void testNoUnwantedTVFiles() throws Exception {
Directory dir = newDirectory();
@@ -1952,7 +1759,7 @@ public class TestIndexWriter extends Luc
RandomIndexWriter w1 = new RandomIndexWriter(random, d);
w1.deleteAll();
try {
- new RandomIndexWriter(random, d);
+ new RandomIndexWriter(random, d, newIndexWriterConfig(TEST_VERSION_CURRENT, null).setWriteLockTimeout(100));
fail("should not be able to create another writer");
} catch (LockObtainFailedException lofe) {
// expected
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java Fri Dec 30 21:14:15 2011
@@ -945,7 +945,7 @@ public class TestIndexWriterDelete exten
// note: tiny rambuffer used, as with a 1MB buffer the test is too slow (flush @ 128,999)
IndexWriter w = new IndexWriter(dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
- .setRAMBufferSizeMB(0.2f).setMaxBufferedDocs(1000).setMergePolicy(NoMergePolicy.NO_COMPOUND_FILES).setReaderPooling(false));
+ .setRAMBufferSizeMB(0.1f).setMaxBufferedDocs(1000).setMergePolicy(NoMergePolicy.NO_COMPOUND_FILES).setReaderPooling(false));
int count = 0;
while(true) {
Document doc = new Document();
@@ -1020,6 +1020,7 @@ public class TestIndexWriterDelete exten
// Make sure buffered (pushed) deletes don't use up so
// much RAM that it forces long tail of tiny segments:
+ @Nightly
public void testApplyDeletesOnFlush() throws Exception {
Directory dir = newDirectory();
// Cannot use RandomIndexWriter because we don't want to
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Fri Dec 30 21:14:15 2011
@@ -936,7 +936,7 @@ public class TestIndexWriterExceptions e
addDoc(w);
w.close();
- int iter = TEST_NIGHTLY ? 200 : 20;
+ int iter = TEST_NIGHTLY ? 200 : 10;
for(int i=0;i<iter;i++) {
if (VERBOSE) {
System.out.println("TEST: iter " + i);
@@ -1233,7 +1233,7 @@ public class TestIndexWriterExceptions e
FailOnTermVectors[] failures = new FailOnTermVectors[] {
new FailOnTermVectors(FailOnTermVectors.AFTER_INIT_STAGE),
new FailOnTermVectors(FailOnTermVectors.INIT_STAGE), };
- int num = atLeast(3);
+ int num = atLeast(1);
for (int j = 0; j < num; j++) {
for (FailOnTermVectors failure : failures) {
MockDirectoryWrapper dir = newDirectory();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java Fri Dec 30 21:14:15 2011
@@ -15,6 +15,7 @@ package org.apache.lucene.index;
* limitations under the License.
*/
+import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
@@ -26,6 +27,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.util.LuceneTestCase;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Random;
@@ -350,4 +352,101 @@ public class TestIndexWriterMerging exte
iw.close();
dir.close();
}
+
+ public void testNoWaitClose() throws Throwable {
+ Directory directory = newDirectory();
+
+ final Document doc = new Document();
+ FieldType customType = new FieldType(TextField.TYPE_STORED);
+ customType.setTokenized(false);
+
+ Field idField = newField("id", "", customType);
+ doc.add(idField);
+
+ for(int pass=0;pass<2;pass++) {
+ if (VERBOSE) {
+ System.out.println("TEST: pass=" + pass);
+ }
+
+ IndexWriterConfig conf = newIndexWriterConfig(
+ TEST_VERSION_CURRENT, new MockAnalyzer(random)).
+ setOpenMode(OpenMode.CREATE).
+ setMaxBufferedDocs(2).
+ setMergePolicy(newLogMergePolicy());
+ if (pass == 2) {
+ conf.setMergeScheduler(new SerialMergeScheduler());
+ }
+
+ IndexWriter writer = new IndexWriter(directory, conf);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(100);
+
+ for(int iter=0;iter<10;iter++) {
+ if (VERBOSE) {
+ System.out.println("TEST: iter=" + iter);
+ }
+ for(int j=0;j<199;j++) {
+ idField.setValue(Integer.toString(iter*201+j));
+ writer.addDocument(doc);
+ }
+
+ int delID = iter*199;
+ for(int j=0;j<20;j++) {
+ writer.deleteDocuments(new Term("id", Integer.toString(delID)));
+ delID += 5;
+ }
+
+ // Force a bunch of merge threads to kick off so we
+ // stress out aborting them on close:
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
+
+ final IndexWriter finalWriter = writer;
+ final ArrayList<Throwable> failure = new ArrayList<Throwable>();
+ Thread t1 = new Thread() {
+ @Override
+ public void run() {
+ boolean done = false;
+ while(!done) {
+ for(int i=0;i<100;i++) {
+ try {
+ finalWriter.addDocument(doc);
+ } catch (AlreadyClosedException e) {
+ done = true;
+ break;
+ } catch (NullPointerException e) {
+ done = true;
+ break;
+ } catch (Throwable e) {
+ e.printStackTrace(System.out);
+ failure.add(e);
+ done = true;
+ break;
+ }
+ }
+ Thread.yield();
+ }
+
+ }
+ };
+
+ if (failure.size() > 0) {
+ throw failure.get(0);
+ }
+
+ t1.start();
+
+ writer.close(false);
+ t1.join();
+
+ // Make sure reader can read
+ IndexReader reader = IndexReader.open(directory);
+ reader.close();
+
+ // Reopen
+ writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.APPEND).setMergePolicy(newLogMergePolicy()));
+ }
+ writer.close();
+ }
+
+ directory.close();
+ }
}
Added: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRandomStoredFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRandomStoredFields.java?rev=1225920&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRandomStoredFields.java (added)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRandomStoredFields.java Fri Dec 30 21:14:15 2011
@@ -0,0 +1,137 @@
+package org.apache.lucene.index;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.lucene.analysis.MockAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util._TestUtil;
+
+public class TestRandomStoredFields extends LuceneTestCase {
+
+ public void testRandomStoredFields() throws IOException {
+ Directory dir = newDirectory();
+ Random rand = random;
+ RandomIndexWriter w = new RandomIndexWriter(rand, dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMaxBufferedDocs(_TestUtil.nextInt(rand, 5, 20)));
+ //w.w.setUseCompoundFile(false);
+ final int docCount = atLeast(200);
+ final int fieldCount = _TestUtil.nextInt(rand, 1, 5);
+
+ final List<Integer> fieldIDs = new ArrayList<Integer>();
+
+ FieldType customType = new FieldType(TextField.TYPE_STORED);
+ customType.setTokenized(false);
+ Field idField = newField("id", "", customType);
+
+ for(int i=0;i<fieldCount;i++) {
+ fieldIDs.add(i);
+ }
+
+ final Map<String,Document> docs = new HashMap<String,Document>();
+
+ if (VERBOSE) {
+ System.out.println("TEST: build index docCount=" + docCount);
+ }
+
+ FieldType customType2 = new FieldType();
+ customType2.setStored(true);
+ for(int i=0;i<docCount;i++) {
+ Document doc = new Document();
+ doc.add(idField);
+ final String id = ""+i;
+ idField.setValue(id);
+ docs.put(id, doc);
+ if (VERBOSE) {
+ System.out.println("TEST: add doc id=" + id);
+ }
+
+ for(int field: fieldIDs) {
+ final String s;
+ if (rand.nextInt(4) != 3) {
+ s = _TestUtil.randomUnicodeString(rand, 1000);
+ doc.add(newField("f"+field, s, customType2));
+ } else {
+ s = null;
+ }
+ }
+ w.addDocument(doc);
+ if (rand.nextInt(50) == 17) {
+ // mixup binding of field name -> Number every so often
+ Collections.shuffle(fieldIDs);
+ }
+ if (rand.nextInt(5) == 3 && i > 0) {
+ final String delID = ""+rand.nextInt(i);
+ if (VERBOSE) {
+ System.out.println("TEST: delete doc id=" + delID);
+ }
+ w.deleteDocuments(new Term("id", delID));
+ docs.remove(delID);
+ }
+ }
+
+ if (VERBOSE) {
+ System.out.println("TEST: " + docs.size() + " docs in index; now load fields");
+ }
+ if (docs.size() > 0) {
+ String[] idsList = docs.keySet().toArray(new String[docs.size()]);
+
+ for(int x=0;x<2;x++) {
+ IndexReader r = w.getReader();
+ IndexSearcher s = newSearcher(r);
+
+ if (VERBOSE) {
+ System.out.println("TEST: cycle x=" + x + " r=" + r);
+ }
+
+ int num = atLeast(1000);
+ for(int iter=0;iter<num;iter++) {
+ String testID = idsList[rand.nextInt(idsList.length)];
+ if (VERBOSE) {
+ System.out.println("TEST: test id=" + testID);
+ }
+ TopDocs hits = s.search(new TermQuery(new Term("id", testID)), 1);
+ assertEquals(1, hits.totalHits);
+ Document doc = r.document(hits.scoreDocs[0].doc);
+ Document docExp = docs.get(testID);
+ for(int i=0;i<fieldCount;i++) {
+ assertEquals("doc " + testID + ", field f" + fieldCount + " is wrong", docExp.get("f"+i), doc.get("f"+i));
+ }
+ }
+ r.close();
+ w.forceMerge(1);
+ }
+ }
+ w.close();
+ dir.close();
+ }
+}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressNRT.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressNRT.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressNRT.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressNRT.java Fri Dec 30 21:14:15 2011
@@ -77,7 +77,7 @@ public class TestStressNRT extends Lucen
final boolean tombstones = random.nextBoolean();
// query variables
- final AtomicLong operations = new AtomicLong(atLeast(50000)); // number of query operations to perform in total
+ final AtomicLong operations = new AtomicLong(atLeast(10000)); // number of query operations to perform in total
final int nReadThreads = _TestUtil.nextInt(random, 1, TEST_NIGHTLY ? 10 : 5);
initModel(ndocs);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCache.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCache.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCache.java Fri Dec 30 21:14:15 2011
@@ -37,19 +37,20 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
public class TestFieldCache extends LuceneTestCase {
- protected IndexReader reader;
- private int NUM_DOCS;
- private int NUM_ORDS;
- private String[] unicodeStrings;
- private BytesRef[][] multiValued;
- private Directory directory;
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- NUM_DOCS = atLeast(1000);
+ private static IndexReader reader;
+ private static int NUM_DOCS;
+ private static int NUM_ORDS;
+ private static String[] unicodeStrings;
+ private static BytesRef[][] multiValued;
+ private static Directory directory;
+
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ NUM_DOCS = atLeast(500);
NUM_ORDS = atLeast(2);
directory = newDirectory();
RandomIndexWriter writer= new RandomIndexWriter(random, directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
@@ -101,11 +102,14 @@ public class TestFieldCache extends Luce
writer.close();
}
- @Override
- public void tearDown() throws Exception {
+ @AfterClass
+ public static void afterClass() throws Exception {
reader.close();
+ reader = null;
directory.close();
- super.tearDown();
+ directory = null;
+ unicodeStrings = null;
+ multiValued = null;
}
public void testInfoStream() throws Exception {
@@ -296,7 +300,7 @@ public class TestFieldCache extends Luce
dir.close();
}
- private String generateString(int i) {
+ private static String generateString(int i) {
String s = null;
if (i > 0 && random.nextInt(3) == 1) {
// reuse past string -- try to find one that's not null
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestShardSearching.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestShardSearching.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestShardSearching.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestShardSearching.java Fri Dec 30 21:14:15 2011
@@ -66,11 +66,11 @@ public class TestShardSearching extends
public void testSimple() throws Exception {
final int numNodes = _TestUtil.nextInt(random, 1, 10);
- final double runTimeSec = atLeast(5) * RANDOM_MULTIPLIER;
+ final double runTimeSec = atLeast(3);
final int minDocsToMakeTerms = _TestUtil.nextInt(random, 5, 20);
- final int maxSearcherAgeSeconds = _TestUtil.nextInt(random, 1, 4);
+ final int maxSearcherAgeSeconds = _TestUtil.nextInt(random, 1, 3);
if (VERBOSE) {
System.out.println("TEST: numNodes=" + numNodes + " runTimeSec=" + runTimeSec + " maxSearcherAgeSeconds=" + maxSearcherAgeSeconds);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java Fri Dec 30 21:14:15 2011
@@ -80,7 +80,7 @@ public class TestSort extends LuceneTest
@BeforeClass
public static void beforeClass() throws Exception {
- NUM_STRINGS = atLeast(6000);
+ NUM_STRINGS = atLeast(500);
}
// document data:
@@ -204,8 +204,7 @@ public class TestSort extends LuceneTest
dirs.add(indexStore);
IndexWriter writer = new IndexWriter(
indexStore,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).
- setMaxBufferedDocs(4).
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).
setMergePolicy(newLogMergePolicy(97))
);
FieldType onlyStored = new FieldType();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java Fri Dec 30 21:14:15 2011
@@ -36,15 +36,16 @@ import org.apache.lucene.util.English;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
public class TestTermVectors extends LuceneTestCase {
- private IndexSearcher searcher;
- private IndexReader reader;
- private Directory directory;
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
+ private static IndexSearcher searcher;
+ private static IndexReader reader;
+ private static Directory directory;
+
+ @BeforeClass
+ public static void beforeClass() throws Exception {
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.SIMPLE, true)).setMergePolicy(newLogMergePolicy()));
//writer.setUseCompoundFile(true);
@@ -77,11 +78,13 @@ public class TestTermVectors extends Luc
searcher = newSearcher(reader);
}
- @Override
- public void tearDown() throws Exception {
+ @AfterClass
+ public static void afterClass() throws Exception {
reader.close();
directory.close();
- super.tearDown();
+ reader = null;
+ directory = null;
+ searcher = null;
}
public void test() {
@@ -370,7 +373,7 @@ public class TestTermVectors extends Luc
}
IndexReader reader = writer.getReader();
writer.close();
- searcher = newSearcher(reader);
+ IndexSearcher searcher = newSearcher(reader);
Query query = new TermQuery(new Term("field", "hundred"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
@@ -418,7 +421,7 @@ public class TestTermVectors extends Luc
IndexReader reader = writer.getReader();
writer.close();
- searcher = newSearcher(reader);
+ IndexSearcher searcher = newSearcher(reader);
Query query = new TermQuery(new Term("field", "one"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java Fri Dec 30 21:14:15 2011
@@ -111,7 +111,7 @@ public class TestBasics extends LuceneTe
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory,
newIndexWriterConfig(TEST_VERSION_CURRENT, simplePayloadAnalyzer)
- .setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)).setMergePolicy(newLogMergePolicy()));
+ .setMaxBufferedDocs(_TestUtil.nextInt(random, 100, 1000)).setMergePolicy(newLogMergePolicy()));
//writer.infoStream = System.out;
for (int i = 0; i < 2000; i++) {
Document doc = new Document();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestLockFactory.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestLockFactory.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestLockFactory.java Fri Dec 30 21:14:15 2011
@@ -132,6 +132,7 @@ public class TestLockFactory extends Luc
// Verify: do stress test, by opening IndexReaders and
// IndexWriters over & over in 2 threads and making sure
// no unexpected exceptions are raised:
+ @Nightly
public void testStressLocks() throws Exception {
_testStressLocks(null, _TestUtil.getTempDir("index.TestLockFactory6"));
}
@@ -140,6 +141,7 @@ public class TestLockFactory extends Luc
// IndexWriters over & over in 2 threads and making sure
// no unexpected exceptions are raised, but use
// NativeFSLockFactory:
+ @Nightly
public void testStressLocksNativeFSLockFactory() throws Exception {
File dir = _TestUtil.getTempDir("index.TestLockFactory7");
_testStressLocks(new NativeFSLockFactory(dir), dir);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java Fri Dec 30 21:14:15 2011
@@ -1436,7 +1436,7 @@ public class TestFSTs extends LuceneTest
Field idField = newField("id", "", StringField.TYPE_UNSTORED);
doc.add(idField);
- final int NUM_IDS = (int) (1000*RANDOM_MULTIPLIER*(1.0+random.nextDouble()));
+ final int NUM_IDS = atLeast(200);
//final int NUM_IDS = (int) (377 * (1.0+random.nextDouble()));
if (VERBOSE) {
System.out.println("TEST: NUM_IDS=" + NUM_IDS);
Modified: lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandlerRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandlerRandom.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandlerRandom.java (original)
+++ lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandlerRandom.java Fri Dec 30 21:14:15 2011
@@ -132,4 +132,9 @@ public class TestTopKResultsHandlerRando
}
}
+ @Override
+ protected int numDocsToIndex() {
+ return TEST_NIGHTLY ? 20000 : 1000;
+ }
+
}
Modified: lucene/dev/trunk/modules/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java (original)
+++ lucene/dev/trunk/modules/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java Fri Dec 30 21:14:15 2011
@@ -303,11 +303,11 @@ public class TestCustomScoreQuery extend
assertEquals("queries should have same #hits",h1.size(),h4CustomAdd.size());
assertEquals("queries should have same #hits",h1.size(),h5CustomMulAdd.size());
- QueryUtils.check(random, q1,s);
- QueryUtils.check(random, q2,s);
- QueryUtils.check(random, q3,s);
- QueryUtils.check(random, q4,s);
- QueryUtils.check(random, q5,s);
+ QueryUtils.check(random, q1, s, rarely());
+ QueryUtils.check(random, q2, s, rarely());
+ QueryUtils.check(random, q3, s, rarely());
+ QueryUtils.check(random, q4, s, rarely());
+ QueryUtils.check(random, q5, s, rarely());
// verify scores ratios
for (final Integer doc : h1.keySet()) {
Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Fri Dec 30 21:14:15 2011
@@ -47,7 +47,6 @@
<property name="example" value="${common-solr.dir}/example" />
<property name="javadoc.dir" location="${build.dir}/docs/api"/>
<property name="tests.loggingfile" value="${common-solr.dir}/testlogging.properties"/>
- <property name="tests.threadspercpu" value="2"/>
<property name="tests.cleanthreads.sysprop" value="perClass"/>
<property name="clover.db.dir" location="${dest}/tests/clover/db"/>
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/conf/solrconfig-icucollate.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/conf/solrconfig-icucollate.xml?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/conf/solrconfig-icucollate.xml (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/conf/solrconfig-icucollate.xml Fri Dec 30 21:14:15 2011
@@ -20,4 +20,5 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
</config>
Modified: lucene/dev/trunk/solr/contrib/clustering/src/test-files/clustering/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/src/test-files/clustering/solr/conf/solrconfig.xml?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/src/test-files/clustering/solr/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/clustering/src/test-files/clustering/solr/conf/solrconfig.xml Fri Dec 30 21:14:15 2011
@@ -24,7 +24,7 @@
If replication is in use, this should match the replication configuration. -->
<dataDir>${solr.data.dir:}</dataDir>
-
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<indexDefaults>
<!-- Values here affect all index writers and act as a default unless overridden. -->
<useCompoundFile>false</useCompoundFile>
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/conf/dataimport-solrconfig.xml?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/conf/dataimport-solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/conf/dataimport-solrconfig.xml Fri Dec 30 21:14:15 2011
@@ -24,6 +24,7 @@
If replication is in use, this should match the replication configuration. -->
<dataDir>${solr.data.dir:}</dataDir>
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<indexDefaults>
<!-- Values here affect all index writers and act as a default unless overridden. -->
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/contentstream-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/contentstream-solrconfig.xml?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/contentstream-solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/contentstream-solrconfig.xml Fri Dec 30 21:14:15 2011
@@ -24,6 +24,7 @@
If replication is in use, this should match the replication configuration. -->
<dataDir>${solr.data.dir:}</dataDir>
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<indexDefaults>
<!-- Values here affect all index writers and act as a default unless overridden. -->
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-nodatasource-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-nodatasource-solrconfig.xml?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-nodatasource-solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-nodatasource-solrconfig.xml Fri Dec 30 21:14:15 2011
@@ -24,6 +24,7 @@
If replication is in use, this should match the replication configuration. -->
<dataDir>${solr.data.dir:}</dataDir>
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<indexDefaults>
<!-- Values here affect all index writers and act as a default unless overridden. -->
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-solrconfig.xml?rev=1225920&r1=1225919&r2=1225920&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-solrconfig.xml Fri Dec 30 21:14:15 2011
@@ -24,6 +24,7 @@
If replication is in use, this should match the replication configuration. -->
<dataDir>${solr.data.dir:}</dataDir>
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<indexDefaults>
<!-- Values here affect all index writers and act as a default unless overridden. -->