mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
[IndexedDB] Reduce heed related panics (#37652)
Allows indexeddb backends to return errors on certain operations. Currently the errors are not demarcated, as the result type is `Result<(), ()>`. If this is not appropriate then perhaps having a string error might be better. Testing: Some tests might perhaps move from PANIC to FAIL Fixes: Partially fixes a bit of #37647, more work needs to be done however --------- Signed-off-by: Ashwin Naren <arihant2math@gmail.com> Signed-off-by: Josh Matthews <josh@joshmatthews.net> Co-authored-by: Josh Matthews <josh@joshmatthews.net>
This commit is contained in:
parent
72e0baa997
commit
d114feb0fa
5 changed files with 60 additions and 28 deletions
|
@ -61,16 +61,14 @@ impl HeedEngine {
|
|||
}
|
||||
|
||||
impl KvsEngine for HeedEngine {
|
||||
fn create_store(&self, store_name: SanitizedName, auto_increment: bool) {
|
||||
let mut write_txn = self
|
||||
.heed_env
|
||||
.write_txn()
|
||||
.expect("Could not create idb store writer");
|
||||
type Error = heed::Error;
|
||||
|
||||
fn create_store(&self, store_name: SanitizedName, auto_increment: bool) -> heed::Result<()> {
|
||||
let mut write_txn = self.heed_env.write_txn()?;
|
||||
let _ = self.heed_env.clear_stale_readers();
|
||||
let new_store: HeedDatabase = self
|
||||
.heed_env
|
||||
.create_database(&mut write_txn, Some(&*store_name.to_string()))
|
||||
.expect("Failed to create idb store");
|
||||
.create_database(&mut write_txn, Some(&*store_name.to_string()))?;
|
||||
|
||||
write_txn.commit().expect("Failed to commit transaction");
|
||||
|
||||
|
@ -85,30 +83,29 @@ impl KvsEngine for HeedEngine {
|
|||
.write()
|
||||
.expect("Could not acquire lock on stores")
|
||||
.insert(store_name, store);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn delete_store(&self, store_name: SanitizedName) {
|
||||
fn delete_store(&self, store_name: SanitizedName) -> heed::Result<()> {
|
||||
// TODO: Actually delete store instead of just clearing it
|
||||
let mut write_txn = self
|
||||
.heed_env
|
||||
.write_txn()
|
||||
.expect("Could not create idb store writer");
|
||||
let mut write_txn = self.heed_env.write_txn()?;
|
||||
let store: HeedDatabase = self
|
||||
.heed_env
|
||||
.create_database(&mut write_txn, Some(&*store_name.to_string()))
|
||||
.expect("Failed to create idb store");
|
||||
store.clear(&mut write_txn).expect("Could not clear store");
|
||||
.create_database(&mut write_txn, Some(&*store_name.to_string()))?;
|
||||
store.clear(&mut write_txn)?;
|
||||
write_txn.commit().expect("Failed to commit transaction");
|
||||
|
||||
let mut open_stores = self.open_stores.write().unwrap();
|
||||
open_stores.retain(|key, _| key != &store_name);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn close_store(&self, store_name: SanitizedName) {
|
||||
fn close_store(&self, store_name: SanitizedName) -> heed::Result<()> {
|
||||
// FIXME: (arihant2math) unused
|
||||
// FIXME:(arihant2math) return error if no store ...
|
||||
let mut open_stores = self.open_stores.write().unwrap();
|
||||
open_stores.retain(|key, _| key != &store_name);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
// Starts a transaction, processes all operations for that transaction,
|
||||
|
@ -162,12 +159,14 @@ impl KvsEngine for HeedEngine {
|
|||
if tx.send(None).is_err() {
|
||||
warn!("IDBTransaction's execution channel is dropped");
|
||||
};
|
||||
|
||||
rtxn.commit().expect("Failed to commit transaction");
|
||||
});
|
||||
} else {
|
||||
self.write_pool.spawn(move || {
|
||||
// Acquiring a writer will block the thread if another `readwrite` transaction is active
|
||||
let env = heed_env;
|
||||
let mut wtxn = env.write_txn().expect("Could not creat idb store writer");
|
||||
let mut wtxn = env.write_txn().expect("Could not create idb store writer");
|
||||
for request in transaction.requests {
|
||||
match request.operation {
|
||||
AsyncOperation::PutItem(key, value, overwrite) => {
|
||||
|
|
|
@ -57,12 +57,18 @@ pub struct KvsTransaction {
|
|||
}
|
||||
|
||||
pub trait KvsEngine {
|
||||
fn create_store(&self, store_name: SanitizedName, auto_increment: bool);
|
||||
type Error;
|
||||
|
||||
fn delete_store(&self, store_name: SanitizedName);
|
||||
fn create_store(
|
||||
&self,
|
||||
store_name: SanitizedName,
|
||||
auto_increment: bool,
|
||||
) -> Result<(), Self::Error>;
|
||||
|
||||
fn delete_store(&self, store_name: SanitizedName) -> Result<(), Self::Error>;
|
||||
|
||||
#[expect(dead_code)]
|
||||
fn close_store(&self, store_name: SanitizedName);
|
||||
fn close_store(&self, store_name: SanitizedName) -> Result<(), Self::Error>;
|
||||
|
||||
fn process_transaction(
|
||||
&self,
|
||||
|
|
|
@ -135,9 +135,13 @@ impl<E: KvsEngine> IndexedDBEnvironment<E> {
|
|||
store_name: SanitizedName,
|
||||
auto_increment: bool,
|
||||
) {
|
||||
self.engine.create_store(store_name, auto_increment);
|
||||
let result = self.engine.create_store(store_name, auto_increment);
|
||||
|
||||
if result.is_ok() {
|
||||
let _ = sender.send(Ok(()));
|
||||
} else {
|
||||
let _ = sender.send(Err(()));
|
||||
}
|
||||
}
|
||||
|
||||
fn delete_object_store(
|
||||
|
@ -145,9 +149,13 @@ impl<E: KvsEngine> IndexedDBEnvironment<E> {
|
|||
sender: IpcSender<Result<(), ()>>,
|
||||
store_name: SanitizedName,
|
||||
) {
|
||||
self.engine.delete_store(store_name);
|
||||
let result = self.engine.delete_store(store_name);
|
||||
|
||||
if result.is_ok() {
|
||||
let _ = sender.send(Ok(()));
|
||||
} else {
|
||||
let _ = sender.send(Err(()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,8 +1,24 @@
|
|||
[list_ordering.any.worker.html]
|
||||
expected: CRASH
|
||||
[Validate ObjectStoreNames and indexNames list order - numbers]
|
||||
expected: FAIL
|
||||
|
||||
[Validate ObjectStoreNames and indexNames list order - numbers 'overflow']
|
||||
expected: FAIL
|
||||
|
||||
[Validate ObjectStoreNames and indexNames list order - lexigraphical string sort]
|
||||
expected: FAIL
|
||||
|
||||
|
||||
[list_ordering.any.html]
|
||||
expected: CRASH
|
||||
[Validate ObjectStoreNames and indexNames list order - numbers]
|
||||
expected: FAIL
|
||||
|
||||
[Validate ObjectStoreNames and indexNames list order - numbers 'overflow']
|
||||
expected: FAIL
|
||||
|
||||
[Validate ObjectStoreNames and indexNames list order - lexigraphical string sort]
|
||||
expected: FAIL
|
||||
|
||||
|
||||
[list_ordering.any.sharedworker.html]
|
||||
expected: ERROR
|
||||
|
|
|
@ -2,10 +2,13 @@
|
|||
expected: ERROR
|
||||
|
||||
[string-list-ordering.any.worker.html]
|
||||
expected: CRASH
|
||||
[Test string list ordering in IndexedDB]
|
||||
expected: FAIL
|
||||
|
||||
|
||||
[string-list-ordering.any.serviceworker.html]
|
||||
expected: ERROR
|
||||
|
||||
[string-list-ordering.any.html]
|
||||
expected: CRASH
|
||||
[Test string list ordering in IndexedDB]
|
||||
expected: FAIL
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue