From 60817cb719316ddb58bdd262ba8faf3e4a1e5c6a Mon Sep 17 00:00:00 2001
From: Doug Cutting <cutting@apache.org>
Date: Tue, 29 Jan 2002 16:30:16 +0000
Subject: [PATCH] Fixed to never delete added indexes.

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@149665 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/lucene/index/IndexWriter.java  | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/java/org/apache/lucene/index/IndexWriter.java b/src/java/org/apache/lucene/index/IndexWriter.java
index a3d986a3603..3b700a4326d 100644
--- a/src/java/org/apache/lucene/index/IndexWriter.java
+++ b/src/java/org/apache/lucene/index/IndexWriter.java
@@ -225,19 +225,11 @@ public final class IndexWriter {
   public final synchronized void addIndexes(Directory[] dirs)
       throws IOException {
     optimize();					  // start with zero or 1 seg
-    int minSegment = segmentInfos.size();
-    int segmentsAddedSinceMerge = 0;
     for (int i = 0; i < dirs.length; i++) {
       SegmentInfos sis = new SegmentInfos();	  // read infos from dir
       sis.read(dirs[i]);
       for (int j = 0; j < sis.size(); j++) {
 	segmentInfos.addElement(sis.info(j));	  // add each info
-
-	// merge whenever mergeFactor segments have been added
-	if (++segmentsAddedSinceMerge == mergeFactor) {
-	  mergeSegments(minSegment++, false);
-	  segmentsAddedSinceMerge = 0;
-	}
       }
     }
     optimize();					  // final cleanup
@@ -286,13 +278,7 @@ public final class IndexWriter {
 
   /** Pops segments off of segmentInfos stack down to minSegment, merges them,
     and pushes the merged index onto the top of the segmentInfos stack. */
-  private final void mergeSegments(int minSegment) throws IOException {
-    mergeSegments(minSegment, true);
-  }
-
-  /** Pops segments off of segmentInfos stack down to minSegment, merges them,
-    and pushes the merged index onto the top of the segmentInfos stack. */
-  private final void mergeSegments(int minSegment, boolean delete)
+  private final void mergeSegments(int minSegment)
       throws IOException {
     String mergedName = newSegmentName();
     int mergedDocCount = 0;
@@ -305,8 +291,9 @@ public final class IndexWriter {
 	infoStream.print(" " + si.name + " (" + si.docCount + " docs)");
       SegmentReader reader = new SegmentReader(si);
       merger.add(reader);
-      if (delete)
-	segmentsToDelete.addElement(reader);	  // queue for deletion
+      if ((reader.directory == this.directory) || // if we own the directory
+          (reader.directory == this.ramDirectory))
+	segmentsToDelete.addElement(reader);	  // queue segment for deletion
       mergedDocCount += si.docCount;
     }
     if (infoStream != null) {