Queries: Optimize single clause boolean query, closes elastic#1206.

mute · Aug 4, 2011 · 6354a0b · 6354a0b
1 parent 86f6099
commit 6354a0b
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/Queries.java b/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/Queries.java
@@ -19,7 +19,13 @@
 
 package org.elasticsearch.common.lucene.search;
 
-import org.apache.lucene.search.*;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.DeletionAwareConstantScoreQuery;
+import org.apache.lucene.search.DisjunctionMaxQuery;
+import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.Query;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -62,6 +68,23 @@ public static List<Query> disMaxClauses(DisjunctionMaxQuery query) {
      * Optimizes the given query and returns the optimized version of it.
      */
     public static Query optimizeQuery(Query q) {
+        if (q instanceof BooleanQuery) {
+            BooleanQuery booleanQuery = (BooleanQuery) q;
+            BooleanClause[] clauses = booleanQuery.getClauses();
+            if (clauses.length == 1) {
+                BooleanClause clause = clauses[0];
+                if (clause.getOccur() == BooleanClause.Occur.MUST) {
+                    Query query = clause.getQuery();
+                    query.setBoost(booleanQuery.getBoost() * query.getBoost());
+                    return optimizeQuery(query);
+                }
+                if (clause.getOccur() == BooleanClause.Occur.SHOULD && booleanQuery.getMinimumNumberShouldMatch() > 0) {
+                    Query query = clause.getQuery();
+                    query.setBoost(booleanQuery.getBoost() * query.getBoost());
+                    return optimizeQuery(query);
+                }
+            }
+        }
         return q;
     }
 

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BoolQueryParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/BoolQueryParser.java
@@ -94,6 +94,20 @@ public class BoolQueryParser implements QueryParser {
             }
         }
 
+        if (clauses.size() == 1) {
+            BooleanClause clause = clauses.get(0);
+            if (clause.getOccur() == BooleanClause.Occur.MUST) {
+                Query query = clause.getQuery();
+                query.setBoost(boost * query.getBoost());
+                return query;
+            }
+            if (clause.getOccur() == BooleanClause.Occur.SHOULD && minimumNumberShouldMatch > 0) {
+                Query query = clause.getQuery();
+                query.setBoost(boost * query.getBoost());
+                return query;
+            }
+        }
+
         BooleanQuery query = new BooleanQuery(disableCoord);
         for (BooleanClause clause : clauses) {
             query.add(clause);