Revert 235595 "Revert 235492 "[sql] Recover Favicons v5 database..."

trunk/src/sql/recovery.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SQL_RECOVERY_H_
 #define SQL_RECOVERY_H_
 
 #include "base/basictypes.h"
 
 #include "sql/connection.h"
@@ skipping 75 matching lines @@
   // database states are not well-understood without further
   // diagnostics.  Abandon recovery but do not raze the original
   // database.
   // NOTE(shess): Only call this when adding recovery support.  In the
   // steady state, all databases should progress to recovered or razed.
   static void Rollback(scoped_ptr<Recovery> r);
 
   // Handle to the temporary recovery database.
   sql::Connection* db() { return &recover_db_; }
 
+  // Attempt to recover the named table from the corrupt database into
+  // the recovery database using a temporary recover virtual table.
+  // The virtual table schema is derived from the named table's schema
+  // in database [main].  Data is copied using INSERT OR REPLACE, so
+  // duplicates overwrite each other.
+  //
+  // |extend_columns| allows recovering tables which have excess
+  // columns relative to the target schema.  The recover virtual table
+  // treats more data than specified as a sign of corruption.
+  //
+  // Returns true if all operations succeeded, with the number of rows
+  // recovered in |*rows_recovered|.
+  //
+  // NOTE(shess): Due to a flaw in the recovery virtual table, at this
+  // time this code injects the DEFAULT value of the target table in
+  // locations where the recovery table returns NULL.  This is not
+  // entirely correct, because it happens both when there is a short
+  // row (correct) but also where there is an actual NULL value
+  // (incorrect).
+  //
+  // TODO(shess): Flag for INSERT OR REPLACE vs IGNORE.
+  // TODO(shess): Handle extended table names.
+  bool AutoRecoverTable(const char* table_name,
+                        size_t extend_columns,
+                        size_t* rows_recovered);
+
+  // Setup a recover virtual table at temp.recover_meta, reading from
+  // corrupt.meta.  Returns true if created.
+  // TODO(shess): Perhaps integrate into Begin().
+  // TODO(shess): Add helpers to fetch additional items from the meta
+  // table as needed.
+  bool SetupMeta();
+
+  // Fetch the version number from temp.recover_meta.  Returns false
+  // if the query fails, or if there is no version row.  Otherwise
+  // returns true, with the version in |*version_number|.
+  //
+  // Only valid to call after successful SetupMeta().
+  bool GetMetaVersionNumber(int* version_number);
+
  private:
   explicit Recovery(Connection* connection);
 
   // Setup the recovery database handle for Begin().  Returns false in
   // case anything failed.
   bool Init(const base::FilePath& db_path) WARN_UNUSED_RESULT;
 
   // Copy the recovered database over the original database.
   bool Backup() WARN_UNUSED_RESULT;
 
   // Close the recovery database, and poison the original handle.
   // |raze| controls whether the original database is razed or just
   // poisoned.
   enum Disposition {
     RAZE_AND_POISON,
     POISON,
   };
   void Shutdown(Disposition raze);
 
   Connection* db_;         // Original database connection.
   Connection recover_db_;  // Recovery connection.
 
   DISALLOW_COPY_AND_ASSIGN(Recovery);
 };
 
 }  // namespace sql
 
 #endif  // SQL_RECOVERY_H_