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

LUCENE-7781: Call ensureOpen when registering closed listeners.

This commit is contained in:
Adrien Grand 2017-04-13 08:20:56 +02:00
parent 4cb00ccca4
commit d3494c2cd6
4 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
View File

@ -294,7 +294,7 @@ public final class SegmentReader extends CodecReader {
synchronized(readerClosedListeners) {
for(ClosedListener listener : readerClosedListeners) {
try {
listener.onClose(cacheHelper.getKey());
listener.onClose(readerCacheHelper.getKey());
} catch (Throwable t) {
if (th == null) {
th = t;
@ -307,7 +307,7 @@ public final class SegmentReader extends CodecReader {
}
}
private final IndexReader.CacheHelper cacheHelper = new IndexReader.CacheHelper() {
private final IndexReader.CacheHelper readerCacheHelper = new IndexReader.CacheHelper() {
private final IndexReader.CacheKey cacheKey = new IndexReader.CacheKey();
@Override
@ -317,18 +317,35 @@ public final class SegmentReader extends CodecReader {
@Override
public void addClosedListener(ClosedListener listener) {
ensureOpen();
readerClosedListeners.add(listener);
}
};
@Override
public CacheHelper getReaderCacheHelper() {
return cacheHelper;
return readerCacheHelper;
}
/** Wrap the cache helper of the core to add ensureOpen() calls that make
* sure users do not register closed listeners on closed indices. */
private final IndexReader.CacheHelper coreCacheHelper = new IndexReader.CacheHelper() {
@Override
public CacheKey getKey() {
return core.getCacheHelper().getKey();
}
@Override
public void addClosedListener(ClosedListener listener) {
ensureOpen();
core.getCacheHelper().addClosedListener(listener);
}
};
@Override
public CacheHelper getCoreCacheHelper() {
return core.getCacheHelper();
return coreCacheHelper;
}
@Override

3
lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java
View File

@ -484,7 +484,8 @@ public final class StandardDirectoryReader extends DirectoryReader {
@Override
public void addClosedListener(ClosedListener listener) {
readerClosedListeners.add(listener);
ensureOpen();
readerClosedListeners.add(listener);
}
};

42
lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java
View File

@ -73,7 +73,7 @@ public class TestIndexReaderClose extends LuceneTestCase {
reader.getReaderCacheHelper().addClosedListener(new FaultyListener());
} else {
count.incrementAndGet();
reader.getReaderCacheHelper().addClosedListener(new CountListener(count));
reader.getReaderCacheHelper().addClosedListener(new CountListener(count, reader.getReaderCacheHelper().getKey()));
}
}
if (!faultySet && !throwOnClose) {
@ -123,7 +123,7 @@ public class TestIndexReaderClose extends LuceneTestCase {
AtomicInteger counter = new AtomicInteger(numListeners);
for (int i = 0; i < numListeners; ++i) {
CountCoreListener listener = new CountCoreListener(counter, leafReader.getCoreCacheHelper().getKey());
CountListener listener = new CountListener(counter, leafReader.getCoreCacheHelper().getKey());
listeners.add(listener);
leafReader.getCoreCacheHelper().addClosedListener(listener);
}
@ -141,12 +141,12 @@ public class TestIndexReaderClose extends LuceneTestCase {
w.w.getDirectory().close();
}
private static final class CountCoreListener implements IndexReader.ClosedListener {
private static final class CountListener implements IndexReader.ClosedListener {
private final AtomicInteger count;
private final Object coreCacheKey;
public CountCoreListener(AtomicInteger count, Object coreCacheKey) {
public CountListener(AtomicInteger count, Object coreCacheKey) {
this.count = count;
this.coreCacheKey = coreCacheKey;
}
@ -159,19 +159,6 @@ public class TestIndexReaderClose extends LuceneTestCase {
}
private static final class CountListener implements IndexReader.ClosedListener {
private final AtomicInteger count;
public CountListener(AtomicInteger count) {
this.count = count;
}
@Override
public void onClose(IndexReader.CacheKey cacheKey) {
count.decrementAndGet();
}
}
private static final class FaultyListener implements IndexReader.ClosedListener {
@Override
@ -180,4 +167,25 @@ public class TestIndexReaderClose extends LuceneTestCase {
}
}
public void testRegisterListenerOnClosedReader() throws IOException {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
w.addDocument(new Document());
DirectoryReader r = DirectoryReader.open(w);
w.close();
// The reader is open, everything should work
r.getReaderCacheHelper().addClosedListener(key -> {});
r.leaves().get(0).reader().getReaderCacheHelper().addClosedListener(key -> {});
r.leaves().get(0).reader().getCoreCacheHelper().addClosedListener(key -> {});
// But now we close
r.close();
expectThrows(AlreadyClosedException.class, () -> r.getReaderCacheHelper().addClosedListener(key -> {}));
expectThrows(AlreadyClosedException.class, () -> r.leaves().get(0).reader().getReaderCacheHelper().addClosedListener(key -> {}));
expectThrows(AlreadyClosedException.class, () -> r.leaves().get(0).reader().getCoreCacheHelper().addClosedListener(key -> {}));
dir.close();
}
}

3
lucene/test-framework/src/java/org/apache/lucene/index/OwnCacheKeyMultiReader.java
View File

@ -40,7 +40,8 @@ public final class OwnCacheKeyMultiReader extends MultiReader {
@Override
public void addClosedListener(ClosedListener listener) {
readerClosedListeners.add(listener);
ensureOpen();
readerClosedListeners.add(listener);
}
};