svn commit: r1670559 - in /lucene/dev/branches/lucene6271: ./ lucene/ lucene/core/ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java

[rm...@apache.org]

Author: rmuir
Date: Wed Apr  1 04:03:29 2015
New Revision: 1670559

URL: http://svn.apache.org/r1670559
Log:
merge trunk changes up to r1670558

Modified:
    lucene/dev/branches/lucene6271/   (props changed)
    lucene/dev/branches/lucene6271/lucene/   (props changed)
    lucene/dev/branches/lucene6271/lucene/core/   (props changed)
    lucene/dev/branches/lucene6271/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java

Modified: lucene/dev/branches/lucene6271/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java?rev=1670559&r1=1670558&r2=1670559&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java (original)
+++ lucene/dev/branches/lucene6271/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java Wed Apr  1 04:03:29 2015
@@ -24,7 +24,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
+import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.MockAnalyzer;
+import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.index.IndexWriterConfig.OpenMode;
@@ -125,7 +127,16 @@ public class TestIndexWriterForceMerge e
 
     final MockDirectoryWrapper dir = newMockDirectory();
     dir.setEnableVirusScanner(false);
-    IndexWriter writer  = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))
+    // don't use MockAnalyzer, variable length payloads can cause merge to make things bigger,
+    // since things are optimized for fixed length case. this is a problem for MemoryPF's encoding.
+    // (it might have other problems too)
+    Analyzer analyzer = new Analyzer() {
+      @Override
+      protected TokenStreamComponents createComponents(String fieldName) {
+        return new TokenStreamComponents(new MockTokenizer(MockTokenizer.WHITESPACE, true));
+      }
+    };
+    IndexWriter writer  = new IndexWriter(dir, newIndexWriterConfig(analyzer)
                                                  .setMaxBufferedDocs(10)
                                                  .setMergePolicy(newLogMergePolicy()));