Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

only delete our own files when re-creating an index (#34695) 

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@168213 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Daniel Naber 2005-05-04 23:34:52 +00:00
parent 77f94fb60c
commit 4b00637662
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.txt
View File

@ -32,6 +32,11 @@ Changes in runtime behavior
ranking across multiple indices not to be equivalent. ranking across multiple indices not to be equivalent.
(Chuck Williams, Wolf Siberski via Otis, bug #31841) (Chuck Williams, Wolf Siberski via Otis, bug #31841)
5. When opening an IndexWriter with create=true, Lucene now only deletes
its own files from the index directory (looking at the file name suffixes
to decide if a file belongs to Lucene). The old behavior was to delete
all files. (Daniel Naber, bug #34695)
New features New features
1. Added support for stored compressed fields (patch #31149) 1. Added support for stored compressed fields (patch #31149)

33
src/java/org/apache/lucene/store/FSDirectory.java
View File

@ -16,6 +16,7 @@ package org.apache.lucene.store;
* limitations under the License. * limitations under the License.
*/ */
import java.io.FilenameFilter;
import java.io.IOException; import java.io.IOException;
import java.io.File; import java.io.File;
import java.io.RandomAccessFile; import java.io.RandomAccessFile;
@ -36,6 +37,36 @@ import org.apache.lucene.util.Constants;
* @author Doug Cutting * @author Doug Cutting
*/ */
public class FSDirectory extends Directory { public class FSDirectory extends Directory {
/**
* Filter that only accepts filenames created by Lucene.
*/
private class LuceneFileFilter implements FilenameFilter {
/* (non-Javadoc)
* @see java.io.FilenameFilter#accept(java.io.File, java.lang.String)
*/
public boolean accept(File dir, String name) {
if (name.endsWith(".cfs")) return true;
else if (name.endsWith(".fnm")) return true;
else if (name.endsWith(".fdt")) return true;
else if (name.endsWith(".fdx")) return true;
else if (name.endsWith(".frq")) return true;
else if (name.endsWith(".prx")) return true;
else if (name.endsWith(".tii")) return true;
else if (name.endsWith(".tis")) return true;
else if (name.endsWith(".tvd")) return true;
else if (name.endsWith(".tvf")) return true;
else if (name.endsWith(".tvx")) return true;
else if (name.endsWith(".del")) return true;
else if (name.equals("deletable")) return true;
else if (name.equals("segments")) return true;
else if (name.matches(".+\\.f\\d+")) return true;
return false;
}
}
/** This cache of directories ensures that there is a unique Directory /** This cache of directories ensures that there is a unique Directory
* instance per path, so that synchronization on the Directory can be used to * instance per path, so that synchronization on the Directory can be used to
* synchronize access between readers and writers. * synchronize access between readers and writers.
@ -157,7 +188,7 @@ public class FSDirectory extends Directory {
if (!directory.mkdirs()) if (!directory.mkdirs())
throw new IOException("Cannot create directory: " + directory); throw new IOException("Cannot create directory: " + directory);
String[] files = directory.list(); // clear old files String[] files = directory.list(new LuceneFileFilter()); // clear old files
for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
File file = new File(directory, files[i]); File file = new File(directory, files[i]);
if (!file.delete()) if (!file.delete())