From commits-return-100723-archive-asf-public=cust-asf.ponee.io@lucene.apache.org Wed May 2 17:42:48 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 8ACD818065D for ; Wed, 2 May 2018 17:42:47 +0200 (CEST) Received: (qmail 80683 invoked by uid 500); 2 May 2018 15:42:46 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 80674 invoked by uid 99); 2 May 2018 15:42:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2018 15:42:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 74985E08A1; Wed, 2 May 2018 15:42:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jpountz@apache.org To: commits@lucene.apache.org Message-Id: <2f01e053f6cd4948b64b45e701b3b98f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: lucene-solr:master: LUCENE-8142: Fix QueryUtils to only call getMaxScore when it is legal to do so. Date: Wed, 2 May 2018 15:42:46 +0000 (UTC) Repository: lucene-solr Updated Branches: refs/heads/master 82e7cb232 -> 67c13bbe2 LUCENE-8142: Fix QueryUtils to only call getMaxScore when it is legal to do so. Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/67c13bbe Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/67c13bbe Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/67c13bbe Branch: refs/heads/master Commit: 67c13bbe2ebdab23c8ff316f8f0805529146a63d Parents: 82e7cb2 Author: Adrien Grand Authored: Wed May 2 17:41:26 2018 +0200 Committer: Adrien Grand Committed: Wed May 2 17:42:18 2018 +0200 ---------------------------------------------------------------------- .../src/java/org/apache/lucene/search/AssertingScorer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/67c13bbe/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java ---------------------------------------------------------------------- diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java index 952687f..a8c32cf 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java @@ -99,7 +99,7 @@ public class AssertingScorer extends Scorer { assert iterating() : state; final float score = in.score(); assert !Float.isNaN(score) : "NaN score for in="+in; - assert score <= getMaxScore(DocIdSetIterator.NO_MORE_DOCS); + assert lastShallowTarget == -1 || score <= getMaxScore(docID()); assert Float.compare(score, 0f) >= 0 : score; return score; }