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 2015/04/20 00:50:36 UTC
svn commit: r1674705 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/core/ lucene/core/src/test/org/apache/lucene/index/
lucene/core/src/test/org/apache/lucene/search/ lucene/test-framework/
lucene/test-framework/src/java/org/apache/lucene/searc...
Author: rmuir
Date: Sun Apr 19 22:50:36 2015
New Revision: 1674705
URL: http://svn.apache.org/r1674705
Log:
speedups for the slowest tests
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java
lucene/dev/branches/branch_5x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java
lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java?rev=1674705&r1=1674704&r2=1674705&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java Sun Apr 19 22:50:36 2015
@@ -28,6 +28,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LineFileDocs;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.TestUtil;
import java.io.IOException;
@@ -36,6 +37,7 @@ import java.util.Random;
/**
* Compares one codec against another
*/
+@Slow
public class TestDuelingCodecs extends LuceneTestCase {
Directory leftDir;
IndexReader leftReader;
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java?rev=1674705&r1=1674704&r2=1674705&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java Sun Apr 19 22:50:36 2015
@@ -899,14 +899,25 @@ public class TestLRUQueryCache extends L
doc.add(f);
w.addDocument(doc);
IndexReader reader = w.getReader();
+
+ final int maxSize;
+ final long maxRamBytesUsed;
+ final int iters;
+
+ if (TEST_NIGHTLY) {
+ maxSize = TestUtil.nextInt(random(), 1, 10000);
+ maxRamBytesUsed = TestUtil.nextLong(random(), 1, 5000000);
+ iters = atLeast(20000);
+ } else {
+ maxSize = TestUtil.nextInt(random(), 1, 1000);
+ maxRamBytesUsed = TestUtil.nextLong(random(), 1, 500000);
+ iters = atLeast(2000);
+ }
- final int maxSize = TestUtil.nextInt(random(), 1, 10000);
- final long maxRamBytesUsed = TestUtil.nextLong(random(), 1, 5000000);
final LRUQueryCache queryCache = new LRUQueryCache(maxSize, maxRamBytesUsed);
IndexSearcher uncachedSearcher = null;
IndexSearcher cachedSearcher = null;
- final int iters = atLeast(20000);
for (int i = 0; i < iters; ++i) {
if (i == 0 || random().nextInt(100) == 1) {
reader.close();
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java?rev=1674705&r1=1674704&r2=1674705&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java Sun Apr 19 22:50:36 2015
@@ -37,6 +37,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.BitDocIdSet;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.automaton.Automata;
import org.apache.lucene.util.automaton.CharacterRunAutomaton;
@@ -50,6 +51,7 @@ import org.junit.BeforeClass;
* {@link #assertSameSet(Query, Query)} and
* {@link #assertSubsetOf(Query, Query)}
*/
+@SuppressCodecs("SimpleText")
public abstract class SearchEquivalenceTestBase extends LuceneTestCase {
protected static IndexSearcher s1, s2;
protected static Directory directory;
@@ -72,7 +74,7 @@ public abstract class SearchEquivalenceT
doc.add(field);
// index some docs
- int numDocs = atLeast(1000);
+ int numDocs = TEST_NIGHTLY ? atLeast(1000) : atLeast(100);
for (int i = 0; i < numDocs; i++) {
id.setStringValue(Integer.toString(i));
field.setStringValue(randomFieldContents());
@@ -244,7 +246,7 @@ public abstract class SearchEquivalenceT
assertSubsetOf(q1, q2, null);
// test with some filters (this will sometimes cause advance'ing enough to test it)
- int numFilters = atLeast(10);
+ int numFilters = TEST_NIGHTLY ? atLeast(10) : atLeast(3);
for (int i = 0; i < numFilters; i++) {
Filter filter = randomFilter();
// incorporate the filter in different ways.
@@ -298,7 +300,7 @@ public abstract class SearchEquivalenceT
assertSameScores(q1, q2, null);
// also test with some filters to test advancing
- int numFilters = atLeast(10);
+ int numFilters = TEST_NIGHTLY ? atLeast(10) : atLeast(3);
for (int i = 0; i < numFilters; i++) {
Filter filter = randomFilter();
// incorporate the filter in different ways.
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java?rev=1674705&r1=1674704&r2=1674705&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java Sun Apr 19 22:50:36 2015
@@ -1057,7 +1057,12 @@ public abstract class BaseDirectoryTestC
public void testSliceOfSlice() throws Exception {
Directory dir = getDirectory(createTempDir("sliceOfSlice"));
IndexOutput output = dir.createOutput("bytes", newIOContext(random()));
- int num = TestUtil.nextInt(random(), 50, 2500);
+ final int num;
+ if (TEST_NIGHTLY) {
+ num = TestUtil.nextInt(random(), 250, 2500);
+ } else {
+ num = TestUtil.nextInt(random(), 50, 250);
+ }
byte bytes[] = new byte[num];
random().nextBytes(bytes);
for (int i = 0; i < bytes.length; i++) {