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/26 13:19:20 UTC
[lucene-solr] branch jira/lucene-8962 updated (2a9580b -> 20e13b0)
This is an automated email from the ASF dual-hosted git repository.
simonw pushed a change to branch jira/lucene-8962
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 2a9580b cleanup after broken merge
new 5635168 also remove merge from pending
new 20e13b0 remove nl
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
lucene/core/src/java/org/apache/lucene/index/IndexWriter.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
[lucene-solr] 02/02: remove nl
Posted by si...@apache.org.
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 20e13b062763c54e2b9c0a3e7161109cabd6c842
Author: Simon Willnauer <si...@apache.org>
AuthorDate: Fri Jun 26 15:19:03 2020 +0200
remove nl
---
lucene/core/src/java/org/apache/lucene/index/IndexWriter.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
index 0fc058f..78459ce 100644
--- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
@@ -3391,7 +3391,6 @@ public class IndexWriter implements Closeable, TwoPhaseCommit, Accountable,
assert removed: "merge should be pending but isn't: " + merge.segString();
abortOneMerge(merge);
mergeFinish(merge);
-
});
}
}
[lucene-solr] 01/02: also remove merge from pending
Posted by si...@apache.org.
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 56351688673a7ce35cfa57a3bbdf9bb53a79e3b9
Author: Simon Willnauer <si...@apache.org>
AuthorDate: Fri Jun 26 15:18:53 2020 +0200
also remove merge from pending
---
lucene/core/src/java/org/apache/lucene/index/IndexWriter.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
index c7e9f90..0fc058f 100644
--- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
@@ -3387,9 +3387,11 @@ public class IndexWriter implements Closeable, TwoPhaseCommit, Accountable,
if (closeReaders) {
IOUtils.applyToAll(onCommitMerges.merges, merge -> {
// that merge is broken we need to clean up after it - it's fine we still have the IW lock to do this
- assert pendingMerges.contains(merge) : "merge should be pending but isn't: " + merge.segString();
+ boolean removed = pendingMerges.remove(merge);
+ assert removed: "merge should be pending but isn't: " + merge.segString();
abortOneMerge(merge);
mergeFinish(merge);
+
});
}
}