svn commit: r1670547 - in /lucene/dev/branches/lucene6271: ./ lucene/ lucene/codecs/ lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/ lucene/core/ lucene/core/src/test/org/apache/lucene/index/

[rm...@apache.org]

Author: rmuir
Date: Wed Apr  1 03:00:55 2015
New Revision: 1670547

URL: http://svn.apache.org/r1670547
Log:
LUCENE-6271: merge trunk changes up to r1670546

Added:
    lucene/dev/branches/lucene6271/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecsAtNight.java
      - copied unchanged from r1670546, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecsAtNight.java
Modified:
    lucene/dev/branches/lucene6271/   (props changed)
    lucene/dev/branches/lucene6271/lucene/   (props changed)
    lucene/dev/branches/lucene6271/lucene/codecs/   (props changed)
    lucene/dev/branches/lucene6271/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java
    lucene/dev/branches/lucene6271/lucene/core/   (props changed)
    lucene/dev/branches/lucene6271/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java

Modified: lucene/dev/branches/lucene6271/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java?rev=1670547&r1=1670546&r2=1670547&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java (original)
+++ lucene/dev/branches/lucene6271/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java Wed Apr  1 03:00:55 2015
@@ -49,7 +49,7 @@ import org.apache.lucene.util.IOUtils;
 
 public final class OrdsBlockTreeTermsReader extends FieldsProducer {
 
-  // Open input to the main terms dict file (_X.tiv)
+  // Open input to the main terms dict file (_X.tio)
   final IndexInput in;
 
   //private static final boolean DEBUG = BlockTreeTermsWriter.DEBUG;

Modified: lucene/dev/branches/lucene6271/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java?rev=1670547&r1=1670546&r2=1670547&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java (original)
+++ lucene/dev/branches/lucene6271/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java Wed Apr  1 03:00:55 2015
@@ -37,17 +37,17 @@ import java.util.Random;
  * Compares one codec against another
  */
 public class TestDuelingCodecs extends LuceneTestCase {
-  private Directory leftDir;
-  private IndexReader leftReader;
-  private Codec leftCodec;
-
-  private Directory rightDir;
-  private IndexReader rightReader;
-  private Codec rightCodec;
-  private RandomIndexWriter leftWriter;
-  private RandomIndexWriter rightWriter;
-  private long seed;
-  private String info;  // for debugging
+  Directory leftDir;
+  IndexReader leftReader;
+  Codec leftCodec;
+
+  Directory rightDir;
+  IndexReader rightReader;
+  Codec rightCodec;
+  RandomIndexWriter leftWriter;
+  RandomIndexWriter rightWriter;
+  long seed;
+  String info;  // for debugging
 
   @Override
   public void setUp() throws Exception {
@@ -143,8 +143,9 @@ public class TestDuelingCodecs extends L
   /**
    * checks the two indexes are equivalent
    */
+  // we use a small amount of docs here, so it works with any codec 
   public void testEquals() throws IOException {
-    int numdocs = TEST_NIGHTLY ? atLeast(2000) : atLeast(100);
+    int numdocs = atLeast(100);
     createRandomIndex(numdocs, leftWriter, seed);
     createRandomIndex(numdocs, rightWriter, seed);