Return-Path: Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: (qmail 6216 invoked from network); 24 Nov 2010 19:49:21 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 24 Nov 2010 19:49:21 -0000 Received: (qmail 87270 invoked by uid 500); 24 Nov 2010 19:49:53 -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 87263 invoked by uid 99); 24 Nov 2010 19:49:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Nov 2010 19:49:53 +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; Wed, 24 Nov 2010 19:49:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B66BE2388A3C; Wed, 24 Nov 2010 19:48:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1038785 - /lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java Date: Wed, 24 Nov 2010 19:48:18 -0000 To: commits@lucene.apache.org From: mikemccand@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101124194818.B66BE2388A3C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mikemccand Date: Wed Nov 24 19:48:18 2010 New Revision: 1038785 URL: http://svn.apache.org/viewvc?rev=1038785&view=rev Log: LUCENE-2773: don't de-optimize an optimize index that's already in CFS format Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java?rev=1038785&r1=1038784&r2=1038785&view=diff ============================================================================== --- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java (original) +++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java Wed Nov 24 19:48:18 2010 @@ -231,8 +231,7 @@ public abstract class LogMergePolicy ext return !hasDeletions && !info.hasSeparateNorms() && info.dir == w.getDirectory() && - (info.getUseCompoundFile() == useCompoundFile || - (noCFSRatio != 1.0 && !info.getUseCompoundFile())); + (info.getUseCompoundFile() == useCompoundFile || noCFSRatio < 1.0); } /**