Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tidied up code, managed errors, etc.

Browse source
This commit is contained in:
Mikayla Maki 2022-10-25 16:55:20 -07:00
parent e9ea751f3d
commit 7d33520b2c
2 changed files with 292 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/db/examples/serialize_workspace.rs
View file

@ -25,26 +25,19 @@ fn main() -> anyhow::Result<()> {
// Order scrambled + sleeps added because sqlite only has 1 second resolution on // Order scrambled + sleeps added because sqlite only has 1 second resolution on
// their timestamps // their timestamps
db.update_worktree_roots(&workspace_7.workspace_id, &["/tmp2"]) db.update_worktree_roots(&workspace_7.workspace_id, &["/tmp2"]);
.unwrap();
sleep(Duration::from_secs(1)); sleep(Duration::from_secs(1));
db.update_worktree_roots(&workspace_1.workspace_id, &["/tmp1"]) db.update_worktree_roots(&workspace_1.workspace_id, &["/tmp1"]);
.unwrap();
sleep(Duration::from_secs(1)); sleep(Duration::from_secs(1));
db.update_worktree_roots(&workspace_2.workspace_id, &["/tmp1", "/tmp2"]) db.update_worktree_roots(&workspace_2.workspace_id, &["/tmp1", "/tmp2"]);
.unwrap();
sleep(Duration::from_secs(1)); sleep(Duration::from_secs(1));
db.update_worktree_roots(&workspace_3.workspace_id, &["/tmp1", "/tmp2", "/tmp3"]) db.update_worktree_roots(&workspace_3.workspace_id, &["/tmp1", "/tmp2", "/tmp3"]);
.unwrap();
sleep(Duration::from_secs(1)); sleep(Duration::from_secs(1));
db.update_worktree_roots(&workspace_4.workspace_id, &["/tmp2", "/tmp3"]) db.update_worktree_roots(&workspace_4.workspace_id, &["/tmp2", "/tmp3"]);
.unwrap();
sleep(Duration::from_secs(1)); sleep(Duration::from_secs(1));
db.update_worktree_roots(&workspace_5.workspace_id, &["/tmp2", "/tmp3", "/tmp4"]) db.update_worktree_roots(&workspace_5.workspace_id, &["/tmp2", "/tmp3", "/tmp4"]);
.unwrap();
sleep(Duration::from_secs(1)); sleep(Duration::from_secs(1));
db.update_worktree_roots(&workspace_6.workspace_id, &["/tmp2", "/tmp4"]) db.update_worktree_roots(&workspace_6.workspace_id, &["/tmp2", "/tmp4"]);
.unwrap();
db.write_to(file).ok(); db.write_to(file).ok();

282
crates/db/src/workspace.rs
View file

@ -1,7 +1,10 @@
use anyhow::Result; use anyhow::Result;
use rusqlite::{params, Connection}; use rusqlite::{params, Connection, OptionalExtension};
use std::{ use std::{
ffi::OsStr,
fmt::Debug,
os::unix::prelude::OsStrExt,
path::{Path, PathBuf}, path::{Path, PathBuf},
sync::Arc, sync::Arc,
}; };
@ -10,12 +13,6 @@ use crate::pane::{PaneGroupId, PaneId, SerializedPane, SerializedPaneGroup};
use super::Db; use super::Db;
// TODO for workspace serialization:
// - Update return types to unwrap all of the results into dummy values
// - On database failure to initialize, delete the DB file
// - Update paths to be blobs ( :( https://users.rust-lang.org/t/how-to-safely-store-a-path-osstring-in-a-sqllite-database/79712/10 )
// - Convert hot paths to prepare-cache-execute style
pub(crate) const WORKSPACE_M_1: &str = " pub(crate) const WORKSPACE_M_1: &str = "
CREATE TABLE workspaces( CREATE TABLE workspaces(
workspace_id INTEGER PRIMARY KEY AUTOINCREMENT, workspace_id INTEGER PRIMARY KEY AUTOINCREMENT,
@ -23,24 +20,13 @@ CREATE TABLE workspaces(
) STRICT; ) STRICT;
CREATE TABLE worktree_roots( CREATE TABLE worktree_roots(
worktree_root TEXT NOT NULL, worktree_root BLOB NOT NULL,
workspace_id INTEGER NOT NULL, workspace_id INTEGER NOT NULL,
FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id) ON DELETE CASCADE FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id) ON DELETE CASCADE
PRIMARY KEY(worktree_root, workspace_id) PRIMARY KEY(worktree_root, workspace_id)
) STRICT; ) STRICT;
"; ";
// Zed stores items with ids which are a combination of a view id during a given run and a workspace id. This
// Case 1: Starting Zed Contextless
// > Zed -> Reopen the last
// Case 2: Starting Zed with a project folder
// > Zed ~/projects/Zed
// Case 3: Starting Zed with a file
// > Zed ~/projects/Zed/cargo.toml
// Case 4: Starting Zed with multiple project folders
// > Zed ~/projects/Zed ~/projects/Zed.dev
#[derive(Debug, PartialEq, Eq, Copy, Clone, Default)] #[derive(Debug, PartialEq, Eq, Copy, Clone, Default)]
pub struct WorkspaceId(i64); pub struct WorkspaceId(i64);
@ -64,7 +50,12 @@ impl Db {
worktree_roots: &[Arc<Path>], worktree_roots: &[Arc<Path>],
) -> SerializedWorkspace { ) -> SerializedWorkspace {
// Find the workspace id which is uniquely identified by this set of paths return it if found // Find the workspace id which is uniquely identified by this set of paths return it if found
if let Ok(Some(workspace_id)) = self.workspace_id(worktree_roots) { let mut workspace_id = self.workspace_id(worktree_roots);
if workspace_id.is_none() && worktree_roots.len() == 0 {
workspace_id = self.last_workspace_id();
}
if let Some(workspace_id) = workspace_id {
// TODO // TODO
// let workspace_row = self.get_workspace_row(workspace_id); // let workspace_row = self.get_workspace_row(workspace_id);
// let center_group = self.get_pane_group(workspace_row.center_group_id); // let center_group = self.get_pane_group(workspace_row.center_group_id);
@ -84,7 +75,8 @@ impl Db {
self.real() self.real()
.map(|db| { .map(|db| {
let lock = db.connection.lock(); let lock = db.connection.lock();
match lock.execute("INSERT INTO workspaces DEFAULT VALUES;", []) { // No need to waste the memory caching this, should happen rarely.
match lock.execute("INSERT INTO workspaces DEFAULT VALUES", []) {
Ok(_) => SerializedWorkspace { Ok(_) => SerializedWorkspace {
workspace_id: WorkspaceId(lock.last_insert_rowid()), workspace_id: WorkspaceId(lock.last_insert_rowid()),
}, },
@ -94,9 +86,9 @@ impl Db {
.unwrap_or_default() .unwrap_or_default()
} }
fn workspace_id<P>(&self, worktree_roots: &[P]) -> Result<Option<WorkspaceId>> fn workspace_id<P>(&self, worktree_roots: &[P]) -> Option<WorkspaceId>
where where
P: AsRef<Path>, P: AsRef<Path> + Debug,
{ {
self.real() self.real()
.map(|db| { .map(|db| {
@ -104,7 +96,7 @@ impl Db {
get_workspace_id(worktree_roots, &lock) get_workspace_id(worktree_roots, &lock)
}) })
.unwrap_or(Ok(None)) .unwrap_or(None)
} }
// fn get_workspace_row(&self, workspace_id: WorkspaceId) -> WorkspaceRow { // fn get_workspace_row(&self, workspace_id: WorkspaceId) -> WorkspaceRow {
@ -114,26 +106,25 @@ impl Db {
/// Updates the open paths for the given workspace id. Will garbage collect items from /// Updates the open paths for the given workspace id. Will garbage collect items from
/// any workspace ids which are no replaced by the new workspace id. Updates the timestamps /// any workspace ids which are no replaced by the new workspace id. Updates the timestamps
/// in the workspace id table /// in the workspace id table
pub fn update_worktree_roots<P>( pub fn update_worktree_roots<P>(&self, workspace_id: &WorkspaceId, worktree_roots: &[P])
&self, where
workspace_id: &WorkspaceId, P: AsRef<Path> + Debug,
{
fn logic<P>(
connection: &mut Connection,
worktree_roots: &[P], worktree_roots: &[P],
workspace_id: &WorkspaceId,
) -> Result<()> ) -> Result<()>
where where
P: AsRef<Path>, P: AsRef<Path> + Debug,
{ {
self.real() let tx = connection.transaction()?;
.map(|db| {
let mut lock = db.connection.lock();
let tx = lock.transaction()?;
{ {
// Lookup any old WorkspaceIds which have the same set of roots, and delete them. // Lookup any old WorkspaceIds which have the same set of roots, and delete them.
let preexisting_id = get_workspace_id(worktree_roots, &tx)?; let preexisting_id = get_workspace_id(worktree_roots, &tx);
if let Some(preexisting_id) = preexisting_id { if let Some(preexisting_id) = preexisting_id {
if preexisting_id != *workspace_id { if preexisting_id != *workspace_id {
// Should also delete fields in other tables // Should also delete fields in other tables with cascading updates
tx.execute( tx.execute(
"DELETE FROM workspaces WHERE workspace_id = ?", "DELETE FROM workspaces WHERE workspace_id = ?",
[preexisting_id.0], [preexisting_id.0],
@ -147,49 +138,89 @@ impl Db {
)?; )?;
for root in worktree_roots { for root in worktree_roots {
// TODO: Update this to use blobs let path = root.as_ref().as_os_str().as_bytes();
let path = root.as_ref().to_string_lossy().to_string();
let mut stmt = tx.prepare_cached("INSERT INTO worktree_roots(workspace_id, worktree_root) VALUES (?, ?)")?; tx.execute(
stmt.execute(params![workspace_id.0, path])?; "INSERT INTO worktree_roots(workspace_id, worktree_root) VALUES (?, ?)",
params![workspace_id.0, path],
)?;
} }
let mut stmt = tx.prepare_cached("UPDATE workspaces SET timestamp = CURRENT_TIMESTAMP WHERE workspace_id = ?")?; tx.execute(
stmt.execute([workspace_id.0])?; "UPDATE workspaces SET timestamp = CURRENT_TIMESTAMP WHERE workspace_id = ?",
[workspace_id.0],
)?;
} }
tx.commit()?; tx.commit()?;
Ok(()) Ok(())
})
.unwrap_or(Ok(()))
} }
/// Returns the previous workspace ids sorted by last modified along with their opened worktree roots self.real().map(|db| {
pub fn recent_workspaces(&self, limit: usize) -> Result<Vec<(WorkspaceId, Vec<Arc<Path>>)>> { let mut lock = db.connection.lock();
// Return all the workspace ids and their associated paths ordered by the access timestamp
//ORDER BY timestamps match logic(&mut lock, worktree_roots, workspace_id) {
Ok(_) => {}
Err(err) => {
log::error!(
"Failed to update the worktree roots for {:?}, roots: {:?}, error: {}",
workspace_id,
worktree_roots,
err
);
}
}
});
}
pub fn last_workspace_id(&self) -> Option<WorkspaceId> {
fn logic(connection: &mut Connection) -> Result<Option<WorkspaceId>> {
let mut stmt = connection
.prepare("SELECT workspace_id FROM workspaces ORDER BY timestamp DESC LIMIT 1")?;
Ok(stmt
.query_row([], |row| Ok(WorkspaceId(row.get(0)?)))
.optional()?)
}
self.real() self.real()
.map(|db| { .map(|db| {
let mut lock = db.connection.lock(); let mut lock = db.connection.lock();
let tx = lock.transaction()?; match logic(&mut lock) {
Ok(result) => result,
Err(err) => {
log::error!("Failed to get last workspace id, err: {}", err);
None
}
}
})
.unwrap_or(None)
}
/// Returns the previous workspace ids sorted by last modified along with their opened worktree roots
pub fn recent_workspaces(&self, limit: usize) -> Vec<(WorkspaceId, Vec<Arc<Path>>)> {
fn logic(
connection: &mut Connection,
limit: usize,
) -> Result<Vec<(WorkspaceId, Vec<Arc<Path>>)>, anyhow::Error> {
let tx = connection.transaction()?;
let result = { let result = {
let mut stmt = tx.prepare_cached( let mut stmt = tx.prepare(
"SELECT workspace_id FROM workspaces ORDER BY timestamp DESC LIMIT ?", "SELECT workspace_id FROM workspaces ORDER BY timestamp DESC LIMIT ?",
)?; )?;
let workspace_ids = stmt let workspace_ids = stmt
.query_map([limit], |row| Ok(WorkspaceId(row.get(0)?)))? .query_map([limit], |row| Ok(WorkspaceId(row.get(0)?)))?
.collect::<Result<Vec<_>, rusqlite::Error>>()?; .collect::<Result<Vec<_>, rusqlite::Error>>()?;
let mut result = Vec::new(); let mut result = Vec::new();
let mut stmt = tx.prepare_cached( let mut stmt =
"SELECT worktree_root FROM worktree_roots WHERE workspace_id = ?", tx.prepare("SELECT worktree_root FROM worktree_roots WHERE workspace_id = ?")?;
)?;
for workspace_id in workspace_ids { for workspace_id in workspace_ids {
let roots = stmt let roots = stmt
.query_map([workspace_id.0], |row| { .query_map([workspace_id.0], |row| {
let row = row.get::<_, String>(0)?; let row = row.get::<_, Vec<u8>>(0)?;
Ok(PathBuf::from(Path::new(&row)).into()) Ok(PathBuf::from(OsStr::from_bytes(&row)).into())
})? })?
.collect::<Result<Vec<_>, rusqlite::Error>>()?; .collect::<Result<Vec<_>, rusqlite::Error>>()?;
result.push((workspace_id, roots)) result.push((workspace_id, roots))
@ -197,21 +228,36 @@ impl Db {
result result
}; };
tx.commit()?; tx.commit()?;
return Ok(result); return Ok(result);
}
self.real()
.map(|db| {
let mut lock = db.connection.lock();
match logic(&mut lock, limit) {
Ok(result) => result,
Err(err) => {
log::error!("Failed to get recent workspaces, err: {}", err);
Vec::new()
}
}
}) })
.unwrap_or_else(|| Ok(Vec::new())) .unwrap_or_else(|| Vec::new())
} }
} }
fn get_workspace_id<P>( fn get_workspace_id<P>(worktree_roots: &[P], connection: &Connection) -> Option<WorkspaceId>
where
P: AsRef<Path> + Debug,
{
fn logic<P>(
worktree_roots: &[P], worktree_roots: &[P],
connection: &Connection, connection: &Connection,
) -> Result<Option<WorkspaceId>, anyhow::Error> ) -> Result<Option<WorkspaceId>, anyhow::Error>
where where
P: AsRef<Path>, P: AsRef<Path> + Debug,
{ {
// Prepare the array binding string. SQL doesn't have syntax for this, so // Prepare the array binding string. SQL doesn't have syntax for this, so
// we have to do it ourselves. // we have to do it ourselves.
@ -269,6 +315,9 @@ where
// And we're done! We've found the matching ID correctly :D // And we're done! We've found the matching ID correctly :D
// However, due to limitations in sqlite's query binding, we still have to do some string // However, due to limitations in sqlite's query binding, we still have to do some string
// substitution to generate the correct query // substitution to generate the correct query
// 47,116,109,112,50
// 2F746D7032
let query = format!( let query = format!(
r#" r#"
SELECT workspace_id SELECT workspace_id
@ -283,26 +332,46 @@ where
"#, "#,
array_bind = array_binding_stmt array_bind = array_binding_stmt
); );
let mut stmt = connection.prepare_cached(&query)?;
// This will only be called on start up and when root workspaces change, no need to waste memory
// caching it.
let mut stmt = connection.prepare(&query)?;
// Make sure we bound the parameters correctly // Make sure we bound the parameters correctly
debug_assert!(worktree_roots.len() + 1 == stmt.parameter_count()); debug_assert!(worktree_roots.len() + 1 == stmt.parameter_count());
for i in 0..worktree_roots.len() { for i in 0..worktree_roots.len() {
// TODO: Update this to use blobs let path = &worktree_roots[i].as_ref().as_os_str().as_bytes();
let path = &worktree_roots[i].as_ref().to_string_lossy().to_string();
stmt.raw_bind_parameter(i + 1, path)? stmt.raw_bind_parameter(i + 1, path)?
} }
// No -1, because SQLite is 1 based // No -1, because SQLite is 1 based
stmt.raw_bind_parameter(worktree_roots.len() + 1, worktree_roots.len())?; stmt.raw_bind_parameter(worktree_roots.len() + 1, worktree_roots.len())?;
let mut rows = stmt.raw_query(); let mut rows = stmt.raw_query();
if let Ok(Some(row)) = rows.next() { let row = rows.next();
return Ok(Some(WorkspaceId(row.get(0)?))); let result = if let Ok(Some(row)) = row {
} Ok(Some(WorkspaceId(row.get(0)?)))
// Ensure that this query only returns one row. The PRIMARY KEY constraint should catch this case } else {
// but this is here to catch it if someone refactors that constraint out.
debug_assert!(matches!(rows.next(), Ok(None)));
Ok(None) Ok(None)
};
// Ensure that this query only returns one row. The PRIMARY KEY constraint should catch this case
// but this is here to catch if someone refactors that constraint out.
debug_assert!(matches!(rows.next(), Ok(None)));
result
}
match logic(worktree_roots, connection) {
Ok(result) => result,
Err(err) => {
log::error!(
"Failed to get the workspace ID for paths {:?}, err: {}",
worktree_roots,
err
);
None
}
}
} }
#[cfg(test)] #[cfg(test)]
@ -335,39 +404,26 @@ mod tests {
for (workspace_id, entries) in data { for (workspace_id, entries) in data {
db.make_new_workspace(); db.make_new_workspace();
db.update_worktree_roots(workspace_id, entries).unwrap(); db.update_worktree_roots(workspace_id, entries);
} }
assert_eq!(Some(WorkspaceId(1)), db.workspace_id(&["/tmp1"]).unwrap()); assert_eq!(Some(WorkspaceId(1)), db.workspace_id(&["/tmp1"]));
assert_eq!(db.workspace_id(&["/tmp1", "/tmp2"]), Some(WorkspaceId(2)));
assert_eq!( assert_eq!(
db.workspace_id(&["/tmp1", "/tmp2"]).unwrap(), db.workspace_id(&["/tmp1", "/tmp2", "/tmp3"]),
Some(WorkspaceId(2))
);
assert_eq!(
db.workspace_id(&["/tmp1", "/tmp2", "/tmp3"]).unwrap(),
Some(WorkspaceId(3)) Some(WorkspaceId(3))
); );
assert_eq!(db.workspace_id(&["/tmp2", "/tmp3"]), Some(WorkspaceId(4)));
assert_eq!( assert_eq!(
db.workspace_id(&["/tmp2", "/tmp3"]).unwrap(), db.workspace_id(&["/tmp2", "/tmp3", "/tmp4"]),
Some(WorkspaceId(4))
);
assert_eq!(
db.workspace_id(&["/tmp2", "/tmp3", "/tmp4"]).unwrap(),
Some(WorkspaceId(5)) Some(WorkspaceId(5))
); );
assert_eq!( assert_eq!(db.workspace_id(&["/tmp2", "/tmp4"]), Some(WorkspaceId(6)));
db.workspace_id(&["/tmp2", "/tmp4"]).unwrap(), assert_eq!(db.workspace_id(&["/tmp2"]), Some(WorkspaceId(7)));
Some(WorkspaceId(6))
);
assert_eq!(db.workspace_id(&["/tmp2"]).unwrap(), Some(WorkspaceId(7)));
assert_eq!(db.workspace_id(&["/tmp1", "/tmp5"]).unwrap(), None); assert_eq!(db.workspace_id(&["/tmp1", "/tmp5"]), None);
assert_eq!(db.workspace_id(&["/tmp5"]).unwrap(), None); assert_eq!(db.workspace_id(&["/tmp5"]), None);
assert_eq!( assert_eq!(db.workspace_id(&["/tmp2", "/tmp3", "/tmp4", "/tmp5"]), None);
db.workspace_id(&["/tmp2", "/tmp3", "/tmp4", "/tmp5"])
.unwrap(),
None
);
} }
#[test] #[test]
@ -382,18 +438,15 @@ mod tests {
for (workspace_id, entries) in data { for (workspace_id, entries) in data {
db.make_new_workspace(); db.make_new_workspace();
db.update_worktree_roots(workspace_id, entries).unwrap(); db.update_worktree_roots(workspace_id, entries);
} }
assert_eq!(db.workspace_id(&["/tmp2"]).unwrap(), None); assert_eq!(db.workspace_id(&["/tmp2"]), None);
assert_eq!(db.workspace_id(&["/tmp2", "/tmp3"]).unwrap(), None); assert_eq!(db.workspace_id(&["/tmp2", "/tmp3"]), None);
assert_eq!(db.workspace_id(&["/tmp"]).unwrap(), Some(WorkspaceId(1))); assert_eq!(db.workspace_id(&["/tmp"]), Some(WorkspaceId(1)));
assert_eq!(db.workspace_id(&["/tmp", "/tmp2"]), Some(WorkspaceId(2)));
assert_eq!( assert_eq!(
db.workspace_id(&["/tmp", "/tmp2"]).unwrap(), db.workspace_id(&["/tmp", "/tmp2", "/tmp3"]),
Some(WorkspaceId(2))
);
assert_eq!(
db.workspace_id(&["/tmp", "/tmp2", "/tmp3"]).unwrap(),
Some(WorkspaceId(3)) Some(WorkspaceId(3))
); );
} }
@ -426,29 +479,28 @@ mod tests {
// Load in the test data // Load in the test data
for (workspace_id, entries) in data { for (workspace_id, entries) in data {
db.workspace_for_worktree_roots(&[]); db.make_new_workspace();
db.update_worktree_roots(workspace_id, entries).unwrap(); db.update_worktree_roots(workspace_id, entries);
} }
// Make sure the timestamp updates // Make sure the timestamp updates
sleep(Duration::from_secs(1)); sleep(Duration::from_secs(1));
// Execute the update // Execute the update
db.update_worktree_roots(&WorkspaceId(2), &["/tmp2", "/tmp3"]) db.update_worktree_roots(&WorkspaceId(2), &["/tmp2", "/tmp3"]);
.unwrap();
// Make sure that workspace 3 doesn't exist // Make sure that workspace 3 doesn't exist
assert_eq!( assert_eq!(db.workspace_id(&["/tmp2", "/tmp3"]), Some(WorkspaceId(2)));
db.workspace_id(&["/tmp2", "/tmp3"]).unwrap(),
Some(WorkspaceId(2))
);
// And that workspace 1 was untouched // And that workspace 1 was untouched
assert_eq!(db.workspace_id(&["/tmp"]).unwrap(), Some(WorkspaceId(1))); assert_eq!(db.workspace_id(&["/tmp"]), Some(WorkspaceId(1)));
// And that workspace 2 is no longer registered under this // And that workspace 2 is no longer registered under these roots
assert_eq!(db.workspace_id(&["/tmp", "/tmp2"]).unwrap(), None); assert_eq!(db.workspace_id(&["/tmp", "/tmp2"]), None);
let recent_workspaces = db.recent_workspaces(10).unwrap(); assert_eq!(Some(WorkspaceId(2)), db.last_workspace_id());
let recent_workspaces = db.recent_workspaces(10);
assert_eq!( assert_eq!(
recent_workspaces.get(0).unwrap(), recent_workspaces.get(0).unwrap(),
&(WorkspaceId(2), vec![arc_path("/tmp2"), arc_path("/tmp3")]) &(WorkspaceId(2), vec![arc_path("/tmp2"), arc_path("/tmp3")])