You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mv...@apache.org on 2016/07/15 14:38:13 UTC
[1/2] lucene-solr:master: LUCENE-7383: fix test,
only use BoostQuery once
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x bb7742ebc -> 7b5365678
refs/heads/master f9c947064 -> 2e0b2f5e3
LUCENE-7383: fix test, only use BoostQuery once
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2e0b2f5e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2e0b2f5e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2e0b2f5e
Branch: refs/heads/master
Commit: 2e0b2f5e37cb65103248467c02388d4e3f86dc91
Parents: f9c9470
Author: Martijn van Groningen <ma...@gmail.com>
Authored: Fri Jul 15 16:32:04 2016 +0200
Committer: Martijn van Groningen <mv...@apache.org>
Committed: Fri Jul 15 16:32:04 2016 +0200
----------------------------------------------------------------------
.../org/apache/lucene/search/vectorhighlight/FieldQueryTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e0b2f5e/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
----------------------------------------------------------------------
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
index 1976327..6b1e49d 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
@@ -959,10 +959,9 @@ public class FieldQueryTest extends AbstractTestCase {
initBoost();
Query childQuery = tq(boost, "a");
Query query = new ToParentBlockJoinQuery(childQuery, new QueryBitSetProducer(new MatchAllDocsQuery()), ScoreMode.None);
- query = new BoostQuery(query, boost );
FieldQuery fq = new FieldQuery(query, true, true );
Set<Query> flatQueries = new HashSet<>();
- fq.flatten(query, reader, flatQueries, 1f );
+ fq.flatten(query, reader, flatQueries, 1f);
assertCollectionQueries(flatQueries, tq(boost, "a"));
}
[2/2] lucene-solr:branch_6x: LUCENE-7383: fix test,
only use BoostQuery once
Posted by mv...@apache.org.
LUCENE-7383: fix test, only use BoostQuery once
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7b536567
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7b536567
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7b536567
Branch: refs/heads/branch_6x
Commit: 7b5365678684359d5fb0b76696767b030209ae09
Parents: bb7742e
Author: Martijn van Groningen <ma...@gmail.com>
Authored: Fri Jul 15 16:32:04 2016 +0200
Committer: Martijn van Groningen <mv...@apache.org>
Committed: Fri Jul 15 16:32:30 2016 +0200
----------------------------------------------------------------------
.../org/apache/lucene/search/vectorhighlight/FieldQueryTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7b536567/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
----------------------------------------------------------------------
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
index 1976327..6b1e49d 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
@@ -959,10 +959,9 @@ public class FieldQueryTest extends AbstractTestCase {
initBoost();
Query childQuery = tq(boost, "a");
Query query = new ToParentBlockJoinQuery(childQuery, new QueryBitSetProducer(new MatchAllDocsQuery()), ScoreMode.None);
- query = new BoostQuery(query, boost );
FieldQuery fq = new FieldQuery(query, true, true );
Set<Query> flatQueries = new HashSet<>();
- fq.flatten(query, reader, flatQueries, 1f );
+ fq.flatten(query, reader, flatQueries, 1f);
assertCollectionQueries(flatQueries, tq(boost, "a"));
}