提交 69dc9db5 authored 作者: Thomas Mueller's avatar Thomas Mueller

Use constants for file suffixes.

上级 83697c14
...@@ -441,6 +441,17 @@ public class Constants { ...@@ -441,6 +441,17 @@ public class Constants {
*/ */
public static final String SUFFIX_MV_FILE = ".mv.db"; public static final String SUFFIX_MV_FILE = ".mv.db";
/**
* The file name suffix of a new MVStore file, used when compacting a store.
*/
public static final String SUFFIX_MV_STORE_NEW_FILE = ".newFile";
/**
* The file name suffix of a temporary MVStore file, used when compacting a
* store.
*/
public static final String SUFFIX_MV_STORE_TEMP_FILE = ".tempFile";
/** /**
* The file name suffix of temporary files. * The file name suffix of temporary files.
*/ */
......
...@@ -15,6 +15,7 @@ import java.util.Map; ...@@ -15,6 +15,7 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.TreeMap; import java.util.TreeMap;
import org.h2.engine.Constants;
import org.h2.message.DbException; import org.h2.message.DbException;
import org.h2.mvstore.type.DataType; import org.h2.mvstore.type.DataType;
import org.h2.mvstore.type.StringDataType; import org.h2.mvstore.type.StringDataType;
...@@ -321,13 +322,13 @@ public class MVStoreTool { ...@@ -321,13 +322,13 @@ public class MVStoreTool {
* @param compress whether to compress the data * @param compress whether to compress the data
*/ */
public static void compact(String fileName, boolean compress) { public static void compact(String fileName, boolean compress) {
String tempName = fileName + ".tempFile"; String tempName = fileName + Constants.SUFFIX_MV_STORE_TEMP_FILE;
FileUtils.delete(tempName); FileUtils.delete(tempName);
compact(fileName, tempName, compress); compact(fileName, tempName, compress);
try { try {
FileUtils.moveAtomicReplace(tempName, fileName); FileUtils.moveAtomicReplace(tempName, fileName);
} catch (DbException e) { } catch (DbException e) {
String newName = fileName + ".newFile"; String newName = fileName + Constants.SUFFIX_MV_STORE_NEW_FILE;
FileUtils.delete(newName); FileUtils.delete(newName);
FileUtils.move(tempName, newName); FileUtils.move(tempName, newName);
FileUtils.delete(fileName); FileUtils.delete(fileName);
...@@ -344,11 +345,11 @@ public class MVStoreTool { ...@@ -344,11 +345,11 @@ public class MVStoreTool {
* @param fileName the file name * @param fileName the file name
*/ */
public static void compactCleanUp(String fileName) { public static void compactCleanUp(String fileName) {
String tempName = fileName + ".tempFile"; String tempName = fileName + Constants.SUFFIX_MV_STORE_TEMP_FILE;
if (FileUtils.exists(tempName)) { if (FileUtils.exists(tempName)) {
FileUtils.delete(tempName); FileUtils.delete(tempName);
} }
String newName = fileName + ".newFile"; String newName = fileName + Constants.SUFFIX_MV_STORE_NEW_FILE;
if (FileUtils.exists(newName)) { if (FileUtils.exists(newName)) {
if (FileUtils.exists(fileName)) { if (FileUtils.exists(fileName)) {
FileUtils.delete(newName); FileUtils.delete(newName);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论