Return-Path: Delivered-To: apmail-lucene-java-commits-archive@www.apache.org Received: (qmail 14788 invoked from network); 18 Feb 2010 20:25:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Feb 2010 20:25:38 -0000 Received: (qmail 88126 invoked by uid 500); 18 Feb 2010 20:25:38 -0000 Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org Received: (qmail 88059 invoked by uid 500); 18 Feb 2010 20:25:38 -0000 Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: java-dev@lucene.apache.org Delivered-To: mailing list java-commits@lucene.apache.org Received: (qmail 88050 invoked by uid 99); 18 Feb 2010 20:25:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2010 20:25:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2010 20:25:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6783F23889B8; Thu, 18 Feb 2010 20:25:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r911552 - in /lucene/java/branches/lucene_2_9: CHANGES.txt src/java/org/apache/lucene/search/Query.java Date: Thu, 18 Feb 2010 20:25:17 -0000 To: java-commits@lucene.apache.org From: yonik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100218202517.6783F23889B8@eris.apache.org> Author: yonik Date: Thu Feb 18 20:25:17 2010 New Revision: 911552 URL: http://svn.apache.org/viewvc?rev=911552&view=rev Log: LUCENE-2770: fix query normalization when boosts of all clauses==0 Modified: lucene/java/branches/lucene_2_9/CHANGES.txt lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/Query.java Modified: lucene/java/branches/lucene_2_9/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/CHANGES.txt?rev=911552&r1=911551&r2=911552&view=diff ============================================================================== --- lucene/java/branches/lucene_2_9/CHANGES.txt (original) +++ lucene/java/branches/lucene_2_9/CHANGES.txt Thu Feb 18 20:25:17 2010 @@ -44,6 +44,10 @@ only one payload is present. (Erik Hatcher, Mike McCandless via Uwe Schindler) + * LUCENE-2770: Queries consisting of all zero-boost clauses + (for example, text:foo^0) sorted incorrectly and produced + invalid docids. (yonik) + API Changes * LUCENE-2190: Added setNextReader method to CustomScoreQuery, which Modified: lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/Query.java URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/Query.java?rev=911552&r1=911551&r2=911552&view=diff ============================================================================== --- lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/Query.java (original) +++ lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/Query.java Thu Feb 18 20:25:17 2010 @@ -99,6 +99,8 @@ Weight weight = query.createWeight(searcher); float sum = weight.sumOfSquaredWeights(); float norm = getSimilarity(searcher).queryNorm(sum); + if (Float.isInfinite(norm) || Float.isNaN(norm)) + norm = 1.0f; weight.normalize(norm); return weight; }