Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add run_transaction helper #97

Merged
merged 1 commit into from
Jan 1, 2024
Merged

add run_transaction helper #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 53 additions & 55 deletions src/cron.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,67 +143,65 @@ impl<'r> Ctx<'r> {

// Compute which nodes changed their state, also update node names in DB
let changed: Vec<(String, NodeData)> = db
.run(move |db| {
db.transaction::<_, anyhow::Error, _>(|db| {
{
let mut changed = Vec::new();

// Go over every node in the database
let db_nodes = nodes::table.load::<models::NodeQuery>(db)?;
for db_node in db_nodes.into_iter() {
let (id, db_data) = model_to_node_data(db_node);
if let Some(cur_data) = cur_nodes_map.remove(&id) {
// We already know this node.
// Did it change?
if cur_data != db_data {
// Update in database
diesel::update(nodes::table.find(id.as_str()))
.set((
nodes::name.eq(cur_data.name.as_str()),
nodes::online.eq(cur_data.online),
))
.execute(db)?;
}
// Did its online status change?
if cur_data.online != db_data.online {
changed.push((id, cur_data));
}
} else {
// The node is in the DB but does not exist any more.
diesel::delete(nodes::table.find(id.as_str())).execute(db)?;
if db_data.online {
// The node was online, so it being gone is a change to offline
changed.push((
id,
NodeData {
online: false,
..db_data
},
));
}
.run_transaction(move |db| {
{
let mut changed = Vec::new();

// Go over every node in the database
let db_nodes = nodes::table.load::<models::NodeQuery>(db)?;
for db_node in db_nodes.into_iter() {
let (id, db_data) = model_to_node_data(db_node);
if let Some(cur_data) = cur_nodes_map.remove(&id) {
// We already know this node.
// Did it change?
if cur_data != db_data {
// Update in database
diesel::update(nodes::table.find(id.as_str()))
.set((
nodes::name.eq(cur_data.name.as_str()),
nodes::online.eq(cur_data.online),
))
.execute(db)?;
}
}

// Go over nodes remaining in the hash map -- they are not in the DB
for (id, cur_data) in cur_nodes_map.into_iter() {
// Insert into DB
diesel::insert_into(nodes::table)
.values(&models::Node {
id: id.as_str(),
name: cur_data.name.as_str(),
online: cur_data.online,
})
.execute(db)?;
if cur_data.online {
// The node is online, so it appearing is a change from the implicit offline
// it was in when it did not exist.
// Did its online status change?
if cur_data.online != db_data.online {
changed.push((id, cur_data));
}
} else {
// The node is in the DB but does not exist any more.
diesel::delete(nodes::table.find(id.as_str())).execute(db)?;
if db_data.online {
// The node was online, so it being gone is a change to offline
changed.push((
id,
NodeData {
online: false,
..db_data
},
));
}
}
}

Ok(changed)
// Go over nodes remaining in the hash map -- they are not in the DB
for (id, cur_data) in cur_nodes_map.into_iter() {
// Insert into DB
diesel::insert_into(nodes::table)
.values(&models::Node {
id: id.as_str(),
name: cur_data.name.as_str(),
online: cur_data.online,
})
.execute(db)?;
if cur_data.online {
// The node is online, so it appearing is a change from the implicit offline
// it was in when it did not exist.
changed.push((id, cur_data));
}
}
})

Ok(changed)
}
})
.await?;

Expand Down
14 changes: 14 additions & 0 deletions src/db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use anyhow::Result;
use diesel::{Connection, PgConnection};
use diesel_migrations::MigrationHarness;

use rocket::fairing::{AdHoc, Fairing};
Expand All @@ -21,3 +23,15 @@ pub fn migration() -> impl Fairing {
rocket
})
}

impl DbConn {
pub async fn run_transaction<T>(
&self,
f: impl FnOnce(&mut PgConnection) -> Result<T> + Send + 'static,
) -> Result<T>
where
T: Send + 'static,
{
self.run(move |db| db.transaction(f)).await
}
}