fixup! use BooleanFilter instead of BooleanQuery to pre-filter in arr…

…ay equals case
crate · Feb 9, 2015 · a96f9c1 · a96f9c1
1 parent e13e690
commit a96f9c1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/sql/src/main/java/io/crate/lucene/LuceneQueryBuilder.java b/sql/src/main/java/io/crate/lucene/LuceneQueryBuilder.java
@@ -900,7 +900,7 @@ private Filter genericFunctionFilter(Function function) {
             for (LuceneCollectorExpression expression : expressions) {
                 expression.startCollect(collectorContext);
             }
-            return new Filter() {
+            Filter filter = new Filter() {
                 @Override
                 public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
                     for (LuceneCollectorExpression expression : expressions) {
@@ -919,6 +919,7 @@ public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws
                     );
                 }
             };
+            return indexCache.filter().cache(filter);
         }
 
         private Query genericFunctionQuery(Function function) {

diff --git a/sql/src/test/java/io/crate/lucene/LuceneQueryBuilderTest.java b/sql/src/test/java/io/crate/lucene/LuceneQueryBuilderTest.java
@@ -42,6 +42,7 @@
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.inject.ModulesBuilder;
 import org.elasticsearch.common.lucene.search.MatchNoDocsQuery;
+import org.elasticsearch.common.lucene.search.XConstantScoreQuery;
 import org.elasticsearch.index.cache.IndexCache;
 import org.elasticsearch.search.internal.SearchContext;
 import org.junit.Before;
@@ -103,7 +104,11 @@ public void testEqOnTwoArraysBecomesGenericFunctionQuery() throws Exception {
         FilteredQuery filteredQuery = (FilteredQuery) query;
 
         assertThat(filteredQuery.getFilter(), instanceOf(BooleanFilter.class));
-        assertThat(filteredQuery.getQuery(), instanceOf(FilteredQuery.class));
+        assertThat(filteredQuery.getQuery(), instanceOf(XConstantScoreQuery.class));
+
+        BooleanFilter filter = (BooleanFilter) filteredQuery.getFilter();
+        assertThat(filter.clauses().get(0).getFilter(), instanceOf(BooleanFilter.class)); // booleanFilter with terms filter
+        assertThat(filter.clauses().get(1).getFilter(), instanceOf(Filter.class)); // generic function filter
     }
 
     @Test