You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2012/03/08 15:04:29 UTC
svn commit: r1298399 -
/lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
Author: mikemccand
Date: Thu Mar 8 14:04:29 2012
New Revision: 1298399
URL: http://svn.apache.org/viewvc?rev=1298399&view=rev
Log:
sync test code w/ trunk
Modified:
lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
Modified: lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1298399&r1=1298398&r2=1298399&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Thu Mar 8 14:04:29 2012
@@ -340,43 +340,30 @@ public abstract class ThreadedIndexingAn
int seenTermCount = 0;
int shift;
int trigger;
- if (totTermCount.get() < 10) {
+ if (totTermCount.get() < 30) {
shift = 0;
trigger = 1;
} else {
- trigger = totTermCount.get()/10;
+ trigger = totTermCount.get()/30;
shift = random.nextInt(trigger);
}
while(System.currentTimeMillis() < stopTimeMS) {
Term term = termEnum.term();
if (term == null) {
- if (seenTermCount == 0) {
- break;
- }
totTermCount.set(seenTermCount);
- seenTermCount = 0;
- if (totTermCount.get() < 10) {
- shift = 0;
- trigger = 1;
- } else {
- trigger = totTermCount.get()/10;
- //System.out.println("trigger " + trigger);
- shift = random.nextInt(trigger);
- }
- termEnum = s.getIndexReader().terms(new Term("body", ""));
- continue;
+ break;
}
seenTermCount++;
- // search 10 terms
- if (trigger == 0) {
- trigger = 1;
- }
+ // search 30 terms
if ((seenTermCount + shift) % trigger == 0) {
//if (VERBOSE) {
//System.out.println(Thread.currentThread().getName() + " now search body:" + term.utf8ToString());
//}
totHits.addAndGet(runQuery(s, new TermQuery(term)));
}
+ if (!termEnum.next()) {
+ break;
+ }
}
//if (VERBOSE) {
//System.out.println(Thread.currentThread().getName() + ": search done");