You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2018/04/05 10:24:36 UTC
[1/2] lucene-solr:master: LUCENE-8233: Use a consistent merge policy
in test to make sure segment counts match
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x dced5ae37 -> fb3a4b063
refs/heads/master 60ae7be40 -> 4a902f35d
LUCENE-8233: Use a consistent merge policy in test to make sure segment counts match
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4a902f35
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4a902f35
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4a902f35
Branch: refs/heads/master
Commit: 4a902f35db6c4758c1ae2da1b711494e73878c96
Parents: 60ae7be
Author: Simon Willnauer <si...@apache.org>
Authored: Thu Apr 5 12:23:41 2018 +0200
Committer: Simon Willnauer <si...@apache.org>
Committed: Thu Apr 5 12:23:41 2018 +0200
----------------------------------------------------------------------
.../apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4a902f35/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java
index 3f4f405..3d8ffe3 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java
@@ -159,7 +159,7 @@ public class TestSoftDeletesRetentionMergePolicy extends LuceneTestCase {
IndexWriterConfig indexWriterConfig = newIndexWriterConfig();
indexWriterConfig.setMergePolicy(new SoftDeletesRetentionMergePolicy("soft_delete",
() -> new MatchAllDocsQuery(),
- indexWriterConfig.getMergePolicy()));
+ new LogDocMergePolicy()));
indexWriterConfig.setSoftDeletesField("soft_delete");
IndexWriter writer = new IndexWriter(dir, indexWriterConfig);
[2/2] lucene-solr:branch_7x: LUCENE-8233: Use a consistent merge
policy in test to make sure segment counts match
Posted by si...@apache.org.
LUCENE-8233: Use a consistent merge policy in test to make sure segment counts match
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fb3a4b06
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fb3a4b06
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fb3a4b06
Branch: refs/heads/branch_7x
Commit: fb3a4b063c955889ef6fd4d1664e8622c8378e4e
Parents: dced5ae
Author: Simon Willnauer <si...@apache.org>
Authored: Thu Apr 5 12:23:41 2018 +0200
Committer: Simon Willnauer <si...@apache.org>
Committed: Thu Apr 5 12:24:22 2018 +0200
----------------------------------------------------------------------
.../apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fb3a4b06/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java
index 3f4f405..3d8ffe3 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java
@@ -159,7 +159,7 @@ public class TestSoftDeletesRetentionMergePolicy extends LuceneTestCase {
IndexWriterConfig indexWriterConfig = newIndexWriterConfig();
indexWriterConfig.setMergePolicy(new SoftDeletesRetentionMergePolicy("soft_delete",
() -> new MatchAllDocsQuery(),
- indexWriterConfig.getMergePolicy()));
+ new LogDocMergePolicy()));
indexWriterConfig.setSoftDeletesField("soft_delete");
IndexWriter writer = new IndexWriter(dir, indexWriterConfig);