Return-Path: Delivered-To: apmail-lucene-java-commits-archive@www.apache.org Received: (qmail 35392 invoked from network); 20 Feb 2009 19:37:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Feb 2009 19:37:48 -0000 Received: (qmail 29720 invoked by uid 500); 20 Feb 2009 19:37:48 -0000 Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org Received: (qmail 29615 invoked by uid 500); 20 Feb 2009 19:37:47 -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 29606 invoked by uid 99); 20 Feb 2009 19:37:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Feb 2009 11:37:47 -0800 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; Fri, 20 Feb 2009 19:37:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7A7BA238896B; Fri, 20 Feb 2009 19:37:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r746343 - in /lucene/java/trunk/src/java/org/apache/lucene/index: MultiSegmentReader.java SegmentReader.java Date: Fri, 20 Feb 2009 19:37:26 -0000 To: java-commits@lucene.apache.org From: mikemccand@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090220193726.7A7BA238896B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mikemccand Date: Fri Feb 20 19:37:25 2009 New Revision: 746343 URL: http://svn.apache.org/viewvc?rev=746343&view=rev Log: LUCENE-1314: add asserts during *Reader.clone() that the incoming SegmentInfo/s matches the current reader Modified: lucene/java/trunk/src/java/org/apache/lucene/index/MultiSegmentReader.java lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java Modified: lucene/java/trunk/src/java/org/apache/lucene/index/MultiSegmentReader.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/MultiSegmentReader.java?rev=746343&r1=746342&r2=746343&view=diff ============================================================================== --- lucene/java/trunk/src/java/org/apache/lucene/index/MultiSegmentReader.java (original) +++ lucene/java/trunk/src/java/org/apache/lucene/index/MultiSegmentReader.java Fri Feb 20 19:37:25 2009 @@ -106,6 +106,10 @@ try { SegmentReader newReader; if (newReaders[i] == null || infos.info(i).getUseCompoundFile() != newReaders[i].getSegmentInfo().getUseCompoundFile()) { + + // We should never see a totally new segment during cloning + assert !doClone; + // this is a new reader; in case we hit an exception we can close it safely newReader = SegmentReader.get(readOnly, infos.info(i)); } else { Modified: lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java?rev=746343&r1=746342&r2=746343&view=diff ============================================================================== --- lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java (original) +++ lucene/java/trunk/src/java/org/apache/lucene/index/SegmentReader.java Fri Feb 20 19:37:25 2009 @@ -671,6 +671,10 @@ return this; } + // When cloning, the incoming SegmentInfos should not + // have any changes in it: + assert !doClone || (normsUpToDate && deletionsUpToDate); + // clone reader SegmentReader clone; try {