svn commit: r1595324 - in /lucene/dev/trunk/lucene: core/src/java/org/apache/lucene/index/ grouping/src/test/org/apache/lucene/search/grouping/ test-framework/src/java/org/apache/lucene/index/

[mi...@apache.org]

Author: mikemccand
Date: Fri May 16 19:45:46 2014
New Revision: 1595324

URL: http://svn.apache.org/r1595324
Log:
improve test coverage for IW.expungeDeletes; fix infoStream logging in BDS to write something meaningful

Modified:
    lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java
    lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java
    lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java

Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java?rev=1595324&r1=1595323&r2=1595324&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java Fri May 16 19:45:46 2014
@@ -30,6 +30,7 @@ import org.apache.lucene.search.DocIdSet
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.QueryWrapperFilter;
+import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.IOContext;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.InfoStream;
@@ -332,7 +333,13 @@ class BufferedUpdatesStream {
     }
 
     if (infoStream.isEnabled("BD")) {
-      infoStream.message("BD", "prune sis=" + segmentInfos + " minGen=" + minGen + " packetCount=" + updates.size());
+      Directory dir;
+      if (segmentInfos.size() > 0) {
+        dir = segmentInfos.info(0).info.dir;
+      } else {
+        dir = null;
+      }
+      infoStream.message("BD", "prune sis=" + segmentInfos.toString(dir) + " minGen=" + minGen + " packetCount=" + updates.size());
     }
     final int limit = updates.size();
     for(int delIDX=0;delIDX<limit;delIDX++) {

Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java?rev=1595324&r1=1595323&r2=1595324&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java Fri May 16 19:45:46 2014
@@ -52,8 +52,8 @@ import org.apache.lucene.util.LuceneTest
 import org.apache.lucene.util.TestUtil;
 
 
-// Need SSDV
-@SuppressCodecs({"Lucene40", "Lucene41"})
+// Need SSDV, ord=-1 for missing:
+@SuppressCodecs({"Lucene40", "Lucene41", "Lucene42"})
 public class GroupFacetCollectorTest extends AbstractGroupingTestCase {
 
   public void testSimple() throws Exception {
@@ -321,7 +321,6 @@ public class GroupFacetCollectorTest ext
     doc = new Document();
     addField(doc, groupField, "a", useDv);
     doc.add(new SortedSetDocValuesField("airport", new BytesRef("dus")));
-
     w.addDocument(doc);
 
     // 4

Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java?rev=1595324&r1=1595323&r2=1595324&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java Fri May 16 19:45:46 2014
@@ -301,7 +301,7 @@ public class RandomIndexWriter implement
           System.out.println("RIW: doRandomForceMerge(1)");
         }
         w.forceMerge(1);
-      } else {
+      } else if (r.nextBoolean()) {
         // partial forceMerge
         final int limit = TestUtil.nextInt(r, 1, segCount);
         if (LuceneTestCase.VERBOSE) {
@@ -309,6 +309,11 @@ public class RandomIndexWriter implement
         }
         w.forceMerge(limit);
         assert !doRandomForceMergeAssert || w.getSegmentCount() <= limit: "limit=" + limit + " actual=" + w.getSegmentCount();
+      } else {
+        if (LuceneTestCase.VERBOSE) {
+          System.out.println("RIW: do random forceMergeDeletes()");
+        }
+        w.forceMergeDeletes();
       }
     }
   }