Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-8295: Remove useless liveDocsSharedPending flag.

This commit is contained in:
Adrien Grand 2018-05-04 14:38:42 +02:00
parent 3a6f5313d6
commit ad0ad2ec89
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java
View File

@ -88,10 +88,6 @@ final class ReadersAndUpdates {
final AtomicLong ramBytesUsed = new AtomicLong(); 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, ReadersAndUpdates(int indexCreatedVersionMajor, SegmentCommitInfo info,
PendingDeletes pendingDeletes) { PendingDeletes pendingDeletes) {
this.info = info; this.info = info;
@ -196,8 +192,6 @@ final class ReadersAndUpdates {
// We steal returned ref: // We steal returned ref:
reader = new SegmentReader(info, indexCreatedVersionMajor, context); reader = new SegmentReader(info, indexCreatedVersionMajor, context);
pendingDeletes.onNewReader(reader, info); pendingDeletes.onNewReader(reader, info);
} else if (liveDocsSharedPending) {
markAsShared();
} }
// Ref for caller // Ref for caller
@ -224,7 +218,6 @@ final class ReadersAndUpdates {
} finally { } finally {
reader = null; reader = null;
} }
liveDocsSharedPending = false;
} }
decRef(); decRef();
@ -678,7 +671,6 @@ final class ReadersAndUpdates {
private void swapNewReaderWithLatestLiveDocs() throws IOException { private void swapNewReaderWithLatestLiveDocs() throws IOException {
reader = createNewReaderWithLatestLiveDocs(reader); reader = createNewReaderWithLatestLiveDocs(reader);
liveDocsSharedPending = true;
} }
synchronized void setIsMerging() { synchronized void setIsMerging() {
@ -764,7 +756,6 @@ final class ReadersAndUpdates {
private final void markAsShared() { private final void markAsShared() {
assert Thread.holdsLock(this); 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 pendingDeletes.liveDocsShared(); // this is not costly we can just call it even if it's already marked as shared
} }