You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/09/29 06:06:16 UTC
lucene-solr:branch_6x: SOLR-8995: use lambdas for CoreCloseListener
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x c904fe7d8 -> adc395bbf
SOLR-8995: use lambdas for CoreCloseListener
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/adc395bb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/adc395bb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/adc395bb
Branch: refs/heads/branch_6x
Commit: adc395bbf3ccc1eb517224b528069cde5bcf0659
Parents: c904fe7
Author: Noble Paul <no...@apache.org>
Authored: Thu Sep 29 11:33:22 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Thu Sep 29 11:36:08 2016 +0530
----------------------------------------------------------------------
.../src/java/org/apache/lucene/index/LeafReader.java | 5 ++---
.../src/java/org/apache/lucene/search/LRUQueryCache.java | 8 +-------
.../org/apache/lucene/index/AssertingLeafReader.java | 11 ++++-------
3 files changed, 7 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/adc395bb/lucene/core/src/java/org/apache/lucene/index/LeafReader.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/LeafReader.java b/lucene/core/src/java/org/apache/lucene/index/LeafReader.java
index 44e61e2..f7108c6 100644
--- a/lucene/core/src/java/org/apache/lucene/index/LeafReader.java
+++ b/lucene/core/src/java/org/apache/lucene/index/LeafReader.java
@@ -19,7 +19,6 @@ package org.apache.lucene.index;
import java.io.IOException;
-import org.apache.lucene.index.IndexReader.ReaderClosedListener;
import org.apache.lucene.search.Sort;
import org.apache.lucene.util.Bits;
@@ -78,12 +77,12 @@ public abstract class LeafReader extends IndexReader {
*
* @lucene.experimental
*/
- public static interface CoreClosedListener {
+ public interface CoreClosedListener {
/** Invoked when the shared core of the original {@code
* SegmentReader} has closed. The provided {@code
* ownerCoreCacheKey} will be the same key as the one
* returned by {@link LeafReader#getCoreCacheKey()}. */
- public void onClose(Object ownerCoreCacheKey) throws IOException;
+ void onClose(Object ownerCoreCacheKey) throws IOException;
}
private static class CoreClosedListenerWrapper implements ReaderClosedListener {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/adc395bb/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java b/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java
index 02c6968..1bcdca1 100644
--- a/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java
+++ b/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java
@@ -32,7 +32,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Predicate;
-import org.apache.lucene.index.LeafReader.CoreClosedListener;
import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.ReaderUtil;
@@ -316,12 +315,7 @@ public class LRUQueryCache implements QueryCache, Accountable {
ramBytesUsed += HASHTABLE_RAM_BYTES_PER_ENTRY;
assert previous == null;
// we just created a new leaf cache, need to register a close listener
- context.reader().addCoreClosedListener(new CoreClosedListener() {
- @Override
- public void onClose(Object ownerCoreCacheKey) {
- clearCoreCacheKey(ownerCoreCacheKey);
- }
- });
+ context.reader().addCoreClosedListener(this::clearCoreCacheKey);
}
leafCache.putIfAbsent(query, set);
evictIfNecessary();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/adc395bb/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java
----------------------------------------------------------------------
diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java b/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java
index b4bcb1e..e840e60 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java
@@ -47,13 +47,10 @@ public class AssertingLeafReader extends FilterLeafReader {
assert in.numDeletedDocs() + in.numDocs() == in.maxDoc();
assert !in.hasDeletions() || in.numDeletedDocs() > 0 && in.numDocs() < in.maxDoc();
- addCoreClosedListener(new CoreClosedListener() {
- @Override
- public void onClose(Object ownerCoreCacheKey) throws IOException {
- final Object expectedKey = getCoreCacheKey();
- assert expectedKey == ownerCoreCacheKey
- : "Core closed listener called on a different key " + expectedKey + " <> " + ownerCoreCacheKey;
- }
+ addCoreClosedListener(ownerCoreCacheKey -> {
+ final Object expectedKey = getCoreCacheKey();
+ assert expectedKey == ownerCoreCacheKey
+ : "Core closed listener called on a different key " + expectedKey + " <> " + ownerCoreCacheKey;
});
}