zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-18 18:08:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rebase - Successfully detecting workplace IDs :D

Browse Source
This commit is contained in:
Mikayla Maki 2022-10-25 13:18:37 -07:00
parent 500ecbf915
commit d7bbfb82a3
4 changed files with 228 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -10,6 +10,7 @@
/assets/themes/Internal/*.json
/assets/themes/Experiments/*.json
**/venv
<<<<<<< HEAD
.build
Packages
*.xcodeproj
@ -18,3 +19,6 @@ DerivedData/
.swiftpm/config/registries.json
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
.netrc
=======
crates/db/test-db.db
>>>>>>> 9d9ad38ce (Successfully detecting workplace IDs :D)

1
crates/db/Cargo.toml
View File

@ -20,7 +20,6 @@ log = { version = "0.4.16", features = ["kv_unstable_serde"] }
parking_lot = "0.11.1"
rusqlite = { version = "0.28.0", features = ["bundled", "serde_json", "backup"] }
rusqlite_migration = { git = "https://github.com/cljoly/rusqlite_migration", rev = "c433555d7c1b41b103426e35756eb3144d0ebbc6" }
>>>>>>> dd2ddc5e3 (Started writing the real SQL we're going to need)
serde = { workspace = true }
serde_rusqlite = "0.31.0"

26
crates/db/examples/serialize_workspace.rs
View File

@ -13,7 +13,31 @@ fn main() -> anyhow::Result<()> {
drop(f);
db.write_kvp("test", "1")?;
db.write_kvp("test", "2")?;
db.write_kvp("test-2", "2")?;
let workspace_1 = db.workspace_for_worktree_roots(&[]);
let workspace_2 = db.workspace_for_worktree_roots(&[]);
let workspace_3 = db.workspace_for_worktree_roots(&[]);
let workspace_4 = db.workspace_for_worktree_roots(&[]);
let workspace_5 = db.workspace_for_worktree_roots(&[]);
let workspace_6 = db.workspace_for_worktree_roots(&[]);
let workspace_7 = db.workspace_for_worktree_roots(&[]);
db.update_worktree_roots(&workspace_1.workspace_id, &["/tmp1"])
.unwrap();
db.update_worktree_roots(&workspace_2.workspace_id, &["/tmp1", "/tmp2"])
.unwrap();
db.update_worktree_roots(&workspace_3.workspace_id, &["/tmp1", "/tmp2", "/tmp3"])
.unwrap();
db.update_worktree_roots(&workspace_4.workspace_id, &["/tmp2", "/tmp3"])
.unwrap();
db.update_worktree_roots(&workspace_5.workspace_id, &["/tmp2", "/tmp3", "/tmp4"])
.unwrap();
db.update_worktree_roots(&workspace_6.workspace_id, &["/tmp2", "/tmp4"])
.unwrap();
db.update_worktree_roots(&workspace_7.workspace_id, &["/tmp2"])
.unwrap();
db.write_to(file).ok();
println!("Wrote database!");

242
crates/db/src/workspace.rs
View File

@ -1,4 +1,5 @@
use anyhow::Result;
use rusqlite::params;
use std::{path::Path, sync::Arc};
@ -14,9 +15,10 @@ CREATE TABLE workspaces(
) STRICT;
CREATE TABLE worktree_roots(
worktree_root BLOB NOT NULL,
worktree_root TEXT NOT NULL, --TODO: Update this to use blobs
workspace_id INTEGER NOT NULL,
FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
PRIMARY KEY(worktree_root, workspace_id)
) STRICT;
";
@ -39,7 +41,7 @@ struct WorkspaceRow {
pub dock_pane_id: PaneId,
}
#[derive(Default)]
#[derive(Default, Debug)]
pub struct SerializedWorkspace {
pub workspace_id: WorkspaceId,
// pub center_group: SerializedPaneGroup,
@ -54,7 +56,7 @@ impl Db {
worktree_roots: &[Arc<Path>],
) -> SerializedWorkspace {
// Find the workspace id which is uniquely identified by this set of paths return it if found
if let Some(workspace_id) = self.workspace_id(worktree_roots) {
if let Ok(Some(workspace_id)) = self.workspace_id(worktree_roots) {
// TODO
// let workspace_row = self.get_workspace_row(workspace_id);
// let center_group = self.get_pane_group(workspace_row.center_group_id);
@ -84,8 +86,110 @@ impl Db {
.unwrap_or_default()
}
fn workspace_id(&self, worktree_roots: &[Arc<Path>]) -> Option<WorkspaceId> {
unimplemented!()
fn workspace_id<P>(&self, worktree_roots: &[P]) -> Result<Option<WorkspaceId>>
where
P: AsRef<Path>,
{
self.real()
.map(|db| {
let lock = db.connection.lock();
// Prepare the array binding string. SQL doesn't have syntax for this, so
// we have to do it ourselves.
let mut array_binding_stmt = "(".to_string();
for i in 0..worktree_roots.len() {
array_binding_stmt.push_str(&format!("?{}", (i + 1))); //sqlite is 1-based
if i < worktree_roots.len() - 1 {
array_binding_stmt.push(',');
array_binding_stmt.push(' ');
}
}
array_binding_stmt.push(')');
// Any workspace can have multiple independent paths, and these paths
// can overlap in the database. Take this test data for example:
//
// [/tmp, /tmp2] -> 1
// [/tmp] -> 2
// [/tmp2, /tmp3] -> 3
//
// This would be stred in the database like so:
//
// ID PATH
// 1 /tmp
// 1 /tmp2
// 2 /tmp
// 3 /tmp2
// 3 /tmp3
//
// Note how both /tmp and /tmp2 are associated with multiple workspace IDs.
// So, given an array of worktree roots, how can we find the exactly matching ID?
// Let's analyze what happens when querying for [/tmp, /tmp2], from the inside out:
// - We start with a join of this table on itself, generating every possible
// pair of ((path, ID), (path, ID)), and filtering the join down to just the
// *overlapping* workspace IDs. For this small data set, this would look like:
//
// wt1.ID wt1.PATH | wt2.ID wt2.PATH
// 3 /tmp3 3 /tmp2
//
// - Moving one SELECT out, we use the first pair's ID column to invert the selection,
// meaning we now have a list of all the entries for our array and *subsets*
// of our array:
//
// ID PATH
// 1 /tmp
// 2 /tmp
// 2 /tmp2
//
// - To trim out the subsets, we need to exploit the fact that there can be no duplicate
// entries in this table. We can just use GROUP BY, COUNT, and a WHERE clause that checks
// for the length of our array:
//
// ID num_matching
// 1 2
//
// 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
// substitution to generate the correct query
let query = format!(
r#"
SELECT workspace_id
FROM (SELECT count(workspace_id) as num_matching, workspace_id FROM worktree_roots
WHERE worktree_root in {array_bind} AND workspace_id NOT IN
(SELECT wt1.workspace_id FROM worktree_roots as wt1
JOIN worktree_roots as wt2
ON wt1.workspace_id = wt2.workspace_id
WHERE wt1.worktree_root NOT in {array_bind} AND wt2.worktree_root in {array_bind})
GROUP BY workspace_id)
WHERE num_matching = ?
"#,
array_bind = array_binding_stmt
);
let mut stmt = lock.prepare_cached(&query)?;
// Make sure we bound the parameters correctly
debug_assert!(worktree_roots.len() + 1 == stmt.parameter_count());
for i in 0..worktree_roots.len() {
// TODO: Update this to use blobs
let path = &worktree_roots[i].as_ref().to_string_lossy().to_string();
stmt.raw_bind_parameter(i + 1, path)?
}
// No -1, because SQLite is 1 based
stmt.raw_bind_parameter(worktree_roots.len() + 1, worktree_roots.len())?;
let mut rows = stmt.raw_query();
if let Ok(Some(row)) = rows.next() {
return Ok(Some(WorkspaceId(row.get(0)?)))
}
// Ensure that this query only returns one row
debug_assert!(matches!(rows.next(), Ok(None)));
Ok(None)
})
.unwrap_or(Ok(None))
}
fn get_workspace_row(&self, workspace_id: WorkspaceId) -> WorkspaceRow {
@ -95,15 +199,36 @@ impl Db {
/// 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
/// in the workspace id table
pub fn update_worktree_roots(&self, workspace_id: &WorkspaceId, worktree_roots: &[Arc<Path>]) {
pub fn update_worktree_roots<P>(
&self,
workspace_id: &WorkspaceId,
worktree_roots: &[P],
) -> Result<()>
where
P: AsRef<Path>,
{
// Lookup any WorkspaceIds which have the same set of roots, and delete them. (NOTE: this should garbage collect other tables)
// TODO
// Remove the old rows which contain workspace_id
// TODO
// Add rows for the new worktree_roots
// zed /tree
// -> add tree2
// -> udpate_worktree_roots() -> ADDs entries for /tree and /tree2, LEAVING BEHIND, the initial entry for /tree
unimplemented!();
self.real()
.map(|db| {
let lock = db.connection.lock();
for root in worktree_roots {
// TODO: Update this to use blobs
let path = root.as_ref().to_string_lossy().to_string();
lock.execute(
"INSERT INTO worktree_roots(workspace_id, worktree_root) VALUES (?, ?)",
params![workspace_id.0, path],
)?;
}
Ok(())
})
.unwrap_or(Ok(()))
}
/// Returns the previous workspace ids sorted by last modified along with their opened worktree roots
@ -117,49 +242,79 @@ impl Db {
#[cfg(test)]
mod tests {
use std::{
path::{Path, PathBuf},
sync::Arc,
};
use crate::Db;
use super::WorkspaceId;
fn arc_path(path: &'static str) -> Arc<Path> {
PathBuf::from(path).into()
}
#[test]
fn test_detect_workspace_id() {
fn test_more_workspace_ids() {
let data = &[
(WorkspaceId(1), vec![arc_path("/tmp")]),
(WorkspaceId(2), vec![arc_path("/tmp"), arc_path("/tmp2")]),
(
WorkspaceId(3),
vec![arc_path("/tmp"), arc_path("/tmp2"), arc_path("/tmp3")],
),
(WorkspaceId(1), vec!["/tmp1"]),
(WorkspaceId(2), vec!["/tmp1", "/tmp2"]),
(WorkspaceId(3), vec!["/tmp1", "/tmp2", "/tmp3"]),
(WorkspaceId(4), vec!["/tmp2", "/tmp3"]),
(WorkspaceId(5), vec!["/tmp2", "/tmp3", "/tmp4"]),
(WorkspaceId(6), vec!["/tmp2", "/tmp4"]),
(WorkspaceId(7), vec!["/tmp2"]),
];
let db = Db::open_in_memory();
for (workspace_id, entries) in data {
db.update_worktree_roots(workspace_id, entries); //??
db.make_new_workspace();
db.update_worktree_roots(workspace_id, entries).unwrap();
}
assert_eq!(None, db.workspace_id(&[arc_path("/tmp2")]));
assert_eq!(WorkspaceId(1), db.workspace_id(&["/tmp1"]).unwrap().unwrap());
assert_eq!(
None,
db.workspace_id(&[arc_path("/tmp2"), arc_path("/tmp3")])
WorkspaceId(2),
db.workspace_id(&["/tmp1", "/tmp2"]).unwrap().unwrap()
);
assert_eq!(Some(WorkspaceId(1)), db.workspace_id(&[arc_path("/tmp")]));
assert_eq!(
Some(WorkspaceId(2)),
db.workspace_id(&[arc_path("/tmp"), arc_path("/tmp2")])
WorkspaceId(3),
db.workspace_id(&["/tmp1", "/tmp2", "/tmp3"]).unwrap().unwrap()
);
assert_eq!(
WorkspaceId(4),
db.workspace_id(&["/tmp2", "/tmp3"]).unwrap().unwrap()
);
assert_eq!(
WorkspaceId(5),
db.workspace_id(&["/tmp2", "/tmp3", "/tmp4"]).unwrap().unwrap()
);
assert_eq!(
WorkspaceId(6),
db.workspace_id(&["/tmp2", "/tmp4"]).unwrap().unwrap()
);
assert_eq!(WorkspaceId(7), db.workspace_id(&["/tmp2"]).unwrap().unwrap());
assert_eq!(None, db.workspace_id(&["/tmp1", "/tmp5"]).unwrap());
assert_eq!(None, db.workspace_id(&["/tmp5"]).unwrap());
assert_eq!(None, db.workspace_id(&["/tmp2", "/tmp3", "/tmp4", "/tmp5"]).unwrap());
}
#[test]
fn test_detect_workspace_id() {
let data = &[
(WorkspaceId(1), vec!["/tmp"]),
(WorkspaceId(2), vec!["/tmp", "/tmp2"]),
(WorkspaceId(3), vec!["/tmp", "/tmp2", "/tmp3"]),
];
let db = Db::open_in_memory();
for (workspace_id, entries) in data {
db.make_new_workspace();
db.update_worktree_roots(workspace_id, entries).unwrap();
}
assert_eq!(None, db.workspace_id(&["/tmp2"]).unwrap());
assert_eq!(None, db.workspace_id(&["/tmp2", "/tmp3"]).unwrap());
assert_eq!(Some(WorkspaceId(1)), db.workspace_id(&["/tmp"]).unwrap());
assert_eq!(Some(WorkspaceId(2)), db.workspace_id(&["/tmp", "/tmp2"]).unwrap());
assert_eq!(
Some(WorkspaceId(3)),
db.workspace_id(&[arc_path("/tmp"), arc_path("/tmp2"), arc_path("/tmp3")])
db.workspace_id(&["/tmp", "/tmp2", "/tmp3"]).unwrap()
);
}
@ -178,27 +333,28 @@ mod tests {
// Get rid of 3 for garbage collection
let data = &[
(WorkspaceId(1), vec![arc_path("/tmp")]),
(WorkspaceId(2), vec![arc_path("/tmp"), arc_path("/tmp2")]),
(WorkspaceId(3), vec![arc_path("/tmp2"), arc_path("/tmp3")]),
(WorkspaceId(1), vec!["/tmp"]),
(WorkspaceId(2), vec!["/tmp", "/tmp2"]),
(WorkspaceId(3), vec!["/tmp2", "/tmp3"]),
];
let db = Db::open_in_memory();
for (workspace_id, entries) in data {
db.update_worktree_roots(workspace_id, entries); //??
assert_eq!(&db.workspace_id(&[]), &Some(*workspace_id))
db.update_worktree_roots(workspace_id, entries).unwrap(); //??
assert_eq!(&db.workspace_id::<String>(&[]).unwrap(), &Some(*workspace_id))
}
for (workspace_id, entries) in data {
assert_eq!(&db.workspace_id(entries.as_slice()), &Some(*workspace_id));
assert_eq!(&db.workspace_id(entries.as_slice()).unwrap(), &Some(*workspace_id));
}
db.update_worktree_roots(&WorkspaceId(2), &[arc_path("/tmp2")]);
db.update_worktree_roots(&WorkspaceId(2), &["/tmp2"])
.unwrap();
// todo!(); // make sure that 3 got garbage collected
assert_eq!(db.workspace_id(&[arc_path("/tmp2")]), Some(WorkspaceId(2)));
assert_eq!(db.workspace_id(&[arc_path("/tmp")]), Some(WorkspaceId(1)));
assert_eq!(db.workspace_id(&["/tmp2"]).unwrap(), Some(WorkspaceId(2)));
assert_eq!(db.workspace_id(&["/tmp"]).unwrap(), Some(WorkspaceId(1)));
let recent_workspaces = db.recent_workspaces();
assert_eq!(recent_workspaces.get(0).unwrap().0, WorkspaceId(2));