Github user cbismuth commented on a diff in the pull request:

    https://github.com/apache/lucene-solr/pull/495#discussion_r234132506
  
    --- Diff: 
lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java ---
    @@ -0,0 +1,215 @@
    +/*
    + * Licensed to the Apache Software Foundation (ASF) under one or more
    + * contributor license agreements.  See the NOTICE file distributed with
    + * this work for additional information regarding copyright ownership.
    + * The ASF licenses this file to You under the Apache License, Version 2.0
    + * (the "License"); you may not use this file except in compliance with
    + * the License.  You may obtain a copy of the License at
    + *
    + *     http://www.apache.org/licenses/LICENSE-2.0
    + *
    + * Unless required by applicable law or agreed to in writing, software
    + * distributed under the License is distributed on an "AS IS" BASIS,
    + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    + * See the License for the specific language governing permissions and
    + * limitations under the License.
    + */
    +package org.apache.lucene.search;
    +
    +import java.io.IOException;
    +
    +import org.apache.lucene.document.Document;
    +import org.apache.lucene.document.Field;
    +import org.apache.lucene.index.IndexReader;
    +import org.apache.lucene.index.LeafReaderContext;
    +import org.apache.lucene.index.RandomIndexWriter;
    +import org.apache.lucene.index.Term;
    +import org.apache.lucene.store.Directory;
    +import org.apache.lucene.util.LuceneTestCase;
    +
    +import static org.apache.lucene.search.BooleanClause.Occur;
    +import static org.apache.lucene.search.DocIdSetIterator.NO_MORE_DOCS;
    +import static org.hamcrest.CoreMatchers.equalTo;
    +
    +public class TestConstantScoreScorer extends LuceneTestCase {
    +  private static final String FIELD = "f";
    +  private static final String[] VALUES = new String[]{
    +      "foo",
    +      "bar",
    +      "foo bar",
    +      "bar foo",
    +      "foo not bar",
    +      "bar foo bar",
    +      "azerty"
    +  };
    +
    +  private static final Query TERM_QUERY = new BooleanQuery.Builder()
    +      .add(new TermQuery(new Term(FIELD, "foo")), Occur.MUST)
    +      .add(new TermQuery(new Term(FIELD, "bar")), Occur.MUST)
    +      .build();
    +  private static final Query PHRASE_QUERY = new PhraseQuery(FIELD, "foo", 
"bar");
    +
    +  public void testMatching_ScoreMode_COMPLETE() throws Exception {
    +    testMatching(ScoreMode.COMPLETE);
    +  }
    +
    +  public void testMatching_ScoreMode_COMPLETE_NO_SCORES() throws Exception 
{
    +    testMatching(ScoreMode.COMPLETE_NO_SCORES);
    +  }
    +
    +  private void testMatching(ScoreMode scoreMode) throws Exception {
    +
    +    try (TestConstantScoreScorerIndex index = new 
TestConstantScoreScorerIndex()) {
    +      int doc;
    +      ConstantScoreScorer scorer = index.constantScoreScorer(TERM_QUERY, 
1f, scoreMode);
    +
    +      // "foo bar" match
    +      doc = scorer.iterator().nextDoc();
    +      assertThat(doc, equalTo(2));
    +      assertThat(scorer.score(), equalTo(1f));
    +
    +      // should not reset iterator
    +      scorer.setMinCompetitiveScore(2f);
    +      assertThat(scorer.docID(), equalTo(doc));
    +      assertThat(scorer.iterator().docID(), equalTo(doc));
    +      assertThat(scorer.score(), equalTo(1f));
    +      
    +      // "bar foo" match
    +      doc = scorer.iterator().nextDoc();
    +      assertThat(doc, equalTo(3));
    +      assertThat(scorer.score(), equalTo(1f));
    +
    +      // "foo not bar" match
    +      doc = scorer.iterator().nextDoc();
    +      assertThat(doc, equalTo(4));
    +      assertThat(scorer.score(), equalTo(1f));
    +
    +      // "foo bar foo" match
    +      doc = scorer.iterator().nextDoc();
    +      assertThat(doc, equalTo(5));
    +      assertThat(scorer.score(), equalTo(1f));
    +      
    +      doc = scorer.iterator().nextDoc();
    +      assertThat(doc, equalTo(NO_MORE_DOCS));
    +    }
    +  }
    +
    +  public void testMatching_ScoreMode_TOP_SCORES() throws Exception {
    +    try (TestConstantScoreScorerIndex index = new 
TestConstantScoreScorerIndex()) {
    +      int doc;
    +      ConstantScoreScorer scorer = index.constantScoreScorer(TERM_QUERY, 
1f, ScoreMode.TOP_SCORES);
    +
    +      // "foo bar" match
    +      doc = scorer.iterator().nextDoc();
    +      assertThat(doc, equalTo(2));
    +      assertThat(scorer.score(), equalTo(1f));
    +
    +      scorer.setMinCompetitiveScore(2f);
    +      assertThat(scorer.docID(), equalTo(doc));
    +      assertThat(scorer.iterator().docID(), equalTo(doc));
    +      assertThat(scorer.score(), equalTo(1f));
    +
    +      doc = scorer.iterator().nextDoc();
    +      assertThat(doc, equalTo(NO_MORE_DOCS));
    +    }
    +  }
    +
    +  public void testTwoPhaseMatching_ScoreMode_COMPLETE() throws Exception {
    +    testTwoPhaseMatching(ScoreMode.COMPLETE);
    +  }
    +
    +  public void testTwoPhaseMatching_ScoreMode_COMPLETE_NO_SCORES() throws 
Exception {
    +    testTwoPhaseMatching(ScoreMode.COMPLETE_NO_SCORES);
    +  }
    +
    +  private void testTwoPhaseMatching(ScoreMode scoreMode) throws Exception {
    +    try (TestConstantScoreScorerIndex index = new 
TestConstantScoreScorerIndex()) {
    +      int doc;
    +      ConstantScoreScorer scorer = index.constantScoreScorer(PHRASE_QUERY, 
1f, scoreMode);
    +
    +      // "foo bar" match
    +      doc = scorer.iterator().nextDoc();
    +      assertThat(doc, equalTo(2));
    +      assertThat(scorer.score(), equalTo(1f));
    +
    +      // should not reset iterator
    +      scorer.setMinCompetitiveScore(2f);
    +      assertThat(scorer.docID(), equalTo(doc));
    +      assertThat(scorer.iterator().docID(), equalTo(doc));
    +      assertThat(scorer.score(), equalTo(1f));
    +      
    +      // "foo not bar" will match the approximation but not the two phase 
iterator
    +
    +      // "foo bar foo" match
    +      doc = scorer.iterator().nextDoc();
    +      assertThat(doc, equalTo(5));
    +      assertThat(scorer.score(), equalTo(1f));
    +
    +      doc = scorer.iterator().nextDoc();
    +      assertThat(doc, equalTo(NO_MORE_DOCS));
    +    }
    +  }
    +
    +  public void testTwoPhaseMatching_ScoreMode_TOP_SCORES() throws Exception 
{
    +    try (TestConstantScoreScorerIndex index = new 
TestConstantScoreScorerIndex()) {
    +      int doc;
    +      ConstantScoreScorer scorer = index.constantScoreScorer(PHRASE_QUERY, 
1f, ScoreMode.TOP_SCORES);
    +
    +      // "foo bar" match
    +      doc = scorer.iterator().nextDoc();
    +      assertThat(doc, equalTo(2));
    +      assertThat(scorer.score(), equalTo(1f));
    +
    +      scorer.setMinCompetitiveScore(2f);
    +      assertThat(scorer.docID(), equalTo(doc));
    +      assertThat(scorer.iterator().docID(), equalTo(doc));
    +      assertThat(scorer.score(), equalTo(1f));
    +
    +      doc = scorer.iterator().nextDoc();
    +      assertThat(doc, equalTo(NO_MORE_DOCS));
    +    }
    +  }
    +
    +  static class TestConstantScoreScorerIndex implements AutoCloseable {
    +    private final Directory directory;
    +    private final RandomIndexWriter writer;
    +    private final IndexReader reader;
    +
    +    TestConstantScoreScorerIndex() throws IOException {
    +      directory = newDirectory();
    +
    +      writer = new RandomIndexWriter(random(), directory,
    +          
newIndexWriterConfig().setMergePolicy(newLogMergePolicy(random().nextBoolean())));
    +
    +      for (String VALUE : VALUES) {
    +        Document doc = new Document();
    +        doc.add(newTextField(FIELD, VALUE, Field.Store.YES));
    +        writer.addDocument(doc);
    +      }
    +      writer.forceMerge(1);
    +
    +      reader = writer.getReader();
    +      writer.close();
    +    }
    +
    +    ConstantScoreScorer constantScoreScorer(Query query, float score, 
ScoreMode scoreMode) throws IOException {
    +      IndexSearcher searcher = newSearcher(reader);
    +      Weight weight = searcher.createWeight(new ConstantScoreQuery(query), 
scoreMode, 1);
    +      LeafReaderContext context = 
searcher.getIndexReader().leaves().get(0);
    --- End diff --
    
    Sure, fixed in c5a83179ebd4a2775e24bd6518ea445cc2cb700e, thanks :+1:


---

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org
For additional commands, e-mail: dev-h...@lucene.apache.org

Reply via email to