content/browser/indexed_db/indexed_db_backing_store.cc - Issue 1996443003: Return number of values deleted by IDBObjectStore.delete(range)

Unified Diff: content/browser/indexed_db/indexed_db_backing_store.cc

Issue 1996443003: Return number of values deleted by IDBObjectStore.delete(range) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Return number of values deleted by IDBObjectStore.delete(range) Created 4 years, 7 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 | « content/browser/indexed_db/indexed_db_backing_store.h ('k') | content/browser/indexed_db/indexed_db_backing_store_unittest.cc » ('j') | content/browser/indexed_db/leveldb/leveldb_transaction.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/indexed_db/indexed_db_backing_store.cc

diff --git a/content/browser/indexed_db/indexed_db_backing_store.cc b/content/browser/indexed_db/indexed_db_backing_store.cc

index b33afc020c1bdfe08a258e8271d33bf2ac065ee5..6c3a9f1011018d0b229f2512cfc30adb737feac8 100644

--- a/content/browser/indexed_db/indexed_db_backing_store.cc

+++ b/content/browser/indexed_db/indexed_db_backing_store.cc

@@ -1363,14 +1363,19 @@ bool IndexedDBBackingStore::UpdateIDBDatabaseIntVersion(

static leveldb::Status DeleteRangeBasic(LevelDBTransaction* transaction,

const std::string& begin,

const std::string& end,

- bool upper_open) {

+ bool upper_open,

+ size_t* delete_count) {

std::unique_ptr<LevelDBIterator> it = transaction->CreateIterator();

leveldb::Status s;

+ DCHECK(delete_count);

dmurph 2016/05/20 18:41:15 Can you move this up 2 lines? We usually have our

palakj1 2016/05/20 19:13:45 Done

+ *delete_count = 0;

for (s = it->Seek(begin); s.ok() && it->IsValid() &&

- (upper_open ? CompareKeys(it->Key(), end) < 0

- : CompareKeys(it->Key(), end) <= 0);

- s = it->Next())

- transaction->Remove(it->Key());

+ (upper_open ? CompareKeys(it->Key(), end) < 0

+ : CompareKeys(it->Key(), end) <= 0);

+ s = it->Next()) {

+ if (transaction->Remove(it->Key()))

+ (*delete_count)++;

+ }

return s;

}

@@ -1767,6 +1772,7 @@ leveldb::Status IndexedDBBackingStore::DeleteObjectStore(

LevelDBTransaction* leveldb_transaction = transaction->transaction();

base::string16 object_store_name;

+ size_t delete_count = 0;

bool found = false;

leveldb::Status s =

GetString(leveldb_transaction,

@@ -1792,8 +1798,8 @@ leveldb::Status IndexedDBBackingStore::DeleteObjectStore(

s = DeleteRangeBasic(

leveldb_transaction,

ObjectStoreMetaDataKey::Encode(database_id, object_store_id, 0),

- ObjectStoreMetaDataKey::EncodeMaxKey(database_id, object_store_id),

- true);

+ ObjectStoreMetaDataKey::EncodeMaxKey(database_id, object_store_id), true,

+ &delete_count);

if (s.ok()) {

leveldb_transaction->Remove(

@@ -1802,16 +1808,16 @@ leveldb::Status IndexedDBBackingStore::DeleteObjectStore(

s = DeleteRangeBasic(

leveldb_transaction,

IndexFreeListKey::Encode(database_id, object_store_id, 0),

- IndexFreeListKey::EncodeMaxKey(database_id, object_store_id),

- true);

+ IndexFreeListKey::EncodeMaxKey(database_id, object_store_id), true,

+ &delete_count);

}

if (s.ok()) {

s = DeleteRangeBasic(

leveldb_transaction,

IndexMetaDataKey::Encode(database_id, object_store_id, 0, 0),

- IndexMetaDataKey::EncodeMaxKey(database_id, object_store_id),

- true);

+ IndexMetaDataKey::EncodeMaxKey(database_id, object_store_id), true,

+ &delete_count);

}

if (!s.ok()) {

@@ -1955,9 +1961,9 @@ leveldb::Status IndexedDBBackingStore::ClearObjectStore(

KeyPrefix(database_id, object_store_id).Encode();

const std::string stop_key =

KeyPrefix(database_id, object_store_id + 1).Encode();

- leveldb::Status s =

- DeleteRangeBasic(transaction->transaction(), start_key, stop_key, true);

+ size_t delete_count = 0;

+ leveldb::Status s = DeleteRangeBasic(transaction->transaction(), start_key,

+ stop_key, true, &delete_count);

if (!s.ok()) {

INTERNAL_WRITE_ERROR(CLEAR_OBJECT_STORE);

return s;

@@ -1993,8 +1999,12 @@ leveldb::Status IndexedDBBackingStore::DeleteRange(

IndexedDBBackingStore::Transaction* transaction,

int64_t database_id,

int64_t object_store_id,

- const IndexedDBKeyRange& key_range) {

+ const IndexedDBKeyRange& key_range,

+ size_t* exists_delete_count) {

dmurph 2016/05/20 18:41:15 Regarding your comment, I'm fine with either way.

palakj1 2016/05/20 19:13:45 Thanks. Will keep as it is then.

leveldb::Status s;

+ DCHECK(exists_delete_count);

dmurph 2016/05/20 18:41:14 Can you move this up one line?

palakj1 2016/05/20 19:13:45 Done

+ *exists_delete_count = 0;

+ size_t data_delete_count = 0;

dmurph 2016/05/20 18:41:15 Can you put this right next to where we use it? (l

palakj1 2016/05/20 19:13:45 Done

std::unique_ptr<IndexedDBBackingStore::Cursor> start_cursor =

OpenObjectStoreCursor(transaction, database_id, object_store_id,

key_range, blink::WebIDBCursorDirectionNext, &s);

@@ -2002,7 +2012,6 @@ leveldb::Status IndexedDBBackingStore::DeleteRange(

return s;

if (!start_cursor)

return leveldb::Status::OK(); // Empty range == delete success.

std::unique_ptr<IndexedDBBackingStore::Cursor> end_cursor =

OpenObjectStoreCursor(transaction, database_id, object_store_id,

key_range, blink::WebIDBCursorDirectionPrev, &s);

@@ -2013,7 +2022,6 @@ leveldb::Status IndexedDBBackingStore::DeleteRange(

return leveldb::Status::OK(); // Empty range == delete success.

BlobEntryKey start_blob_key, end_blob_key;

std::string start_key = ObjectStoreDataKey::Encode(

database_id, object_store_id, start_cursor->key());

base::StringPiece start_key_piece(start_key);

@@ -2033,15 +2041,19 @@ leveldb::Status IndexedDBBackingStore::DeleteRange(

false);

if (!s.ok())

return s;

- s = DeleteRangeBasic(transaction->transaction(), start_key, stop_key, false);

+ s = DeleteRangeBasic(transaction->transaction(), start_key, stop_key, false,

+ &data_delete_count);

if (!s.ok())

return s;

start_key =

ExistsEntryKey::Encode(database_id, object_store_id, start_cursor->key());

stop_key =

ExistsEntryKey::Encode(database_id, object_store_id, end_cursor->key());

- return DeleteRangeBasic(

- transaction->transaction(), start_key, stop_key, false);

+ s = DeleteRangeBasic(transaction->transaction(), start_key, stop_key, false,

+ exists_delete_count);

+ DCHECK_EQ(data_delete_count, *exists_delete_count);

+ return s;

}

leveldb::Status IndexedDBBackingStore::GetKeyGeneratorCurrentNumber(

@@ -2835,20 +2847,22 @@ leveldb::Status IndexedDBBackingStore::DeleteIndex(

return InvalidDBKeyStatus();

LevelDBTransaction* leveldb_transaction = transaction->transaction();

+ size_t delete_count = 0;

const std::string index_meta_data_start =

IndexMetaDataKey::Encode(database_id, object_store_id, index_id, 0);

const std::string index_meta_data_end =

IndexMetaDataKey::EncodeMaxKey(database_id, object_store_id, index_id);

- leveldb::Status s = DeleteRangeBasic(

- leveldb_transaction, index_meta_data_start, index_meta_data_end, true);

+ leveldb::Status s =

+ DeleteRangeBasic(leveldb_transaction, index_meta_data_start,

+ index_meta_data_end, true, &delete_count);

if (s.ok()) {

const std::string index_data_start =

IndexDataKey::EncodeMinKey(database_id, object_store_id, index_id);

const std::string index_data_end =

IndexDataKey::EncodeMaxKey(database_id, object_store_id, index_id);

- s = DeleteRangeBasic(

- leveldb_transaction, index_data_start, index_data_end, true);

+ s = DeleteRangeBasic(leveldb_transaction, index_data_start, index_data_end,

+ true, &delete_count);

}

if (!s.ok())