forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[TransactionalLevelDB] Fix iterating 'Prev' from evicted iterators
Iterators in TransactionalLevelDB are evicted when there are any changes to the database. There is an edge case where an iterator is evicted while on the 'last' key of the database, and that key is deleted. When reloaded, it Seek()s to the previous key, only to become 'Invalid' because it reaches the end of the database. Unfortunately leveldb doesn't allow 'Prev' to be called from the end of the database and instead just stays invalid. The fix checks for the state where 'the iterator was valid before eviction and is invalid after reloading' in the Prev() method. In this state, there must be no no keys at or after the previously loaded key. Thus calling SeekToLast() will correctly position the iterator at the first element 'Prev' the previously loaded key. Bug: 1022594 Change-Id: Ifa938b441683ea9f2cac5d926ff22b734ab4bb67 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1897007 Commit-Queue: Daniel Murphy <[email protected]> Auto-Submit: Daniel Murphy <[email protected]> Reviewed-by: Ken Rockot <[email protected]> Cr-Commit-Position: refs/heads/master@{#713947}
- Loading branch information
Showing
3 changed files
with
136 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
third_party/blink/web_tests/external/wpt/IndexedDB/idbindex_reverse_cursor.any.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
// META: title=Reverse Cursor Validity | ||
// META: script=support-promises.js | ||
|
||
async function iterateAndReturnAllCursorResult(testCase, cursor) { | ||
return new Promise((resolve, reject) => { | ||
let results = []; | ||
cursor.onsuccess = testCase.step_func(function(e) { | ||
let cursor = e.target.result; | ||
if (!cursor) { | ||
resolve(results); | ||
return; | ||
} | ||
results.push(cursor.value); | ||
cursor.continue(); | ||
}); | ||
cursor.onerror = reject; | ||
}); | ||
} | ||
|
||
promise_test(async testCase => { | ||
const db = await createDatabase(testCase, db => { | ||
db.createObjectStore('objectStore', {keyPath: 'key'}) | ||
.createIndex('index', 'indexedOn'); | ||
}); | ||
const txn1 = db.transaction(['objectStore'], 'readwrite'); | ||
txn1.objectStore('objectStore').add({'key': 'firstItem', 'indexedOn': 3}); | ||
const txn2 = db.transaction(['objectStore'], 'readwrite'); | ||
txn2.objectStore('objectStore').put({'key': 'firstItem', 'indexedOn': -1}); | ||
const txn3= db.transaction(['objectStore'], 'readwrite'); | ||
txn3.objectStore('objectStore').add({'key': 'secondItem', 'indexedOn': 2}); | ||
|
||
const txn4 = db.transaction(['objectStore'], 'readonly'); | ||
cursor = txn4.objectStore('objectStore').index('index').openCursor(IDBKeyRange.bound(0, 10), "prev"); | ||
let results = await iterateAndReturnAllCursorResult(testCase, cursor); | ||
|
||
assert_equals(results.length, 1); | ||
|
||
await promiseForTransaction(testCase, txn4); | ||
db.close(); | ||
}, 'Reverse cursor sees update from separate transactions.'); | ||
|
||
promise_test(async testCase => { | ||
const db = await createDatabase(testCase, db => { | ||
db.createObjectStore('objectStore', {keyPath: 'key'}) | ||
.createIndex('index', 'indexedOn'); | ||
}); | ||
const txn = db.transaction(['objectStore'], 'readwrite'); | ||
txn.objectStore('objectStore').add({'key': '1', 'indexedOn': 2}); | ||
txn.objectStore('objectStore').put({'key': '1', 'indexedOn': -1}); | ||
txn.objectStore('objectStore').add({'key': '2', 'indexedOn': 1}); | ||
|
||
const txn2 = db.transaction(['objectStore'], 'readonly'); | ||
cursor = txn2.objectStore('objectStore').index('index').openCursor(IDBKeyRange.bound(0, 10), "prev"); | ||
let results = await iterateAndReturnAllCursorResult(testCase, cursor); | ||
|
||
assert_equals(1, results.length); | ||
|
||
await promiseForTransaction(testCase, txn2); | ||
db.close(); | ||
}, 'Reverse cursor sees in-transaction update.'); |