Merge remote-tracking branch 'origin/master'

Author: anidotnet

nitrite/src/main/java/org/dizitart/no2/tool/Recovery.java

@@ -66,9 +66,10 @@ public class Recovery {
      * newest good version.
      *
      * @param fileName the database file name
+     * @return `true` if repair successful; otherwise `false`
      */
-    public static void recover(String fileName) {
-        recover(fileName, new PrintWriter(System.out));
+    public static boolean recover(String fileName) {
+        return recover(fileName, new PrintWriter(System.out));
     }
 
     /**
@@ -77,27 +78,29 @@ public static void recover(String fileName) {
      *
      * @param fileName the database file name
      * @param writer   the log writer
+     * @return `true` if repair successful; otherwise `false`
      */
-    public static void recover(String fileName, PrintWriter writer) {
+    public static boolean recover(String fileName, PrintWriter writer) {
         notNull(fileName, errorMessage("fileName can not be null", VE_RECOVER_NULL_FILE_NAME));
         notEmpty(fileName, errorMessage("fileName can not be empty", VE_RECOVER_EMPTY_FILE_NAME));
         notNull(writer, errorMessage("writer can not be null", VE_RECOVER_NULL_WRITER));
-        repair(fileName, writer);
+        return repair(fileName, writer);
     }
 
     /**
      * Repair a store by rolling back to the newest good version.
      *
      * @param fileName the file name
      */
-    private static void repair(String fileName, PrintWriter pw) {
+    private static boolean repair(String fileName, PrintWriter pw) {
         long version = Long.MAX_VALUE;
         OutputStream ignore = new OutputStream() {
             @Override
-            public void write(int b) throws IOException {
+            public void write(int b) {
                 // ignore
             }
         };
+        boolean repaired = false;
         while (version >= 0) {
             pw.println(version == Long.MAX_VALUE ? "Trying latest version" : ("Trying version " + version));
             pw.flush();
@@ -108,6 +111,7 @@ public void write(int b) throws IOException {
                     FilePath.get(fileName).moveTo(FilePath.get(fileName + ".back"), true);
                     FilePath.get(fileName + ".temp").moveTo(FilePath.get(fileName), true);
                     pw.println("Success");
+                    repaired = true;
                     break;
                 }
                 pw.println("    ... failed: " + error);
@@ -118,6 +122,7 @@ public void write(int b) throws IOException {
             version--;
         }
         pw.flush();
+        return repaired;
     }
 
     /**
@@ -269,7 +274,7 @@ private static String info(String fileName, Writer writer) {
             MVMap<String, String> meta = store.getMetaMap();
             Map<String, Object> header = store.getStoreHeader();
             long fileCreated = DataUtils.readHexLong(header, "created", 0L);
-            TreeMap<Integer, Chunk> chunks = new TreeMap<Integer, Chunk>();
+            TreeMap<Integer, Chunk> chunks = new TreeMap<>();
             long chunkLength = 0;
             long maxLength = 0;
             long maxLengthLive = 0;

nitrite/src/test/java/org/dizitart/no2/tool/RecoveryNegativeTest.java

@@ -29,6 +29,7 @@
 
 import static org.dizitart.no2.DbTestOperations.getRandomTempDbFile;
 import static org.dizitart.no2.tool.Recovery.recover;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
 
 /**
@@ -45,7 +46,7 @@ public void testRecoverInvalid() throws IOException {
             raf.setLength(raf.length() + 100);
             raf.close();
 
-            recover(fileName);
+            assertFalse(recover(fileName));
         } else {
             fail("failed to create file");
         }

nitrite/src/test/java/org/dizitart/no2/tool/RecoveryTest.java

@@ -33,6 +33,7 @@
 import static org.dizitart.no2.DbTestOperations.getRandomTempDbFile;
 import static org.dizitart.no2.filters.Filters.ALL;
 import static org.dizitart.no2.tool.Recovery.recover;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Anindya Chatterjee.
@@ -41,7 +42,7 @@ public class RecoveryTest {
     private static final String fileName = getRandomTempDbFile();
 
     @Test
-    public void testRecovery() throws ParseException, IOException {
+    public void testRecovery() throws ParseException {
         Nitrite db;
         NitriteCollection collection;
         db = Nitrite.builder()
@@ -79,7 +80,7 @@ public void testRecovery() throws ParseException, IOException {
         db.commit();
         db.close();
 
-        recover(fileName);
+        assertTrue(recover(fileName));
     }
 
     @After