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/07/06 17:48:29 UTC
svn commit: r1689432 - in /lucene/dev/trunk: lucene/
lucene/highlighter/src/test/org/apache/lucene/search/highlight/
lucene/join/src/java/org/apache/lucene/search/join/
lucene/join/src/test/org/apache/lucene/search/join/
solr/contrib/dataimporthandler/...
Author: jpountz
Date: Mon Jul 6 15:48:28 2015
New Revision: 1689432
URL: http://svn.apache.org/r1689432
Log:
LUCENE-6649: Remove dependency of lucene/join on Filter.
Added:
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/BitSetProducer.java (with props)
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/QueryBitSetProducer.java (with props)
Removed:
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetFilter.java
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java
lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java
lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ChildDocTransformerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParser.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParser.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1689432&r1=1689431&r2=1689432&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Mon Jul 6 15:48:28 2015
@@ -188,6 +188,10 @@ API Changes
* LUCENE-6646: Make EarlyTerminatingCollector take a Sort object directly
instead of a SortingMergePolicy. (Christine Poerschke via Adrien Grand)
+* LUCENE-6649: BitDocIdSetFilter and BitDocIdSetCachingWrapperFilter are now
+ deprecated in favour of BitSetProducer and QueryBitSetProducer, which do not
+ extend oal.search.Filter. (Adrien Grand)
+
Bug fixes
* LUCENE-6500: ParallelCompositeReader did not always call
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=1689432&r1=1689431&r2=1689432&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Mon Jul 6 15:48:28 2015
@@ -81,8 +81,8 @@ import org.apache.lucene.search.TermRang
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.WildcardQuery;
import org.apache.lucene.search.highlight.SynonymTokenizer.TestHighlightRunner;
-import org.apache.lucene.search.join.BitDocIdSetCachingWrapperFilter;
-import org.apache.lucene.search.join.BitDocIdSetFilter;
+import org.apache.lucene.search.join.QueryBitSetProducer;
+import org.apache.lucene.search.join.BitSetProducer;
import org.apache.lucene.search.join.ScoreMode;
import org.apache.lucene.search.join.ToChildBlockJoinQuery;
import org.apache.lucene.search.join.ToParentBlockJoinQuery;
@@ -587,7 +587,7 @@ public class HighlighterTest extends Bas
}
public void testToParentBlockJoinQuery() throws Exception {
- BitDocIdSetFilter parentFilter = new BitDocIdSetCachingWrapperFilter(
+ BitSetProducer parentFilter = new QueryBitSetProducer(
new QueryWrapperFilter(
new TermQuery(new Term(FIELD_NAME, "parent"))));
@@ -613,7 +613,7 @@ public class HighlighterTest extends Bas
}
public void testToChildBlockJoinQuery() throws Exception {
- BitDocIdSetFilter parentFilter = new BitDocIdSetCachingWrapperFilter(
+ BitSetProducer parentFilter = new QueryBitSetProducer(
new QueryWrapperFilter(
new TermQuery(new Term(FIELD_NAME, "parent"))));
Added: lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/BitSetProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/BitSetProducer.java?rev=1689432&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/BitSetProducer.java (added)
+++ lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/BitSetProducer.java Mon Jul 6 15:48:28 2015
@@ -0,0 +1,36 @@
+package org.apache.lucene.search.join;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.IOException;
+
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.util.BitSet;
+
+/**
+ * A producer of {@link BitSet}s per segment.
+ */
+public interface BitSetProducer {
+
+ /**
+ * Produce a {@link BitSet} matching the expected documents on the given
+ * segment. This may return {@code null} if no documents match.
+ */
+ BitSet getBitSet(LeafReaderContext context) throws IOException;
+
+}
Added: lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/QueryBitSetProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/QueryBitSetProducer.java?rev=1689432&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/QueryBitSetProducer.java (added)
+++ lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/QueryBitSetProducer.java Mon Jul 6 15:48:28 2015
@@ -0,0 +1,105 @@
+package org.apache.lucene.search.join;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import org.apache.lucene.index.IndexReaderContext;
+import org.apache.lucene.index.LeafReader;
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.index.ReaderUtil;
+import org.apache.lucene.search.DocIdSet;
+import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.Weight;
+import org.apache.lucene.util.BitDocIdSet;
+import org.apache.lucene.util.BitSet;
+
+/**
+ * A {@link BitSetProducer} that wraps a query and caches matching
+ * {@link BitSet}s per segment.
+ */
+public class QueryBitSetProducer implements BitSetProducer {
+ private final Query query;
+ private final Map<Object,DocIdSet> cache = Collections.synchronizedMap(new WeakHashMap<>());
+
+ /** Wraps another query's result and caches it into bitsets.
+ * @param query Query to cache results of
+ */
+ public QueryBitSetProducer(Query query) {
+ this.query = query;
+ }
+
+ /**
+ * Gets the contained query.
+ * @return the contained query.
+ */
+ public Query getQuery() {
+ return query;
+ }
+
+ @Override
+ public BitSet getBitSet(LeafReaderContext context) throws IOException {
+ final LeafReader reader = context.reader();
+ final Object key = reader.getCoreCacheKey();
+
+ DocIdSet docIdSet = cache.get(key);
+ if (docIdSet == null) {
+ final IndexReaderContext topLevelContext = ReaderUtil.getTopLevelContext(context);
+ final IndexSearcher searcher = new IndexSearcher(topLevelContext);
+ searcher.setQueryCache(null);
+ final Weight weight = searcher.createNormalizedWeight(query, false);
+ final DocIdSetIterator it = weight.scorer(context);
+
+ BitDocIdSet.Builder builder = new BitDocIdSet.Builder(context.reader().maxDoc());
+ if (it != null) {
+ builder.or(it);
+ }
+ docIdSet = builder.build();
+ if (docIdSet == null) {
+ // We use EMPTY as a sentinel for the empty set, which is cacheable
+ docIdSet = DocIdSet.EMPTY;
+ }
+ cache.put(key, docIdSet);
+ }
+ return docIdSet == DocIdSet.EMPTY ? null : ((BitDocIdSet) docIdSet).bits();
+ }
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + "("+query.toString()+")";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ final QueryBitSetProducer other = (QueryBitSetProducer) o;
+ return this.query.equals(other.query);
+ }
+
+ @Override
+ public int hashCode() {
+ return 31 * getClass().hashCode() + query.hashCode();
+ }
+}
Modified: lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java?rev=1689432&r1=1689431&r2=1689432&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java (original)
+++ lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java Mon Jul 6 15:48:28 2015
@@ -31,7 +31,6 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Weight;
-import org.apache.lucene.util.BitDocIdSet;
import org.apache.lucene.util.BitSet;
/**
@@ -51,7 +50,7 @@ public class ToChildBlockJoinQuery exten
static final String INVALID_QUERY_MESSAGE = "Parent query yields document which is not matched by parents filter, docID=";
static final String ILLEGAL_ADVANCE_ON_PARENT = "Expect to be advanced on child docs only. got docID=";
- private final BitDocIdSetFilter parentsFilter;
+ private final BitSetProducer parentsFilter;
private final Query parentQuery;
// If we are rewritten, this is the original parentQuery we
@@ -67,14 +66,14 @@ public class ToChildBlockJoinQuery exten
* @param parentQuery Query that matches parent documents
* @param parentsFilter Filter identifying the parent documents.
*/
- public ToChildBlockJoinQuery(Query parentQuery, BitDocIdSetFilter parentsFilter) {
+ public ToChildBlockJoinQuery(Query parentQuery, BitSetProducer parentsFilter) {
super();
this.origParentQuery = parentQuery;
this.parentQuery = parentQuery;
this.parentsFilter = parentsFilter;
}
- private ToChildBlockJoinQuery(Query origParentQuery, Query parentQuery, BitDocIdSetFilter parentsFilter) {
+ private ToChildBlockJoinQuery(Query origParentQuery, Query parentQuery, BitSetProducer parentsFilter) {
super();
this.origParentQuery = origParentQuery;
this.parentQuery = parentQuery;
@@ -94,10 +93,10 @@ public class ToChildBlockJoinQuery exten
private static class ToChildBlockJoinWeight extends Weight {
private final Query joinQuery;
private final Weight parentWeight;
- private final BitDocIdSetFilter parentsFilter;
+ private final BitSetProducer parentsFilter;
private final boolean doScores;
- public ToChildBlockJoinWeight(Query joinQuery, Weight parentWeight, BitDocIdSetFilter parentsFilter, boolean doScores) {
+ public ToChildBlockJoinWeight(Query joinQuery, Weight parentWeight, BitSetProducer parentsFilter, boolean doScores) {
super(joinQuery);
this.joinQuery = joinQuery;
this.parentWeight = parentWeight;
@@ -132,13 +131,13 @@ public class ToChildBlockJoinQuery exten
// NOTE: this doesn't take acceptDocs into account, the responsibility
// to not match deleted docs is on the scorer
- final BitDocIdSet parents = parentsFilter.getDocIdSet(readerContext);
+ final BitSet parents = parentsFilter.getBitSet(readerContext);
if (parents == null) {
// No parents
return null;
}
- return new ToChildBlockJoinScorer(this, parentScorer, parents.bits(), doScores);
+ return new ToChildBlockJoinScorer(this, parentScorer, parents, doScores);
}
@Override
Modified: lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java?rev=1689432&r1=1689431&r2=1689432&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java (original)
+++ lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java Mon Jul 6 15:48:28 2015
@@ -35,9 +35,7 @@ import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Weight;
import org.apache.lucene.search.grouping.TopGroups;
import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.BitDocIdSet;
import org.apache.lucene.util.BitSet;
-import org.apache.lucene.util.Bits;
/**
* This query requires that you index
@@ -83,7 +81,7 @@ import org.apache.lucene.util.Bits;
*/
public class ToParentBlockJoinQuery extends Query {
- private final BitDocIdSetFilter parentsFilter;
+ private final BitSetProducer parentsFilter;
private final Query childQuery;
// If we are rewritten, this is the original childQuery we
@@ -101,7 +99,7 @@ public class ToParentBlockJoinQuery exte
* @param scoreMode How to aggregate multiple child scores
* into a single parent score.
**/
- public ToParentBlockJoinQuery(Query childQuery, BitDocIdSetFilter parentsFilter, ScoreMode scoreMode) {
+ public ToParentBlockJoinQuery(Query childQuery, BitSetProducer parentsFilter, ScoreMode scoreMode) {
super();
this.origChildQuery = childQuery;
this.childQuery = childQuery;
@@ -109,7 +107,7 @@ public class ToParentBlockJoinQuery exte
this.scoreMode = scoreMode;
}
- private ToParentBlockJoinQuery(Query origChildQuery, Query childQuery, BitDocIdSetFilter parentsFilter, ScoreMode scoreMode) {
+ private ToParentBlockJoinQuery(Query origChildQuery, Query childQuery, BitSetProducer parentsFilter, ScoreMode scoreMode) {
super();
this.origChildQuery = origChildQuery;
this.childQuery = childQuery;
@@ -130,10 +128,10 @@ public class ToParentBlockJoinQuery exte
private static class BlockJoinWeight extends Weight {
private final Query joinQuery;
private final Weight childWeight;
- private final BitDocIdSetFilter parentsFilter;
+ private final BitSetProducer parentsFilter;
private final ScoreMode scoreMode;
- public BlockJoinWeight(Query joinQuery, Weight childWeight, BitDocIdSetFilter parentsFilter, ScoreMode scoreMode) {
+ public BlockJoinWeight(Query joinQuery, Weight childWeight, BitSetProducer parentsFilter, ScoreMode scoreMode) {
super(joinQuery);
this.joinQuery = joinQuery;
this.childWeight = childWeight;
@@ -173,14 +171,14 @@ public class ToParentBlockJoinQuery exte
// NOTE: this does not take accept docs into account, the responsibility
// to not match deleted docs is on the scorer
- final BitDocIdSet parents = parentsFilter.getDocIdSet(readerContext);
+ final BitSet parents = parentsFilter.getBitSet(readerContext);
if (parents == null) {
// No matches
return null;
}
- return new BlockJoinScorer(this, childScorer, parents.bits(), firstChildDoc, scoreMode);
+ return new BlockJoinScorer(this, childScorer, parents, firstChildDoc, scoreMode);
}
@Override
Modified: lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java?rev=1689432&r1=1689431&r2=1689432&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java (original)
+++ lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java Mon Jul 6 15:48:28 2015
@@ -25,7 +25,7 @@ import org.apache.lucene.index.SortedNum
import org.apache.lucene.index.SortedSetDocValues;
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.util.BitDocIdSet;
+import org.apache.lucene.util.BitSet;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.NumericUtils;
@@ -40,8 +40,8 @@ import java.io.IOException;
public class ToParentBlockJoinSortField extends SortField {
private final boolean order;
- private final BitDocIdSetFilter parentFilter;
- private final BitDocIdSetFilter childFilter;
+ private final BitSetProducer parentFilter;
+ private final BitSetProducer childFilter;
/**
* Create ToParentBlockJoinSortField. The parent document ordering is based on child document ordering (reverse).
@@ -52,7 +52,7 @@ public class ToParentBlockJoinSortField
* @param parentFilter Filter that identifies the parent documents.
* @param childFilter Filter that defines which child documents participates in sorting.
*/
- public ToParentBlockJoinSortField(String field, Type type, boolean reverse, BitDocIdSetFilter parentFilter, BitDocIdSetFilter childFilter) {
+ public ToParentBlockJoinSortField(String field, Type type, boolean reverse, BitSetProducer parentFilter, BitSetProducer childFilter) {
super(field, type, reverse);
switch (getType()) {
case STRING:
@@ -80,7 +80,7 @@ public class ToParentBlockJoinSortField
* @param parentFilter Filter that identifies the parent documents.
* @param childFilter Filter that defines which child documents participates in sorting.
*/
- public ToParentBlockJoinSortField(String field, Type type, boolean reverse, boolean order, BitDocIdSetFilter parentFilter, BitDocIdSetFilter childFilter) {
+ public ToParentBlockJoinSortField(String field, Type type, boolean reverse, boolean order, BitSetProducer parentFilter, BitSetProducer childFilter) {
super(field, type, reverse);
this.order = order;
this.parentFilter = parentFilter;
@@ -114,12 +114,12 @@ public class ToParentBlockJoinSortField
final BlockJoinSelector.Type type = order
? BlockJoinSelector.Type.MAX
: BlockJoinSelector.Type.MIN;
- final BitDocIdSet parents = parentFilter.getDocIdSet(context);
- final BitDocIdSet children = childFilter.getDocIdSet(context);
+ final BitSet parents = parentFilter.getBitSet(context);
+ final BitSet children = childFilter.getBitSet(context);
if (children == null) {
return DocValues.emptySorted();
}
- return BlockJoinSelector.wrap(sortedSet, type, parents.bits(), children.bits());
+ return BlockJoinSelector.wrap(sortedSet, type, parents, children);
}
};
@@ -133,22 +133,22 @@ public class ToParentBlockJoinSortField
final BlockJoinSelector.Type type = order
? BlockJoinSelector.Type.MAX
: BlockJoinSelector.Type.MIN;
- final BitDocIdSet parents = parentFilter.getDocIdSet(context);
- final BitDocIdSet children = childFilter.getDocIdSet(context);
+ final BitSet parents = parentFilter.getBitSet(context);
+ final BitSet children = childFilter.getBitSet(context);
if (children == null) {
return DocValues.emptyNumeric();
}
- return BlockJoinSelector.wrap(sortedNumeric, type, parents.bits(), children.bits());
+ return BlockJoinSelector.wrap(sortedNumeric, type, parents, children);
}
@Override
protected Bits getDocsWithValue(LeafReaderContext context, String field) throws IOException {
final Bits docsWithValue = DocValues.getDocsWithField(context.reader(), field);
- final BitDocIdSet parents = parentFilter.getDocIdSet(context);
- final BitDocIdSet children = childFilter.getDocIdSet(context);
+ final BitSet parents = parentFilter.getBitSet(context);
+ final BitSet children = childFilter.getBitSet(context);
if (children == null) {
return new Bits.MatchNoBits(context.reader().maxDoc());
}
- return BlockJoinSelector.wrap(docsWithValue, parents.bits(), children.bits());
+ return BlockJoinSelector.wrap(docsWithValue, parents, children);
}
};
}
@@ -161,22 +161,22 @@ public class ToParentBlockJoinSortField
final BlockJoinSelector.Type type = order
? BlockJoinSelector.Type.MAX
: BlockJoinSelector.Type.MIN;
- final BitDocIdSet parents = parentFilter.getDocIdSet(context);
- final BitDocIdSet children = childFilter.getDocIdSet(context);
+ final BitSet parents = parentFilter.getBitSet(context);
+ final BitSet children = childFilter.getBitSet(context);
if (children == null) {
return DocValues.emptyNumeric();
}
- return BlockJoinSelector.wrap(sortedNumeric, type, parents.bits(), children.bits());
+ return BlockJoinSelector.wrap(sortedNumeric, type, parents, children);
}
@Override
protected Bits getDocsWithValue(LeafReaderContext context, String field) throws IOException {
final Bits docsWithValue = DocValues.getDocsWithField(context.reader(), field);
- final BitDocIdSet parents = parentFilter.getDocIdSet(context);
- final BitDocIdSet children = childFilter.getDocIdSet(context);
+ final BitSet parents = parentFilter.getBitSet(context);
+ final BitSet children = childFilter.getBitSet(context);
if (children == null) {
return new Bits.MatchNoBits(context.reader().maxDoc());
}
- return BlockJoinSelector.wrap(docsWithValue, parents.bits(), children.bits());
+ return BlockJoinSelector.wrap(docsWithValue, parents, children);
}
};
}
@@ -189,12 +189,12 @@ public class ToParentBlockJoinSortField
final BlockJoinSelector.Type type = order
? BlockJoinSelector.Type.MAX
: BlockJoinSelector.Type.MIN;
- final BitDocIdSet parents = parentFilter.getDocIdSet(context);
- final BitDocIdSet children = childFilter.getDocIdSet(context);
+ final BitSet parents = parentFilter.getBitSet(context);
+ final BitSet children = childFilter.getBitSet(context);
if (children == null) {
return DocValues.emptyNumeric();
}
- final NumericDocValues view = BlockJoinSelector.wrap(sortedNumeric, type, parents.bits(), children.bits());
+ final NumericDocValues view = BlockJoinSelector.wrap(sortedNumeric, type, parents, children);
// undo the numericutils sortability
return new NumericDocValues() {
@Override
@@ -214,12 +214,12 @@ public class ToParentBlockJoinSortField
final BlockJoinSelector.Type type = order
? BlockJoinSelector.Type.MAX
: BlockJoinSelector.Type.MIN;
- final BitDocIdSet parents = parentFilter.getDocIdSet(context);
- final BitDocIdSet children = childFilter.getDocIdSet(context);
+ final BitSet parents = parentFilter.getBitSet(context);
+ final BitSet children = childFilter.getBitSet(context);
if (children == null) {
return DocValues.emptyNumeric();
}
- final NumericDocValues view = BlockJoinSelector.wrap(sortedNumeric, type, parents.bits(), children.bits());
+ final NumericDocValues view = BlockJoinSelector.wrap(sortedNumeric, type, parents, children);
// undo the numericutils sortability
return new NumericDocValues() {
@Override
@@ -231,12 +231,12 @@ public class ToParentBlockJoinSortField
@Override
protected Bits getDocsWithValue(LeafReaderContext context, String field) throws IOException {
final Bits docsWithValue = DocValues.getDocsWithField(context.reader(), field);
- final BitDocIdSet parents = parentFilter.getDocIdSet(context);
- final BitDocIdSet children = childFilter.getDocIdSet(context);
+ final BitSet parents = parentFilter.getBitSet(context);
+ final BitSet children = childFilter.getBitSet(context);
if (children == null) {
return new Bits.MatchNoBits(context.reader().maxDoc());
}
- return BlockJoinSelector.wrap(docsWithValue, parents.bits(), children.bits());
+ return BlockJoinSelector.wrap(docsWithValue, parents, children);
}
};
}
Modified: lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java?rev=1689432&r1=1689431&r2=1689432&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (original)
+++ lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java Mon Jul 6 15:48:28 2015
@@ -52,7 +52,6 @@ import org.apache.lucene.search.BooleanQ
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.FieldDoc;
-import org.apache.lucene.search.Filter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.MatchNoDocsQuery;
@@ -61,7 +60,6 @@ import org.apache.lucene.search.NumericR
import org.apache.lucene.search.PrefixQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryUtils;
-import org.apache.lucene.search.QueryWrapperFilter;
import org.apache.lucene.search.RandomApproximationQuery;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.Sort;
@@ -139,7 +137,7 @@ public class TestBlockJoin extends Lucen
w.close();
assertTrue(r.leaves().size() > 1);
IndexSearcher s = new IndexSearcher(r);
- BitDocIdSetFilter parentsFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("docType", "resume"))));
+ BitSetProducer parentsFilter = new QueryBitSetProducer(new TermQuery(new Term("docType", "resume")));
BooleanQuery.Builder childQuery = new BooleanQuery.Builder();
childQuery.add(new BooleanClause(new TermQuery(new Term("skill", "java")), Occur.MUST));
@@ -191,7 +189,7 @@ public class TestBlockJoin extends Lucen
IndexSearcher s = newSearcher(r);
// Create a filter that defines "parent" documents in the index - in this case resumes
- BitDocIdSetFilter parentsFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("docType", "resume"))));
+ BitSetProducer parentsFilter = new QueryBitSetProducer(new TermQuery(new Term("docType", "resume")));
// Define child document criteria (finds an example of relevant work experience)
BooleanQuery.Builder childQuery = new BooleanQuery.Builder();
@@ -281,7 +279,7 @@ public class TestBlockJoin extends Lucen
// iterations:
qc.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_REWRITE);
- BitDocIdSetFilter parentsFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("docType", "resume"))));
+ BitSetProducer parentsFilter = new QueryBitSetProducer(new TermQuery(new Term("docType", "resume")));
int h1 = qc.hashCode();
Query qw1 = qc.rewrite(r);
@@ -306,8 +304,8 @@ public class TestBlockJoin extends Lucen
dir.close();
}
- protected QueryWrapperFilter skill(String skill) {
- return new QueryWrapperFilter(new TermQuery(new Term("skill", skill)));
+ protected Query skill(String skill) {
+ return new TermQuery(new Term("skill", skill));
}
public void testSimpleFilter() throws Exception {
@@ -342,7 +340,7 @@ public class TestBlockJoin extends Lucen
IndexSearcher s = newSearcher(r);
// Create a filter that defines "parent" documents in the index - in this case resumes
- BitDocIdSetFilter parentsFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("docType", "resume"))));
+ BitSetProducer parentsFilter = new QueryBitSetProducer(new TermQuery(new Term("docType", "resume")));
// Define child document criteria (finds an example of relevant work experience)
BooleanQuery.Builder childQuery = new BooleanQuery.Builder();
@@ -360,7 +358,7 @@ public class TestBlockJoin extends Lucen
Query query = new BooleanQuery.Builder()
.add(childJoinQuery, Occur.MUST)
- .add(parentsFilter, Occur.FILTER)
+ .add(new TermQuery(new Term("docType", "resume")), Occur.FILTER)
.build();
assertEquals("dummy filter passes everyone ", 2, s.search(query, 10).totalHits);
query = new BooleanQuery.Builder()
@@ -372,19 +370,14 @@ public class TestBlockJoin extends Lucen
// not found test
query = new BooleanQuery.Builder()
.add(childJoinQuery, Occur.MUST)
- .add(new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("country", "Oz")))), Occur.FILTER)
- .build();
- assertEquals("noone live there", 0, s.search(query, 1).totalHits);
- query = new BooleanQuery.Builder()
- .add(childJoinQuery, Occur.MUST)
- .add(new QueryWrapperFilter(new TermQuery(new Term("country", "Oz"))), Occur.FILTER)
+ .add(new TermQuery(new Term("country", "Oz")), Occur.FILTER)
.build();
assertEquals("noone live there", 0, s.search(query, 1).totalHits);
// apply the UK filter by the searcher
query = new BooleanQuery.Builder()
.add(childJoinQuery, Occur.MUST)
- .add(new QueryWrapperFilter(parentQuery), Occur.FILTER)
+ .add(parentQuery, Occur.FILTER)
.build();
TopDocs ukOnly = s.search(query, 1);
assertEquals("has filter - single passed", 1, ukOnly.totalHits);
@@ -392,7 +385,7 @@ public class TestBlockJoin extends Lucen
query = new BooleanQuery.Builder()
.add(childJoinQuery, Occur.MUST)
- .add(new QueryWrapperFilter(new TermQuery(new Term("country", "United States"))), Occur.FILTER)
+ .add(new TermQuery(new Term("country", "United States")), Occur.FILTER)
.build();
// looking for US candidates
TopDocs usThen = s.search(query, 1);
@@ -430,11 +423,11 @@ public class TestBlockJoin extends Lucen
}
}
- private StoredDocument getParentDoc(IndexReader reader, BitDocIdSetFilter parents, int childDocID) throws IOException {
+ private StoredDocument getParentDoc(IndexReader reader, BitSetProducer parents, int childDocID) throws IOException {
final List<LeafReaderContext> leaves = reader.leaves();
final int subIndex = ReaderUtil.subIndex(childDocID, leaves);
final LeafReaderContext leaf = leaves.get(subIndex);
- final BitSet bits = parents.getDocIdSet(leaf).bits();
+ final BitSet bits = parents.getBitSet(leaf);
return leaf.reader().document(bits.nextSetBit(childDocID - leaf.docBase));
}
@@ -445,7 +438,7 @@ public class TestBlockJoin extends Lucen
w.close();
IndexSearcher s = newSearcher(r);
- ToParentBlockJoinQuery q = new ToParentBlockJoinQuery(new MatchNoDocsQuery(), new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new MatchAllDocsQuery())), ScoreMode.Avg);
+ ToParentBlockJoinQuery q = new ToParentBlockJoinQuery(new MatchNoDocsQuery(), new QueryBitSetProducer(new MatchAllDocsQuery()), ScoreMode.Avg);
QueryUtils.check(random(), q, s);
s.search(q, 10);
BooleanQuery.Builder bqB = new BooleanQuery.Builder();
@@ -656,7 +649,7 @@ public class TestBlockJoin extends Lucen
final IndexSearcher joinS = new IndexSearcher(joinR);
- final BitDocIdSetFilter parentsFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("isParent", "x"))));
+ final BitSetProducer parentsFilter = new QueryBitSetProducer(new TermQuery(new Term("isParent", "x")));
final int iters = 200*RANDOM_MULTIPLIER;
@@ -906,10 +899,9 @@ public class TestBlockJoin extends Lucen
final Term childTerm = randomChildTerm(childFields[0]);
if (random().nextBoolean()) { // filtered case
childJoinQuery2 = parentJoinQuery2;
- final Filter f = new QueryWrapperFilter(new TermQuery(childTerm));
childJoinQuery2 = new BooleanQuery.Builder()
.add(childJoinQuery2, Occur.MUST)
- .add(random().nextBoolean() ? new BitDocIdSetCachingWrapperFilter(f): f, Occur.FILTER)
+ .add(new TermQuery(childTerm), Occur.FILTER)
.build();
} else {
// AND child field w/ parent query:
@@ -928,10 +920,9 @@ public class TestBlockJoin extends Lucen
if (random().nextBoolean()) { // filtered case
childQuery2 = parentQuery2;
- final Filter f = new QueryWrapperFilter(new TermQuery(childTerm));
childQuery2 = new BooleanQuery.Builder()
.add(childQuery2, Occur.MUST)
- .add(random().nextBoolean() ? new BitDocIdSetCachingWrapperFilter(f): f, Occur.FILTER)
+ .add(new TermQuery(childTerm), Occur.FILTER)
.build();
} else {
final BooleanQuery.Builder bq2 = new BooleanQuery.Builder();
@@ -1067,7 +1058,7 @@ public class TestBlockJoin extends Lucen
IndexSearcher s = newSearcher(r);
// Create a filter that defines "parent" documents in the index - in this case resumes
- BitDocIdSetFilter parentsFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("docType", "resume"))));
+ BitSetProducer parentsFilter = new QueryBitSetProducer(new TermQuery(new Term("docType", "resume")));
// Define child document criteria (finds an example of relevant work experience)
BooleanQuery.Builder childJobQuery = new BooleanQuery.Builder();
@@ -1147,9 +1138,8 @@ public class TestBlockJoin extends Lucen
w.close();
IndexSearcher s = newSearcher(r);
Query tq = new TermQuery(new Term("child", "1"));
- BitDocIdSetFilter parentFilter = new BitDocIdSetCachingWrapperFilter(
- new QueryWrapperFilter(
- new TermQuery(new Term("parent", "1"))));
+ BitSetProducer parentFilter = new QueryBitSetProducer(
+ new TermQuery(new Term("parent", "1")));
ToParentBlockJoinQuery q = new ToParentBlockJoinQuery(tq, parentFilter, ScoreMode.Avg);
Weight weight = s.createNormalizedWeight(q, true);
@@ -1181,9 +1171,8 @@ public class TestBlockJoin extends Lucen
w.close();
IndexSearcher s = newSearcher(r);
Query tq = new TermQuery(new Term("child", "2"));
- BitDocIdSetFilter parentFilter = new BitDocIdSetCachingWrapperFilter(
- new QueryWrapperFilter(
- new TermQuery(new Term("isparent", "yes"))));
+ BitSetProducer parentFilter = new QueryBitSetProducer(
+ new TermQuery(new Term("isparent", "yes")));
ToParentBlockJoinQuery q = new ToParentBlockJoinQuery(tq, parentFilter, ScoreMode.Avg);
Weight weight = s.createNormalizedWeight(q, true);
@@ -1215,7 +1204,7 @@ public class TestBlockJoin extends Lucen
IndexSearcher s = new IndexSearcher(r);
// Create a filter that defines "parent" documents in the index - in this case resumes
- BitDocIdSetFilter parentsFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("docType", "resume"))));
+ BitSetProducer parentsFilter = new QueryBitSetProducer(new TermQuery(new Term("docType", "resume")));
// Define child document criteria (finds an example of relevant work experience)
BooleanQuery.Builder childQuery = new BooleanQuery.Builder();
@@ -1321,7 +1310,7 @@ public class TestBlockJoin extends Lucen
IndexSearcher searcher = new ToParentBlockJoinIndexSearcher(r);
Query childQuery = new TermQuery(new Term("childText", "text"));
- BitDocIdSetFilter parentsFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("isParent", "yes"))));
+ BitSetProducer parentsFilter = new QueryBitSetProducer(new TermQuery(new Term("isParent", "yes")));
ToParentBlockJoinQuery childJoinQuery = new ToParentBlockJoinQuery(childQuery, parentsFilter, ScoreMode.Avg);
BooleanQuery.Builder parentQuery = new BooleanQuery.Builder();
parentQuery.add(childJoinQuery, Occur.SHOULD);
@@ -1391,7 +1380,7 @@ public class TestBlockJoin extends Lucen
// never matches:
Query childQuery = new TermQuery(new Term("childText", "bogus"));
- BitDocIdSetFilter parentsFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("isParent", "yes"))));
+ BitSetProducer parentsFilter = new QueryBitSetProducer(new TermQuery(new Term("isParent", "yes")));
ToParentBlockJoinQuery childJoinQuery = new ToParentBlockJoinQuery(childQuery, parentsFilter, ScoreMode.Avg);
BooleanQuery.Builder parentQuery = new BooleanQuery.Builder();
parentQuery.add(childJoinQuery, Occur.SHOULD);
@@ -1456,7 +1445,7 @@ public class TestBlockJoin extends Lucen
// illegally matches parent:
Query childQuery = new TermQuery(new Term("parentText", "text"));
- BitDocIdSetFilter parentsFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("isParent", "yes"))));
+ BitSetProducer parentsFilter = new QueryBitSetProducer(new TermQuery(new Term("isParent", "yes")));
ToParentBlockJoinQuery childJoinQuery = new ToParentBlockJoinQuery(childQuery, parentsFilter, ScoreMode.Avg);
BooleanQuery.Builder parentQuery = new BooleanQuery.Builder();
parentQuery.add(childJoinQuery, Occur.SHOULD);
@@ -1508,7 +1497,7 @@ public class TestBlockJoin extends Lucen
IndexSearcher s = newSearcher(r);
// Create a filter that defines "parent" documents in the index - in this case resumes
- BitDocIdSetFilter parentsFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("isparent", "yes"))));
+ BitSetProducer parentsFilter = new QueryBitSetProducer(new TermQuery(new Term("isparent", "yes")));
Query parentQuery = new TermQuery(new Term("parent", "2"));
@@ -1543,7 +1532,7 @@ public class TestBlockJoin extends Lucen
final IndexSearcher searcher = newSearcher(reader);
searcher.setQueryCache(null); // to have real advance() calls
- final BitDocIdSetFilter parentsFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("parent", "true"))));
+ final BitSetProducer parentsFilter = new QueryBitSetProducer(new TermQuery(new Term("parent", "true")));
final Query toChild = new ToChildBlockJoinQuery(new TermQuery(new Term("foo_parent", "bar")), parentsFilter);
final Query childQuery = new TermQuery(new Term("foo_child", "baz"));
@@ -1587,7 +1576,7 @@ public class TestBlockJoin extends Lucen
IndexSearcher s = newSearcher(r);
// Create a filter that defines "parent" documents in the index - in this case resumes
- BitDocIdSetFilter parentsFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("docType", "resume"))));
+ BitSetProducer parentsFilter = new QueryBitSetProducer(new TermQuery(new Term("docType", "resume")));
Query parentQuery = new PrefixQuery(new Term("country", "United"));
ToChildBlockJoinQuery toChildQuery = new ToChildBlockJoinQuery(parentQuery, parentsFilter);
@@ -1625,7 +1614,7 @@ public class TestBlockJoin extends Lucen
IndexSearcher s = newSearcher(r);
// Create a filter that defines "parent" documents in the index - in this case resumes
- BitDocIdSetFilter parentsFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("docType", "resume"))));
+ BitSetProducer parentsFilter = new QueryBitSetProducer(new TermQuery(new Term("docType", "resume")));
Query parentQuery = new PrefixQuery(new Term("country", "United"));
ToChildBlockJoinQuery toChildQuery = new ToChildBlockJoinQuery(parentQuery, parentsFilter);
Modified: lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java?rev=1689432&r1=1689431&r2=1689432&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java (original)
+++ lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java Mon Jul 6 15:48:28 2015
@@ -29,7 +29,6 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.search.FieldDoc;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PrefixQuery;
-import org.apache.lucene.search.QueryWrapperFilter;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TermQuery;
@@ -228,11 +227,11 @@ public class TestBlockJoinSorting extend
IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(w.w, false));
w.close();
- BitDocIdSetFilter parentFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("__type", "parent"))));
- BitDocIdSetFilter childFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new PrefixQuery(new Term("field2"))));
+ BitSetProducer parentFilter = new QueryBitSetProducer(new TermQuery(new Term("__type", "parent")));
+ BitSetProducer childFilter = new QueryBitSetProducer(new PrefixQuery(new Term("field2")));
ToParentBlockJoinQuery query = new ToParentBlockJoinQuery(
- childFilter,
- new BitDocIdSetCachingWrapperFilter(parentFilter),
+ new PrefixQuery(new Term("field2")),
+ parentFilter,
ScoreMode.None
);
@@ -294,10 +293,10 @@ public class TestBlockJoinSorting extend
assertEquals("g", ((BytesRef) ((FieldDoc) topDocs.scoreDocs[4]).fields[0]).utf8ToString());
// Sort by field descending, order last, sort filter (filter_1:T)
- childFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery((new Term("filter_1", "T")))));
+ childFilter = new QueryBitSetProducer(new TermQuery((new Term("filter_1", "T"))));
query = new ToParentBlockJoinQuery(
- childFilter,
- new BitDocIdSetCachingWrapperFilter(parentFilter),
+ new TermQuery((new Term("filter_1", "T"))),
+ parentFilter,
ScoreMode.None
);
sortField = new ToParentBlockJoinSortField(
Modified: lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java?rev=1689432&r1=1689431&r2=1689432&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java (original)
+++ lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java Mon Jul 6 15:48:28 2015
@@ -34,7 +34,6 @@ import org.apache.lucene.search.BooleanQ
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.QueryWrapperFilter;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.Weight;
@@ -54,7 +53,7 @@ public class TestBlockJoinValidation ext
private Directory directory;
private IndexReader indexReader;
private IndexSearcher indexSearcher;
- private BitDocIdSetFilter parentsFilter;
+ private BitSetProducer parentsFilter;
@Override
public void setUp() throws Exception {
@@ -70,7 +69,7 @@ public class TestBlockJoinValidation ext
indexReader = DirectoryReader.open(indexWriter, random().nextBoolean());
indexWriter.close();
indexSearcher = new IndexSearcher(indexReader);
- parentsFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new WildcardQuery(new Term("parent", "*"))));
+ parentsFilter = new QueryBitSetProducer(new WildcardQuery(new Term("parent", "*")));
}
@Override
@@ -132,7 +131,7 @@ public class TestBlockJoinValidation ext
final LeafReaderContext context = indexSearcher.getIndexReader().leaves().get(0);
Weight weight = indexSearcher.createNormalizedWeight(blockJoinQuery, true);
Scorer scorer = weight.scorer(context);
- final Bits parentDocs = parentsFilter.getDocIdSet(context).bits();
+ final Bits parentDocs = parentsFilter.getBitSet(context);
int target;
do {
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java?rev=1689432&r1=1689431&r2=1689432&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java Mon Jul 6 15:48:28 2015
@@ -34,8 +34,8 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryWrapperFilter;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.join.BitDocIdSetCachingWrapperFilter;
-import org.apache.lucene.search.join.BitDocIdSetFilter;
+import org.apache.lucene.search.join.QueryBitSetProducer;
+import org.apache.lucene.search.join.BitSetProducer;
import org.apache.lucene.search.join.ScoreMode;
import org.apache.lucene.search.join.ToParentBlockJoinQuery;
import org.apache.solr.common.util.StrUtils;
@@ -457,10 +457,10 @@ public class TestHierarchicalDocBuilder
**/
private final String childEntityTemplate = "<entity " + ConfigNameConstants.CHILD + "=\"true\" name=\"{0}\" query=\"{1}\">\n {2} {3} </entity>\n";
- private BitDocIdSetFilter createParentFilter(String type) {
+ private BitSetProducer createParentFilter(String type) {
BooleanQuery.Builder parentQuery = new BooleanQuery.Builder();
parentQuery.add(new TermQuery(new Term("type_s", type)), Occur.MUST);
- return new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(parentQuery.build()));
+ return new QueryBitSetProducer(new QueryWrapperFilter(parentQuery.build()));
}
private String nextId() {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ChildDocTransformerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ChildDocTransformerFactory.java?rev=1689432&r1=1689431&r2=1689432&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ChildDocTransformerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ChildDocTransformerFactory.java Mon Jul 6 15:48:28 2015
@@ -23,8 +23,8 @@ import org.apache.lucene.index.StoredDoc
import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryWrapperFilter;
import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.join.BitDocIdSetCachingWrapperFilter;
-import org.apache.lucene.search.join.BitDocIdSetFilter;
+import org.apache.lucene.search.join.QueryBitSetProducer;
+import org.apache.lucene.search.join.BitSetProducer;
import org.apache.lucene.search.join.ToChildBlockJoinQuery;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrException;
@@ -75,10 +75,10 @@ public class ChildDocTransformerFactory
String childFilter = params.get( "childFilter" );
int limit = params.getInt( "limit", 10 );
- BitDocIdSetFilter parentsFilter = null;
+ BitSetProducer parentsFilter = null;
try {
Query parentFilterQuery = QParser.getParser( parentFilter, null, req).getQuery();
- parentsFilter = new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(parentFilterQuery));
+ parentsFilter = new QueryBitSetProducer(new QueryWrapperFilter(parentFilterQuery));
} catch (SyntaxError syntaxError) {
throw new SolrException( ErrorCode.BAD_REQUEST, "Failed to create correct parent filter query" );
}
@@ -100,11 +100,11 @@ class ChildDocTransformer extends Transf
private final String name;
private final SchemaField idField;
private final IndexSchema schema;
- private BitDocIdSetFilter parentsFilter;
+ private BitSetProducer parentsFilter;
private Query childFilterQuery;
private int limit;
- public ChildDocTransformer( String name, final BitDocIdSetFilter parentsFilter,
+ public ChildDocTransformer( String name, final BitSetProducer parentsFilter,
final SchemaField idField, IndexSchema schema,
final Query childFilterQuery, int limit) {
this.name = name;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParser.java?rev=1689432&r1=1689431&r2=1689432&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParser.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParser.java Mon Jul 6 15:48:28 2015
@@ -29,7 +29,7 @@ public class BlockJoinChildQParser exten
}
protected Query createQuery(Query parentListQuery, Query query) {
- return new ToChildBlockJoinQuery(query, getFilter(parentListQuery));
+ return new ToChildBlockJoinQuery(query, getFilter(parentListQuery).filter);
}
@Override
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParser.java?rev=1689432&r1=1689431&r2=1689432&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParser.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParser.java Mon Jul 6 15:48:28 2015
@@ -17,13 +17,21 @@
package org.apache.solr.search.join;
+import java.io.IOException;
+
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.search.BitsFilteredDocIdSet;
+import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryWrapperFilter;
-import org.apache.lucene.search.join.BitDocIdSetCachingWrapperFilter;
-import org.apache.lucene.search.join.BitDocIdSetFilter;
+import org.apache.lucene.search.join.QueryBitSetProducer;
+import org.apache.lucene.search.join.BitSetProducer;
import org.apache.lucene.search.join.ScoreMode;
import org.apache.lucene.search.join.ToParentBlockJoinQuery;
+import org.apache.lucene.util.BitDocIdSet;
+import org.apache.lucene.util.BitSet;
+import org.apache.lucene.util.Bits;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.search.QParser;
@@ -63,21 +71,21 @@ class BlockJoinParentQParser extends QPa
}
protected Query createQuery(Query parentList, Query query) {
- return new ToParentBlockJoinQuery(query, getFilter(parentList), ScoreMode.None);
+ return new ToParentBlockJoinQuery(query, getFilter(parentList).filter, ScoreMode.None);
}
- BitDocIdSetFilter getFilter(Query parentList) {
+ BitDocIdSetFilterWrapper getFilter(Query parentList) {
SolrCache parentCache = req.getSearcher().getCache(CACHE_NAME);
// lazily retrieve from solr cache
Filter filter = null;
if (parentCache != null) {
filter = (Filter) parentCache.get(parentList);
}
- BitDocIdSetFilter result;
- if (filter instanceof BitDocIdSetFilter) {
- result = (BitDocIdSetFilter) filter;
+ BitDocIdSetFilterWrapper result;
+ if (filter instanceof BitDocIdSetFilterWrapper) {
+ result = (BitDocIdSetFilterWrapper) filter;
} else {
- result = createParentFilter(parentList);
+ result = new BitDocIdSetFilterWrapper(createParentFilter(parentList));
if (parentCache != null) {
parentCache.put(parentList, result);
}
@@ -85,9 +93,48 @@ class BlockJoinParentQParser extends QPa
return result;
}
- private BitDocIdSetFilter createParentFilter(Query parentQ) {
- return new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(parentQ));
+ private BitSetProducer createParentFilter(Query parentQ) {
+ return new QueryBitSetProducer(new QueryWrapperFilter(parentQ));
+ }
+
+ // We need this wrapper since BitDocIdSetFilter does not extend Filter
+ static class BitDocIdSetFilterWrapper extends Filter {
+
+ final BitSetProducer filter;
+
+ BitDocIdSetFilterWrapper(BitSetProducer filter) {
+ this.filter = filter;
+ }
+
+ @Override
+ public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) throws IOException {
+ BitSet set = filter.getBitSet(context);
+ if (set == null) {
+ return null;
+ }
+ return BitsFilteredDocIdSet.wrap(new BitDocIdSet(set), acceptDocs);
+ }
+
+ @Override
+ public String toString(String field) {
+ return getClass().getSimpleName() + "(" + filter + ")";
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (super.equals(obj) == false) {
+ return false;
+ }
+ return filter.equals(((BitDocIdSetFilterWrapper) obj).filter);
+ }
+
+ @Override
+ public int hashCode() {
+ return 31 * super.hashCode() + filter.hashCode();
+ }
+
}
+
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java?rev=1689432&r1=1689431&r2=1689432&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java Mon Jul 6 15:48:28 2015
@@ -26,7 +26,7 @@ import org.apache.lucene.search.QueryWra
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TermRangeQuery;
import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.join.BitDocIdSetCachingWrapperFilter;
+import org.apache.lucene.search.join.QueryBitSetProducer;
import org.apache.lucene.search.join.ScoreMode;
import org.apache.lucene.search.join.ToParentBlockJoinQuery;
import org.apache.solr.SolrTestCaseJ4;
@@ -562,7 +562,7 @@ public class AddBlockUpdateTest extends
protected ToParentBlockJoinQuery join(final String childTerm) {
return new ToParentBlockJoinQuery(
- new TermQuery(new Term(child, childTerm)), new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(
+ new TermQuery(new Term(child, childTerm)), new QueryBitSetProducer(new QueryWrapperFilter(
new TermRangeQuery(parent, null, null, false, false))), ScoreMode.None);
}