Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(377)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/content/browser/indexed_db/indexed_db_database.cc

Issue 216433007: Revert 260147 "Handling LevelDB errors encountered after open." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/content/browser/indexed_db/indexed_db_browsertest.cc ('k') | trunk/src/content/browser/indexed_db/indexed_db_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/browser/indexed_db/indexed_db_database.cc
===================================================================
--- trunk/src/content/browser/indexed_db/indexed_db_database.cc (revision 260206)
+++ trunk/src/content/browser/indexed_db/indexed_db_database.cc (working copy)
@@ -14,7 +14,6 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "content/browser/indexed_db/indexed_db_connection.h"
-#include "content/browser/indexed_db/indexed_db_context_impl.h"
#include "content/browser/indexed_db/indexed_db_cursor.h"
#include "content/browser/indexed_db/indexed_db_factory.h"
#include "content/browser/indexed_db/indexed_db_index_writer.h"
@@ -295,22 +294,17 @@
const IndexedDBObjectStoreMetadata& object_store_metadata,
IndexedDBTransaction* transaction) {
IDB_TRACE("IndexedDBDatabase::CreateObjectStoreOperation");
- leveldb::Status s =
- backing_store_->CreateObjectStore(transaction->BackingStoreTransaction(),
- transaction->database()->id(),
- object_store_metadata.id,
- object_store_metadata.name,
- object_store_metadata.key_path,
- object_store_metadata.auto_increment);
- if (!s.ok()) {
- IndexedDBDatabaseError error(
+ if (!backing_store_->CreateObjectStore(
+ transaction->BackingStoreTransaction(),
+ transaction->database()->id(),
+ object_store_metadata.id,
+ object_store_metadata.name,
+ object_store_metadata.key_path,
+ object_store_metadata.auto_increment).ok()) {
+ transaction->Abort(IndexedDBDatabaseError(
blink::WebIDBDatabaseExceptionUnknownError,
ASCIIToUTF16("Internal error creating object store '") +
- object_store_metadata.name + ASCIIToUTF16("'."));
- transaction->Abort(error);
- if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ object_store_metadata.name + ASCIIToUTF16("'.")));
return;
}
}
@@ -442,12 +436,8 @@
base::string16 error_string =
ASCIIToUTF16("Internal error deleting index '") +
index_metadata.name + ASCIIToUTF16("'.");
- IndexedDBDatabaseError error(blink::WebIDBDatabaseExceptionUnknownError,
- error_string);
- transaction->Abort(error);
- if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ transaction->Abort(IndexedDBDatabaseError(
+ blink::WebIDBDatabaseExceptionUnknownError, error_string));
}
}
@@ -579,13 +569,9 @@
*key,
&value);
if (!s.ok()) {
- IndexedDBDatabaseError error(blink::WebIDBDatabaseExceptionUnknownError,
- "Internal error in GetRecord.");
- callbacks->OnError(error);
-
- if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ callbacks->OnError(
+ IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError,
+ "Internal error in GetRecord."));
return;
}
@@ -613,12 +599,9 @@
*key,
&primary_key);
if (!s.ok()) {
- IndexedDBDatabaseError error(blink::WebIDBDatabaseExceptionUnknownError,
- "Internal error in GetPrimaryKeyViaIndex.");
- callbacks->OnError(error);
- if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ callbacks->OnError(
+ IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError,
+ "Internal error in GetPrimaryKeyViaIndex."));
return;
}
if (!primary_key) {
@@ -639,12 +622,9 @@
*primary_key,
&value);
if (!s.ok()) {
- IndexedDBDatabaseError error(blink::WebIDBDatabaseExceptionUnknownError,
- "Internal error in GetRecord.");
- callbacks->OnError(error);
- if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ callbacks->OnError(
+ IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError,
+ "Internal error in GetRecord."));
return;
}
@@ -781,12 +761,9 @@
&record_identifier,
&found);
if (!s.ok()) {
- IndexedDBDatabaseError error(blink::WebIDBDatabaseExceptionUnknownError,
- "Internal error checking key existence.");
- params->callbacks->OnError(error);
- if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ params->callbacks->OnError(
+ IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError,
+ "Internal error checking key existence."));
return;
}
if (found) {
@@ -832,13 +809,9 @@
params->value,
&record_identifier);
if (!s.ok()) {
- IndexedDBDatabaseError error(
+ params->callbacks->OnError(IndexedDBDatabaseError(
blink::WebIDBDatabaseExceptionUnknownError,
- "Internal error: backing store error performing put/add.");
- params->callbacks->OnError(error);
- if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ "Internal error: backing store error performing put/add."));
return;
}
@@ -861,12 +834,9 @@
*key,
!key_was_generated);
if (!s.ok()) {
- IndexedDBDatabaseError error(blink::WebIDBDatabaseExceptionUnknownError,
- "Internal error updating key generator.");
- params->callbacks->OnError(error);
- if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ params->callbacks->OnError(
+ IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError,
+ "Internal error updating key generator."));
return;
}
}
@@ -896,12 +866,9 @@
&record_identifier,
&found);
if (!s.ok()) {
- IndexedDBDatabaseError error(blink::WebIDBDatabaseExceptionUnknownError,
- "Internal error setting index keys.");
- transaction->Abort(error);
- if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ transaction->Abort(
+ IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionUnknownError,
+ "Internal error setting index keys."));
return;
}
if (!found) {
@@ -1239,12 +1206,8 @@
base::string16 error_string =
ASCIIToUTF16("Internal error deleting object store '") +
object_store_metadata.name + ASCIIToUTF16("'.");
- IndexedDBDatabaseError error(blink::WebIDBDatabaseExceptionUnknownError,
- error_string);
- transaction->Abort(error);
- if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ transaction->Abort(IndexedDBDatabaseError(
+ blink::WebIDBDatabaseExceptionUnknownError, error_string));
}
}
« no previous file with comments | « trunk/src/content/browser/indexed_db/indexed_db_browsertest.cc ('k') | trunk/src/content/browser/indexed_db/indexed_db_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698