Return-Path: Delivered-To: apmail-lucene-java-commits-archive@www.apache.org Received: (qmail 50430 invoked from network); 26 Oct 2009 18:04:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Oct 2009 18:04:46 -0000 Received: (qmail 8561 invoked by uid 500); 26 Oct 2009 18:04:46 -0000 Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org Received: (qmail 8491 invoked by uid 500); 26 Oct 2009 18:04:46 -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 8482 invoked by uid 99); 26 Oct 2009 18:04:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Oct 2009 18:04:46 +0000 X-ASF-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL,BAYES_00 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; Mon, 26 Oct 2009 18:04:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 871EE238889D; Mon, 26 Oct 2009 18:04:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r829882 - in /lucene/java/trunk: ./ contrib/ src/java/org/apache/lucene/search/ src/test/org/apache/lucene/analysis/ src/test/org/apache/lucene/document/ src/test/org/apache/lucene/index/ Date: Mon, 26 Oct 2009 18:04:23 -0000 To: java-commits@lucene.apache.org From: mikemccand@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091026180423.871EE238889D@eris.apache.org> Author: mikemccand Date: Mon Oct 26 18:04:22 2009 New Revision: 829882 URL: http://svn.apache.org/viewvc?rev=829882&view=rev Log: LUCENE-1973: un-deprecate IndexSearcher.setDefaultFieldSortScoring Modified: lucene/java/trunk/ (props changed) lucene/java/trunk/CHANGES.txt lucene/java/trunk/contrib/ (props changed) lucene/java/trunk/src/java/org/apache/lucene/search/IndexSearcher.java lucene/java/trunk/src/java/org/apache/lucene/search/Searchable.java lucene/java/trunk/src/java/org/apache/lucene/search/Searcher.java lucene/java/trunk/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed) lucene/java/trunk/src/test/org/apache/lucene/document/TestDateTools.java (props changed) lucene/java/trunk/src/test/org/apache/lucene/document/TestNumberTools.java (props changed) lucene/java/trunk/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed) Propchange: lucene/java/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 26 18:04:22 2009 @@ -1,3 +1,3 @@ /lucene/java/branches/lucene_2_4:748824 -/lucene/java/branches/lucene_2_9:817269-818600,825998,829134 +/lucene/java/branches/lucene_2_9:817269-818600,825998,829134,829881 /lucene/java/branches/lucene_2_9_back_compat_tests:818601-821336 Modified: lucene/java/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/java/trunk/CHANGES.txt?rev=829882&r1=829881&r2=829882&view=diff ============================================================================== --- lucene/java/trunk/CHANGES.txt (original) +++ lucene/java/trunk/CHANGES.txt Mon Oct 26 18:04:22 2009 @@ -103,6 +103,10 @@ of 2.9) enablePositionIncrements to true to match StandardAnalyzer's 2.9 default (Uwe Schindler, Mike McCandless) +* LUCENE-1973: Un-deprecate IndexSearcher.setDefaultFieldSortScoring, + to allow controlling per-IndexSearcher whether scores are computed + when sorting by field. (Uwe Schindler, Mike McCandless) + Bug fixes * LUCENE-1951: When the text provided to WildcardQuery has no wildcard Propchange: lucene/java/trunk/contrib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 26 18:04:22 2009 @@ -1,3 +1,3 @@ /lucene/java/branches/lucene_2_4/contrib:748824 -/lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816 +/lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881 /lucene/java/branches/lucene_2_9_back_compat_tests/contrib:818601-821336 Modified: lucene/java/trunk/src/java/org/apache/lucene/search/IndexSearcher.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/IndexSearcher.java?rev=829882&r1=829881&r2=829882&view=diff ============================================================================== --- lucene/java/trunk/src/java/org/apache/lucene/search/IndexSearcher.java (original) +++ lucene/java/trunk/src/java/org/apache/lucene/search/IndexSearcher.java Mon Oct 26 18:04:22 2009 @@ -270,7 +270,18 @@ private boolean fieldSortDoTrackScores; private boolean fieldSortDoMaxScore; - /** @deprecated */ + /** By default, no scores are computed when sorting by + * field (using {@link #search(Query,Filter,int,Sort)}). + * You can change that, per IndexSearcher instance, by + * calling this method. Note that this will incur a CPU + * cost. + * + * @param doTrackScores If true, then scores are + * returned for every matching document in {@link + * TopFieldDocs}. + * + * @param doMaxScore If true, then the max score for all + * matching docs is computed. */ public void setDefaultFieldSortScoring(boolean doTrackScores, boolean doMaxScore) { fieldSortDoTrackScores = doTrackScores; fieldSortDoMaxScore = doMaxScore; Modified: lucene/java/trunk/src/java/org/apache/lucene/search/Searchable.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/Searchable.java?rev=829882&r1=829881&r2=829882&view=diff ============================================================================== --- lucene/java/trunk/src/java/org/apache/lucene/search/Searchable.java (original) +++ lucene/java/trunk/src/java/org/apache/lucene/search/Searchable.java Mon Oct 26 18:04:22 2009 @@ -155,7 +155,7 @@ * sort. * *

Applications should usually call {@link - * Searcher#search(Query,Filter,Sort)} instead. + * Searcher#search(Query,Filter,int,Sort)} instead. * * @throws BooleanQuery.TooManyClauses */ Modified: lucene/java/trunk/src/java/org/apache/lucene/search/Searcher.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/Searcher.java?rev=829882&r1=829881&r2=829882&view=diff ============================================================================== --- lucene/java/trunk/src/java/org/apache/lucene/search/Searcher.java (original) +++ lucene/java/trunk/src/java/org/apache/lucene/search/Searcher.java Mon Oct 26 18:04:22 2009 @@ -37,11 +37,9 @@ * filter if non-null, and sorting the hits by the criteria in * sort. * - *

NOTE: this does not compute scores by default. If - * you need scores, create a {@link TopFieldCollector} - * instance by calling {@link TopFieldCollector#create} - * and then pass that to {@link #search(Query, Filter, - * Collector)}.

+ *

NOTE: this does not compute scores by default; use + * {@link IndexSearcher#setDefaultFieldSortScoring} to + * enable scoring. * * @throws BooleanQuery.TooManyClauses */ Propchange: lucene/java/trunk/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 26 18:04:22 2009 @@ -1,2 +1,2 @@ /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824 -/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134 +/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881 Propchange: lucene/java/trunk/src/test/org/apache/lucene/document/TestDateTools.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 26 18:04:22 2009 @@ -1,2 +1,2 @@ /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824 -/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134 +/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134,829881 Propchange: lucene/java/trunk/src/test/org/apache/lucene/document/TestNumberTools.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 26 18:04:22 2009 @@ -1,2 +1,2 @@ /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824 -/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134 +/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134,829881 Propchange: lucene/java/trunk/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 26 18:04:22 2009 @@ -1,2 +1,2 @@ /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824 -/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134 +/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134,829881