lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikemcc...@apache.org
Subject lucene-solr git commit: try again
Date Fri, 29 Jan 2016 14:25:36 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/master 3141c697e -> c40308387


try again


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c4030838
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c4030838
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c4030838

Branch: refs/heads/master
Commit: c403083872408b6f70f10b999fc2ae706804a672
Parents: 3141c69
Author: Mike McCandless <mikemccand@apache.org>
Authored: Fri Jan 29 09:25:48 2016 -0500
Committer: Mike McCandless <mikemccand@apache.org>
Committed: Fri Jan 29 09:25:48 2016 -0500

----------------------------------------------------------------------
 .../org/apache/lucene/index/BaseIndexFileFormatTestCase.java  | 5 +++++
 .../java/org/apache/lucene/index/BasePointFormatTestCase.java | 7 +++++++
 2 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c4030838/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java
----------------------------------------------------------------------
diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java
b/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java
index b4b6f7d..c53293c 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java
@@ -195,6 +195,7 @@ abstract class BaseIndexFileFormatTestCase extends LuceneTestCase {
 
   /** The purpose of this test is to make sure that bulk merge doesn't accumulate useless
data over runs. */
   public void testMergeStability() throws Exception {
+    assumeTrue("merge is not stable", mergeIsStable());
     Directory dir = newDirectory();
     if (dir instanceof MockDirectoryWrapper) {
       // Else, the virus checker may prevent deletion of files and cause
@@ -240,6 +241,10 @@ abstract class BaseIndexFileFormatTestCase extends LuceneTestCase {
     dir2.close();
   }
 
+  protected boolean mergeIsStable() {
+    return true;
+  }
+
   /** Test the accuracy of the ramBytesUsed estimations. */
   @Slow
   public void testRamBytesUsed() throws IOException {

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c4030838/lucene/test-framework/src/java/org/apache/lucene/index/BasePointFormatTestCase.java
----------------------------------------------------------------------
diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BasePointFormatTestCase.java
b/lucene/test-framework/src/java/org/apache/lucene/index/BasePointFormatTestCase.java
index 3b19530..2b88d74 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/index/BasePointFormatTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/index/BasePointFormatTestCase.java
@@ -919,4 +919,11 @@ public abstract class BasePointFormatTestCase extends BaseIndexFileFormatTestCas
     //dir = FSDirectory.open(createTempDir());
     return dir;
   }
+
+  @Override
+  protected boolean mergeIsStable() {
+    // suppress this test from base class: merges for BKD trees are not stable because the
tree created by merge will have a different
+    // structure than the tree created by adding points separately
+    return false;
+  }
 }


Mime
View raw message