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 2020/06/25 08:55:57 UTC
[lucene-solr] 01/02: fix more tests
This is an automated email from the ASF dual-hosted git repository.
simonw pushed a commit to branch jira/lucene-8962
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 206eea3347ef9ed648fff9ba6100de7c8cea1d69
Author: Simon Willnauer <si...@apache.org>
AuthorDate: Thu Jun 25 09:11:02 2020 +0200
fix more tests
---
lucene/core/src/java/org/apache/lucene/index/MergePolicy.java | 2 +-
.../src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java | 3 ++-
lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java b/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java
index d962a5b..c474a37 100644
--- a/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java
+++ b/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java
@@ -443,7 +443,7 @@ public abstract class MergePolicy {
* Clears the list of merge readers;
*/
List<MergeReader> clearMergeReader() {
- assert mergeCompleted.isDone();
+ assert mergeCompleted.isDone() : this.getClass().getName();
List<MergeReader> readers = mergeReaders;
mergeReaders = List.of();
return readers;
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java b/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java
index 2ab2c92..a222bb7 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java
@@ -530,7 +530,7 @@ public class TestDemoParallelLeafReader extends LuceneTestCase {
@Override
public CodecReader wrapForMerge(CodecReader reader) throws IOException {
- LeafReader wrapped = getCurrentReader((SegmentReader)reader, schemaGen);
+ LeafReader wrapped = getCurrentReader(reader, schemaGen);
if (wrapped instanceof ParallelLeafReader) {
parallelReaders.add((ParallelLeafReader) wrapped);
}
@@ -539,6 +539,7 @@ public class TestDemoParallelLeafReader extends LuceneTestCase {
@Override
public void mergeFinished(boolean success, boolean segmentDropped) throws IOException {
+ super.mergeFinished(success, segmentDropped);
Throwable th = null;
for (ParallelLeafReader r : parallelReaders) {
try {
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
index 5ba0d80..2c9bc23 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
@@ -4181,7 +4181,8 @@ public class TestIndexWriter extends LuceneTestCase {
SetOnce<Boolean> onlyFinishOnce = new SetOnce<>();
return new MergePolicy.OneMerge(merge.segments) {
@Override
- public void mergeFinished(boolean success, boolean segmentDropped) {
+ public void mergeFinished(boolean success, boolean segmentDropped) throws IOException {
+ super.mergeFinished(success, segmentDropped);
onlyFinishOnce.set(true);
}
};