Ticket #109: quartz-recovery.patch

backends/quartz/btree.cc

@@ -1775 +1775 @@
 
 /************ B-tree reading ************/
 
-void
+bool
 Btree::do_open_to_read(bool revision_supplied, quartz_revision_number_t revision_)
 {
     if (!basic_open(revision_supplied, revision_)) {
+        if (revision_supplied) {
+            // The requested revision was not available.
+            // This could be because the database was modified underneath us, or
+            // because a base file is missing.  Return false, and work out what
+            // the problem was at a higher level.
+            return false;
+        }
         throw Xapian::DatabaseOpeningError("Failed to open table for reading");
     }
 
@@ -1801 +1808 @@
     }
 
     read_root();
+    return true;
 }
 
 void
@@ -1811 +1819 @@
     close();
 
     if (!writable) {
-        do_open_to_read(false, 0);
+        // Any errors are thrown if revision_supplied is false
+        (void)do_open_to_read(false, 0);
         return;
     }
 
@@ -1827 +1836 @@
     close();
 
     if (!writable) {
-        do_open_to_read(true, revision);
-        AssertEq(revision_number, revision);
-        RETURN(true);
+        if (do_open_to_read(true, revision)) {
+            AssertEq(revision_number, revision);
+            RETURN(true);
+        } else {
+            close();
+            RETURN(false);
+        }
     }
 
     if (!do_open_to_write(true, revision)) {

backends/quartz/btree.h

@@ -553 +553 @@
     protected:
 
         /** Perform the opening operation to read.
+         *
+         *  Return true iff the open succeeded.
          */
-        void do_open_to_read(bool revision_supplied, quartz_revision_number_t revision_);
+        bool do_open_to_read(bool revision_supplied, quartz_revision_number_t revision_);
 
         /** Perform the opening operation to read.
          *

backends/quartz/quartz_database.cc

@@ -285 +285 @@
                 log.make_entry("Cannot open all tables at revision in record table: " + om_tostring(revision));
                 throw Xapian::DatabaseCorruptError("Cannot open tables at consistent revisions");
             }
+            revision = newrevision;
         }
     }
 
     if (!fully_opened) {
         log.make_entry("Cannot open all tables in a consistent state - keep changing too fast, giving up after " + om_tostring(tries) + " attempts");
-        throw Xapian::DatabaseOpeningError("Cannot open tables at stable revision - changing too fast");
+        throw Xapian::DatabaseModifiedError("Cannot open tables at stable revision - changing too fast");
     }
 
     log.make_entry("Opened tables at revision " + om_tostring(revision));