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/05/23 05:56:04 UTC
[2/2] lucene-solr:branch_7x: LUCENE-8324: Fix test to exclude the
write.lock in expected files
LUCENE-8324: Fix test to exclude the write.lock in expected files
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3ed9f98e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3ed9f98e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3ed9f98e
Branch: refs/heads/branch_7x
Commit: 3ed9f98ed8083716e24bf0aa5d72138da2d8b518
Parents: 245d6cd
Author: Simon Willnauer <si...@apache.org>
Authored: Wed May 23 07:43:53 2018 +0200
Committer: Simon Willnauer <si...@apache.org>
Committed: Wed May 23 07:55:52 2018 +0200
----------------------------------------------------------------------
.../core/src/test/org/apache/lucene/index/TestIndexWriter.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3ed9f98e/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
----------------------------------------------------------------------
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 5f6171f..7ebfdd4 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
@@ -40,6 +40,7 @@ import java.util.Random;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Predicate;
import java.util.stream.Collectors;
import com.carrotsearch.randomizedtesting.generators.RandomPicks;
@@ -3340,11 +3341,12 @@ public class TestIndexWriter extends LuceneTestCase {
}
private static void assertFiles(IndexWriter writer) throws IOException {
+ Predicate<String> filter = file -> file.startsWith("segments") == false && file.equals("write.lock") == false;
// remove segment files we don't know if we have committed and what is kept around
Set<String> segFiles = new HashSet<>(writer.segmentInfos.files(true)).stream()
- .filter(f -> f.startsWith("segments") == false).collect(Collectors.toSet());
+ .filter(filter).collect(Collectors.toSet());
Set<String> dirFiles = new HashSet<>(Arrays.asList(writer.getDirectory().listAll()))
- .stream().filter(f -> f.startsWith("segments") == false).collect(Collectors.toSet());
+ .stream().filter(filter).collect(Collectors.toSet());
Set<String> s = new HashSet<>(segFiles);
s.removeAll(dirFiles);
assertEquals(segFiles.toString() + " vs "+ dirFiles.toString(), segFiles.size(), dirFiles.size());