Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ public synchronized void serialize() throws IOException {
}
File src = fsFactory.getFile(file + RESOURCE_SUFFIX + TEMP_SUFFIX);
File dest = fsFactory.getFile(file + RESOURCE_SUFFIX);
Files.deleteIfExists(dest.toPath());
fsFactory.deleteIfExists(dest);
fsFactory.moveFile(src, dest);
}

Expand Down Expand Up @@ -459,22 +459,21 @@ public void removeModFile() throws IOException {
/** Remove the data file, its resource file, and its modification file physically. */
public void remove() {
try {
Files.deleteIfExists(file.toPath());
fsFactory.deleteIfExists(file);
} catch (IOException e) {
logger.error("TsFile {} cannot be deleted: {}", file, e.getMessage());
}
removeResourceFile();
try {
Files.deleteIfExists(
fsFactory.getFile(file.getPath() + ModificationFile.FILE_SUFFIX).toPath());
fsFactory.deleteIfExists(fsFactory.getFile(file.getPath() + ModificationFile.FILE_SUFFIX));
} catch (IOException e) {
logger.error("ModificationFile {} cannot be deleted: {}", file, e.getMessage());
}
}

public void removeResourceFile() {
try {
Files.deleteIfExists(fsFactory.getFile(file.getPath() + RESOURCE_SUFFIX).toPath());
fsFactory.deleteIfExists(fsFactory.getFile(file.getPath() + RESOURCE_SUFFIX));
} catch (IOException e) {
logger.error("TsFileResource {} cannot be deleted: {}", file, e.getMessage());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.IOException;
import java.net.URI;

public interface FSFactory {
Expand Down Expand Up @@ -128,4 +129,11 @@ public interface FSFactory {
* @return list of files
*/
File[] listFilesByPrefix(String fileFolder, String prefix);

/**
* delete the file if it exists
*
* @param file local file or HDFS file
*/
boolean deleteIfExists(File file) throws IOException;
}
Original file line number Diff line number Diff line change
Expand Up @@ -229,4 +229,9 @@ public File[] listFilesByPrefix(String fileFolder, String prefix) {
return null;
}
}

@Override
public boolean deleteIfExists(File file) {
return file.delete();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import java.io.FileWriter;
import java.io.IOException;
import java.net.URI;
import java.nio.file.Files;

public class LocalFSFactory implements FSFactory {

Expand Down Expand Up @@ -131,4 +132,9 @@ public File[] listFilesBySuffix(String fileFolder, String suffix) {
public File[] listFilesByPrefix(String fileFolder, String prefix) {
return new File(fileFolder).listFiles(file -> file.getName().startsWith(prefix));
}

@Override
public boolean deleteIfExists(File file) throws IOException {
return Files.deleteIfExists(file.toPath());
}
}