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 2015/09/09 12:30:10 UTC
svn commit: r1701972 - in /lucene/dev/branches/lucene_solr_5_3: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/search/
lucene/core/src/test/org/apache/lucene/search/ lucene/queries/
lucene/queries/src/java/org/apache/lucene/queries/ luc...
Author: jpountz
Date: Wed Sep 9 10:30:09 2015
New Revision: 1701972
URL: http://svn.apache.org/r1701972
Log:
LUCENE-6781,LUCENE-6748: backport for 5.3.1.
Modified:
lucene/dev/branches/lucene_solr_5_3/ (props changed)
lucene/dev/branches/lucene_solr_5_3/lucene/ (props changed)
lucene/dev/branches/lucene_solr_5_3/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_5_3/lucene/core/ (props changed)
lucene/dev/branches/lucene_solr_5_3/lucene/core/src/java/org/apache/lucene/search/UsageTrackingQueryCachingPolicy.java
lucene/dev/branches/lucene_solr_5_3/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java
lucene/dev/branches/lucene_solr_5_3/lucene/queries/ (props changed)
lucene/dev/branches/lucene_solr_5_3/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
lucene/dev/branches/lucene_solr_5_3/lucene/queries/src/test/org/apache/lucene/queries/BoostingQueryTest.java
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/CHANGES.txt?rev=1701972&r1=1701971&r2=1701972&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/CHANGES.txt Wed Sep 9 10:30:09 2015
@@ -11,6 +11,11 @@ Bug Fixes
* LUCENE-6774: Remove classloader hack in MorfologikFilter. (Robert Muir,
Uwe Schindler)
+* LUCENE-6781: Fixed BoostingQuery to rewrite wrapped queries. (Adrien Grand)
+
+* LUCENE-6748: UsageTrackingQueryCachingPolicy no longer caches trivial queries
+ like MatchAllDocsQuery. (Adrien Grand)
+
Tests
* LUCENE-6760, SOLR-7958: Move TestUtil#randomWhitespace to the only
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/core/src/java/org/apache/lucene/search/UsageTrackingQueryCachingPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/core/src/java/org/apache/lucene/search/UsageTrackingQueryCachingPolicy.java?rev=1701972&r1=1701971&r2=1701972&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/core/src/java/org/apache/lucene/search/UsageTrackingQueryCachingPolicy.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/core/src/java/org/apache/lucene/search/UsageTrackingQueryCachingPolicy.java Wed Sep 9 10:30:09 2015
@@ -134,6 +134,24 @@ public final class UsageTrackingQueryCac
@Override
public boolean shouldCache(Query query, LeafReaderContext context) throws IOException {
+ if (query instanceof MatchAllDocsQuery
+ // MatchNoDocsQuery currently rewrites to a BooleanQuery,
+ // but who knows, it might get its own Weight one day
+ || query instanceof MatchNoDocsQuery) {
+ return false;
+ }
+ if (query instanceof BooleanQuery) {
+ BooleanQuery bq = (BooleanQuery) query;
+ if (bq.clauses().isEmpty()) {
+ return false;
+ }
+ }
+ if (query instanceof DisjunctionMaxQuery) {
+ DisjunctionMaxQuery dmq = (DisjunctionMaxQuery) query;
+ if (dmq.getDisjuncts().isEmpty()) {
+ return false;
+ }
+ }
if (segmentPolicy.shouldCache(query, context) == false) {
return false;
}
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java?rev=1701972&r1=1701971&r2=1701972&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java Wed Sep 9 10:30:09 2015
@@ -17,6 +17,8 @@ package org.apache.lucene.search;
* limitations under the License.
*/
+import org.apache.lucene.index.MultiReader;
+import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.index.Term;
import org.apache.lucene.util.LuceneTestCase;
@@ -41,4 +43,13 @@ public class TestUsageTrackingFilterCach
assertEquals(2, policy.frequency(q3));
}
+ public void testNeverCacheMatchAll() throws Exception {
+ Query q = new MatchAllDocsQuery();
+ UsageTrackingQueryCachingPolicy policy = new UsageTrackingQueryCachingPolicy();
+ for (int i = 0; i < 1000; ++i) {
+ policy.onUse(q);
+ }
+ assertFalse(policy.shouldCache(q, SlowCompositeReaderWrapper.wrap(new MultiReader()).getContext()));
+ }
+
}
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java?rev=1701972&r1=1701971&r2=1701972&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java Wed Sep 9 10:30:09 2015
@@ -21,10 +21,10 @@ import java.io.IOException;
import java.util.Objects;
import java.util.Set;
+import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.*;
-import org.apache.lucene.util.Bits;
/**
* The BoostingQuery class can be used to effectively demote results that match a given query.
@@ -55,6 +55,18 @@ public class BoostingQuery extends Query
}
@Override
+ public Query rewrite(IndexReader reader) throws IOException {
+ Query matchRewritten = match.rewrite(reader);
+ Query contextRewritten = context.rewrite(reader);
+ if (match != matchRewritten || context != contextRewritten) {
+ BoostingQuery rewritten = new BoostingQuery(matchRewritten, contextRewritten, boost);
+ rewritten.setBoost(getBoost());
+ return rewritten;
+ }
+ return super.rewrite(reader);
+ }
+
+ @Override
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
if (needsScores == false) {
return match.createWeight(searcher, needsScores);
Modified: lucene/dev/branches/lucene_solr_5_3/lucene/queries/src/test/org/apache/lucene/queries/BoostingQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/lucene/queries/src/test/org/apache/lucene/queries/BoostingQueryTest.java?rev=1701972&r1=1701971&r2=1701972&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/lucene/queries/src/test/org/apache/lucene/queries/BoostingQueryTest.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/lucene/queries/src/test/org/apache/lucene/queries/BoostingQueryTest.java Wed Sep 9 10:30:09 2015
@@ -17,7 +17,15 @@ package org.apache.lucene.queries;
* limitations under the License.
*/
+import java.io.IOException;
+
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.Term;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.MatchNoDocsQuery;
+import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryUtils;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.util.LuceneTestCase;
@@ -35,4 +43,13 @@ public class BoostingQueryTest extends L
BoostingQuery bq2 = new BoostingQuery(q1, q2, 0.1f);
assertEquals("BoostingQuery with same attributes is not equal", bq1, bq2);
}
+
+ public void testRewrite() throws IOException {
+ IndexReader reader = new MultiReader();
+ BoostingQuery q = new BoostingQuery(new MatchNoDocsQuery(), new MatchAllDocsQuery(), 3);
+ Query rewritten = q.rewrite(reader);
+ Query expectedRewritten = new BoostingQuery(new BooleanQuery.Builder().build(), new MatchAllDocsQuery(), 3);
+ assertEquals(expectedRewritten, rewritten);
+ assertSame(rewritten, rewritten.rewrite(reader));
+ }
}