add FxDashMap/FxDashSet (#261)

Author: joshuadavidthomas

Cargo.lock

@@ -1,51 +1,38 @@
-use std::collections::HashMap;
 use std::io;
 use std::sync::Arc;
-use std::sync::Mutex;
 
 use camino::Utf8Path;
 use camino::Utf8PathBuf;
 use djls_source::Db as SourceDb;
 use djls_source::File;
+use djls_source::FxDashMap;
 use djls_templates::Db as TemplateDb;
 use salsa::Setter;
 
 #[salsa::db]
 #[derive(Clone)]
 pub struct Db {
-    sources: Arc<Mutex<HashMap<Utf8PathBuf, String>>>,
+    sources: Arc<FxDashMap<Utf8PathBuf, String>>,
     storage: salsa::Storage<Self>,
 }
 
 impl Db {
     #[must_use]
     pub fn new() -> Self {
         Self {
-            sources: Arc::new(Mutex::new(HashMap::new())),
+            sources: Arc::new(FxDashMap::default()),
             storage: salsa::Storage::default(),
         }
     }
 
-    /// ## Panics
-    ///
-    /// If sources mutex is poisoned.
     pub fn file_with_contents(&mut self, path: Utf8PathBuf, contents: &str) -> File {
-        self.sources
-            .lock()
-            .expect("sources lock poisoned")
-            .insert(path.clone(), contents.to_string());
+        self.sources.insert(path.clone(), contents.to_string());
         File::new(self, path, 0)
     }
 
-    /// ## Panics
-    ///
-    /// If sources mutex is poisoned.
     pub fn set_file_contents(&mut self, file: File, contents: &str, revision: u64) {
         let path = file.path(self);
-        self.sources
-            .lock()
-            .expect("sources lock poisoned")
-            .insert(path.clone(), contents.to_string());
+        self.sources.insert(path.clone(), contents.to_string());
         file.set_revision(self).to(revision);
     }
 }
@@ -62,8 +49,11 @@ impl salsa::Database for Db {}
 #[salsa::db]
 impl SourceDb for Db {
     fn read_file_source(&self, path: &Utf8Path) -> io::Result<String> {
-        let sources = self.sources.lock().expect("sources lock poisoned");
-        Ok(sources.get(path).cloned().unwrap_or_default())
+        Ok(self
+            .sources
+            .get(path)
+            .map(|entry| entry.value().clone())
+            .unwrap_or_default())
     }
 }
 

crates/djls-bench/src/db.rs

@@ -5,6 +5,8 @@ edition = "2021"
 
 [dependencies]
 camino = { workspace = true }
+dashmap = { workspace = true }
+rustc-hash = { workspace = true }
 salsa = { workspace = true }
 serde = { workspace = true }
 thiserror = { workspace = true }

crates/djls-source/Cargo.toml

@@ -0,0 +1,8 @@
+use std::hash::BuildHasherDefault;
+
+use dashmap::DashMap;
+use dashmap::DashSet;
+use rustc_hash::FxHasher;
+
+pub type FxDashMap<K, V> = DashMap<K, V, BuildHasherDefault<FxHasher>>;
+pub type FxDashSet<K> = DashSet<K, BuildHasherDefault<FxHasher>>;

crates/djls-source/src/collections.rs

@@ -1,9 +1,12 @@
+mod collections;
 mod db;
 mod file;
 mod line;
 mod position;
 mod protocol;
 
+pub use collections::FxDashMap;
+pub use collections::FxDashSet;
 pub use db::Db;
 pub use file::File;
 pub use file::FileKind;

crates/djls-source/src/lib.rs

@@ -8,7 +8,7 @@
 /// [`WorkspaceFileSystem`]: crate::fs::WorkspaceFileSystem
 use std::sync::Arc;
 
-use dashmap::DashMap;
+use djls_source::FxDashMap;
 use url::Url;
 
 use crate::document::TextDocument;
@@ -35,14 +35,14 @@ use crate::document::TextDocument;
 /// [`WorkspaceFileSystem`]: crate::fs::WorkspaceFileSystem
 #[derive(Clone, Debug)]
 pub struct Buffers {
-    inner: Arc<DashMap<Url, TextDocument>>,
+    inner: Arc<FxDashMap<Url, TextDocument>>,
 }
 
 impl Buffers {
     #[must_use]
     pub fn new() -> Self {
         Self {
-            inner: Arc::new(DashMap::new()),
+            inner: Arc::new(FxDashMap::default()),
         }
     }
 

crates/djls-workspace/src/buffers.rs

@@ -8,8 +8,8 @@ use std::sync::Arc;
 
 use camino::Utf8Path;
 use camino::Utf8PathBuf;
-use dashmap::DashMap;
 use djls_source::File;
+use djls_source::FxDashMap;
 use djls_source::PositionEncoding;
 use tower_lsp_server::lsp_types::TextDocumentContentChangeEvent;
 use url::Url;
@@ -54,7 +54,7 @@ pub struct Workspace {
     /// Thread-safe shared buffer storage for open documents
     buffers: Buffers,
     /// Registry mapping file paths to Salsa [`File`] handles
-    files: Arc<DashMap<Utf8PathBuf, File>>,
+    files: Arc<FxDashMap<Utf8PathBuf, File>>,
     /// File system abstraction that checks buffers first, then disk
     file_system: Arc<WorkspaceFileSystem>,
 }
@@ -64,7 +64,7 @@ impl Workspace {
     #[must_use]
     pub fn new() -> Self {
         let buffers = Buffers::new();
-        let files = Arc::new(DashMap::new());
+        let files = Arc::new(FxDashMap::default());
         let file_system = Arc::new(WorkspaceFileSystem::new(
             buffers.clone(),
             Arc::new(OsFileSystem),