Return-Path: Delivered-To: apmail-jakarta-lucene-dev-archive@www.apache.org Received: (qmail 12146 invoked from network); 13 Oct 2003 14:27:43 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 13 Oct 2003 14:27:43 -0000 Received: (qmail 88375 invoked by uid 500); 13 Oct 2003 14:27:25 -0000 Delivered-To: apmail-jakarta-lucene-dev-archive@jakarta.apache.org Received: (qmail 88341 invoked by uid 500); 13 Oct 2003 14:27:25 -0000 Mailing-List: contact lucene-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Lucene Developers List" Reply-To: "Lucene Developers List" Delivered-To: mailing list lucene-dev@jakarta.apache.org Received: (qmail 88321 invoked by uid 500); 13 Oct 2003 14:27:24 -0000 Received: (qmail 88270 invoked from network); 13 Oct 2003 14:27:24 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 13 Oct 2003 14:27:24 -0000 Received: (qmail 12017 invoked by uid 1371); 13 Oct 2003 14:27:28 -0000 Date: 13 Oct 2003 14:27:28 -0000 Message-ID: <20031013142728.12016.qmail@minotaur.apache.org> From: otis@apache.org To: jakarta-lucene-cvs@apache.org Subject: cvs commit: jakarta-lucene/src/java/org/apache/lucene/index SegmentMerger.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N otis 2003/10/13 07:27:28 Modified: src/java/org/apache/lucene/index SegmentMerger.java Log: - Made String COMPOUND_EXTENSIONS[] static and moved the definition higher in the code. - Cleaned up a bit. Revision Changes Path 1.4 +11 -15 jakarta-lucene/src/java/org/apache/lucene/index/SegmentMerger.java Index: SegmentMerger.java =================================================================== RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/index/SegmentMerger.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SegmentMerger.java 25 Sep 2003 22:01:51 -0000 1.3 +++ SegmentMerger.java 13 Oct 2003 14:27:28 -0000 1.4 @@ -71,6 +71,11 @@ private Vector readers = new Vector(); private FieldInfos fieldInfos; + + // File extensions of old-style index files + private static final String COMPOUND_EXTENSIONS[] = new String[] { + "fnm", "frq", "prx", "fdx", "fdt", "tii", "tis" + }; SegmentMerger(Directory dir, String name, boolean compoundFile) { directory = dir; @@ -103,17 +108,9 @@ createCompoundFile(); } - - // Add the fixed files - private final String COMPOUND_EXTENSIONS[] = new String[] { - "fnm", "frq", "prx", "fdx", "fdt", "tii", "tis" - }; - - private final void createCompoundFile() - throws IOException - { - CompoundFileWriter oneWriter = + throws IOException { + CompoundFileWriter cfsWriter = new CompoundFileWriter(directory, segment + ".cfs"); ArrayList files = @@ -135,17 +132,16 @@ // Now merge all added files Iterator it = files.iterator(); while(it.hasNext()) { - oneWriter.addFile((String) it.next()); + cfsWriter.addFile((String) it.next()); } // Perform the merge - oneWriter.close(); - - + cfsWriter.close(); + // Now delete the source files it = files.iterator(); while(it.hasNext()) { - directory.deleteFile((String) it.next()); + directory.deleteFile((String) it.next()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: lucene-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: lucene-dev-help@jakarta.apache.org