Db layers #14

Merged
micialware merged 7 commits from db_layers into master 2026-08-30 23:38:33 +03:00
2 changed files with 45 additions and 2 deletions
Showing only changes of commit 6f010428d5 - Show all commits

No files matched your search

-1
View File
@@ -19,7 +19,6 @@ use rusqlite::Connection;
pub const USER_FONT: Font = Font::with_name("Noto Sans JP");
pub fn start() -> iced::Result {
println!("{}", size_of::<WordData>());
info!("Welcome to JapLearn");
iced::application(ScreenState::boot, ScreenState::update, ScreenState::view)
.window(window_settings())
+45 -1
View File
@@ -37,22 +37,38 @@ where
impl<T: EntityData, Q: TableAccessQuerySet<T>> DbLayer<T> for SqliteDbLayer<T, Q> {
fn write_entity(&self, entity: &T, connection: &Connection) -> MaybeError {
let time = Instant::now();
connection
.execute(Q::load(), Q::update_params(entity))
.map_err(|_| DbSaveError)?;
info!(
"Updated in {} for {:?}",
Q::name(),
time.elapsed()
);
Ok(())
}
fn add_entity(&mut self, entity: &mut T, connection: &Connection) -> MaybeError {
let time = Instant::now();
let index: u32 = connection
.query_row(Q::add(), Q::insert_params(entity), |row| row.get(0))
.map_err(|_| DbSaveError)?;
entity.set_id(index.into());
info!(
"Added into {} for {:?}",
Q::name(),
time.elapsed()
);
Ok(())
}
fn delete_entity(&mut self, id: Id, connection: &Connection) -> MaybeError {
let time = Instant::now();
if !id.is_valid() {
return Err(DbSaveError);
}
@@ -62,10 +78,17 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> DbLayer<T> for SqliteDbLayer<T, Q
(&id,),
)
.map_err(|_| DbSaveError)?;
info!(
"Deleted from {} for {:?}",
Q::name(),
time.elapsed()
);
Ok(())
}
fn load_all(&self, storage: &mut Vec<T>, connection: &Connection) -> MaybeError {
let time = Instant::now();
let mut stmt = connection
.prepare(Q::load())
.expect("Failed to prepare state query");
@@ -75,12 +98,21 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> DbLayer<T> for SqliteDbLayer<T, Q
iter.filter_map(|res| res.ok())
.for_each(|i| storage.push(i));
info!(
"Loaded {} from {} for {:?}",
storage.len(),
Q::name(),
time.elapsed()
);
Ok(())
}
}
impl<T: EntityData, Q: TableAccessQuerySet<T>> BatchedDbLayer<T> for SqliteDbLayer<T, Q> {
fn delete_many_entities(&mut self, ids: &[Id], connection: &mut Connection) -> MaybeError {
let time = Instant::now();
for chunk in ids.chunks(1000) {
let stringed = chunk
.iter()
@@ -94,6 +126,13 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> BatchedDbLayer<T> for SqliteDbLay
)
.map_err(|_| DbSaveError)?;
}
info!(
"Deleted {} from {} for {:?}",
ids.len(),
Q::name(),
time.elapsed()
);
Ok(())
}
@@ -121,7 +160,12 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> BatchedDbLayer<T> for SqliteDbLay
entities[index].set_id(id.into());
}
info!("Added {} entities for {:?}", entities.len(), time.elapsed());
info!(
"Added {} into {} for {:?}",
entities.len(),
Q::name(),
time.elapsed()
);
Ok(())
}
}