You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/05/08 21:15:21 UTC
[35/50] [abbrv] lucene-solr:jira/solr-11779: LUCENE-8295: Remove
useless liveDocsSharedPending flag.
LUCENE-8295: Remove useless liveDocsSharedPending flag.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ad0ad2ec
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ad0ad2ec
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ad0ad2ec
Branch: refs/heads/jira/solr-11779
Commit: ad0ad2ec891b7c122ddf5b0385a9e4b984e78b38
Parents: 3a6f531
Author: Adrien Grand <jp...@gmail.com>
Authored: Fri May 4 14:38:42 2018 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Fri May 4 14:38:42 2018 +0200
----------------------------------------------------------------------
.../src/java/org/apache/lucene/index/ReadersAndUpdates.java | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ad0ad2ec/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java b/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java
index b33ac4b..a02d26a 100644
--- a/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java
+++ b/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java
@@ -88,10 +88,6 @@ final class ReadersAndUpdates {
final AtomicLong ramBytesUsed = new AtomicLong();
- // if set to true the pending deletes must be marked as shared next time the reader is
- // returned from #getReader()
- private boolean liveDocsSharedPending = false;
-
ReadersAndUpdates(int indexCreatedVersionMajor, SegmentCommitInfo info,
PendingDeletes pendingDeletes) {
this.info = info;
@@ -196,8 +192,6 @@ final class ReadersAndUpdates {
// We steal returned ref:
reader = new SegmentReader(info, indexCreatedVersionMajor, context);
pendingDeletes.onNewReader(reader, info);
- } else if (liveDocsSharedPending) {
- markAsShared();
}
// Ref for caller
@@ -224,7 +218,6 @@ final class ReadersAndUpdates {
} finally {
reader = null;
}
- liveDocsSharedPending = false;
}
decRef();
@@ -678,7 +671,6 @@ final class ReadersAndUpdates {
private void swapNewReaderWithLatestLiveDocs() throws IOException {
reader = createNewReaderWithLatestLiveDocs(reader);
- liveDocsSharedPending = true;
}
synchronized void setIsMerging() {
@@ -764,7 +756,6 @@ final class ReadersAndUpdates {
private final void markAsShared() {
assert Thread.holdsLock(this);
- liveDocsSharedPending = false;
pendingDeletes.liveDocsShared(); // this is not costly we can just call it even if it's already marked as shared
}