Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id ED620200C4C for ; Tue, 4 Apr 2017 17:32:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EBED6160BAA; Tue, 4 Apr 2017 15:32:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 35128160B81 for ; Tue, 4 Apr 2017 17:32:45 +0200 (CEST) Received: (qmail 77499 invoked by uid 500); 4 Apr 2017 15:32:43 -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 77181 invoked by uid 99); 4 Apr 2017 15:32:43 -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; Tue, 04 Apr 2017 15:32:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6B739E024D; Tue, 4 Apr 2017 15:32:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cpoerschke@apache.org To: commits@lucene.apache.org Date: Tue, 04 Apr 2017 15:32:48 -0000 Message-Id: <6ac96708dff84e7f85ae9bd581ef7ad5@git.apache.org> In-Reply-To: <0a3dcaa280024095b62e96429e13787c@git.apache.org> References: <0a3dcaa280024095b62e96429e13787c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/36] lucene-solr:jira/solr-6203: LUCENE-7761: Fixed comment in ReqExclScorer. archived-at: Tue, 04 Apr 2017 15:32:46 -0000 LUCENE-7761: Fixed comment in ReqExclScorer. Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/23c6ea27 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/23c6ea27 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/23c6ea27 Branch: refs/heads/jira/solr-6203 Commit: 23c6ea274ea3e288a916acc160c2ca6c63d3c4dd Parents: 0445f82 Author: Adrien Grand Authored: Fri Mar 31 16:11:19 2017 +0200 Committer: Adrien Grand Committed: Fri Mar 31 17:28:21 2017 +0200 ---------------------------------------------------------------------- lucene/CHANGES.txt | 3 +++ lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/23c6ea27/lucene/CHANGES.txt ---------------------------------------------------------------------- diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index da643ff..c8a8deb 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -93,6 +93,9 @@ Other * LUCENE-7743: Never call new String(String). (Daniel Jelinski via Adrien Grand) +* LUCENE-7761: Fixed comment in ReqExclScorer. + (Pablo Pita Leira via Adrien Grand) + ======================= Lucene 6.5.1 ======================= Bug Fixes http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/23c6ea27/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java ---------------------------------------------------------------------- diff --git a/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java b/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java index 5ce6f5e..50a321b 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java @@ -154,7 +154,7 @@ class ReqExclScorer extends Scorer { } }; } else { - // reqTwoPhaseIterator is MORE costly than exclTwoPhaseIterator, check it first + // reqTwoPhaseIterator is MORE costly than exclTwoPhaseIterator, check it last return new TwoPhaseIterator(reqApproximation) { @Override