You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2019/09/05 07:45:24 UTC
[lucene-solr] branch branch_8x updated: LUCENE-8942: Tighten Up
LRUQueryCache's Methods (#816)
This is an automated email from the ASF dual-hosted git repository.
jpountz pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 5c0255b LUCENE-8942: Tighten Up LRUQueryCache's Methods (#816)
5c0255b is described below
commit 5c0255bac3111da1d2cc970c2c44ffbefc09e04a
Author: Atri Sharma <at...@gmail.com>
AuthorDate: Thu Sep 5 13:07:09 2019 +0530
LUCENE-8942: Tighten Up LRUQueryCache's Methods (#816)
---
lucene/CHANGES.txt | 3 +++
.../src/java/org/apache/lucene/search/LRUQueryCache.java | 14 +++++++-------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 5b9849a..9f60dc7 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -53,6 +53,9 @@ Improvements
* LUCENE-8906: Expose Lucene50PostingsFormat.IntBlockTermState as public so that other postings formats can re-use it.
(Bruno Roustant)
+* LUCENE-8942: Remove redundant parameters and improve visibility strictness in
+ LRUQueryCache (Atri Sharma)
+
* SOLR-13663: Introduce <SpanPositionRange> into XML Query Parser (Alessandro Benedetti via Mikhail Khludnev)
* LUCENE-8952: Use a sort key instead of true distance in NearestNeighbor (Julie Tibshirani).
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 fd80aaa..52ae826 100644
--- a/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java
+++ b/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java
@@ -259,7 +259,7 @@ public class LRUQueryCache implements QueryCache, Accountable {
}
}
- DocIdSet get(Query key, LeafReaderContext context, IndexReader.CacheHelper cacheHelper) {
+ DocIdSet get(Query key, IndexReader.CacheHelper cacheHelper) {
assert lock.isHeldByCurrentThread();
assert key instanceof BoostQuery == false;
assert key instanceof ConstantScoreQuery == false;
@@ -284,7 +284,7 @@ public class LRUQueryCache implements QueryCache, Accountable {
return cached;
}
- void putIfAbsent(Query query, LeafReaderContext context, DocIdSet set, IndexReader.CacheHelper cacheHelper) {
+ private void putIfAbsent(Query query, DocIdSet set, IndexReader.CacheHelper cacheHelper) {
assert query instanceof BoostQuery == false;
assert query instanceof ConstantScoreQuery == false;
// under a lock to make sure that mostRecentlyUsedQueries and cache remain sync'ed
@@ -313,7 +313,7 @@ public class LRUQueryCache implements QueryCache, Accountable {
}
}
- void evictIfNecessary() {
+ private void evictIfNecessary() {
assert lock.isHeldByCurrentThread();
// under a lock to make sure that mostRecentlyUsedQueries and cache keep sync'ed
if (requiresEviction()) {
@@ -731,7 +731,7 @@ public class LRUQueryCache implements QueryCache, Accountable {
DocIdSet docIdSet;
try {
- docIdSet = get(in.getQuery(), context, cacheHelper);
+ docIdSet = get(in.getQuery(), cacheHelper);
} finally {
lock.unlock();
}
@@ -739,7 +739,7 @@ public class LRUQueryCache implements QueryCache, Accountable {
if (docIdSet == null) {
if (policy.shouldCache(in.getQuery())) {
docIdSet = cache(context);
- putIfAbsent(in.getQuery(), context, docIdSet, cacheHelper);
+ putIfAbsent(in.getQuery(), docIdSet, cacheHelper);
} else {
return in.scorerSupplier(context);
}
@@ -812,7 +812,7 @@ public class LRUQueryCache implements QueryCache, Accountable {
DocIdSet docIdSet;
try {
- docIdSet = get(in.getQuery(), context, cacheHelper);
+ docIdSet = get(in.getQuery(), cacheHelper);
} finally {
lock.unlock();
}
@@ -820,7 +820,7 @@ public class LRUQueryCache implements QueryCache, Accountable {
if (docIdSet == null) {
if (policy.shouldCache(in.getQuery())) {
docIdSet = cache(context);
- putIfAbsent(in.getQuery(), context, docIdSet, cacheHelper);
+ putIfAbsent(in.getQuery(), docIdSet, cacheHelper);
} else {
return in.bulkScorer(context);
}