Create a class to represent a DOM Storage Database.

webkit/dom_storage/dom_storage_database.cc

Index: webkit/dom_storage/dom_storage_database.cc
diff --git a/webkit/dom_storage/dom_storage_database.cc b/webkit/dom_storage/dom_storage_database.cc
new file mode 100644
index 0000000000000000000000000000000000000000..742ff15805cea73d1aa095b5663fb6561eb4abc1
--- /dev/null
+++ b/webkit/dom_storage/dom_storage_database.cc
@@ -0,0 +1,227 @@
+// Copyright (c) 2012 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.
+
+#include "webkit/dom_storage/dom_storage_database.h"
+
+#include "base/file_util.h"
+#include "base/logging.h"
+#include "sql/diagnostic_error_delegate.h"
+#include "sql/statement.h"
+#include "sql/transaction.h"
+#include "third_party/sqlite/sqlite3.h"
+
+namespace {
+
+class HistogramUniquifier {
+ public:
+  static const char* name() { return "Sqlite.DomStorageDatabase.Error"; }
+};
+
+sql::ErrorDelegate* GetErrorHandlerForDomStorageDatabase() {
+  return new sql::DiagnosticErrorDelegate<HistogramUniquifier>();
+}
+
+}  // anon namespace
+
+namespace dom_storage {
+
+DomStorageDatabase::DomStorageDatabase(const FilePath& file_path)
+    : file_path_(file_path),
+      db_(NULL) {
+  DCHECK(!file_path_.empty());
+}
+
+DomStorageDatabase::~DomStorageDatabase() {
+}
+
+void DomStorageDatabase::ReadAllValues(
+    DomStorageDatabase::ValuesMap* result) {
+  if (!LazyOpen(false))
+    return;
+
+  sql::Statement statement(db_->GetCachedStatement(SQL_FROM_HERE,
+                                                   "SELECT * from ItemTable"));
+  DCHECK(statement.is_valid());
+
+  while (statement.Step()) {
+    string16 key = statement.ColumnString16(0);
+    string16 value;
+    statement.ColumnBlobAsString16(1, &value);
+    (*result)[key] = NullableString16(value, false);
+  }
+}
+
+bool DomStorageDatabase::CommitChanges(bool clear_all_first,
+                                       const ValuesMap& changes) {
+  if (!LazyOpen(!changes.empty()))
+    return false;
+
+  sql::Transaction transaction(db_.get());
+  if (!transaction.Begin())
+    return false;
+
+  if (clear_all_first) {
+    if (!db_->Execute("DELETE FROM ItemTable"))
+      return false;
+  }
+
+  ValuesMap::const_iterator it = changes.begin();
+  for(; it != changes.end(); ++it) {
+    sql::Statement statement;
+    string16 key = it->first;
+    NullableString16 value = it->second;
+    if (value.is_null()) {
+      statement.Assign(db_->GetCachedStatement(SQL_FROM_HERE,
+         "DELETE FROM ItemTable WHERE key=?"));
+      statement.BindString16(0, key);
+    } else {
+      statement.Assign(db_->GetCachedStatement(SQL_FROM_HERE,
+          "INSERT INTO ItemTable VALUES (?,?)"));
+      statement.BindString16(0, key);
+      statement.BindBlob(1, value.string().data(),
+                         value.string().length() * sizeof(char16));
+    }
+    DCHECK(statement.is_valid());
+    statement.Run();
+  }
+  return transaction.Commit();
+}
+
+bool DomStorageDatabase::LazyOpen(bool create_if_needed) {
+  if (IsOpen())
+    return true;
+
+  bool database_exists = file_util::PathExists(file_path_);
+
+  if (!database_exists && !create_if_needed) {
+    // If the file doesn't exist already and we haven't been asked to create
+    // a file on disk, then we don't bother opening the database. This means
+    // we wait until we absolutely need to put something onto disk before we
+    // do so.
+    return false;
+  }
+
+  db_.reset(new sql::Connection());
+  db_->set_error_delegate(GetErrorHandlerForDomStorageDatabase());
+  if (!db_->Open(file_path_)) {
+    // TODO(benm): We should handle the error condition better. At the very
+    // least we should set a flag so that we don't try to repeatedly open
+    // the database each time LazyOpen is called. We may want to try and
+    // delete the file and start from scratch.
+    LOG(ERROR) << "Unable to open DOM storage database at "
+               << file_path_.value()
+               << " error: " << db_->GetErrorMessage();
+    return false;
+  }
+
+  // Open() may succeed even if the file we try and open is not a database so
+  // we check here that what we've got is something sensible.
+  // TODO(benm): It might be useful to actually verify the output of the
+  // quick_check too and try to recover in the case errors are detected.
+  // However, in the case that the database is corrupted to the point that
+  // SQLite doesn't actually think it's a database,
+  // sql::Connection::GetCachedStatement will DCHECK.
+  if (db_->ExecuteAndReturnErrorCode("PRAGMA quick_check(1)") != SQLITE_OK) {

[michaeln, 2012/02/04 00:21:34]

oh... this is probably a good idea, but i wonder how many existing localstorage
db files would actually fail this test and become suddenly unusable. w/o knowing
that, i'm kind of wary of acting heavy handed based on the results of this
check. it could be a significant change in behavior.

might be good to gather UMA stats on the quick_check(1)?

maybe we can use a variant of VerifySchema() in this open sequence to help
determine what needs to happen in here, and that method could also be used in
the unittests to verify things...

enum SchemaVersion {
  INVALID,
  V1,
  V2
}
SchemaVersion GetSchemaVersion();


if (!db_.open()) {
  // oh no!!!!
  return database_exists ? DeleteAndRecreate() : false;
}

if (!database_exists) {
  // brand new file, blaze away and create the schema
  return CreateSchema();
}

version = GetSchemaVersion();
if (version == V2) {
  return true;  // whoohoo!
}
if (version == V1) {
  // give the upgrade path a whirl
  return Upgrade() || DeleteAndRecreate();
}
if (version == INVALID)  {
  // deal with a botched existing file
  return DeleteAndRecreate();
}

[benm (inactive), 2012/02/06 14:02:36]

As it stands at the moment, we're executing the quick check to only verify the
database connection can execute a query - it doesn't really need to be
quick_check, but I needed something that will fail fast when we haven't actually
opened a database, but not be too slow in the common "good file" case. We will
continue regardless of the returned results of the query (it returns a table
where each row is a detected error or a single row "ok") as long as it could be
executed. It would be nice to try and recover from those errors, but that's a
lot more work because there isn't an API on sql::Connection to get a statement
you can step that doesn't DCHECK with an invalid database connection (maybe it'd
be good to add one, but I think that's best done as a separate patch). Perhaps
it'd be a good idea to change Connection::Open to fail if the file opened is not
a database. But that's a bit scary and would need thorough testing.
That's quite a nice plan, but the tricky part is detecting that you've got an
INVALID version with the current sql API, as if you try and run queries then the
code will DCHECK. I'll have a think about this today.

+    // TODO(benm): What to do in this case? Delete the file and try again?
+    Close();
+    return false;
+  }
+
+  // sql::Connection uses UTF-8 encoding, but WebCore style databases use
+  // UTF-16, so ensure we match.
+  ignore_result(db_->Execute("PRAGMA encoding=\"UTF-16\""));

[michaeln, 2012/02/04 00:21:34]

does this pragma need to be applied prior to the previous one to get it to
stick?

[benm (inactive), 2012/02/06 14:02:36]

Mm, good question. The SQLite docs aren't very clear on this. I tried some
experiments locally, and it seems that the encoding pragma sticks as long as you
don't execute a mutating statement like a CREATE, so I think it's OK. Sadly this
pragma doesn't fail on an invalid database connection, so it can't be used in
place of the quick_check above.

+
+  // If the table doesn't exist, try to create it at the current version.
+  if (!db_->DoesTableExist("ItemTable")) {
+    if (CreateTable())
+      return true;
+    // Couldn't create the table.
+    // TODO(benm): Handle this better. Delete the file on disk and try again?
+    Close();
+    return false;
+  }
+
+  // Table exists, so ensure we're at the right version, upgrading if
+  // necessary.
+  if (UpgradeVersion1To2IfNeeded())
+    return true;
+
+  // Upgrade failed, drop table and start fresh.
+  sql::Transaction recreation(db_.get());
+  if (recreation.Begin()) {
+    if (db_->Execute("DROP TABLE ItemTable")) {
+      if (CreateTable()) {
+        if (recreation.Commit())
+          return true;
+      }
+    }
+  }
+
+  // We were not able to verify that the database is at the correct version
+  // so close the connection.
+  // TODO(benm): Handle this better. Delete the file on disk and try again?
+  Close();
+  return false;
+}
+
+bool DomStorageDatabase::CreateTable() {
+  DCHECK(IsOpen());
+  // Current version is 2.
+  return CreateTableV2();
+}
+
+bool DomStorageDatabase::CreateTableV2() {
+  DCHECK(IsOpen());
+
+  return db_->Execute(
+      "CREATE TABLE IF NOT EXISTS ItemTable ("
+      "key TEXT UNIQUE ON CONFLICT REPLACE, "
+      "value BLOB NOT NULL ON CONFLICT FAIL)");
+}
+
+bool DomStorageDatabase::UpgradeVersion1To2IfNeeded() {
+  DCHECK(IsOpen());
+  sql::Statement statement(db_->GetCachedStatement(SQL_FROM_HERE,
+      "SELECT * FROM ItemTable"));
+  DCHECK(statement.is_valid());
+
+  // Quick check to see if we need to upgrade or not. The single
+  // effect of V1 -> V2 is to change the value column from type
+  // TEXT to type BLOB.
+  sql::ColType value_column_type = statement.DeclaredColumnType(1);
+  if (value_column_type == sql::COLUMN_TYPE_BLOB)
+    return true;
+
+  if (value_column_type != sql::COLUMN_TYPE_TEXT) {
+    // Something is messed up. This is not a V1 database.
+    return false;
+  }
+
+  // Need to migrate from TEXT value column to BLOB.
+  // Store the current database content so we can re-insert
+  // the data into the new V2 table.
+  ValuesMap values;
+  while (statement.Step()) {
+    string16 key = statement.ColumnString16(0);
+    NullableString16 value(statement.ColumnString16(1), false);
+    values[key] = value;
+  }
+
+  sql::Transaction migration(db_.get());
+  if (!migration.Begin())
+    return false;
+
+  if (db_->Execute("DROP TABLE ItemTable")) {
+    CreateTableV2();
+    if (CommitChanges(false, values))
+      return migration.Commit();
+  }
+  return false;
+}
+
+void DomStorageDatabase::Close() {
+  db_.reset(NULL);
+}
+
+}  // namespace dom_storage