honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to lucene r1660560 

Squashed commit of the following:

commit 07391388715ed1f737e8acc391cea0bce5d79db9
Merge: a71cc45 b61b021
Author: Robert Muir <rmuir@apache.org>
Date:   Fri Feb 20 06:58:11 2015 -0500

    Git really sucks

    Merge branch 'lucene_r1660560' of github.com:elasticsearch/elasticsearch into lucene_r1660560

commit b61b02163f62ad8ddd9906cedb3d57fed75eb52d
Author: Adrien Grand <jpountz@gmail.com>
Date:   Wed Feb 18 19:03:49 2015 +0100

    Try to improve TopDocs.merge usage.

commit bf8e4ac46d7fdaf9ae128606d96328a59784f126
Author: Ryan Ernst <ryan@iernst.net>
Date:   Wed Feb 18 07:43:37 2015 -0800

    reenable scripting test for accessing postings pieces.  commented out
    parts that fail because of bad assumptions

commit 6d4d635b1a23b33c437a6bae70beea70ad52d91c
Author: Robert Muir <rmuir@apache.org>
Date:   Wed Feb 18 09:41:46 2015 -0500

    add some protection against broken asserts, but, also disable crappy test

commit c735bbb11f38782dfea9c4200fcf732564126bf5
Author: Robert Muir <rmuir@apache.org>
Date:   Wed Feb 18 02:21:30 2015 -0500

    cutover remaining stuff from old postings api

commit 11c9c2bea3db3ff1cd2807bd43e77b500b167aed
Author: Robert Muir <rmuir@apache.org>
Date:   Wed Feb 18 01:46:04 2015 -0500

    cut over most DocsEnum usage

commit bc18017662f6abddf3f074078f74e582494c88e2
Author: Robert Muir <rmuir@apache.org>
Date:   Wed Feb 18 01:19:35 2015 -0500

    upgrade to lucene_r1660560, modulo one test fail
This commit is contained in:
Robert Muir 2015-02-20 06:58:43 -05:00
parent a71cc45023
commit 30a4294a6a
86 changed files with 799 additions and 602 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -32,7 +32,7 @@
<properties>
<lucene.version>5.1.0</lucene.version>
<lucene.maven.version>5.1.0-snapshot-1657571</lucene.maven.version>
<lucene.maven.version>5.1.0-snapshot-1660560</lucene.maven.version>
<tests.jvms>auto</tests.jvms>
<tests.shuffle>true</tests.shuffle>
<tests.output>onerror</tests.output>
@ -56,7 +56,7 @@
<repository>
<id>lucene-snapshots</id>
<name>Lucene Snapshots</name>
<url>https://download.elasticsearch.org/lucenesnapshots/1657571</url>
<url>https://download.elasticsearch.org/lucenesnapshots/1660560</url>
</repository>
</repositories>

18
src/main/java/org/apache/lucene/search/postingshighlight/XPostingsHighlighter.java
View File

@ -391,7 +391,7 @@ public class XPostingsHighlighter {
Map<Integer,Object> highlights = new HashMap<>();
// reuse in the real sense... for docs in same segment we just advance our old enum
DocsAndPositionsEnum postings[] = null;
PostingsEnum postings[] = null;
TermsEnum termsEnum = null;
int lastLeaf = -1;
@ -416,7 +416,7 @@ public class XPostingsHighlighter {
}
if (leaf != lastLeaf) {
termsEnum = t.iterator(null);
postings = new DocsAndPositionsEnum[terms.length];
postings = new PostingsEnum[terms.length];
}
Passage passages[] = highlightDoc(field, terms, content.length(), bi, doc - subContext.docBase, termsEnum, postings, maxPassages);
if (passages.length == 0) {
@ -437,7 +437,7 @@ public class XPostingsHighlighter {
// we can intersect these with the postings lists via BreakIterator.preceding(offset),s
// score each sentence as norm(sentenceStartOffset) * sum(weight * tf(freq))
private Passage[] highlightDoc(String field, BytesRef terms[], int contentLength, BreakIterator bi, int doc,
TermsEnum termsEnum, DocsAndPositionsEnum[] postings, int n) throws IOException {
TermsEnum termsEnum, PostingsEnum[] postings, int n) throws IOException {
//BEGIN EDIT added call to method that returns the offset for the current value (discrete highlighting)
int valueOffset = getOffsetForCurrentValue(field, doc);
@ -462,7 +462,7 @@ public class XPostingsHighlighter {
float weights[] = new float[terms.length];
// initialize postings
for (int i = 0; i < terms.length; i++) {
DocsAndPositionsEnum de = postings[i];
PostingsEnum de = postings[i];
int pDoc;
if (de == EMPTY) {
continue;
@ -471,7 +471,7 @@ public class XPostingsHighlighter {
if (!termsEnum.seekExact(terms[i])) {
continue; // term not found
}
de = postings[i] = termsEnum.docsAndPositions(null, null, DocsAndPositionsEnum.FLAG_OFFSETS);
de = postings[i] = termsEnum.postings(null, null, PostingsEnum.OFFSETS);
if (de == null) {
// no positions available
throw new IllegalArgumentException("field '" + field + "' was indexed without offsets, cannot highlight");
@ -512,7 +512,7 @@ public class XPostingsHighlighter {
OffsetsEnum off;
while ((off = pq.poll()) != null) {
final DocsAndPositionsEnum dp = off.dp;
final PostingsEnum dp = off.dp;
int start = dp.startOffset();
if (start == -1) {
@ -651,11 +651,11 @@ public class XPostingsHighlighter {
}
private static class OffsetsEnum implements Comparable<OffsetsEnum> {
DocsAndPositionsEnum dp;
PostingsEnum dp;
int pos;
int id;
OffsetsEnum(DocsAndPositionsEnum dp, int id) throws IOException {
OffsetsEnum(PostingsEnum dp, int id) throws IOException {
this.dp = dp;
this.id = id;
this.pos = 1;
@ -677,7 +677,7 @@ public class XPostingsHighlighter {
}
}
private static final DocsAndPositionsEnum EMPTY = new DocsAndPositionsEnum() {
private static final PostingsEnum EMPTY = new PostingsEnum() {
@Override
public int nextPosition() throws IOException { return 0; }

11
src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java
View File

@ -77,12 +77,7 @@ public class CustomFieldQuery extends FieldQuery {
if (sourceQuery instanceof SpanTermQuery) {
super.flatten(new TermQuery(((SpanTermQuery) sourceQuery).getTerm()), reader, flatQueries);
} else if (sourceQuery instanceof ConstantScoreQuery) {
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) sourceQuery;
if (constantScoreQuery.getFilter() != null) {
flatten(constantScoreQuery.getFilter(), reader, flatQueries);
} else {
flatten(constantScoreQuery.getQuery(), reader, flatQueries);
}
flatten(((ConstantScoreQuery) sourceQuery).getQuery(), reader, flatQueries);
} else if (sourceQuery instanceof FunctionScoreQuery) {
flatten(((FunctionScoreQuery) sourceQuery).getSubQuery(), reader, flatQueries);
} else if (sourceQuery instanceof FilteredQuery) {
@ -146,7 +141,9 @@ public class CustomFieldQuery extends FieldQuery {
return;
}
if (sourceFilter instanceof TermFilter) {
flatten(new TermQuery(((TermFilter) sourceFilter).getTerm()), reader, flatQueries);
// TermFilter is just a deprecated wrapper over QWF
TermQuery actualQuery = (TermQuery) ((TermFilter) sourceFilter).getQuery();
flatten(new TermQuery(actualQuery.getTerm()), reader, flatQueries);
} else if (sourceFilter instanceof MultiTermQueryWrapperFilter) {
if (multiTermQueryWrapperFilterQueryField != null) {
try {

17
src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java
View File

@ -324,14 +324,9 @@ public final class TermVectorsFields extends Fields {
}
@Override
public DocsEnum docs(Bits liveDocs, DocsEnum reuse, int flags) throws IOException {
return docsAndPositions(liveDocs, reuse instanceof DocsAndPositionsEnum ? (DocsAndPositionsEnum) reuse : null, 0);
}
@Override
public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) throws IOException {
final TermVectorDocsAndPosEnum retVal = (reuse instanceof TermVectorDocsAndPosEnum ? (TermVectorDocsAndPosEnum) reuse
: new TermVectorDocsAndPosEnum());
public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) throws IOException {
final TermVectorPostingsEnum retVal = (reuse instanceof TermVectorPostingsEnum ? (TermVectorPostingsEnum) reuse
: new TermVectorPostingsEnum());
return retVal.reset(hasPositions ? positions : null, hasOffsets ? startOffsets : null, hasOffsets ? endOffsets
: null, hasPayloads ? payloads : null, freq);
}
@ -380,7 +375,7 @@ public final class TermVectorsFields extends Fields {
}
}
private final class TermVectorDocsAndPosEnum extends DocsAndPositionsEnum {
private final class TermVectorPostingsEnum extends PostingsEnum {
private boolean hasPositions;
private boolean hasOffsets;
private boolean hasPayloads;
@ -392,7 +387,7 @@ public final class TermVectorsFields extends Fields {
private BytesRefBuilder[] payloads;
private int[] endOffsets;
private DocsAndPositionsEnum reset(int[] positions, int[] startOffsets, int[] endOffsets, BytesRefBuilder[] payloads, int freq) {
private PostingsEnum reset(int[] positions, int[] startOffsets, int[] endOffsets, BytesRefBuilder[] payloads, int freq) {
curPos = -1;
doc = -1;
this.hasPositions = positions != null;
@ -488,4 +483,4 @@ public final class TermVectorsFields extends Fields {
return stream.readVLong() - 1;
}
}
}

7
src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java
View File

@ -20,8 +20,9 @@
package org.elasticsearch.action.termvectors;
import com.google.common.collect.Iterators;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.util.ArrayUtil;
@ -215,7 +216,7 @@ public class TermVectorsResponse extends ActionResponse implements ToXContent {
builder.startObject(spare.toString());
buildTermStatistics(builder, termIter);
// finally write the term vectors
DocsAndPositionsEnum posEnum = termIter.docsAndPositions(null, null);
PostingsEnum posEnum = termIter.postings(null, null, PostingsEnum.ALL);
int termFreq = posEnum.freq();
builder.field(FieldStrings.TERM_FREQ, termFreq);
initMemory(curTerms, termFreq);
@ -260,7 +261,7 @@ public class TermVectorsResponse extends ActionResponse implements ToXContent {
builder.endArray();
}
private void initValues(Terms curTerms, DocsAndPositionsEnum posEnum, int termFreq) throws IOException {
private void initValues(Terms curTerms, PostingsEnum posEnum, int termFreq) throws IOException {
for (int j = 0; j < termFreq; j++) {
int nextPos = posEnum.nextPosition();
if (curTerms.hasPositions()) {

23
src/main/java/org/elasticsearch/action/termvectors/TermVectorsWriter.java
View File

@ -20,6 +20,7 @@ package org.elasticsearch.action.termvectors;
import org.apache.lucene.index.*;
import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.TermStatistics;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.action.termvectors.TermVectorsRequest.Flag;
@ -52,8 +53,8 @@ final class TermVectorsWriter {
void setFields(Fields termVectorsByField, Set<String> selectedFields, EnumSet<Flag> flags, Fields topLevelFields, @Nullable AggregatedDfs dfs) throws IOException {
int numFieldsWritten = 0;
TermsEnum iterator = null;
DocsAndPositionsEnum docsAndPosEnum = null;
DocsEnum docsEnum = null;
PostingsEnum docsAndPosEnum = null;
PostingsEnum docsEnum = null;
TermsEnum topLevelIterator = null;
for (String field : termVectorsByField) {
if ((selectedFields != null) && (!selectedFields.contains(field))) {
@ -100,7 +101,7 @@ final class TermVectorsWriter {
docsAndPosEnum = writeTermWithDocsAndPos(iterator, docsAndPosEnum, positions, offsets, payloads);
} else {
// if we do not have the positions stored, we need to
// get the frequency from a DocsEnum.
// get the frequency from a PostingsEnum.
docsEnum = writeTermWithDocsOnly(iterator, docsEnum);
}
}
@ -127,23 +128,23 @@ final class TermVectorsWriter {
return header.bytes();
}
private DocsEnum writeTermWithDocsOnly(TermsEnum iterator, DocsEnum docsEnum) throws IOException {
docsEnum = iterator.docs(null, docsEnum);
private PostingsEnum writeTermWithDocsOnly(TermsEnum iterator, PostingsEnum docsEnum) throws IOException {
docsEnum = iterator.postings(null, docsEnum);
int nextDoc = docsEnum.nextDoc();
assert nextDoc != DocsEnum.NO_MORE_DOCS;
assert nextDoc != DocIdSetIterator.NO_MORE_DOCS;
writeFreq(docsEnum.freq());
nextDoc = docsEnum.nextDoc();
assert nextDoc == DocsEnum.NO_MORE_DOCS;
assert nextDoc == DocIdSetIterator.NO_MORE_DOCS;
return docsEnum;
}
private DocsAndPositionsEnum writeTermWithDocsAndPos(TermsEnum iterator, DocsAndPositionsEnum docsAndPosEnum, boolean positions,
private PostingsEnum writeTermWithDocsAndPos(TermsEnum iterator, PostingsEnum docsAndPosEnum, boolean positions,
boolean offsets, boolean payloads) throws IOException {
docsAndPosEnum = iterator.docsAndPositions(null, docsAndPosEnum);
docsAndPosEnum = iterator.postings(null, docsAndPosEnum, PostingsEnum.ALL);
// for each term (iterator next) in this field (field)
// iterate over the docs (should only be one)
int nextDoc = docsAndPosEnum.nextDoc();
assert nextDoc != DocsEnum.NO_MORE_DOCS;
assert nextDoc != DocIdSetIterator.NO_MORE_DOCS;
final int freq = docsAndPosEnum.freq();
writeFreq(freq);
for (int j = 0; j < freq; j++) {
@ -159,7 +160,7 @@ final class TermVectorsWriter {
}
}
nextDoc = docsAndPosEnum.nextDoc();
assert nextDoc == DocsEnum.NO_MORE_DOCS;
assert nextDoc == DocIdSetIterator.NO_MORE_DOCS;
return docsAndPosEnum;
}

40
src/main/java/org/elasticsearch/common/lucene/Lucene.java
View File

@ -325,10 +325,6 @@ public class Lucene {
}
public static TopDocs readTopDocs(StreamInput in) throws IOException {
if (!in.readBoolean()) {
// no docs
return null;
}
if (in.readBoolean()) {
int totalHits = in.readVInt();
float maxScore = in.readFloat();
@ -395,11 +391,7 @@ public class Lucene {
}
public static void writeTopDocs(StreamOutput out, TopDocs topDocs, int from) throws IOException {
if (topDocs.scoreDocs.length - from < 0) {
out.writeBoolean(false);
return;
}
out.writeBoolean(true);
from = Math.min(from, topDocs.scoreDocs.length);
if (topDocs instanceof TopFieldDocs) {
out.writeBoolean(true);
TopFieldDocs topFieldDocs = (TopFieldDocs) topDocs;
@ -424,11 +416,8 @@ public class Lucene {
}
out.writeVInt(topDocs.scoreDocs.length - from);
int index = 0;
for (ScoreDoc doc : topFieldDocs.scoreDocs) {
if (index++ < from) {
continue;
}
for (int i = from; i < topFieldDocs.scoreDocs.length; ++i) {
ScoreDoc doc = topFieldDocs.scoreDocs[i];
writeFieldDoc(out, (FieldDoc) doc);
}
} else {
@ -437,11 +426,8 @@ public class Lucene {
out.writeFloat(topDocs.getMaxScore());
out.writeVInt(topDocs.scoreDocs.length - from);
int index = 0;
for (ScoreDoc doc : topDocs.scoreDocs) {
if (index++ < from) {
continue;
}
for (int i = from; i < topDocs.scoreDocs.length; ++i) {
ScoreDoc doc = topDocs.scoreDocs[i];
writeScoreDoc(out, doc);
}
}
@ -686,6 +672,22 @@ public class Lucene {
public int nextDoc() throws IOException {
throw new ElasticsearchIllegalStateException(message);
}
@Override
public int nextPosition() throws IOException {
throw new ElasticsearchIllegalStateException(message);
}
@Override
public int startOffset() throws IOException {
throw new ElasticsearchIllegalStateException(message);
}
@Override
public int endOffset() throws IOException {
throw new ElasticsearchIllegalStateException(message);
}
@Override
public BytesRef getPayload() throws IOException {
throw new ElasticsearchIllegalStateException(message);
}
};
}

12
src/main/java/org/elasticsearch/common/lucene/all/AllTermQuery.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.common.lucene.all;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.ComplexExplanation;
import org.apache.lucene.search.Explanation;
@ -51,7 +51,9 @@ public class AllTermQuery extends SpanTermQuery {
}
@Override
public Weight createWeight(IndexSearcher searcher) throws IOException {
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
// TODO: needsScores
// we should be able to just return a regular SpanTermWeight, at most here if needsScores == false?
return new AllTermWeight(this, searcher);
}
@ -62,7 +64,7 @@ public class AllTermQuery extends SpanTermQuery {
}
@Override
public AllTermSpanScorer scorer(LeafReaderContext context, Bits acceptDocs, boolean needsScores) throws IOException {
public AllTermSpanScorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
if (this.stats == null) {
return null;
}
@ -71,7 +73,7 @@ public class AllTermQuery extends SpanTermQuery {
}
protected class AllTermSpanScorer extends SpanScorer {
protected DocsAndPositionsEnum positions;
protected PostingsEnum positions;
protected float payloadScore;
protected int payloadsSeen;
@ -146,7 +148,7 @@ public class AllTermQuery extends SpanTermQuery {
@Override
public Explanation explain(LeafReaderContext context, int doc) throws IOException{
AllTermSpanScorer scorer = scorer(context, context.reader().getLiveDocs(), true);
AllTermSpanScorer scorer = scorer(context, context.reader().getLiveDocs());
if (scorer != null) {
int newDoc = scorer.advance(doc);
if (newDoc == doc) {

23
src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java
View File

@ -20,10 +20,10 @@
package org.elasticsearch.common.lucene.index;
import com.google.common.collect.Lists;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.DocIdSet;
@ -48,7 +48,7 @@ public class FilterableTermsEnum extends TermsEnum {
static class Holder {
final TermsEnum termsEnum;
@Nullable
DocsEnum docsEnum;
PostingsEnum docsEnum;
@Nullable
final Bits bits;
@ -68,7 +68,7 @@ public class FilterableTermsEnum extends TermsEnum {
protected int numDocs;
public FilterableTermsEnum(IndexReader reader, String field, int docsEnumFlag, @Nullable final Filter filter) throws IOException {
if ((docsEnumFlag != DocsEnum.FLAG_FREQS) && (docsEnumFlag != DocsEnum.FLAG_NONE)) {
if ((docsEnumFlag != PostingsEnum.FREQS) && (docsEnumFlag != PostingsEnum.NONE)) {
throw new ElasticsearchIllegalArgumentException("invalid docsEnumFlag of " + docsEnumFlag);
}
this.docsEnumFlag = docsEnumFlag;
@ -128,7 +128,7 @@ public class FilterableTermsEnum extends TermsEnum {
if (anEnum.termsEnum.seekExact(text)) {
if (anEnum.bits == null) {
docFreq += anEnum.termsEnum.docFreq();
if (docsEnumFlag == DocsEnum.FLAG_FREQS) {
if (docsEnumFlag == PostingsEnum.FREQS) {
long leafTotalTermFreq = anEnum.termsEnum.totalTermFreq();
if (totalTermFreq == -1 || leafTotalTermFreq == -1) {
totalTermFreq = -1;
@ -137,9 +137,9 @@ public class FilterableTermsEnum extends TermsEnum {
totalTermFreq += leafTotalTermFreq;
}
} else {
final DocsEnum docsEnum = anEnum.docsEnum = anEnum.termsEnum.docs(anEnum.bits, anEnum.docsEnum, docsEnumFlag);
final PostingsEnum docsEnum = anEnum.docsEnum = anEnum.termsEnum.postings(anEnum.bits, anEnum.docsEnum, docsEnumFlag);
// 2 choices for performing same heavy loop - one attempts to calculate totalTermFreq and other does not
if (docsEnumFlag == DocsEnum.FLAG_FREQS) {
if (docsEnumFlag == PostingsEnum.FREQS) {
for (int docId = docsEnum.nextDoc(); docId != DocIdSetIterator.NO_MORE_DOCS; docId = docsEnum.nextDoc()) {
docFreq++;
// docsEnum.freq() returns 1 if doc indexed with IndexOptions.DOCS_ONLY so no way of knowing if value
@ -148,7 +148,7 @@ public class FilterableTermsEnum extends TermsEnum {
}
} else {
for (int docId = docsEnum.nextDoc(); docId != DocIdSetIterator.NO_MORE_DOCS; docId = docsEnum.nextDoc()) {
// docsEnum.freq() behaviour is undefined if docsEnumFlag==DocsEnum.FLAG_NONE so don't bother with call
// docsEnum.freq() behaviour is undefined if docsEnumFlag==PostingsEnum.FLAG_NONE so don't bother with call
docFreq++;
}
}
@ -194,12 +194,7 @@ public class FilterableTermsEnum extends TermsEnum {
}
@Override
public DocsEnum docs(Bits liveDocs, DocsEnum reuse, int flags) throws IOException {
throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE);
}
@Override
public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) throws IOException {
public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) throws IOException {
throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE);
}

4
src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java
View File

@ -19,8 +19,8 @@
package org.elasticsearch.common.lucene.index;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.search.Filter;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.ElasticsearchException;
@ -49,7 +49,7 @@ public class FreqTermsEnum extends FilterableTermsEnum implements Releasable {
public FreqTermsEnum(IndexReader reader, String field, boolean needDocFreq, boolean needTotalTermFreq, @Nullable Filter filter, BigArrays bigArrays) throws IOException {
super(reader, field, needTotalTermFreq ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE, filter);
super(reader, field, needTotalTermFreq ? PostingsEnum.FREQS : PostingsEnum.NONE, filter);
this.bigArrays = bigArrays;
this.needDocFreqs = needDocFreq;
this.needTotalTermFreqs = needTotalTermFreq;

2
src/main/java/org/elasticsearch/common/lucene/search/AndFilter.java
View File

@ -81,7 +81,7 @@ public class AndFilter extends Filter {
}
@Override
public String toString() {
public String toString(String field) {
StringBuilder builder = new StringBuilder();
for (Filter filter : filters) {
if (builder.length() > 0) {

21
src/main/java/org/elasticsearch/common/lucene/search/EmptyScorer.java
View File

@ -20,6 +20,7 @@ package org.elasticsearch.common.lucene.search;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.BytesRef;
import java.io.IOException;
@ -64,4 +65,24 @@ public class EmptyScorer extends Scorer {
public long cost() {
return 0;
}
@Override
public int nextPosition() throws IOException {
return -1;
}
@Override
public int startOffset() throws IOException {
return -1;
}
@Override
public int endOffset() throws IOException {
return -1;
}
@Override
public BytesRef getPayload() throws IOException {
return null;
}
}

5
src/main/java/org/elasticsearch/common/lucene/search/LimitFilter.java
View File

@ -71,4 +71,9 @@ public class LimitFilter extends NoCacheFilter {
return RamUsageEstimator.NUM_BYTES_INT;
}
}
@Override
public String toString(String field) {
return "limit(limit=" + limit + ")";
}
}

2
src/main/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilter.java
View File

@ -60,7 +60,7 @@ public class MatchAllDocsFilter extends Filter {
}
@Override
public String toString() {
public String toString(String field) {
return "*:*";
}
}

2
src/main/java/org/elasticsearch/common/lucene/search/MatchNoDocsFilter.java
View File

@ -58,7 +58,7 @@ public class MatchNoDocsFilter extends Filter {
}
@Override
public String toString() {
public String toString(String field) {
return "MatchNoDocsFilter";
}
}

15
src/main/java/org/elasticsearch/common/lucene/search/MatchNoDocsQuery.java
View File

@ -37,14 +37,13 @@ public final class MatchNoDocsQuery extends Query {
*/
private class MatchNoDocsWeight extends Weight {
@Override
public String toString() {
return "weight(" + MatchNoDocsQuery.this + ")";
MatchNoDocsWeight(Query parent) {
super(parent);
}
@Override
public Query getQuery() {
return MatchNoDocsQuery.this;
public String toString() {
return "weight(" + MatchNoDocsQuery.this + ")";
}
@Override
@ -57,7 +56,7 @@ public final class MatchNoDocsQuery extends Query {
}
@Override
public Scorer scorer(LeafReaderContext context, Bits acceptDocs, boolean needsScores) throws IOException {
public Scorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
return null;
}
@ -69,8 +68,8 @@ public final class MatchNoDocsQuery extends Query {
}
@Override
public Weight createWeight(IndexSearcher searcher) throws IOException {
return new MatchNoDocsWeight();
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
return new MatchNoDocsWeight(this);
}
@Override

2
src/main/java/org/elasticsearch/common/lucene/search/NoCacheFilter.java
View File

@ -60,7 +60,7 @@ public abstract class NoCacheFilter extends Filter {
}
@Override
public String toString() {
public String toString(String field) {
return "no_cache(" + delegate + ")";
}

2
src/main/java/org/elasticsearch/common/lucene/search/NotFilter.java
View File

@ -67,7 +67,7 @@ public class NotFilter extends Filter {
}
@Override
public String toString() {
public String toString(String field) {
return "NotFilter(" + filter + ")";
}

2
src/main/java/org/elasticsearch/common/lucene/search/OrFilter.java
View File

@ -91,7 +91,7 @@ public class OrFilter extends Filter {
}
@Override
public String toString() {
public String toString(String field) {
StringBuilder builder = new StringBuilder();
for (Filter filter : filters) {
if (builder.length() > 0) {

2
src/main/java/org/elasticsearch/common/lucene/search/Queries.java
View File

@ -76,7 +76,7 @@ public class Queries {
public static boolean isConstantMatchAllQuery(Query query) {
if (query instanceof ConstantScoreQuery) {
ConstantScoreQuery scoreQuery = (ConstantScoreQuery) query;
if (scoreQuery.getFilter() instanceof MatchAllDocsFilter) {
if (scoreQuery.getQuery() instanceof MatchAllDocsFilter || scoreQuery.getQuery() instanceof MatchAllDocsQuery) {
return true;
}
}

2
src/main/java/org/elasticsearch/common/lucene/search/RegexpFilter.java
View File

@ -95,7 +95,7 @@ public class RegexpFilter extends Filter {
}
@Override
public String toString() {
public String toString(String field) {
// todo should we also show the flags?
return term.field() + ":" + term.text();
}

2
src/main/java/org/elasticsearch/common/lucene/search/XBooleanFilter.java
View File

@ -320,7 +320,7 @@ public class XBooleanFilter extends Filter implements Iterable<FilterClause> {
* Prints a user-readable version of this Filter.
*/
@Override
public String toString() {
public String toString(String field) {
final StringBuilder buffer = new StringBuilder("BooleanFilter(");
final int minLen = buffer.length();
for (final FilterClause c : clauses) {

2
src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java
View File

@ -855,7 +855,7 @@ public final class XMoreLikeThis {
continue;
}
DocsEnum docs = termsEnum.docs(null, null);
PostingsEnum docs = termsEnum.postings(null, null);
final int freq = docs.freq();
// increment frequency

23
src/main/java/org/elasticsearch/common/lucene/search/function/CustomBoostFactorScorer.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.common.lucene.search.function;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.BytesRef;
import java.io.IOException;
@ -81,6 +82,28 @@ abstract class CustomBoostFactorScorer extends Scorer {
return scorer.cost();
}
@Override
public int nextPosition() throws IOException {
return scorer.nextPosition();
}
@Override
public int startOffset() throws IOException {
return scorer.startOffset();
}
@Override
public int endOffset() throws IOException {
return scorer.endOffset();
}
@Override
public BytesRef getPayload() throws IOException {
return scorer.getPayload();
}
public interface NextDoc {
public int advance(int target) throws IOException;

19
src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java
View File

@ -120,9 +120,11 @@ public class FiltersFunctionScoreQuery extends Query {
}
@Override
public Weight createWeight(IndexSearcher searcher) throws IOException {
Weight subQueryWeight = subQuery.createWeight(searcher);
return new CustomBoostFactorWeight(subQueryWeight, filterFunctions.length);
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
// TODO: needsScores
// if we dont need scores, just return the underlying Weight?
Weight subQueryWeight = subQuery.createWeight(searcher, needsScores);
return new CustomBoostFactorWeight(this, subQueryWeight, filterFunctions.length);
}
class CustomBoostFactorWeight extends Weight {
@ -130,15 +132,12 @@ public class FiltersFunctionScoreQuery extends Query {
final Weight subQueryWeight;
final Bits[] docSets;
public CustomBoostFactorWeight(Weight subQueryWeight, int filterFunctionLength) throws IOException {
public CustomBoostFactorWeight(Query parent, Weight subQueryWeight, int filterFunctionLength) throws IOException {
super(parent);
this.subQueryWeight = subQueryWeight;
this.docSets = new Bits[filterFunctionLength];
}
public Query getQuery() {
return FiltersFunctionScoreQuery.this;
}
@Override
public float getValueForNormalization() throws IOException {
float sum = subQueryWeight.getValueForNormalization();
@ -152,11 +151,11 @@ public class FiltersFunctionScoreQuery extends Query {
}
@Override
public Scorer scorer(LeafReaderContext context, Bits acceptDocs, boolean needsScores) throws IOException {
public Scorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
// we ignore scoreDocsInOrder parameter, because we need to score in
// order if documents are scored with a script. The
// ShardLookup depends on in order scoring.
Scorer subQueryScorer = subQueryWeight.scorer(context, acceptDocs, needsScores);
Scorer subQueryScorer = subQueryWeight.scorer(context, acceptDocs);
if (subQueryScorer == null) {
return null;
}

22
src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java
View File

@ -90,23 +90,22 @@ public class FunctionScoreQuery extends Query {
}
@Override
public Weight createWeight(IndexSearcher searcher) throws IOException {
Weight subQueryWeight = subQuery.createWeight(searcher);
return new CustomBoostFactorWeight(subQueryWeight);
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
// TODO: needsScores
// if we don't need scores, just return the underlying weight?
Weight subQueryWeight = subQuery.createWeight(searcher, needsScores);
return new CustomBoostFactorWeight(this, subQueryWeight);
}
class CustomBoostFactorWeight extends Weight {
final Weight subQueryWeight;
public CustomBoostFactorWeight(Weight subQueryWeight) throws IOException {
public CustomBoostFactorWeight(Query parent, Weight subQueryWeight) throws IOException {
super(parent);
this.subQueryWeight = subQueryWeight;
}
public Query getQuery() {
return FunctionScoreQuery.this;
}
@Override
public float getValueForNormalization() throws IOException {
float sum = subQueryWeight.getValueForNormalization();
@ -120,11 +119,8 @@ public class FunctionScoreQuery extends Query {
}
@Override
public Scorer scorer(LeafReaderContext context, Bits acceptDocs, boolean needsScores) throws IOException {
// we ignore scoreDocsInOrder parameter, because we need to score in
// order if documents are scored with a script. The
// ShardLookup depends on in order scoring.
Scorer subQueryScorer = subQueryWeight.scorer(context, acceptDocs, needsScores);
public Scorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
Scorer subQueryScorer = subQueryWeight.scorer(context, acceptDocs);
if (subQueryScorer == null) {
return null;
}

21
src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java
View File

@ -22,6 +22,7 @@ package org.elasticsearch.common.lucene.search.function;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.script.ScriptException;
import org.elasticsearch.script.ExplainableSearchScript;
import org.elasticsearch.script.SearchScript;
@ -64,6 +65,26 @@ public class ScriptScoreFunction extends ScoreFunction {
throw new UnsupportedOperationException();
}
@Override
public int nextPosition() throws IOException {
return -1;
}
@Override
public int startOffset() throws IOException {
return -1;
}
@Override
public int endOffset() throws IOException {
return -1;
}
@Override
public BytesRef getPayload() throws IOException {
return null;
}
@Override
public long cost() {
return 1;

30
src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDAndVersionLookup.java
View File

@ -23,14 +23,14 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.common.Numbers;
@ -50,9 +50,9 @@ final class PerThreadIDAndVersionLookup {
private final LeafReaderContext[] readerContexts;
private final TermsEnum[] termsEnums;
private final DocsEnum[] docsEnums;
private final PostingsEnum[] docsEnums;
// Only used for back compat, to lookup a version from payload:
private final DocsAndPositionsEnum[] posEnums;
private final PostingsEnum[] posEnums;
private final Bits[] liveDocs;
private final NumericDocValues[] versions;
private final int numSegs;
@ -65,8 +65,8 @@ final class PerThreadIDAndVersionLookup {
readerContexts = leaves.toArray(new LeafReaderContext[leaves.size()]);
termsEnums = new TermsEnum[leaves.size()];
docsEnums = new DocsEnum[leaves.size()];
posEnums = new DocsAndPositionsEnum[leaves.size()];
docsEnums = new PostingsEnum[leaves.size()];
posEnums = new PostingsEnum[leaves.size()];
liveDocs = new Bits[leaves.size()];
versions = new NumericDocValues[leaves.size()];
hasPayloads = new boolean[leaves.size()];
@ -102,16 +102,16 @@ final class PerThreadIDAndVersionLookup {
NumericDocValues segVersions = versions[seg];
if (segVersions != null || hasPayloads[seg] == false) {
// Use NDV to retrieve the version, in which case we only need DocsEnum:
// Use NDV to retrieve the version, in which case we only need PostingsEnum:
// there may be more than one matching docID, in the case of nested docs, so we want the last one:
DocsEnum docs = docsEnums[seg] = termsEnums[seg].docs(liveDocs[seg], docsEnums[seg], 0);
int docID = DocsEnum.NO_MORE_DOCS;
for (int d = docs.nextDoc(); d != DocsEnum.NO_MORE_DOCS; d = docs.nextDoc()) {
PostingsEnum docs = docsEnums[seg] = termsEnums[seg].postings(liveDocs[seg], docsEnums[seg], 0);
int docID = DocIdSetIterator.NO_MORE_DOCS;
for (int d = docs.nextDoc(); d != DocIdSetIterator.NO_MORE_DOCS; d = docs.nextDoc()) {
docID = d;
}
if (docID != DocsEnum.NO_MORE_DOCS) {
if (docID != DocIdSetIterator.NO_MORE_DOCS) {
if (segVersions != null) {
return new DocIdAndVersion(docID, segVersions.get(docID), readerContexts[seg]);
} else {
@ -124,12 +124,10 @@ final class PerThreadIDAndVersionLookup {
}
}
// ... but used to be stored as payloads; in this case we must use DocsAndPositionsEnum
DocsAndPositionsEnum dpe = posEnums[seg] = termsEnums[seg].docsAndPositions(liveDocs[seg], posEnums[seg], DocsAndPositionsEnum.FLAG_PAYLOADS);
// ... but used to be stored as payloads; in this case we must use PostingsEnum
PostingsEnum dpe = posEnums[seg] = termsEnums[seg].postings(liveDocs[seg], posEnums[seg], PostingsEnum.PAYLOADS);
assert dpe != null; // terms has payloads
int docID = DocsEnum.NO_MORE_DOCS;
for (int d = dpe.nextDoc(); d != DocsEnum.NO_MORE_DOCS; d = dpe.nextDoc()) {
docID = d;
for (int d = dpe.nextDoc(); d != DocIdSetIterator.NO_MORE_DOCS; d = dpe.nextDoc()) {
dpe.nextPosition();
final BytesRef payload = dpe.getPayload();
if (payload != null && payload.length == 8) {

5
src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java vendored
View File

@ -222,15 +222,18 @@ public class BitsetFilterCache extends AbstractIndexComponent implements LeafRea
}
}
public String toString() {
@Override
public String toString(String field) {
return "random_access(" + filter + ")";
}
@Override
public boolean equals(Object o) {
if (!(o instanceof BitDocIdSetFilterWrapper)) return false;
return this.filter.equals(((BitDocIdSetFilterWrapper) o).filter);
}
@Override
public int hashCode() {
return filter.hashCode() ^ 0x1117BF26;
}

3
src/main/java/org/elasticsearch/index/cache/filter/weighted/WeightedFilterCache.java vendored
View File

@ -205,7 +205,8 @@ public class WeightedFilterCache extends AbstractIndexComponent implements Filte
return BitsFilteredDocIdSet.wrap(DocIdSets.isEmpty(ret) ? null : ret, acceptDocs);
}
public String toString() {
@Override
public String toString(String field) {
return "cache(" + filter + ")";
}

20
src/main/java/org/elasticsearch/index/codec/postingsformat/BloomFilterPostingsFormat.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.index.codec.postingsformat;
import org.apache.lucene.codecs.*;
import org.apache.lucene.index.*;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.*;
import org.apache.lucene.util.*;
import org.elasticsearch.common.util.BloomFilter;
@ -339,18 +340,9 @@ public class BloomFilterPostingsFormat extends PostingsFormat {
@Override
public DocsAndPositionsEnum docsAndPositions(Bits liveDocs,
DocsAndPositionsEnum reuse, int flags) throws IOException {
return getDelegate().docsAndPositions(liveDocs, reuse, flags);
public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) throws IOException {
return getDelegate().postings(liveDocs, reuse, flags);
}
@Override
public DocsEnum docs(Bits liveDocs, DocsEnum reuse, int flags)
throws IOException {
return getDelegate().docs(liveDocs, reuse, flags);
}
}
// TODO: would be great to move this out to test code, but the interaction between es090 and bloom is complex
@ -397,7 +389,7 @@ public class BloomFilterPostingsFormat extends PostingsFormat {
BloomFilter bloomFilter = null;
DocsEnum docsEnum = null;
PostingsEnum postings = null;
while (true) {
BytesRef term = termsEnum.next();
if (term == null) {
@ -409,8 +401,8 @@ public class BloomFilterPostingsFormat extends PostingsFormat {
bloomFilters.put(fieldInfo, bloomFilter);
}
// Make sure there's at least one doc for this term:
docsEnum = termsEnum.docs(null, docsEnum, 0);
if (docsEnum.nextDoc() != DocsEnum.NO_MORE_DOCS) {
postings = termsEnum.postings(null, postings, 0);
if (postings.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
bloomFilter.put(term);
}
}

9
src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java
View File

@ -19,9 +19,10 @@
package org.elasticsearch.index.fielddata.ordinals;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FilteredTermsEnum;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.util.*;
import org.apache.lucene.util.packed.GrowableWriter;
import org.apache.lucene.util.packed.PackedInts;
@ -463,16 +464,16 @@ public final class OrdinalsBuilder implements Closeable {
*/
public BytesRefIterator buildFromTerms(final TermsEnum termsEnum) throws IOException {
return new BytesRefIterator() {
private DocsEnum docsEnum = null;
private PostingsEnum docsEnum = null;
@Override
public BytesRef next() throws IOException {
BytesRef ref;
if ((ref = termsEnum.next()) != null) {
docsEnum = termsEnum.docs(null, docsEnum, DocsEnum.FLAG_NONE);
docsEnum = termsEnum.postings(null, docsEnum, PostingsEnum.NONE);
nextOrdinal();
int docId;
while ((docId = docsEnum.nextDoc()) != DocsEnum.NO_MORE_DOCS) {
while ((docId = docsEnum.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
addDoc(docId);
}
}

7
src/main/java/org/elasticsearch/index/fielddata/plain/FSTBytesIndexFieldData.java
View File

@ -19,6 +19,7 @@
package org.elasticsearch.index.fielddata.plain;
import org.apache.lucene.index.*;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IntsRefBuilder;
import org.apache.lucene.util.fst.FST;
@ -87,12 +88,12 @@ public class FSTBytesIndexFieldData extends AbstractIndexOrdinalsFieldData {
// we don't store an ord 0 in the FST since we could have an empty string in there and FST don't support
// empty strings twice. ie. them merge fails for long output.
TermsEnum termsEnum = filter(terms, reader);
DocsEnum docsEnum = null;
PostingsEnum docsEnum = null;
for (BytesRef term = termsEnum.next(); term != null; term = termsEnum.next()) {
final long termOrd = builder.nextOrdinal();
fstBuilder.add(Util.toIntsRef(term, scratch), (long) termOrd);
docsEnum = termsEnum.docs(null, docsEnum, DocsEnum.FLAG_NONE);
for (int docId = docsEnum.nextDoc(); docId != DocsEnum.NO_MORE_DOCS; docId = docsEnum.nextDoc()) {
docsEnum = termsEnum.postings(null, docsEnum, PostingsEnum.NONE);
for (int docId = docsEnum.nextDoc(); docId != DocIdSetIterator.NO_MORE_DOCS; docId = docsEnum.nextDoc()) {
builder.addDoc(docId);
}
}

7
src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.index.fielddata.plain;
import org.apache.lucene.codecs.blocktree.FieldReader;
import org.apache.lucene.codecs.blocktree.Stats;
import org.apache.lucene.index.*;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.PagedBytes;
import org.apache.lucene.util.packed.PackedInts;
@ -90,13 +91,13 @@ public class PagedBytesIndexFieldData extends AbstractIndexOrdinalsFieldData {
boolean success = false;
try (OrdinalsBuilder builder = new OrdinalsBuilder(numTerms, reader.maxDoc(), acceptableTransientOverheadRatio)) {
DocsEnum docsEnum = null;
PostingsEnum docsEnum = null;
for (BytesRef term = termsEnum.next(); term != null; term = termsEnum.next()) {
final long termOrd = builder.nextOrdinal();
assert termOrd == termOrdToBytesOffset.size();
termOrdToBytesOffset.add(bytes.copyUsingLengthPrefix(term));
docsEnum = termsEnum.docs(null, docsEnum, DocsEnum.FLAG_NONE);
for (int docId = docsEnum.nextDoc(); docId != DocsEnum.NO_MORE_DOCS; docId = docsEnum.nextDoc()) {
docsEnum = termsEnum.postings(null, docsEnum, PostingsEnum.NONE);
for (int docId = docsEnum.nextDoc(); docId != DocIdSetIterator.NO_MORE_DOCS; docId = docsEnum.nextDoc()) {
builder.addDoc(docId);
}
}

9
src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
View File

@ -23,14 +23,15 @@ import com.carrotsearch.hppc.ObjectObjectOpenHashMap;
import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
import com.google.common.collect.ImmutableSortedSet;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.MultiDocValues.OrdinalMap;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.SortedDocValues;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LongValues;
@ -135,7 +136,7 @@ public class ParentChildIndexFieldData extends AbstractIndexFieldData<AtomicPare
ObjectObjectOpenHashMap<String, TypeBuilder> typeBuilders = ObjectObjectOpenHashMap.newInstance();
try {
try {
DocsEnum docsEnum = null;
PostingsEnum docsEnum = null;
for (BytesRef term = estimatedTermsEnum.next(); term != null; term = estimatedTermsEnum.next()) {
// Usually this would be estimatedTermsEnum, but the
// abstract TermsEnum class does not support the .type()
@ -152,8 +153,8 @@ public class ParentChildIndexFieldData extends AbstractIndexFieldData<AtomicPare
final long termOrd = typeBuilder.builder.nextOrdinal();
assert termOrd == typeBuilder.termOrdToBytesOffset.size();
typeBuilder.termOrdToBytesOffset.add(typeBuilder.bytes.copyUsingLengthPrefix(id));
docsEnum = estimatedTermsEnum.docs(null, docsEnum, DocsEnum.FLAG_NONE);
for (int docId = docsEnum.nextDoc(); docId != DocsEnum.NO_MORE_DOCS; docId = docsEnum.nextDoc()) {
docsEnum = estimatedTermsEnum.postings(null, docsEnum, PostingsEnum.NONE);
for (int docId = docsEnum.nextDoc(); docId != DocIdSetIterator.NO_MORE_DOCS; docId = docsEnum.nextDoc()) {
typeBuilder.builder.addDoc(docId);
}
}

47
src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIntersectTermsEnum.java
View File

@ -20,7 +20,9 @@
package org.elasticsearch.index.fielddata.plain;
import com.carrotsearch.hppc.IntArrayList;
import org.apache.lucene.index.*;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
@ -63,16 +65,16 @@ final class ParentChildIntersectTermsEnum extends TermsEnum {
}
@Override
public DocsEnum docs(Bits liveDocs, DocsEnum reuse, int flags) throws IOException {
public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) throws IOException {
int size = stateSlots.size();
assert size > 0;
if (size == 1) {
// Can't use 'reuse' since we don't know to which previous TermsEnum it belonged to.
return states.get(stateSlots.get(0)).termsEnum.docs(liveDocs, null, flags);
return states.get(stateSlots.get(0)).termsEnum.postings(liveDocs, null, flags);
} else {
List<DocsEnum> docsEnums = new ArrayList<>(stateSlots.size());
List<PostingsEnum> docsEnums = new ArrayList<>(stateSlots.size());
for (int i = 0; i < stateSlots.size(); i++) {
docsEnums.add(states.get(stateSlots.get(i)).termsEnum.docs(liveDocs, null, flags));
docsEnums.add(states.get(stateSlots.get(i)).termsEnum.postings(liveDocs, null, flags));
}
return new CompoundDocsEnum(docsEnums);
}
@ -213,14 +215,14 @@ final class ParentChildIntersectTermsEnum extends TermsEnum {
}
}
class CompoundDocsEnum extends DocsEnum {
class CompoundDocsEnum extends PostingsEnum {
final List<State> states;
int current = -1;
CompoundDocsEnum(List<DocsEnum> docsEnums) {
CompoundDocsEnum(List<PostingsEnum> docsEnums) {
this.states = new ArrayList<>(docsEnums.size());
for (DocsEnum docsEnum : docsEnums) {
for (PostingsEnum docsEnum : docsEnums) {
states.add(new State(docsEnum));
}
}
@ -257,7 +259,7 @@ final class ParentChildIntersectTermsEnum extends TermsEnum {
}
}
if (states.get(lowestIndex).next() == DocsEnum.NO_MORE_DOCS) {
if (states.get(lowestIndex).next() == DocIdSetIterator.NO_MORE_DOCS) {
states.remove(lowestIndex);
}
@ -274,12 +276,32 @@ final class ParentChildIntersectTermsEnum extends TermsEnum {
throw new UnsupportedOperationException();
}
@Override
public int endOffset() throws IOException {
throw new UnsupportedOperationException();
}
@Override
public BytesRef getPayload() throws IOException {
throw new UnsupportedOperationException();
}
@Override
public int nextPosition() throws IOException {
throw new UnsupportedOperationException();
}
@Override
public int startOffset() throws IOException {
throw new UnsupportedOperationException();
}
class State {
final DocsEnum docsEnum;
final PostingsEnum docsEnum;
int current = -1;
State(DocsEnum docsEnum) {
State(PostingsEnum docsEnum) {
this.docsEnum = docsEnum;
}
@ -312,9 +334,4 @@ final class ParentChildIntersectTermsEnum extends TermsEnum {
public long totalTermFreq() throws IOException {
throw new UnsupportedOperationException();
}
@Override
public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) throws IOException {
throw new UnsupportedOperationException();
}
}

5
src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java
View File

@ -585,6 +585,11 @@ public class DateFieldMapper extends NumberFieldMapper<Long> {
public Filter resolve() {
return innerRangeFilter(fieldData, lowerTerm, upperTerm, includeLower, includeUpper, timeZone, forcedDateParser);
}
@Override
public String toString(String field) {
return "late(lower=" + lowerTerm + ",upper=" + upperTerm + ")";
}
}
public final class LateParsingQuery extends NoCacheQuery {

10
src/main/java/org/elasticsearch/index/merge/policy/VersionFieldUpgrader.java
View File

@ -22,15 +22,15 @@ package org.elasticsearch.index.merge.policy;
import org.apache.lucene.codecs.DocValuesProducer;
import org.apache.lucene.index.CodecReader;
import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.FilterCodecReader;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.packed.GrowableWriter;
@ -131,11 +131,11 @@ class VersionFieldUpgrader extends FilterCodecReader {
final Terms terms = reader.terms(UidFieldMapper.NAME);
final TermsEnum uids = terms.iterator(null);
final GrowableWriter versions = new GrowableWriter(2, reader.maxDoc(), PackedInts.COMPACT);
DocsAndPositionsEnum dpe = null;
PostingsEnum dpe = null;
for (BytesRef uid = uids.next(); uid != null; uid = uids.next()) {
dpe = uids.docsAndPositions(reader.getLiveDocs(), dpe, DocsAndPositionsEnum.FLAG_PAYLOADS);
dpe = uids.postings(reader.getLiveDocs(), dpe, PostingsEnum.PAYLOADS);
assert dpe != null : "field has payloads";
for (int doc = dpe.nextDoc(); doc != DocsEnum.NO_MORE_DOCS; doc = dpe.nextDoc()) {
for (int doc = dpe.nextDoc(); doc != DocIdSetIterator.NO_MORE_DOCS; doc = dpe.nextDoc()) {
dpe.nextPosition();
final BytesRef payload = dpe.getPayload();
if (payload != null && payload.length == 8) {

10
src/main/java/org/elasticsearch/index/query/FilteredQueryParser.java
View File

@ -75,14 +75,14 @@ public class FilteredQueryParser implements QueryParser {
}
@Override
public Scorer filteredScorer(LeafReaderContext context, Weight weight, DocIdSet docIdSet, boolean needsScores) throws IOException {
public Scorer filteredScorer(LeafReaderContext context, Weight weight, DocIdSet docIdSet) throws IOException {
// CHANGE: If threshold is 0, always pass down the accept docs, don't pay the price of calling nextDoc even...
final Bits filterAcceptDocs = docIdSet.bits();
if (threshold == 0) {
if (filterAcceptDocs != null) {
return weight.scorer(context, filterAcceptDocs, needsScores);
return weight.scorer(context, filterAcceptDocs);
} else {
return FilteredQuery.LEAP_FROG_QUERY_FIRST_STRATEGY.filteredScorer(context, weight, docIdSet, needsScores);
return FilteredQuery.LEAP_FROG_QUERY_FIRST_STRATEGY.filteredScorer(context, weight, docIdSet);
}
}
@ -91,11 +91,11 @@ public class FilteredQueryParser implements QueryParser {
// default value, don't iterate on only apply filter after query if its not a "fast" docIdSet
// TODO: is there a way we could avoid creating an iterator here?
if (filterAcceptDocs != null && DocIdSets.isBroken(docIdSet.iterator())) {
return FilteredQuery.QUERY_FIRST_FILTER_STRATEGY.filteredScorer(context, weight, docIdSet, needsScores);
return FilteredQuery.QUERY_FIRST_FILTER_STRATEGY.filteredScorer(context, weight, docIdSet);
}
}
return super.filteredScorer(context, weight, docIdSet, needsScores);
return super.filteredScorer(context, weight, docIdSet);
}
@Override

6
src/main/java/org/elasticsearch/index/query/QueryParseContext.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.index.query;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queryparser.classic.MapperQueryParser;
import org.apache.lucene.queryparser.classic.QueryParserSettings;
@ -241,6 +242,11 @@ public class QueryParseContext {
filter = indexQueryParser.indexCache.filter().cache(filter, cacheKey, cachePolicy);
return filter.getDocIdSet(atomicReaderContext, bits);
}
@Override
public String toString(String field) {
return "AnonymousResolvableFilter"; // TODO: not sure what is going on here
}
};
} else {
return indexQueryParser.indexCache.filter().cache(filter, cacheKey, cachePolicy);

2
src/main/java/org/elasticsearch/index/query/ScriptFilterParser.java
View File

@ -140,7 +140,7 @@ public class ScriptFilterParser implements FilterParser {
}
@Override
public String toString() {
public String toString(String field) {
StringBuilder buffer = new StringBuilder();
buffer.append("ScriptFilter(");
buffer.append(script);

9
src/main/java/org/elasticsearch/index/search/FieldDataTermsFilter.java
View File

@ -97,9 +97,6 @@ public abstract class FieldDataTermsFilter extends Filter {
@Override
public abstract int hashCode();
@Override
public abstract String toString();
/**
* Filters on non-numeric fields.
*/
@ -120,7 +117,7 @@ public abstract class FieldDataTermsFilter extends Filter {
}
@Override
public String toString() {
public String toString(String field) {
final StringBuilder sb = new StringBuilder("BytesFieldDataFilter:");
return sb
.append(fieldData.getFieldNames().indexName())
@ -177,7 +174,7 @@ public abstract class FieldDataTermsFilter extends Filter {
}
@Override
public String toString() {
public String toString(String field) {
final StringBuilder sb = new StringBuilder("LongsFieldDataFilter:");
return sb
.append(fieldData.getFieldNames().indexName())
@ -236,7 +233,7 @@ public abstract class FieldDataTermsFilter extends Filter {
}
@Override
public String toString() {
public String toString(String field) {
final StringBuilder sb = new StringBuilder("DoublesFieldDataFilter");
return sb
.append(fieldData.getFieldNames().indexName())

2
src/main/java/org/elasticsearch/index/search/NumericRangeFieldDataFilter.java
View File

@ -72,7 +72,7 @@ public abstract class NumericRangeFieldDataFilter<T> extends Filter {
}
@Override
public final String toString() {
public final String toString(String field) {
final StringBuilder sb = new StringBuilder(indexFieldData.getFieldNames().indexName()).append(":");
return sb.append(includeLower ? '[' : '{')
.append((lowerVal == null) ? "*" : lowerVal.toString())

20
src/main/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQuery.java
View File

@ -101,7 +101,7 @@ public class ChildrenConstantScoreQuery extends Query {
}
@Override
public Weight createWeight(IndexSearcher searcher) throws IOException {
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
SearchContext sc = SearchContext.current();
IndexParentChildFieldData globalIfd = parentChildIndexFieldData.loadGlobal(searcher.getIndexReader());
assert rewrittenChildQuery != null;
@ -110,7 +110,7 @@ public class ChildrenConstantScoreQuery extends Query {
final long valueCount;
List<LeafReaderContext> leaves = searcher.getIndexReader().leaves();
if (globalIfd == null || leaves.isEmpty()) {
return Queries.newMatchNoDocsQuery().createWeight(searcher);
return Queries.newMatchNoDocsQuery().createWeight(searcher, needsScores);
} else {
AtomicParentChildFieldData afd = globalIfd.load(leaves.get(0));
SortedDocValues globalValues = afd.getOrdinalsValues(parentType);
@ -118,7 +118,7 @@ public class ChildrenConstantScoreQuery extends Query {
}
if (valueCount == 0) {
return Queries.newMatchNoDocsQuery().createWeight(searcher);
return Queries.newMatchNoDocsQuery().createWeight(searcher, needsScores);
}
Query childQuery = rewrittenChildQuery;
@ -129,7 +129,7 @@ public class ChildrenConstantScoreQuery extends Query {
final long remaining = collector.foundParents();
if (remaining == 0) {
return Queries.newMatchNoDocsQuery().createWeight(searcher);
return Queries.newMatchNoDocsQuery().createWeight(searcher, needsScores);
}
Filter shortCircuitFilter = null;
@ -138,7 +138,7 @@ public class ChildrenConstantScoreQuery extends Query {
nonNestedDocsFilter, sc, parentType, collector.values, collector.parentOrds, remaining
);
}
return new ParentWeight(parentFilter, globalIfd, shortCircuitFilter, collector, remaining);
return new ParentWeight(this, parentFilter, globalIfd, shortCircuitFilter, collector, remaining);
}
@Override
@ -191,7 +191,8 @@ public class ChildrenConstantScoreQuery extends Query {
private float queryNorm;
private float queryWeight;
public ParentWeight(Filter parentFilter, IndexParentChildFieldData globalIfd, Filter shortCircuitFilter, ParentOrdCollector collector, long remaining) {
public ParentWeight(Query query, Filter parentFilter, IndexParentChildFieldData globalIfd, Filter shortCircuitFilter, ParentOrdCollector collector, long remaining) {
super(query);
this.parentFilter = parentFilter;
this.globalIfd = globalIfd;
this.shortCircuitFilter = shortCircuitFilter;
@ -204,11 +205,6 @@ public class ChildrenConstantScoreQuery extends Query {
return new Explanation(getBoost(), "not implemented yet...");
}
@Override
public Query getQuery() {
return ChildrenConstantScoreQuery.this;
}
@Override
public float getValueForNormalization() throws IOException {
queryWeight = getBoost();
@ -222,7 +218,7 @@ public class ChildrenConstantScoreQuery extends Query {
}
@Override
public Scorer scorer(LeafReaderContext context, Bits acceptDocs, boolean needsScores) throws IOException {
public Scorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
if (remaining == 0) {
return null;
}

39
src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java
View File

@ -35,6 +35,7 @@ import org.apache.lucene.search.Weight;
import org.apache.lucene.search.XFilteredDocIdSetIterator;
import org.apache.lucene.search.join.BitDocIdSetFilter;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.ToStringUtils;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.common.lease.Releasable;
@ -164,7 +165,7 @@ public class ChildrenQuery extends Query {
}
@Override
public Weight createWeight(IndexSearcher searcher) throws IOException {
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
SearchContext sc = SearchContext.current();
assert rewrittenChildQuery != null;
assert rewriteIndexReader == searcher.getIndexReader() : "not equal, rewriteIndexReader=" + rewriteIndexReader
@ -174,7 +175,7 @@ public class ChildrenQuery extends Query {
IndexParentChildFieldData globalIfd = ifd.loadGlobal(searcher.getIndexReader());
if (globalIfd == null) {
// No docs of the specified type exist on this shard
return Queries.newMatchNoDocsQuery().createWeight(searcher);
return Queries.newMatchNoDocsQuery().createWeight(searcher, needsScores);
}
IndexSearcher indexSearcher = new IndexSearcher(searcher.getIndexReader());
indexSearcher.setSimilarity(searcher.getSimilarity());
@ -219,7 +220,7 @@ public class ChildrenQuery extends Query {
indexSearcher.search(childQuery, collector);
numFoundParents = collector.foundParents();
if (numFoundParents == 0) {
return Queries.newMatchNoDocsQuery().createWeight(searcher);
return Queries.newMatchNoDocsQuery().createWeight(searcher, needsScores);
}
abort = false;
} finally {
@ -235,7 +236,7 @@ public class ChildrenQuery extends Query {
} else {
parentFilter = this.parentFilter;
}
return new ParentWeight(rewrittenChildQuery.createWeight(searcher), parentFilter, numFoundParents, collector, minChildren,
return new ParentWeight(this, rewrittenChildQuery.createWeight(searcher, needsScores), parentFilter, numFoundParents, collector, minChildren,
maxChildren);
}
@ -251,7 +252,8 @@ public class ChildrenQuery extends Query {
protected float queryNorm;
protected float queryWeight;
protected ParentWeight(Weight childWeight, Filter parentFilter, long remaining, ParentCollector collector, int minChildren, int maxChildren) {
protected ParentWeight(Query query, Weight childWeight, Filter parentFilter, long remaining, ParentCollector collector, int minChildren, int maxChildren) {
super(query);
this.childWeight = childWeight;
this.parentFilter = parentFilter;
this.remaining = remaining;
@ -265,11 +267,6 @@ public class ChildrenQuery extends Query {
return new Explanation(getBoost(), "not implemented yet...");
}
@Override
public Query getQuery() {
return ChildrenQuery.this;
}
@Override
public void normalize(float norm, float topLevelBoost) {
this.queryNorm = norm * topLevelBoost;
@ -288,7 +285,7 @@ public class ChildrenQuery extends Query {
}
@Override
public Scorer scorer(LeafReaderContext context, Bits acceptDocs, boolean needsScores) throws IOException {
public Scorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
DocIdSet parentsSet = parentFilter.getDocIdSet(context, acceptDocs);
if (DocIdSets.isEmpty(parentsSet) || remaining == 0) {
return null;
@ -643,6 +640,26 @@ public class ChildrenQuery extends Query {
public long cost() {
return parentsIterator.cost();
}
@Override
public int nextPosition() throws IOException {
return -1;
}
@Override
public int startOffset() throws IOException {
return -1;
}
@Override
public int endOffset() throws IOException {
return -1;
}
@Override
public BytesRef getPayload() throws IOException {
return null;
}
}
private static class ParentCountScorer extends ParentScorer {

20
src/main/java/org/elasticsearch/index/search/child/ConstantScorer.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.index.search.child;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.BytesRef;
import java.io.IOException;
@ -74,4 +75,23 @@ public class ConstantScorer extends Scorer {
return docIdSetIterator.cost();
}
@Override
public int nextPosition() throws IOException {
return -1;
}
@Override
public int startOffset() throws IOException {
return -1;
}
@Override
public int endOffset() throws IOException {
return -1;
}
@Override
public BytesRef getPayload() throws IOException {
return null;
}
}

6
src/main/java/org/elasticsearch/index/search/child/CustomQueryWrappingFilter.java
View File

@ -68,12 +68,12 @@ public class CustomQueryWrappingFilter extends NoCacheFilter implements Releasab
this.searcher = searcher;
searchContext.addReleasable(this, Lifetime.COLLECTION);
final Weight weight = searcher.createNormalizedWeight(query);
final Weight weight = searcher.createNormalizedWeight(query, false);
for (final LeafReaderContext leaf : searcher.getTopReaderContext().leaves()) {
final DocIdSet set = new DocIdSet() {
@Override
public DocIdSetIterator iterator() throws IOException {
return weight.scorer(leaf, null, false);
return weight.scorer(leaf, null);
}
@Override
public boolean isCacheable() { return false; }
@ -101,7 +101,7 @@ public class CustomQueryWrappingFilter extends NoCacheFilter implements Releasab
}
@Override
public String toString() {
public String toString(String field) {
return "CustomQueryWrappingFilter(" + query + ")";
}

20
src/main/java/org/elasticsearch/index/search/child/ParentConstantScoreQuery.java
View File

@ -82,7 +82,7 @@ public class ParentConstantScoreQuery extends Query {
}
@Override
public Weight createWeight(IndexSearcher searcher) throws IOException {
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
IndexParentChildFieldData globalIfd = parentChildIndexFieldData.loadGlobal(searcher.getIndexReader());
assert rewrittenParentQuery != null;
assert rewriteIndexReader == searcher.getIndexReader() : "not equal, rewriteIndexReader=" + rewriteIndexReader + " searcher.getIndexReader()=" + searcher.getIndexReader();
@ -90,7 +90,7 @@ public class ParentConstantScoreQuery extends Query {
final long maxOrd;
List<LeafReaderContext> leaves = searcher.getIndexReader().leaves();
if (globalIfd == null || leaves.isEmpty()) {
return Queries.newMatchNoDocsQuery().createWeight(searcher);
return Queries.newMatchNoDocsQuery().createWeight(searcher, needsScores);
} else {
AtomicParentChildFieldData afd = globalIfd.load(leaves.get(0));
SortedDocValues globalValues = afd.getOrdinalsValues(parentType);
@ -98,7 +98,7 @@ public class ParentConstantScoreQuery extends Query {
}
if (maxOrd == 0) {
return Queries.newMatchNoDocsQuery().createWeight(searcher);
return Queries.newMatchNoDocsQuery().createWeight(searcher, needsScores);
}
final Query parentQuery = rewrittenParentQuery;
@ -108,10 +108,10 @@ public class ParentConstantScoreQuery extends Query {
indexSearcher.search(parentQuery, collector);
if (collector.parentCount() == 0) {
return Queries.newMatchNoDocsQuery().createWeight(searcher);
return Queries.newMatchNoDocsQuery().createWeight(searcher, needsScores);
}
return new ChildrenWeight(childrenFilter, collector, globalIfd);
return new ChildrenWeight(this, childrenFilter, collector, globalIfd);
}
@Override
@ -158,7 +158,8 @@ public class ParentConstantScoreQuery extends Query {
private float queryNorm;
private float queryWeight;
private ChildrenWeight(Filter childrenFilter, ParentOrdsCollector collector, IndexParentChildFieldData globalIfd) {
private ChildrenWeight(Query query, Filter childrenFilter, ParentOrdsCollector collector, IndexParentChildFieldData globalIfd) {
super(query);
this.globalIfd = globalIfd;
this.childrenFilter = childrenFilter;
this.parentOrds = collector.parentOrds;
@ -169,11 +170,6 @@ public class ParentConstantScoreQuery extends Query {
return new Explanation(getBoost(), "not implemented yet...");
}
@Override
public Query getQuery() {
return ParentConstantScoreQuery.this;
}
@Override
public float getValueForNormalization() throws IOException {
queryWeight = getBoost();
@ -187,7 +183,7 @@ public class ParentConstantScoreQuery extends Query {
}
@Override
public Scorer scorer(LeafReaderContext context, Bits acceptDocs, boolean needsScores) throws IOException {
public Scorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
DocIdSet childrenDocIdSet = childrenFilter.getDocIdSet(context, acceptDocs);
if (DocIdSets.isEmpty(childrenDocIdSet)) {
return null;

11
src/main/java/org/elasticsearch/index/search/child/ParentIdsFilter.java
View File

@ -18,8 +18,8 @@
*/
package org.elasticsearch.index.search.child;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.SortedDocValues;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
@ -153,7 +153,7 @@ final class ParentIdsFilter extends Filter {
nonNestedDocs = nonNestedDocsFilter.getDocIdSet(context).bits();
}
DocsEnum docsEnum = null;
PostingsEnum docsEnum = null;
BitSet result = null;
int size = (int) parentIds.size();
for (int i = 0; i < size; i++) {
@ -161,7 +161,7 @@ final class ParentIdsFilter extends Filter {
BytesRef uid = Uid.createUidAsBytes(parentTypeBr, idSpare, uidSpare);
if (termsEnum.seekExact(uid)) {
int docId;
docsEnum = termsEnum.docs(acceptDocs, docsEnum, DocsEnum.FLAG_NONE);
docsEnum = termsEnum.postings(acceptDocs, docsEnum, PostingsEnum.NONE);
if (result == null) {
docId = docsEnum.nextDoc();
if (docId != DocIdSetIterator.NO_MORE_DOCS) {
@ -192,4 +192,9 @@ final class ParentIdsFilter extends Filter {
}
return result == null ? null : new BitDocIdSet(result);
}
@Override
public String toString(String field) {
return "parentsFilter(type=" + parentTypeBr.utf8ToString() + ")";
}
}

39
src/main/java/org/elasticsearch/index/search/child/ParentQuery.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.index.search.child;
import org.apache.lucene.index.*;
import org.apache.lucene.search.*;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.ToStringUtils;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.common.lease.Releasable;
@ -122,7 +123,7 @@ public class ParentQuery extends Query {
}
@Override
public Weight createWeight(IndexSearcher searcher) throws IOException {
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
SearchContext sc = SearchContext.current();
ChildWeight childWeight;
boolean releaseCollectorResource = true;
@ -130,7 +131,7 @@ public class ParentQuery extends Query {
IndexParentChildFieldData globalIfd = parentChildIndexFieldData.loadGlobal(searcher.getIndexReader());
if (globalIfd == null) {
// No docs of the specified type don't exist on this shard
return Queries.newMatchNoDocsQuery().createWeight(searcher);
return Queries.newMatchNoDocsQuery().createWeight(searcher, needsScores);
}
try {
@ -142,9 +143,9 @@ public class ParentQuery extends Query {
indexSearcher.setSimilarity(searcher.getSimilarity());
indexSearcher.search(parentQuery, collector);
if (collector.parentCount() == 0) {
return Queries.newMatchNoDocsQuery().createWeight(searcher);
return Queries.newMatchNoDocsQuery().createWeight(searcher, needsScores);
}
childWeight = new ChildWeight(parentQuery.createWeight(searcher), childrenFilter, collector, globalIfd);
childWeight = new ChildWeight(this, parentQuery.createWeight(searcher, needsScores), childrenFilter, collector, globalIfd);
releaseCollectorResource = false;
} finally {
if (releaseCollectorResource) {
@ -221,7 +222,8 @@ public class ParentQuery extends Query {
private final FloatArray scores;
private final IndexParentChildFieldData globalIfd;
private ChildWeight(Weight parentWeight, Filter childrenFilter, ParentOrdAndScoreCollector collector, IndexParentChildFieldData globalIfd) {
private ChildWeight(Query query, Weight parentWeight, Filter childrenFilter, ParentOrdAndScoreCollector collector, IndexParentChildFieldData globalIfd) {
super(query);
this.parentWeight = parentWeight;
this.childrenFilter = childrenFilter;
this.parentIdxs = collector.parentIdxs;
@ -234,11 +236,6 @@ public class ParentQuery extends Query {
return new Explanation(getBoost(), "not implemented yet...");
}
@Override
public Query getQuery() {
return ParentQuery.this;
}
@Override
public float getValueForNormalization() throws IOException {
float sum = parentWeight.getValueForNormalization();
@ -251,7 +248,7 @@ public class ParentQuery extends Query {
}
@Override
public Scorer scorer(LeafReaderContext context, Bits acceptDocs, boolean needsScores) throws IOException {
public Scorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
DocIdSet childrenDocSet = childrenFilter.getDocIdSet(context, acceptDocs);
if (DocIdSets.isEmpty(childrenDocSet)) {
return null;
@ -347,5 +344,25 @@ public class ParentQuery extends Query {
public long cost() {
return childrenIterator.cost();
}
@Override
public int nextPosition() throws IOException {
return -1;
}
@Override
public int startOffset() throws IOException {
return -1;
}
@Override
public int endOffset() throws IOException {
return -1;
}
@Override
public BytesRef getPayload() throws IOException {
return null;
}
}
}

38
src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java
View File

@ -20,6 +20,7 @@ package org.elasticsearch.index.search.child;
import com.carrotsearch.hppc.IntObjectOpenHashMap;
import com.carrotsearch.hppc.ObjectObjectOpenHashMap;
import org.apache.lucene.index.*;
import org.apache.lucene.search.*;
import org.apache.lucene.util.*;
@ -115,7 +116,7 @@ public class TopChildrenQuery extends Query {
}
@Override
public Weight createWeight(IndexSearcher searcher) throws IOException {
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
ObjectObjectOpenHashMap<Object, ParentDoc[]> parentDocs = new ObjectObjectOpenHashMap<>();
SearchContext searchContext = SearchContext.current();
@ -160,7 +161,7 @@ public class TopChildrenQuery extends Query {
}
}
ParentWeight parentWeight = new ParentWeight(rewrittenChildQuery.createWeight(searcher), parentDocs);
ParentWeight parentWeight = new ParentWeight(this, rewrittenChildQuery.createWeight(searcher, needsScores), parentDocs);
searchContext.addReleasable(parentWeight, Lifetime.COLLECTION);
return parentWeight;
}
@ -199,12 +200,12 @@ public class TopChildrenQuery extends Query {
if (!termsEnum.seekExact(Uid.createUidAsBytes(parentType, parentId))) {
continue;
}
DocsEnum docsEnum = termsEnum.docs(indexReader.getLiveDocs(), null, DocsEnum.FLAG_NONE);
PostingsEnum docsEnum = termsEnum.postings(indexReader.getLiveDocs(), null, PostingsEnum.NONE);
int parentDocId = docsEnum.nextDoc();
if (nonNestedDocs != null && !nonNestedDocs.get(parentDocId)) {
parentDocId = nonNestedDocs.nextSetBit(parentDocId);
}
if (parentDocId != DocsEnum.NO_MORE_DOCS) {
if (parentDocId != DocIdSetIterator.NO_MORE_DOCS) {
// we found a match, add it and break
IntObjectOpenHashMap<ParentDoc> readerParentDocs = parentDocsPerReader.get(indexReader.getCoreCacheKey());
if (readerParentDocs == null) {
@ -297,15 +298,12 @@ public class TopChildrenQuery extends Query {
private final Weight queryWeight;
private final ObjectObjectOpenHashMap<Object, ParentDoc[]> parentDocs;
public ParentWeight(Weight queryWeight, ObjectObjectOpenHashMap<Object, ParentDoc[]> parentDocs) throws IOException {
public ParentWeight(Query query, Weight queryWeight, ObjectObjectOpenHashMap<Object, ParentDoc[]> parentDocs) throws IOException {
super(query);
this.queryWeight = queryWeight;
this.parentDocs = parentDocs;
}
public Query getQuery() {
return TopChildrenQuery.this;
}
@Override
public float getValueForNormalization() throws IOException {
float sum = queryWeight.getValueForNormalization();
@ -323,7 +321,7 @@ public class TopChildrenQuery extends Query {
}
@Override
public Scorer scorer(LeafReaderContext context, Bits acceptDocs, boolean needsScores) throws IOException {
public Scorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
ParentDoc[] readerParentDocs = parentDocs.get(context.reader().getCoreCacheKey());
// We ignore the needsScores parameter here because there isn't really anything that we
// can improve by ignoring scores. Actually this query does not really make sense
@ -417,6 +415,26 @@ public class TopChildrenQuery extends Query {
public final long cost() {
return docs.length;
}
@Override
public int nextPosition() throws IOException {
return -1;
}
@Override
public int startOffset() throws IOException {
return -1;
}
@Override
public int endOffset() throws IOException {
return -1;
}
@Override
public BytesRef getPayload() throws IOException {
return null;
}
}
private static class ParentDocComparator implements Comparator<ParentDoc> {

2
src/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java
View File

@ -138,7 +138,7 @@ public class GeoDistanceFilter extends Filter {
}
@Override
public String toString() {
public String toString(String field) {
return "GeoDistanceFilter(" + indexFieldData.getFieldNames().indexName() + ", " + geoDistance + ", " + distance + ", " + lat + ", " + lon + ")";
}

2
src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java
View File

@ -149,7 +149,7 @@ public class GeoDistanceRangeFilter extends Filter {
}
@Override
public String toString() {
public String toString(String field) {
return "GeoDistanceRangeFilter(" + indexFieldData.getFieldNames().indexName() + ", " + geoDistance + ", [" + inclusiveLowerPoint + " - " + inclusiveUpperPoint + "], " + lat + ", " + lon + ")";
}

2
src/main/java/org/elasticsearch/index/search/geo/GeoPolygonFilter.java
View File

@ -61,7 +61,7 @@ public class GeoPolygonFilter extends Filter {
}
@Override
public String toString() {
public String toString(String field) {
StringBuilder sb = new StringBuilder("GeoPolygonFilter(");
sb.append(indexFieldData.getFieldNames().indexName());
sb.append(", ").append(Arrays.toString(points)).append(')');

2
src/main/java/org/elasticsearch/index/search/geo/InMemoryGeoBoundingBoxFilter.java
View File

@ -72,7 +72,7 @@ public class InMemoryGeoBoundingBoxFilter extends Filter {
}
@Override
public String toString() {
public String toString(String field) {
return "GeoBoundingBoxFilter(" + indexFieldData.getFieldNames().indexName() + ", " + topLeft + ", " + bottomRight + ")";
}

37
src/main/java/org/elasticsearch/index/search/nested/IncludeNestedDocsQuery.java
View File

@ -27,6 +27,7 @@ import org.apache.lucene.search.join.BitDocIdSetFilter;
import org.apache.lucene.util.BitSet;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BitDocIdSet;
import org.apache.lucene.util.BytesRef;
import java.io.IOException;
import java.util.Collection;
@ -73,8 +74,8 @@ public class IncludeNestedDocsQuery extends Query {
}
@Override
public Weight createWeight(IndexSearcher searcher) throws IOException {
return new IncludeNestedDocsWeight(parentQuery, parentQuery.createWeight(searcher), parentFilter);
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
return new IncludeNestedDocsWeight(this, parentQuery, parentQuery.createWeight(searcher, needsScores), parentFilter);
}
static class IncludeNestedDocsWeight extends Weight {
@ -83,17 +84,13 @@ public class IncludeNestedDocsQuery extends Query {
private final Weight parentWeight;
private final BitDocIdSetFilter parentsFilter;
IncludeNestedDocsWeight(Query parentQuery, Weight parentWeight, BitDocIdSetFilter parentsFilter) {
IncludeNestedDocsWeight(Query query, Query parentQuery, Weight parentWeight, BitDocIdSetFilter parentsFilter) {
super(query);
this.parentQuery = parentQuery;
this.parentWeight = parentWeight;
this.parentsFilter = parentsFilter;
}
@Override
public Query getQuery() {
return parentQuery;
}
@Override
public void normalize(float norm, float topLevelBoost) {
parentWeight.normalize(norm, topLevelBoost);
@ -105,8 +102,8 @@ public class IncludeNestedDocsQuery extends Query {
}
@Override
public Scorer scorer(LeafReaderContext context, Bits acceptDocs, boolean needsScores) throws IOException {
final Scorer parentScorer = parentWeight.scorer(context, acceptDocs, needsScores);
public Scorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
final Scorer parentScorer = parentWeight.scorer(context, acceptDocs);
// no matches
if (parentScorer == null) {
@ -234,6 +231,26 @@ public class IncludeNestedDocsQuery extends Query {
return parentScorer.freq();
}
@Override
public int nextPosition() throws IOException {
return parentScorer.nextPosition();
}
@Override
public int startOffset() throws IOException {
return parentScorer.startOffset();
}
@Override
public int endOffset() throws IOException {
return parentScorer.endOffset();
}
@Override
public BytesRef getPayload() throws IOException {
return parentScorer.getPayload();
}
public int docID() {
return currentDoc;
}

5
src/main/java/org/elasticsearch/index/search/nested/NonNestedDocsFilter.java
View File

@ -63,6 +63,11 @@ public class NonNestedDocsFilter extends Filter {
return obj == INSTANCE;
}
@Override
public String toString(String field) {
return "NonNestedDocsFilter";
}
/**
* @return a filter that returns all nested documents.
*/

4
src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java
View File

@ -18,8 +18,8 @@
*/
package org.elasticsearch.search.aggregations.bucket.significant;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.util.BytesRef;
@ -219,7 +219,7 @@ public class SignificantTermsAggregatorFactory extends ValuesSourceAggregatorFac
try {
if (numberOfAggregatorsCreated == 1) {
// Setup a termsEnum for sole use by one aggregator
termsEnum = new FilterableTermsEnum(reader, indexedFieldName, DocsEnum.FLAG_NONE, filter);
termsEnum = new FilterableTermsEnum(reader, indexedFieldName, PostingsEnum.NONE, filter);
} else {
// When we have > 1 agg we have possibility of duplicate term frequency lookups
// and so use a TermsEnum that caches results of all term lookups

50
src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java
View File

@ -73,12 +73,6 @@ public class InternalTopHits extends InternalMetricsAggregation implements TopHi
this.searchHits = searchHits;
}
public InternalTopHits(String name, InternalSearchHits searchHits) {
this.name = name;
this.searchHits = searchHits;
this.topDocs = Lucene.EMPTY_TOP_DOCS;
}
@Override
public Type type() {
@ -93,27 +87,32 @@ public class InternalTopHits extends InternalMetricsAggregation implements TopHi
@Override
public InternalAggregation reduce(ReduceContext reduceContext) {
List<InternalAggregation> aggregations = reduceContext.aggregations();
TopDocs[] shardDocs = new TopDocs[aggregations.size()];
InternalSearchHits[] shardHits = new InternalSearchHits[aggregations.size()];
TopDocs topDocs = this.topDocs;
for (int i = 0; i < shardDocs.length; i++) {
InternalTopHits topHitsAgg = (InternalTopHits) aggregations.get(i);
shardDocs[i] = topHitsAgg.topDocs;
shardHits[i] = topHitsAgg.searchHits;
if (topDocs.scoreDocs.length == 0) {
topDocs = topHitsAgg.topDocs;
}
}
final Sort sort;
if (topDocs instanceof TopFieldDocs) {
sort = new Sort(((TopFieldDocs) topDocs).fields);
} else {
sort = null;
}
final TopDocs reducedTopDocs;
final TopDocs[] shardDocs;
try {
int[] tracker = new int[shardHits.length];
TopDocs reducedTopDocs = TopDocs.merge(sort, from, size, shardDocs);
if (topDocs instanceof TopFieldDocs) {
Sort sort = new Sort(((TopFieldDocs) topDocs).fields);
shardDocs = new TopFieldDocs[aggregations.size()];
for (int i = 0; i < shardDocs.length; i++) {
InternalTopHits topHitsAgg = (InternalTopHits) aggregations.get(i);
shardDocs[i] = (TopFieldDocs) topHitsAgg.topDocs;
shardHits[i] = topHitsAgg.searchHits;
}
reducedTopDocs = TopDocs.merge(sort, from, size, (TopFieldDocs[]) shardDocs);
} else {
shardDocs = new TopDocs[aggregations.size()];
for (int i = 0; i < shardDocs.length; i++) {
InternalTopHits topHitsAgg = (InternalTopHits) aggregations.get(i);
shardDocs[i] = topHitsAgg.topDocs;
shardHits[i] = topHitsAgg.searchHits;
}
reducedTopDocs = TopDocs.merge(from, size, shardDocs);
}
final int[] tracker = new int[shardHits.length];
InternalSearchHit[] hits = new InternalSearchHit[reducedTopDocs.scoreDocs.length];
for (int i = 0; i < reducedTopDocs.scoreDocs.length; i++) {
ScoreDoc scoreDoc = reducedTopDocs.scoreDocs[i];
@ -123,7 +122,7 @@ public class InternalTopHits extends InternalMetricsAggregation implements TopHi
} while (shardDocs[scoreDoc.shardIndex].scoreDocs[position] != scoreDoc);
hits[i] = (InternalSearchHit) shardHits[scoreDoc.shardIndex].getAt(position);
}
return new InternalTopHits(name, new InternalSearchHits(hits, reducedTopDocs.totalHits, reducedTopDocs.getMaxScore()));
return new InternalTopHits(name, from, size, reducedTopDocs, new InternalSearchHits(hits, reducedTopDocs.totalHits, reducedTopDocs.getMaxScore()));
} catch (IOException e) {
throw ExceptionsHelper.convertToElastic(e);
}
@ -143,6 +142,7 @@ public class InternalTopHits extends InternalMetricsAggregation implements TopHi
from = in.readVInt();
size = in.readVInt();
topDocs = Lucene.readTopDocs(in);
assert topDocs != null;
searchHits = InternalSearchHits.readSearchHits(in);
}

22
src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregator.java
View File

@ -28,6 +28,7 @@ import org.apache.lucene.search.Sort;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.TopDocsCollector;
import org.apache.lucene.search.TopFieldCollector;
import org.apache.lucene.search.TopFieldDocs;
import org.apache.lucene.search.TopScoreDocCollector;
import org.elasticsearch.common.lease.Releasables;
import org.elasticsearch.common.lucene.Lucene;
@ -127,13 +128,11 @@ public class TopHitsAggregator extends MetricsAggregator {
@Override
public InternalAggregation buildAggregation(long owningBucketOrdinal) {
TopDocsAndLeafCollector topDocsCollector = topDocsCollectors.get(owningBucketOrdinal);
final InternalTopHits topHits;
if (topDocsCollector == null) {
return buildEmptyAggregation();
topHits = buildEmptyAggregation();
} else {
TopDocs topDocs = topDocsCollector.topLevelCollector.topDocs();
if (topDocs.totalHits == 0) {
return buildEmptyAggregation();
}
final TopDocs topDocs = topDocsCollector.topLevelCollector.topDocs();
subSearchContext.queryResult().topDocs(topDocs);
int[] docIdsToLoad = new int[topDocs.scoreDocs.length];
@ -154,13 +153,20 @@ public class TopHitsAggregator extends MetricsAggregator {
searchHitFields.sortValues(fieldDoc.fields);
}
}
return new InternalTopHits(name, subSearchContext.from(), subSearchContext.size(), topDocs, fetchResult.hits());
topHits = new InternalTopHits(name, subSearchContext.from(), subSearchContext.size(), topDocs, fetchResult.hits());
}
return topHits;
}
@Override
public InternalAggregation buildEmptyAggregation() {
return new InternalTopHits(name, subSearchContext.from(), subSearchContext.size(), Lucene.EMPTY_TOP_DOCS, InternalSearchHits.empty());
public InternalTopHits buildEmptyAggregation() {
TopDocs topDocs;
if (subSearchContext.sort() != null) {
topDocs = new TopFieldDocs(0, new FieldDoc[0], subSearchContext.sort().getSort(), Float.NaN);
} else {
topDocs = Lucene.EMPTY_TOP_DOCS;
}
return new InternalTopHits(name, subSearchContext.from(), subSearchContext.size(), topDocs, InternalSearchHits.empty());
}
@Override

54
src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.search.controller;
import com.carrotsearch.hppc.IntArrayList;
import com.carrotsearch.hppc.ObjectObjectOpenHashMap;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.*;
import org.elasticsearch.action.search.SearchRequest;
@ -199,38 +200,51 @@ public class SearchPhaseController extends AbstractComponent {
Arrays.sort(sortedResults, QUERY_RESULT_ORDERING);
QuerySearchResultProvider firstResult = sortedResults[0].value;
final Sort sort;
if (firstResult.queryResult().topDocs() instanceof TopFieldDocs) {
TopFieldDocs firstTopDocs = (TopFieldDocs) firstResult.queryResult().topDocs();
sort = new Sort(firstTopDocs.fields);
} else {
sort = null;
}
int topN = firstResult.queryResult().size();
// Need to use the length of the resultsArr array, since the slots will be based on the position in the resultsArr array
TopDocs[] shardTopDocs = new TopDocs[resultsArr.length()];
if (firstResult.includeFetch()) {
// if we did both query and fetch on the same go, we have fetched all the docs from each shards already, use them...
// this is also important since we shortcut and fetch only docs from "from" and up to "size"
topN *= sortedResults.length;
}
for (AtomicArray.Entry<? extends QuerySearchResultProvider> sortedResult : sortedResults) {
TopDocs topDocs = sortedResult.value.queryResult().topDocs();
// the 'index' field is the position in the resultsArr atomic array
shardTopDocs[sortedResult.index] = topDocs;
}
int from = firstResult.queryResult().from();
if (ignoreFrom) {
from = 0;
}
// TopDocs#merge can't deal with null shard TopDocs
for (int i = 0; i < shardTopDocs.length; i++) {
if (shardTopDocs[i] == null) {
shardTopDocs[i] = Lucene.EMPTY_TOP_DOCS;
final TopDocs mergedTopDocs;
if (firstResult.queryResult().topDocs() instanceof TopFieldDocs) {
TopFieldDocs firstTopDocs = (TopFieldDocs) firstResult.queryResult().topDocs();
final Sort sort = new Sort(firstTopDocs.fields);
final TopFieldDocs[] shardTopDocs = new TopFieldDocs[resultsArr.length()];
for (AtomicArray.Entry<? extends QuerySearchResultProvider> sortedResult : sortedResults) {
TopDocs topDocs = sortedResult.value.queryResult().topDocs();
// the 'index' field is the position in the resultsArr atomic array
shardTopDocs[sortedResult.index] = (TopFieldDocs) topDocs;
}
// TopDocs#merge can't deal with null shard TopDocs
for (int i = 0; i < shardTopDocs.length; ++i) {
if (shardTopDocs[i] == null) {
shardTopDocs[i] = new TopFieldDocs(0, new FieldDoc[0], sort.getSort(), Float.NaN);
}
}
mergedTopDocs = TopDocs.merge(sort, from, topN, shardTopDocs);
} else {
final TopDocs[] shardTopDocs = new TopDocs[resultsArr.length()];
for (AtomicArray.Entry<? extends QuerySearchResultProvider> sortedResult : sortedResults) {
TopDocs topDocs = sortedResult.value.queryResult().topDocs();
// the 'index' field is the position in the resultsArr atomic array
shardTopDocs[sortedResult.index] = topDocs;
}
// TopDocs#merge can't deal with null shard TopDocs
for (int i = 0; i < shardTopDocs.length; ++i) {
if (shardTopDocs[i] == null) {
shardTopDocs[i] = Lucene.EMPTY_TOP_DOCS;
}
}
mergedTopDocs = TopDocs.merge(from, topN, shardTopDocs);
}
TopDocs mergedTopDocs = TopDocs.merge(sort, from, topN, shardTopDocs);
return mergedTopDocs.scoreDocs;
}

26
src/main/java/org/elasticsearch/search/dfs/CachedDfSource.java
View File

@ -96,30 +96,4 @@ public class CachedDfSource extends IndexSearcher {
protected void search(List<LeafReaderContext> leaves, Weight weight, Collector collector) throws IOException {
throw new UnsupportedOperationException();
}
@Override
protected TopDocs search(Weight weight, ScoreDoc after, int nDocs) throws IOException {
throw new UnsupportedOperationException();
}
@Override
protected TopDocs search(List<LeafReaderContext> leaves, Weight weight, ScoreDoc after, int nDocs) throws IOException {
throw new UnsupportedOperationException();
}
@Override
protected TopFieldDocs search(Weight weight, int nDocs, Sort sort, boolean doDocScores, boolean doMaxScore) throws IOException {
throw new UnsupportedOperationException();
}
@Override
protected TopFieldDocs search(Weight weight, FieldDoc after, int nDocs, Sort sort, boolean fillFields, boolean doDocScores, boolean doMaxScore) throws IOException {
throw new UnsupportedOperationException();
}
@Override
protected TopFieldDocs search(List<LeafReaderContext> leaves, Weight weight, FieldDoc after, int nDocs, Sort sort, boolean fillFields, boolean doDocScores, boolean doMaxScore) throws IOException {
throw new UnsupportedOperationException();
}
}

6
src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsContext.java
View File

@ -20,6 +20,7 @@
package org.elasticsearch.search.fetch.innerhits;
import com.google.common.collect.ImmutableMap;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.Term;
@ -153,6 +154,11 @@ public final class InnerHitsContext {
this.atomicReader = hitContext.readerContext().reader();
}
@Override
public String toString(String field) {
return "NestedChildren(parent=" + parentFilter + ",child=" + childFilter + ")";
}
@Override
public DocIdSet getDocIdSet(LeafReaderContext context, final Bits acceptDocs) throws IOException {
// Nested docs only reside in a single segment, so no need to evaluate all segments

8
src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
View File

@ -117,13 +117,15 @@ public class ContextIndexSearcher extends IndexSearcher implements Releasable {
}
@Override
public Weight createNormalizedWeight(Query query) throws IOException {
public Weight createNormalizedWeight(Query query, boolean needsScores) throws IOException {
// TODO: needsScores
// can we avoid dfs stuff here if we dont need scores?
try {
// if its the main query, use we have dfs data, only then do it
if (dfSource != null && (query == searchContext.query() || query == searchContext.parsedQuery().query())) {
return dfSource.createNormalizedWeight(query);
return dfSource.createNormalizedWeight(query, needsScores);
}
return in.createNormalizedWeight(query);
return in.createNormalizedWeight(query, needsScores);
} catch (Throwable t) {
searchContext.clearReleasables(Lifetime.COLLECTION);
throw new RuntimeException(t);

129
src/main/java/org/elasticsearch/search/lookup/IndexFieldTerm.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.search.lookup;
import org.apache.lucene.index.*;
import org.apache.lucene.search.TermStatistics;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.common.lucene.search.EmptyScorer;
@ -33,8 +34,8 @@ import java.util.Iterator;
public class IndexFieldTerm implements Iterable<TermPosition> {
// The posting list for this term. Is null if the term or field does not
// exist. Can be DocsEnum or DocsAndPositionsEnum.
DocsEnum docsEnum;
// exist.
PostingsEnum postings;
// Stores if positions, offsets and payloads are requested.
private final int flags;
@ -50,7 +51,7 @@ public class IndexFieldTerm implements Iterable<TermPosition> {
private final TermStatistics termStats;
static private EmptyScorer EMPTY_DOCS_ENUM = new EmptyScorer(null);
static private EmptyScorer EMPTY_SCORER = new EmptyScorer(null);
// get the document frequency of the term
public long df() throws IOException {
@ -67,22 +68,70 @@ public class IndexFieldTerm implements Iterable<TermPosition> {
// and reader
void setNextReader(LeafReader reader) {
try {
// Get the posting list for a specific term. Depending on the flags,
// this
// will either get a DocsEnum or a DocsAndPositionsEnum if
// available.
// Get the posting list for a specific term.
// get lucene frequency flag
int luceneFrequencyFlag = getLuceneFrequencyFlag(flags);
if (shouldRetrieveFrequenciesOnly()) {
docsEnum = getOnlyDocsEnum(luceneFrequencyFlag, reader);
} else {
int lucenePositionsFlags = getLucenePositionsFlags(flags);
docsEnum = getDocsAndPosEnum(lucenePositionsFlags, reader);
if (docsEnum == null) {// no pos available
docsEnum = getOnlyDocsEnum(luceneFrequencyFlag, reader);
if (!shouldRetrieveFrequenciesOnly()) {
postings = getPostings(getLucenePositionsFlags(flags), reader);
}
if (postings == null) {
postings = getPostings(getLuceneFrequencyFlag(flags), reader);
if (postings != null) {
final PostingsEnum p = postings;
postings = new PostingsEnum() {
@Override
public int freq() throws IOException {
return p.freq();
}
@Override
public int nextPosition() throws IOException {
return -1;
}
@Override
public int startOffset() throws IOException {
return -1;
}
@Override
public int endOffset() throws IOException {
return -1;
}
@Override
public BytesRef getPayload() throws IOException {
return null;
}
@Override
public int docID() {
return p.docID();
}
@Override
public int nextDoc() throws IOException {
return p.nextDoc();
}
@Override
public int advance(int target) throws IOException {
return p.advance(target);
}
@Override
public long cost() {
return p.cost();
}
};
}
}
if (postings == null) {
postings = EMPTY_SCORER;
}
} catch (IOException e) {
throw new ElasticsearchException("Unable to get posting list for field " + fieldName + " and term " + term, e);
}
@ -94,69 +143,45 @@ public class IndexFieldTerm implements Iterable<TermPosition> {
}
private int getLuceneFrequencyFlag(int flags) {
return (flags & IndexLookup.FLAG_FREQUENCIES) > 0 ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE;
return (flags & IndexLookup.FLAG_FREQUENCIES) > 0 ? PostingsEnum.FREQS : PostingsEnum.NONE;
}
private int getLucenePositionsFlags(int flags) {
int lucenePositionsFlags = (flags & IndexLookup.FLAG_PAYLOADS) > 0 ? DocsAndPositionsEnum.FLAG_PAYLOADS : 0x0;
lucenePositionsFlags |= (flags & IndexLookup.FLAG_OFFSETS) > 0 ? DocsAndPositionsEnum.FLAG_OFFSETS : 0x0;
int lucenePositionsFlags = PostingsEnum.POSITIONS;
lucenePositionsFlags |= (flags & IndexLookup.FLAG_PAYLOADS) > 0 ? PostingsEnum.PAYLOADS : 0x0;
lucenePositionsFlags |= (flags & IndexLookup.FLAG_OFFSETS) > 0 ? PostingsEnum.OFFSETS : 0x0;
return lucenePositionsFlags;
}
// get the DocsAndPositionsEnum from the reader.
private DocsEnum getDocsAndPosEnum(int luceneFlags, LeafReader reader) throws IOException {
private PostingsEnum getPostings(int luceneFlags, LeafReader reader) throws IOException {
assert identifier.field() != null;
assert identifier.bytes() != null;
final Fields fields = reader.fields();
DocsEnum newDocsEnum = null;
if (fields != null) {
final Terms terms = fields.terms(identifier.field());
if (terms != null) {
if (terms.hasPositions()) {
final TermsEnum termsEnum = terms.iterator(null);
if (termsEnum.seekExact(identifier.bytes())) {
newDocsEnum = termsEnum.docsAndPositions(reader.getLiveDocs(),
docsEnum instanceof DocsAndPositionsEnum ? (DocsAndPositionsEnum) docsEnum : null, luceneFlags);
}
}
}
}
return newDocsEnum;
}
// get the DocsEnum from the reader.
private DocsEnum getOnlyDocsEnum(int luceneFlags, LeafReader reader) throws IOException {
assert identifier.field() != null;
assert identifier.bytes() != null;
final Fields fields = reader.fields();
DocsEnum newDocsEnum = null;
PostingsEnum newPostings = null;
if (fields != null) {
final Terms terms = fields.terms(identifier.field());
if (terms != null) {
TermsEnum termsEnum = terms.iterator(null);
if (termsEnum.seekExact(identifier.bytes())) {
newDocsEnum = termsEnum.docs(reader.getLiveDocs(), docsEnum, luceneFlags);
newPostings = termsEnum.postings(reader.getLiveDocs(), postings, luceneFlags);
}
}
}
if (newDocsEnum == null) {
newDocsEnum = EMPTY_DOCS_ENUM;
}
return newDocsEnum;
return newPostings;
}
private int freq = 0;
public void setNextDoc(int docId) {
assert (docsEnum != null);
assert (postings != null);
try {
// we try to advance to the current document.
int currentDocPos = docsEnum.docID();
int currentDocPos = postings.docID();
if (currentDocPos < docId) {
currentDocPos = docsEnum.advance(docId);
currentDocPos = postings.advance(docId);
}
if (currentDocPos == docId) {
freq = docsEnum.freq();
freq = postings.freq();
} else {
freq = 0;
}

70
src/main/java/org/elasticsearch/search/lookup/PositionIterator.java
View File

@ -19,8 +19,7 @@
package org.elasticsearch.search.lookup;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.index.PostingsEnum;
import org.elasticsearch.ElasticsearchException;
import java.io.IOException;
@ -28,8 +27,6 @@ import java.util.Iterator;
public class PositionIterator implements Iterator<TermPosition> {
private static final DocsAndPositionsEnum EMPTY = new EmptyDocsAndPosEnum();
private boolean resetted = false;
protected IndexFieldTerm indexFieldTerm;
@ -41,7 +38,7 @@ public class PositionIterator implements Iterator<TermPosition> {
protected final TermPosition termPosition = new TermPosition();
private DocsAndPositionsEnum docsAndPos;
private PostingsEnum postings;
public PositionIterator(IndexFieldTerm indexFieldTerm) {
this.indexFieldTerm = indexFieldTerm;
@ -61,10 +58,10 @@ public class PositionIterator implements Iterator<TermPosition> {
@Override
public TermPosition next() {
try {
termPosition.position = docsAndPos.nextPosition();
termPosition.startOffset = docsAndPos.startOffset();
termPosition.endOffset = docsAndPos.endOffset();
termPosition.payload = docsAndPos.getPayload();
termPosition.position = postings.nextPosition();
termPosition.startOffset = postings.startOffset();
termPosition.endOffset = postings.endOffset();
termPosition.payload = postings.getPayload();
} catch (IOException ex) {
throw new ElasticsearchException("can not advance iterator", ex);
}
@ -76,11 +73,7 @@ public class PositionIterator implements Iterator<TermPosition> {
resetted = false;
currentPos = 0;
freq = indexFieldTerm.tf();
if (indexFieldTerm.docsEnum instanceof DocsAndPositionsEnum) {
docsAndPos = (DocsAndPositionsEnum) indexFieldTerm.docsEnum;
} else {
docsAndPos = EMPTY;
}
postings = indexFieldTerm.postings;
}
public Iterator<TermPosition> reset() {
@ -91,53 +84,4 @@ public class PositionIterator implements Iterator<TermPosition> {
resetted = true;
return this;
}
// we use this to make sure we can also iterate if there are no positions
private static final class EmptyDocsAndPosEnum extends DocsAndPositionsEnum {
@Override
public int nextPosition() throws IOException {
return -1;
}
@Override
public int startOffset() throws IOException {
return -1;
}
@Override
public int endOffset() throws IOException {
return -1;
}
@Override
public BytesRef getPayload() throws IOException {
return null;
}
@Override
public int freq() throws IOException {
throw new UnsupportedOperationException();
}
@Override
public int docID() {
throw new UnsupportedOperationException();
}
@Override
public int nextDoc() throws IOException {
throw new UnsupportedOperationException();
}
@Override
public int advance(int target) throws IOException {
throw new UnsupportedOperationException();
}
@Override
public long cost() {
throw new UnsupportedOperationException();
}
}
}

5
src/main/java/org/elasticsearch/search/scan/ScanContext.java
View File

@ -167,6 +167,11 @@ public class ScanContext {
}
return BitsFilteredDocIdSet.wrap(new AllDocIdSet(context.reader().maxDoc()), acceptedDocs);
}
@Override
public String toString(String field) {
return "ScanFilter";
}
}
static class ReaderState {

6
src/main/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProvider.java
View File

@ -24,7 +24,7 @@ import com.carrotsearch.hppc.ObjectLongOpenHashMap;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.codecs.CodecUtil;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
@ -133,7 +133,7 @@ public class AnalyzingCompletionLookupProvider extends CompletionLookupProvider
continue;
}
TermsEnum termsEnum = terms.iterator(null);
DocsAndPositionsEnum docsEnum = null;
PostingsEnum docsEnum = null;
final SuggestPayload spare = new SuggestPayload();
int maxAnalyzedPathsForOneInput = 0;
final XAnalyzingSuggester.XBuilder builder = new XAnalyzingSuggester.XBuilder(maxSurfaceFormsPerAnalyzedForm, hasPayloads, XAnalyzingSuggester.PAYLOAD_SEP);
@ -143,7 +143,7 @@ public class AnalyzingCompletionLookupProvider extends CompletionLookupProvider
if (term == null) {
break;
}
docsEnum = termsEnum.docsAndPositions(null, docsEnum, DocsAndPositionsEnum.FLAG_PAYLOADS);
docsEnum = termsEnum.postings(null, docsEnum, PostingsEnum.PAYLOADS);
builder.startTerm(term);
int docFreq = 0;
while (docsEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {

4
src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTests.java
View File

@ -347,8 +347,8 @@ public abstract class AbstractTermVectorsTests extends ElasticsearchIntegrationT
assertNotNull(luceneTermEnum.next());
assertThat(esTermEnum.totalTermFreq(), equalTo(luceneTermEnum.totalTermFreq()));
DocsAndPositionsEnum esDocsPosEnum = esTermEnum.docsAndPositions(null, null, 0);
DocsAndPositionsEnum luceneDocsPosEnum = luceneTermEnum.docsAndPositions(null, null, 0);
PostingsEnum esDocsPosEnum = esTermEnum.postings(null, null, PostingsEnum.POSITIONS);
PostingsEnum luceneDocsPosEnum = luceneTermEnum.postings(null, null, PostingsEnum.POSITIONS);
if (luceneDocsPosEnum == null) {
// test we expect that...
assertFalse(field.storedOffset);

8
src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqTests.java
View File

@ -19,8 +19,8 @@
package org.elasticsearch.action.termvectors;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.util.BytesRef;
@ -121,7 +121,7 @@ public class GetTermVectorsCheckDocFreqTests extends ElasticsearchIntegrationTes
assertThat("expected ttf of " + string, numDocs, equalTo((int) iterator.totalTermFreq()));
}
DocsAndPositionsEnum docsAndPositions = iterator.docsAndPositions(null, null);
PostingsEnum docsAndPositions = iterator.postings(null, null, PostingsEnum.ALL);
assertThat(docsAndPositions.nextDoc(), equalTo(0));
assertThat(freq[j], equalTo(docsAndPositions.freq()));
assertThat(iterator.docFreq(), equalTo(numDocs));
@ -178,7 +178,7 @@ public class GetTermVectorsCheckDocFreqTests extends ElasticsearchIntegrationTes
assertThat("expected ttf of " + string, -1, equalTo((int) iterator.totalTermFreq()));
DocsAndPositionsEnum docsAndPositions = iterator.docsAndPositions(null, null);
PostingsEnum docsAndPositions = iterator.postings(null, null, PostingsEnum.ALL);
assertThat(docsAndPositions.nextDoc(), equalTo(0));
assertThat(freq[j], equalTo(docsAndPositions.freq()));
assertThat(iterator.docFreq(), equalTo(-1));
@ -238,7 +238,7 @@ public class GetTermVectorsCheckDocFreqTests extends ElasticsearchIntegrationTes
assertThat("expected ttf of " + string, numDocs, equalTo((int) iterator.totalTermFreq()));
}
DocsAndPositionsEnum docsAndPositions = iterator.docsAndPositions(null, null);
PostingsEnum docsAndPositions = iterator.postings(null, null, PostingsEnum.ALL);
assertThat(docsAndPositions.nextDoc(), equalTo(0));
assertThat(freq[j], equalTo(docsAndPositions.freq()));
assertThat(iterator.docFreq(), equalTo(numDocs));

10
src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java
View File

@ -321,7 +321,7 @@ public class GetTermVectorsTests extends AbstractTermVectorsTests {
assertThat(infoString, next, notNullValue());
// do not test ttf or doc frequency, because here we have
// many shards and do not know how documents are distributed
DocsAndPositionsEnum docsAndPositions = iterator.docsAndPositions(null, null);
PostingsEnum docsAndPositions = iterator.postings(null, null, PostingsEnum.ALL);
// docs and pos only returns something if positions or
// payloads or offsets are stored / requestd Otherwise use
// DocsEnum?
@ -450,7 +450,7 @@ public class GetTermVectorsTests extends AbstractTermVectorsTests {
TermsEnum iterator = terms.iterator(null);
while (iterator.next() != null) {
String term = iterator.term().utf8ToString();
DocsAndPositionsEnum docsAndPositions = iterator.docsAndPositions(null, null);
PostingsEnum docsAndPositions = iterator.postings(null, null, PostingsEnum.ALL);
assertThat(docsAndPositions.nextDoc(), equalTo(0));
List<BytesRef> curPayloads = payloads.get(term);
assertThat(term, curPayloads, notNullValue());
@ -644,7 +644,7 @@ public class GetTermVectorsTests extends AbstractTermVectorsTests {
assertThat(next, notNullValue());
// do not test ttf or doc frequency, because here we have many
// shards and do not know how documents are distributed
DocsAndPositionsEnum docsAndPositions = iterator.docsAndPositions(null, null);
PostingsEnum docsAndPositions = iterator.postings(null, null, PostingsEnum.ALL);
assertThat(docsAndPositions.nextDoc(), equalTo(0));
assertThat(freq[j], equalTo(docsAndPositions.freq()));
int[] termPos = pos[j];
@ -739,8 +739,8 @@ public class GetTermVectorsTests extends AbstractTermVectorsTests {
assertThat("term: " + string0, iter0.totalTermFreq(), equalTo(iter1.totalTermFreq()));
// compare freq and docs
DocsAndPositionsEnum docsAndPositions0 = iter0.docsAndPositions(null, null);
DocsAndPositionsEnum docsAndPositions1 = iter1.docsAndPositions(null, null);
PostingsEnum docsAndPositions0 = iter0.postings(null, null, PostingsEnum.ALL);
PostingsEnum docsAndPositions1 = iter1.postings(null, null, PostingsEnum.ALL);
assertThat("term: " + string0, docsAndPositions0.nextDoc(), equalTo(docsAndPositions1.nextDoc()));
assertThat("term: " + string0, docsAndPositions0.freq(), equalTo(docsAndPositions1.freq()));

3
src/test/java/org/elasticsearch/common/lucene/search/TermsFilterTests.java
View File

@ -59,7 +59,8 @@ public class TermsFilterTests extends ElasticsearchTestCase {
w.close();
TermFilter tf = new TermFilter(new Term(fieldName, "19"));
assertNull(tf.getDocIdSet(reader.getContext(), reader.getLiveDocs()));
DocIdSet dis = tf.getDocIdSet(reader.getContext(), reader.getLiveDocs());
assertTrue(dis == null || dis.iterator() == null);
tf = new TermFilter(new Term(fieldName, "20"));
DocIdSet result = tf.getDocIdSet(reader.getContext(), reader.getLiveDocs());

15
src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterLuceneTests.java
View File

@ -112,6 +112,11 @@ public class XBooleanFilterLuceneTests extends ElasticsearchTestCase {
public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return new BitDocIdSet(new SparseFixedBitSet(context.reader().maxDoc()));
}
@Override
public String toString(String field) {
return "empty";
}
};
}
@ -121,6 +126,11 @@ public class XBooleanFilterLuceneTests extends ElasticsearchTestCase {
public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return null;
}
@Override
public String toString(String field) {
return "nulldis";
}
};
}
@ -145,6 +155,11 @@ public class XBooleanFilterLuceneTests extends ElasticsearchTestCase {
}
};
}
@Override
public String toString(String field) {
return "nulldisi";
}
};
}

7
src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterTests.java
View File

@ -554,7 +554,7 @@ public class XBooleanFilterTests extends ElasticsearchLuceneTestCase {
}
@Override
public String toString() {
public String toString(String field) {
return "SLOW(" + field + ":" + value + ")";
}
}
@ -566,6 +566,11 @@ public class XBooleanFilterTests extends ElasticsearchLuceneTestCase {
return random().nextBoolean() ? new Empty() : null;
}
@Override
public String toString(String field) {
return "empty";
}
private class Empty extends DocIdSet {
@Override

4
src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java
View File

@ -236,7 +236,7 @@ public class SimpleLuceneTests extends ElasticsearchTestCase {
TermsEnum termsEnum = terms.iterator(null);
termsEnum.next();
DocsEnum termDocs = termsEnum.docs(atomicReader.getLiveDocs(), null);
PostingsEnum termDocs = termsEnum.postings(atomicReader.getLiveDocs(), null);
assertThat(termDocs.nextDoc(), equalTo(0));
assertThat(termDocs.docID(), equalTo(0));
assertThat(termDocs.freq(), equalTo(1));
@ -244,7 +244,7 @@ public class SimpleLuceneTests extends ElasticsearchTestCase {
terms = atomicReader.terms("int2");
termsEnum = terms.iterator(termsEnum);
termsEnum.next();
termDocs = termsEnum.docs(atomicReader.getLiveDocs(), termDocs);
termDocs = termsEnum.postings(atomicReader.getLiveDocs(), termDocs);
assertThat(termDocs.nextDoc(), equalTo(0));
assertThat(termDocs.docID(), equalTo(0));
assertThat(termDocs.freq(), equalTo(2));

11
src/test/java/org/elasticsearch/index/fielddata/plain/ParentChildFilteredTermsEnumTests.java
View File

@ -23,6 +23,7 @@ import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.*;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.test.ElasticsearchLuceneTestCase;
@ -64,12 +65,12 @@ public class ParentChildFilteredTermsEnumTests extends ElasticsearchLuceneTestCa
for (BytesRef term = termsEnum.next(); term != null; term = termsEnum.next()) {
++expected;
assertThat(term.utf8ToString(), equalTo(format(expected)));
DocsEnum docsEnum = termsEnum.docs(null, null);
PostingsEnum docsEnum = termsEnum.postings(null, null);
assertThat(docsEnum, notNullValue());
int docId = docsEnum.nextDoc();
assertThat(docId, not(equalTo(-1)));
assertThat(docId, not(equalTo(DocsEnum.NO_MORE_DOCS)));
assertThat(docsEnum.nextDoc(), equalTo(DocsEnum.NO_MORE_DOCS));
assertThat(docId, not(equalTo(DocIdSetIterator.NO_MORE_DOCS)));
assertThat(docsEnum.nextDoc(), equalTo(DocIdSetIterator.NO_MORE_DOCS));
}
}
@ -103,10 +104,10 @@ public class ParentChildFilteredTermsEnumTests extends ElasticsearchLuceneTestCa
for (BytesRef term = termsEnum.next(); term != null; term = termsEnum.next()) {
++expected;
assertThat(term.utf8ToString(), equalTo(format(expected)));
DocsEnum docsEnum = termsEnum.docs(null, null);
PostingsEnum docsEnum = termsEnum.postings(null, null);
assertThat(docsEnum, notNullValue());
int numDocs = 0;
for (int docId = docsEnum.nextDoc(); docId != DocsEnum.NO_MORE_DOCS; docId = docsEnum.nextDoc()) {
for (int docId = docsEnum.nextDoc(); docId != DocIdSetIterator.NO_MORE_DOCS; docId = docsEnum.nextDoc()) {
numDocs++;
}
assertThat(numDocs, equalTo(11));

154
src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
View File

@ -330,7 +330,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
Filter internalFilter = constantScoreQuery.getFilter();
Filter internalFilter = (Filter) constantScoreQuery.getQuery();
assertThat(internalFilter, instanceOf(MatchAllDocsFilter.class));
}
@ -856,22 +856,22 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(iterator.hasNext(), equalTo(true));
FilterClause clause = iterator.next();
assertThat(clause.getOccur(), equalTo(BooleanClause.Occur.MUST));
assertThat(((TermFilter) clause.getFilter()).getTerm(), equalTo(new Term("name.first", "shay1")));
assertThat(getTerm(clause.getFilter()), equalTo(new Term("name.first", "shay1")));
assertThat(iterator.hasNext(), equalTo(true));
clause = iterator.next();
assertThat(clause.getOccur(), equalTo(BooleanClause.Occur.MUST));
assertThat(((TermFilter) clause.getFilter()).getTerm(), equalTo(new Term("name.first", "shay4")));
assertThat(getTerm(clause.getFilter()), equalTo(new Term("name.first", "shay4")));
assertThat(iterator.hasNext(), equalTo(true));
clause = iterator.next();
assertThat(clause.getOccur(), equalTo(BooleanClause.Occur.MUST_NOT));
assertThat(((TermFilter) clause.getFilter()).getTerm(), equalTo(new Term("name.first", "shay2")));
assertThat(getTerm(clause.getFilter()), equalTo(new Term("name.first", "shay2")));
assertThat(iterator.hasNext(), equalTo(true));
clause = iterator.next();
assertThat(clause.getOccur(), equalTo(BooleanClause.Occur.SHOULD));
assertThat(((TermFilter) clause.getFilter()).getTerm(), equalTo(new Term("name.first", "shay3")));
assertThat(getTerm(clause.getFilter()), equalTo(new Term("name.first", "shay3")));
assertThat(iterator.hasNext(), equalTo(false));
}
@ -890,22 +890,22 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(iterator.hasNext(), equalTo(true));
FilterClause clause = iterator.next();
assertThat(clause.getOccur(), equalTo(BooleanClause.Occur.MUST));
assertThat(((TermFilter) clause.getFilter()).getTerm(), equalTo(new Term("name.first", "shay1")));
assertThat(getTerm(clause.getFilter()), equalTo(new Term("name.first", "shay1")));
assertThat(iterator.hasNext(), equalTo(true));
clause = iterator.next();
assertThat(clause.getOccur(), equalTo(BooleanClause.Occur.MUST));
assertThat(((TermFilter) clause.getFilter()).getTerm(), equalTo(new Term("name.first", "shay4")));
assertThat(getTerm(clause.getFilter()), equalTo(new Term("name.first", "shay4")));
assertThat(iterator.hasNext(), equalTo(true));
clause = iterator.next();
assertThat(clause.getOccur(), equalTo(BooleanClause.Occur.MUST_NOT));
assertThat(((TermFilter) clause.getFilter()).getTerm(), equalTo(new Term("name.first", "shay2")));
assertThat(getTerm(clause.getFilter()), equalTo(new Term("name.first", "shay2")));
assertThat(iterator.hasNext(), equalTo(true));
clause = iterator.next();
assertThat(clause.getOccur(), equalTo(BooleanClause.Occur.SHOULD));
assertThat(((TermFilter) clause.getFilter()).getTerm(), equalTo(new Term("name.first", "shay3")));
assertThat(getTerm(clause.getFilter()), equalTo(new Term("name.first", "shay3")));
assertThat(iterator.hasNext(), equalTo(false));
}
@ -917,10 +917,10 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
AndFilter andFilter = (AndFilter) constantScoreQuery.getFilter();
AndFilter andFilter = (AndFilter) constantScoreQuery.getQuery();
assertThat(andFilter.filters().size(), equalTo(2));
assertThat(((TermFilter) andFilter.filters().get(0)).getTerm(), equalTo(new Term("name.first", "shay1")));
assertThat(((TermFilter) andFilter.filters().get(1)).getTerm(), equalTo(new Term("name.first", "shay4")));
assertThat(getTerm(andFilter.filters().get(0)), equalTo(new Term("name.first", "shay1")));
assertThat(getTerm(andFilter.filters().get(1)), equalTo(new Term("name.first", "shay4")));
}
@Test
@ -933,8 +933,8 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
AndFilter andFilter = (AndFilter) filteredQuery.getFilter();
assertThat(andFilter.filters().size(), equalTo(2));
assertThat(((TermFilter) andFilter.filters().get(0)).getTerm(), equalTo(new Term("name.first", "shay1")));
assertThat(((TermFilter) andFilter.filters().get(1)).getTerm(), equalTo(new Term("name.first", "shay4")));
assertThat(getTerm(andFilter.filters().get(0)), equalTo(new Term("name.first", "shay1")));
assertThat(getTerm(andFilter.filters().get(1)), equalTo(new Term("name.first", "shay4")));
}
@Test
@ -948,8 +948,8 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
AndFilter andFilter = (AndFilter) filteredQuery.getFilter();
assertThat(andFilter.filters().size(), equalTo(2));
assertThat(((TermFilter) andFilter.filters().get(0)).getTerm(), equalTo(new Term("name.first", "shay1")));
assertThat(((TermFilter) andFilter.filters().get(1)).getTerm(), equalTo(new Term("name.first", "shay4")));
assertThat(getTerm(andFilter.filters().get(0)), equalTo(new Term("name.first", "shay1")));
assertThat(getTerm(andFilter.filters().get(1)), equalTo(new Term("name.first", "shay4")));
}
@Test
@ -962,8 +962,8 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
AndFilter andFilter = (AndFilter) filteredQuery.getFilter();
assertThat(andFilter.filters().size(), equalTo(2));
assertThat(((TermFilter) andFilter.filters().get(0)).getTerm(), equalTo(new Term("name.first", "shay1")));
assertThat(((TermFilter) andFilter.filters().get(1)).getTerm(), equalTo(new Term("name.first", "shay4")));
assertThat(getTerm(andFilter.filters().get(0)), equalTo(new Term("name.first", "shay1")));
assertThat(getTerm(andFilter.filters().get(1)), equalTo(new Term("name.first", "shay4")));
}
@Test
@ -973,10 +973,10 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
OrFilter andFilter = (OrFilter) constantScoreQuery.getFilter();
OrFilter andFilter = (OrFilter) constantScoreQuery.getQuery();
assertThat(andFilter.filters().size(), equalTo(2));
assertThat(((TermFilter) andFilter.filters().get(0)).getTerm(), equalTo(new Term("name.first", "shay1")));
assertThat(((TermFilter) andFilter.filters().get(1)).getTerm(), equalTo(new Term("name.first", "shay4")));
assertThat(getTerm(andFilter.filters().get(0)), equalTo(new Term("name.first", "shay1")));
assertThat(getTerm(andFilter.filters().get(1)), equalTo(new Term("name.first", "shay4")));
}
@Test
@ -989,8 +989,8 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
OrFilter orFilter = (OrFilter) filteredQuery.getFilter();
assertThat(orFilter.filters().size(), equalTo(2));
assertThat(((TermFilter) orFilter.filters().get(0)).getTerm(), equalTo(new Term("name.first", "shay1")));
assertThat(((TermFilter) orFilter.filters().get(1)).getTerm(), equalTo(new Term("name.first", "shay4")));
assertThat(getTerm(orFilter.filters().get(0)), equalTo(new Term("name.first", "shay1")));
assertThat(getTerm(orFilter.filters().get(1)), equalTo(new Term("name.first", "shay4")));
}
@Test
@ -1003,8 +1003,8 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
OrFilter orFilter = (OrFilter) filteredQuery.getFilter();
assertThat(orFilter.filters().size(), equalTo(2));
assertThat(((TermFilter) orFilter.filters().get(0)).getTerm(), equalTo(new Term("name.first", "shay1")));
assertThat(((TermFilter) orFilter.filters().get(1)).getTerm(), equalTo(new Term("name.first", "shay4")));
assertThat(getTerm(orFilter.filters().get(0)), equalTo(new Term("name.first", "shay1")));
assertThat(getTerm(orFilter.filters().get(1)), equalTo(new Term("name.first", "shay4")));
}
@Test
@ -1014,8 +1014,8 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
NotFilter notFilter = (NotFilter) constantScoreQuery.getFilter();
assertThat(((TermFilter) notFilter.filter()).getTerm(), equalTo(new Term("name.first", "shay1")));
NotFilter notFilter = (NotFilter) constantScoreQuery.getQuery();
assertThat(getTerm(notFilter.filter()), equalTo(new Term("name.first", "shay1")));
}
@Test
@ -1028,7 +1028,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(((TermQuery) filteredQuery.getQuery()).getTerm(), equalTo(new Term("name.first", "shay")));
NotFilter notFilter = (NotFilter) filteredQuery.getFilter();
assertThat(((TermFilter) notFilter.filter()).getTerm(), equalTo(new Term("name.first", "shay1")));
assertThat(getTerm(notFilter.filter()), equalTo(new Term("name.first", "shay1")));
}
@Test
@ -1041,7 +1041,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(((TermQuery) filteredQuery.getQuery()).getTerm(), equalTo(new Term("name.first", "shay")));
NotFilter notFilter = (NotFilter) filteredQuery.getFilter();
assertThat(((TermFilter) notFilter.filter()).getTerm(), equalTo(new Term("name.first", "shay1")));
assertThat(getTerm(notFilter.filter()), equalTo(new Term("name.first", "shay1")));
}
@Test
@ -1054,7 +1054,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(((TermQuery) filteredQuery.getQuery()).getTerm(), equalTo(new Term("name.first", "shay")));
NotFilter notFilter = (NotFilter) filteredQuery.getFilter();
assertThat(((TermFilter) notFilter.filter()).getTerm(), equalTo(new Term("name.first", "shay1")));
assertThat(getTerm(notFilter.filter()), equalTo(new Term("name.first", "shay1")));
}
@Test
@ -1225,7 +1225,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(parsedQuery, instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery;
assertThat(((TermQuery) filteredQuery.getQuery()).getTerm(), equalTo(new Term("name.first", "shay")));
assertThat(((TermFilter) filteredQuery.getFilter()).getTerm(), equalTo(new Term("name.last", "banon")));
assertThat(getTerm(filteredQuery.getFilter()), equalTo(new Term("name.last", "banon")));
}
@Test
@ -1236,7 +1236,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(parsedQuery, instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery;
assertThat(((TermQuery) filteredQuery.getQuery()).getTerm(), equalTo(new Term("name.first", "shay")));
assertThat(((TermFilter) filteredQuery.getFilter()).getTerm(), equalTo(new Term("name.last", "banon")));
assertThat(getTerm(filteredQuery.getFilter()), equalTo(new Term("name.last", "banon")));
}
@Test
@ -1247,7 +1247,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(parsedQuery, instanceOf(FilteredQuery.class));
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery;
assertThat(((TermQuery) filteredQuery.getQuery()).getTerm(), equalTo(new Term("name.first", "shay")));
assertThat(((TermFilter) filteredQuery.getFilter()).getTerm(), equalTo(new Term("name.last", "banon")));
assertThat(getTerm(filteredQuery.getFilter()), equalTo(new Term("name.last", "banon")));
}
@Test
@ -1278,7 +1278,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(wildcardQuery.getTerm(), equalTo(new Term("name.first", "sh*")));
assertThat((double) wildcardQuery.getBoost(), closeTo(1.1, 0.001));
assertThat(((TermFilter) filteredQuery.getFilter()).getTerm(), equalTo(new Term("name.last", "banon")));
assertThat(getTerm(filteredQuery.getFilter()), equalTo(new Term("name.last", "banon")));
}
@Test
@ -1304,8 +1304,8 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery;
assertThat(filteredQuery.getFilter(), instanceOf(TermFilter.class));
TermFilter termFilter = (TermFilter) filteredQuery.getFilter();
assertThat(termFilter.getTerm().field(), equalTo("name.last"));
assertThat(termFilter.getTerm().text(), equalTo("banon"));
assertThat(getTerm(termFilter).field(), equalTo("name.last"));
assertThat(getTerm(termFilter).text(), equalTo("banon"));
}
@Test
@ -1318,8 +1318,8 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
FilteredQuery filteredQuery = (FilteredQuery) parsedQuery.query();
assertThat(filteredQuery.getFilter(), instanceOf(TermFilter.class));
TermFilter termFilter = (TermFilter) filteredQuery.getFilter();
assertThat(termFilter.getTerm().field(), equalTo("name.last"));
assertThat(termFilter.getTerm().text(), equalTo("banon"));
assertThat(getTerm(termFilter).field(), equalTo("name.last"));
assertThat(getTerm(termFilter).text(), equalTo("banon"));
}
@Test
@ -1368,7 +1368,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(constantScoreQuery(termFilter("name.last", "banon"))).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
assertThat(((TermFilter) constantScoreQuery.getFilter()).getTerm(), equalTo(new Term("name.last", "banon")));
assertThat(getTerm(constantScoreQuery.getQuery()), equalTo(new Term("name.last", "banon")));
}
@Test
@ -1378,7 +1378,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
assertThat(((TermFilter) constantScoreQuery.getFilter()).getTerm(), equalTo(new Term("name.last", "banon")));
assertThat(getTerm(constantScoreQuery.getQuery()), equalTo(new Term("name.last", "banon")));
}
@Test
@ -1398,7 +1398,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(parsedQuery, instanceOf(FunctionScoreQuery.class));
FunctionScoreQuery functionScoreQuery = (FunctionScoreQuery) parsedQuery;
assertThat(functionScoreQuery.getSubQuery() instanceof ConstantScoreQuery, equalTo(true));
assertThat(((ConstantScoreQuery) functionScoreQuery.getSubQuery()).getFilter() instanceof MatchAllDocsFilter, equalTo(true));
assertThat(((ConstantScoreQuery) functionScoreQuery.getSubQuery()).getQuery() instanceof MatchAllDocsFilter, equalTo(true));
assertThat((double) ((BoostScoreFunction) functionScoreQuery.getFunction()).getBoost(), closeTo(1.3, 0.001));
}
@ -1871,7 +1871,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(parsedQuery.namedFilters().containsKey("test"), equalTo(true));
assertThat(parsedQuery.query(), instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery.query();
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getFilter();
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001));
@ -1885,7 +1885,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getFilter();
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001));
@ -1899,7 +1899,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getFilter();
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001));
@ -1913,7 +1913,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getFilter();
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001));
@ -1927,7 +1927,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getFilter();
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001));
@ -1941,7 +1941,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getFilter();
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001));
@ -1955,7 +1955,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getFilter();
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001));
@ -1969,7 +1969,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getFilter();
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001));
@ -1983,7 +1983,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getFilter();
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001));
@ -1997,7 +1997,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getFilter();
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001));
@ -2011,7 +2011,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getFilter();
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001));
@ -2025,7 +2025,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getFilter();
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001));
@ -2039,7 +2039,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getFilter();
GeoDistanceFilter filter = (GeoDistanceFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.lat(), closeTo(40, 0.00001));
assertThat(filter.lon(), closeTo(-70, 0.00001));
@ -2054,7 +2054,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(parsedQuery.query(), instanceOf(ConstantScoreQuery.class));
assertThat(parsedQuery.namedFilters().containsKey("test"), equalTo(true));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery.query();
InMemoryGeoBoundingBoxFilter filter = (InMemoryGeoBoundingBoxFilter) constantScoreQuery.getFilter();
InMemoryGeoBoundingBoxFilter filter = (InMemoryGeoBoundingBoxFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.topLeft().lat(), closeTo(40, 0.00001));
assertThat(filter.topLeft().lon(), closeTo(-70, 0.00001));
@ -2070,7 +2070,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
InMemoryGeoBoundingBoxFilter filter = (InMemoryGeoBoundingBoxFilter) constantScoreQuery.getFilter();
InMemoryGeoBoundingBoxFilter filter = (InMemoryGeoBoundingBoxFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.topLeft().lat(), closeTo(40, 0.00001));
assertThat(filter.topLeft().lon(), closeTo(-70, 0.00001));
@ -2085,7 +2085,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
InMemoryGeoBoundingBoxFilter filter = (InMemoryGeoBoundingBoxFilter) constantScoreQuery.getFilter();
InMemoryGeoBoundingBoxFilter filter = (InMemoryGeoBoundingBoxFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.topLeft().lat(), closeTo(40, 0.00001));
assertThat(filter.topLeft().lon(), closeTo(-70, 0.00001));
@ -2100,7 +2100,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
InMemoryGeoBoundingBoxFilter filter = (InMemoryGeoBoundingBoxFilter) constantScoreQuery.getFilter();
InMemoryGeoBoundingBoxFilter filter = (InMemoryGeoBoundingBoxFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.topLeft().lat(), closeTo(40, 0.00001));
assertThat(filter.topLeft().lon(), closeTo(-70, 0.00001));
@ -2115,7 +2115,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
InMemoryGeoBoundingBoxFilter filter = (InMemoryGeoBoundingBoxFilter) constantScoreQuery.getFilter();
InMemoryGeoBoundingBoxFilter filter = (InMemoryGeoBoundingBoxFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.topLeft().lat(), closeTo(40, 0.00001));
assertThat(filter.topLeft().lon(), closeTo(-70, 0.00001));
@ -2130,7 +2130,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
InMemoryGeoBoundingBoxFilter filter = (InMemoryGeoBoundingBoxFilter) constantScoreQuery.getFilter();
InMemoryGeoBoundingBoxFilter filter = (InMemoryGeoBoundingBoxFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.topLeft().lat(), closeTo(40, 0.00001));
assertThat(filter.topLeft().lon(), closeTo(-70, 0.00001));
@ -2145,7 +2145,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
InMemoryGeoBoundingBoxFilter filter = (InMemoryGeoBoundingBoxFilter) constantScoreQuery.getFilter();
InMemoryGeoBoundingBoxFilter filter = (InMemoryGeoBoundingBoxFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.topLeft().lat(), closeTo(40, 0.00001));
assertThat(filter.topLeft().lon(), closeTo(-70, 0.00001));
@ -2162,7 +2162,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(parsedQuery.namedFilters().containsKey("test"), equalTo(true));
assertThat(parsedQuery.query(), instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery.query();
GeoPolygonFilter filter = (GeoPolygonFilter) constantScoreQuery.getFilter();
GeoPolygonFilter filter = (GeoPolygonFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.points().length, equalTo(4));
assertThat(filter.points()[0].lat(), closeTo(40, 0.00001));
@ -2203,7 +2203,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
GeoPolygonFilter filter = (GeoPolygonFilter) constantScoreQuery.getFilter();
GeoPolygonFilter filter = (GeoPolygonFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.points().length, equalTo(4));
assertThat(filter.points()[0].lat(), closeTo(40, 0.00001));
@ -2221,7 +2221,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
GeoPolygonFilter filter = (GeoPolygonFilter) constantScoreQuery.getFilter();
GeoPolygonFilter filter = (GeoPolygonFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.points().length, equalTo(4));
assertThat(filter.points()[0].lat(), closeTo(40, 0.00001));
@ -2239,7 +2239,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
GeoPolygonFilter filter = (GeoPolygonFilter) constantScoreQuery.getFilter();
GeoPolygonFilter filter = (GeoPolygonFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.points().length, equalTo(4));
assertThat(filter.points()[0].lat(), closeTo(40, 0.00001));
@ -2257,7 +2257,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
GeoPolygonFilter filter = (GeoPolygonFilter) constantScoreQuery.getFilter();
GeoPolygonFilter filter = (GeoPolygonFilter) constantScoreQuery.getQuery();
assertThat(filter.fieldName(), equalTo("location"));
assertThat(filter.points().length, equalTo(4));
assertThat(filter.points()[0].lat(), closeTo(40, 0.00001));
@ -2275,7 +2275,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery;
assertThat(constantScoreQuery.getFilter(), instanceOf(IntersectsPrefixTreeFilter.class));
assertThat(constantScoreQuery.getQuery(), instanceOf(IntersectsPrefixTreeFilter.class));
}
@Test
@ -2285,7 +2285,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
ConstantScoreQuery csq = (ConstantScoreQuery) parsedQuery;
assertThat(csq.getFilter(), instanceOf(IntersectsPrefixTreeFilter.class));
assertThat(csq.getQuery(), instanceOf(IntersectsPrefixTreeFilter.class));
}
@Test
@ -2428,7 +2428,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
assertThat(((QueryWrapperFilter) parsedQuery.filter()).getQuery(), instanceOf(FilteredQuery.class));
assertThat(((FilteredQuery) ((QueryWrapperFilter) parsedQuery.filter()).getQuery()).getFilter(), instanceOf(TermFilter.class));
TermFilter filter = (TermFilter) ((FilteredQuery) ((QueryWrapperFilter) parsedQuery.filter()).getQuery()).getFilter();
assertThat(filter.getTerm().toString(), equalTo("text:apache"));
assertThat(getTerm(filter).toString(), equalTo("text:apache"));
}
@Test
@ -2527,9 +2527,19 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
IndexQueryParserService queryParser = indexService.queryParserService();
Query parsedQuery = queryParser.parse(query).query();
assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
assertThat(((ConstantScoreQuery) parsedQuery).getFilter(), instanceOf(CustomQueryWrappingFilter.class));
assertThat(((CustomQueryWrappingFilter) ((ConstantScoreQuery) parsedQuery).getFilter()).getQuery(), instanceOf(ParentConstantScoreQuery.class));
assertThat(((CustomQueryWrappingFilter) ((ConstantScoreQuery) parsedQuery).getFilter()).getQuery().toString(), equalTo("parent_filter[foo](filtered(*:*)->cache(_type:foo))"));
assertThat(((ConstantScoreQuery) parsedQuery).getQuery(), instanceOf(CustomQueryWrappingFilter.class));
assertThat(((CustomQueryWrappingFilter) ((ConstantScoreQuery) parsedQuery).getQuery()).getQuery(), instanceOf(ParentConstantScoreQuery.class));
assertThat(((CustomQueryWrappingFilter) ((ConstantScoreQuery) parsedQuery).getQuery()).getQuery().toString(), equalTo("parent_filter[foo](filtered(*:*)->cache(_type:foo))"));
SearchContext.removeCurrent();
}
/**
* helper to extract term from TermFilter.
* @deprecated transition device: use TermQuery instead.*/
@Deprecated
private Term getTerm(Query query) {
TermFilter filter = (TermFilter) query;
TermQuery wrapped = (TermQuery) filter.getQuery();
return wrapped.getTerm();
}
}

4
src/test/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQueryTests.java
View File

@ -261,11 +261,11 @@ public class ChildrenConstantScoreQueryTests extends AbstractChildTests {
if (terms != null) {
NavigableSet<String> parentIds = childValueToParentIds.lget();
TermsEnum termsEnum = terms.iterator(null);
DocsEnum docsEnum = null;
PostingsEnum docsEnum = null;
for (String id : parentIds) {
TermsEnum.SeekStatus seekStatus = termsEnum.seekCeil(Uid.createUidAsBytes("parent", id));
if (seekStatus == TermsEnum.SeekStatus.FOUND) {
docsEnum = termsEnum.docs(slowLeafReader.getLiveDocs(), docsEnum, DocsEnum.FLAG_NONE);
docsEnum = termsEnum.postings(slowLeafReader.getLiveDocs(), docsEnum, PostingsEnum.NONE);
expectedResult.set(docsEnum.nextDoc());
} else if (seekStatus == TermsEnum.SeekStatus.END) {
break;

4
src/test/java/org/elasticsearch/index/search/child/ChildrenQueryTests.java
View File

@ -230,13 +230,13 @@ public class ChildrenQueryTests extends AbstractChildTests {
if (terms != null) {
NavigableMap<String, FloatArrayList> parentIdToChildScores = childValueToParentIds.lget();
TermsEnum termsEnum = terms.iterator(null);
DocsEnum docsEnum = null;
PostingsEnum docsEnum = null;
for (Map.Entry<String, FloatArrayList> entry : parentIdToChildScores.entrySet()) {
int count = entry.getValue().elementsCount;
if (count >= minChildren && (maxChildren == 0 || count <= maxChildren)) {
TermsEnum.SeekStatus seekStatus = termsEnum.seekCeil(Uid.createUidAsBytes("parent", entry.getKey()));
if (seekStatus == TermsEnum.SeekStatus.FOUND) {
docsEnum = termsEnum.docs(slowLeafReader.getLiveDocs(), docsEnum, DocsEnum.FLAG_NONE);
docsEnum = termsEnum.postings(slowLeafReader.getLiveDocs(), docsEnum, PostingsEnum.NONE);
expectedResult.set(docsEnum.nextDoc());
scores[docsEnum.docID()] = new FloatArrayList(entry.getValue());
} else if (seekStatus == TermsEnum.SeekStatus.END) {

22
src/test/java/org/elasticsearch/index/search/child/MockScorer.java
View File

@ -19,7 +19,9 @@
package org.elasticsearch.index.search.child;
import com.carrotsearch.hppc.FloatArrayList;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.util.BytesRef;
import java.io.IOException;
@ -97,4 +99,24 @@ class MockScorer extends Scorer {
public long cost() {
return 0;
}
@Override
public int nextPosition() throws IOException {
return -1;
}
@Override
public int startOffset() throws IOException {
return -1;
}
@Override
public int endOffset() throws IOException {
return -1;
}
@Override
public BytesRef getPayload() throws IOException {
return null;
}
}

4
src/test/java/org/elasticsearch/index/search/child/ParentConstantScoreQueryTests.java
View File

@ -212,11 +212,11 @@ public class ParentConstantScoreQueryTests extends AbstractChildTests {
if (terms != null) {
NavigableSet<String> childIds = parentValueToChildDocIds.lget();
TermsEnum termsEnum = terms.iterator(null);
DocsEnum docsEnum = null;
PostingsEnum docsEnum = null;
for (String id : childIds) {
TermsEnum.SeekStatus seekStatus = termsEnum.seekCeil(Uid.createUidAsBytes("child", id));
if (seekStatus == TermsEnum.SeekStatus.FOUND) {
docsEnum = termsEnum.docs(slowLeafReader.getLiveDocs(), docsEnum, DocsEnum.FLAG_NONE);
docsEnum = termsEnum.postings(slowLeafReader.getLiveDocs(), docsEnum, PostingsEnum.NONE);
expectedResult.set(docsEnum.nextDoc());
} else if (seekStatus == TermsEnum.SeekStatus.END) {
break;

4
src/test/java/org/elasticsearch/index/search/child/ParentQueryTests.java
View File

@ -210,11 +210,11 @@ public class ParentQueryTests extends AbstractChildTests {
if (terms != null) {
NavigableMap<String, Float> childIdsAndScore = parentValueToChildIds.lget();
TermsEnum termsEnum = terms.iterator(null);
DocsEnum docsEnum = null;
PostingsEnum docsEnum = null;
for (Map.Entry<String, Float> entry : childIdsAndScore.entrySet()) {
TermsEnum.SeekStatus seekStatus = termsEnum.seekCeil(Uid.createUidAsBytes("child", entry.getKey()));
if (seekStatus == TermsEnum.SeekStatus.FOUND) {
docsEnum = termsEnum.docs(slowLeafReader.getLiveDocs(), docsEnum, DocsEnum.FLAG_NONE);
docsEnum = termsEnum.postings(slowLeafReader.getLiveDocs(), docsEnum, PostingsEnum.NONE);
expectedResult.set(docsEnum.nextDoc());
FloatArrayList s = scores[docsEnum.docID()];
if (s == null) {

7
src/test/java/org/elasticsearch/script/IndexLookupTests.java
View File

@ -30,6 +30,7 @@ import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.hamcrest.Matchers;
import org.junit.Ignore;
import org.junit.Test;
import java.io.IOException;
@ -296,6 +297,7 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
// check default flag
String script = createPositionsArrayScriptDefaultGet("int_payload_field", "b", "position");
// there should be no positions
/* TODO: the following tests fail with the new postings enum apis because of a bogus assert in BlockDocsEnum
checkArrayValsInEachDoc(script, emptyArray, 3);
script = createPositionsArrayScriptDefaultGet("int_payload_field", "b", "startOffset");
// there should be no offsets
@ -319,12 +321,13 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
checkArrayValsInEachDoc(script, emptyArray, 3);
script = createPositionsArrayScript("int_payload_field", "b", "_FREQUENCIES", "payloadAsInt(-1)");
// there should be no payloads
checkArrayValsInEachDoc(script, emptyArray, 3);
checkArrayValsInEachDoc(script, emptyArray, 3);*/
// check FLAG_POSITIONS flag
script = createPositionsArrayScript("int_payload_field", "b", "_POSITIONS", "position");
// there should be positions
checkArrayValsInEachDoc(script, expectedPositionsArray, 3);
/* TODO: these tests make a bogus assumption that asking for positions will return only positions
script = createPositionsArrayScript("int_payload_field", "b", "_POSITIONS", "startOffset");
// there should be no offsets
checkArrayValsInEachDoc(script, emptyArray, 3);
@ -333,7 +336,7 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
checkArrayValsInEachDoc(script, emptyArray, 3);
script = createPositionsArrayScript("int_payload_field", "b", "_POSITIONS", "payloadAsInt(-1)");
// there should be no payloads
checkArrayValsInEachDoc(script, emptyArray, 3);
checkArrayValsInEachDoc(script, emptyArray, 3);*/
// check FLAG_OFFSETS flag
script = createPositionsArrayScript("int_payload_field", "b", "_OFFSETS", "position");

6
src/test/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProviderV1.java
View File

@ -24,8 +24,8 @@ import com.carrotsearch.hppc.ObjectLongOpenHashMap;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.codecs.CodecUtil;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.search.DocIdSetIterator;
@ -141,7 +141,7 @@ public class AnalyzingCompletionLookupProviderV1 extends CompletionLookupProvide
continue;
}
TermsEnum termsEnum = terms.iterator(null);
DocsAndPositionsEnum docsEnum = null;
PostingsEnum docsEnum = null;
final SuggestPayload spare = new SuggestPayload();
int maxAnalyzedPathsForOneInput = 0;
final XAnalyzingSuggester.XBuilder builder = new XAnalyzingSuggester.XBuilder(maxSurfaceFormsPerAnalyzedForm, hasPayloads, XAnalyzingSuggester.PAYLOAD_SEP);
@ -151,7 +151,7 @@ public class AnalyzingCompletionLookupProviderV1 extends CompletionLookupProvide
if (term == null) {
break;
}
docsEnum = termsEnum.docsAndPositions(null, docsEnum, DocsAndPositionsEnum.FLAG_PAYLOADS);
docsEnum = termsEnum.postings(null, docsEnum, PostingsEnum.PAYLOADS);
builder.startTerm(term);
int docFreq = 0;
while (docsEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {

9
src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTest.java
View File

@ -393,14 +393,9 @@ public class CompletionPostingsFormatTest extends ElasticsearchTestCase {
}
@Override
public DocsEnum docs(Bits liveDocs, DocsEnum reuse, int flags) throws IOException {
throw new UnsupportedOperationException();
}
@Override
public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) throws IOException {
public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) throws IOException {
final TermPosAndPayload data = current;
return new DocsAndPositionsEnum() {
return new PostingsEnum() {
boolean done = false;
@Override
public int nextPosition() throws IOException {

16
src/test/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java
View File

@ -146,15 +146,13 @@ public class ThrowingLeafReaderWrapper extends FilterLeafReader {
}
@Override
public DocsEnum docs(Bits liveDocs, DocsEnum reuse, int flags) throws IOException {
thrower.maybeThrow(Flags.DocsEnum);
return super.docs(liveDocs, reuse, flags);
}
@Override
public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) throws IOException {
thrower.maybeThrow(Flags.DocsAndPositionsEnum);
return super.docsAndPositions(liveDocs, reuse, flags);
public PostingsEnum postings(Bits liveDocs, PostingsEnum reuse, int flags) throws IOException {
if ((flags & PostingsEnum.POSITIONS) != 0) {
thrower.maybeThrow(Flags.DocsAndPositionsEnum);
} else {
thrower.maybeThrow(Flags.DocsEnum);
}
return super.postings(liveDocs, reuse, flags);
}
}