change all catalog-types to use dashmap

Cargo.toml

@@ -91,6 +91,7 @@ tokio = { version = "1", features = ["macros"] }
 tokio-postgres-rustls = "0.13"
 url = "2.5"
 xxhash-rust = { version = "0.8", features = ["xxh3"] }
+dashmap = { version =  "6.1.0", features = ["inline", "serde"] }
 
 [profile.dev.package]
 # See https://github.com/launchbadge/sqlx#compile-time-verification

martin/Cargo.toml

@@ -113,6 +113,7 @@ tilejson.workspace = true
 tokio = { workspace = true, features = ["io-std"] }
 tokio-postgres-rustls = { workspace = true, optional = true }
 url.workspace = true
+dashmap.workspace = true
 
 [build-dependencies]
 static-files = { workspace = true, optional = true }

martin/src/bin/martin-cp.rs

@@ -299,7 +299,7 @@ async fn run_tile_copy(args: CopyArgs, state: ServerState) -> MartinCpResult<()>
     } else {
         CopyDuplicateMode::Override
     };
-    let mbt_type = init_schema(&mbt, &mut conn, src.sources.as_slice(), src.info, &args).await?;
+    let mbt_type = init_schema(&mbt, &mut conn, &src.sources, src.info, &args).await?;
 
     let progress = Progress::new(&tiles);
     info!(
@@ -392,7 +392,7 @@ fn parse_encoding(encoding: &str) -> MartinCpResult<AcceptEncoding> {
 async fn init_schema(
     mbt: &Mbtiles,
     conn: &mut SqliteConnection,
-    sources: &[&dyn Source],
+    sources: &[Box<dyn Source>],
     tile_info: TileInfo,
     args: &CopyArgs,
 ) -> Result<MbtType, MartinError> {

martin/src/fonts/mod.rs

@@ -1,11 +1,10 @@
-use std::collections::hash_map::Entry;
-use std::collections::{BTreeMap, HashMap};
 use std::ffi::OsStr;
 use std::fmt::Debug;
 use std::path::PathBuf;
 use std::sync::OnceLock;
 
 use bit_set::BitSet;
+use dashmap::DashMap;
 use itertools::Itertools as _;
 use log::{debug, info, warn};
 use pbf_font_tools::freetype::{Face, Library};
@@ -103,11 +102,11 @@ fn get_available_codepoints(face: &mut Face) -> Option<GetGlyphInfo> {
 
 #[derive(Debug, Clone, Default)]
 pub struct FontSources {
-    fonts: HashMap<String, FontSource>,
+    fonts: DashMap<String, FontSource>,
     masks: Vec<BitSet>,
 }
 
-pub type FontCatalog = BTreeMap<String, CatalogFontEntry>;
+pub type FontCatalog = DashMap<String, CatalogFontEntry>;
 
 #[serde_with::skip_serializing_none]
 #[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq)]
@@ -125,7 +124,7 @@ impl FontSources {
             return Ok(Self::default());
         }
 
-        let mut fonts = HashMap::new();
+        let mut fonts = DashMap::new();
         let lib = Library::init()?;
 
         for path in config.iter() {
@@ -150,7 +149,7 @@ impl FontSources {
     pub fn get_catalog(&self) -> FontCatalog {
         self.fonts
             .iter()
-            .map(|(k, v)| (k.clone(), v.catalog_entry.clone()))
+            .map(|v| (v.key().clone(), v.catalog_entry.clone()))
             .sorted_by(|(a, _), (b, _)| a.cmp(b))
             .collect()
     }
@@ -242,7 +241,7 @@ pub struct FontSource {
 fn recurse_dirs(
     lib: &Library,
     path: PathBuf,
-    fonts: &mut HashMap<String, FontSource>,
+    fonts: &mut DashMap<String, FontSource>,
     is_top_level: bool,
 ) -> FontResult<()> {
     let start_count = fonts.len();
@@ -275,7 +274,7 @@ fn recurse_dirs(
 
 fn parse_font(
     lib: &Library,
-    fonts: &mut HashMap<String, FontSource>,
+    fonts: &mut DashMap<String, FontSource>,
     path: PathBuf,
 ) -> FontResult<()> {
     static RE_SPACES: OnceLock<Regex> = OnceLock::new();
@@ -301,29 +300,28 @@ fn parse_font(
             .replace_all(name.as_str(), " ")
             .to_string();
 
-        match fonts.entry(name) {
-            Entry::Occupied(v) => {
+        match fonts.get(&name) {
+            Some(v) => {
                 warn!(
                     "Ignoring duplicate font {} from {} because it was already configured from {}",
                     v.key(),
                     path.display(),
-                    v.get().path.display()
+                    v.path.display()
                 );
             }
-            Entry::Vacant(v) => {
-                let key = v.key();
+            None => {
                 let Some((codepoints, glyphs, ranges, start, end)) =
                     get_available_codepoints(&mut face)
                 else {
                     warn!(
-                        "Ignoring font {key} from {} because it has no available glyphs",
+                        "Ignoring font {name} from {} because it has no available glyphs",
                         path.display()
                     );
                     continue;
                 };
 
                 info!(
-                    "Configured font {key} with {glyphs} glyphs ({start:04X}-{end:04X}) from {}",
+                    "Configured font {name} with {glyphs} glyphs ({start:04X}-{end:04X}) from {}",
                     path.display()
                 );
                 debug!(
@@ -338,18 +336,21 @@ fn parse_font(
                         .join(", "),
                 );
 
-                v.insert(FontSource {
-                    path: path.clone(),
-                    face_index,
-                    codepoints,
-                    catalog_entry: CatalogFontEntry {
-                        family,
-                        style,
-                        glyphs,
-                        start,
-                        end,
+                fonts.insert(
+                    name,
+                    FontSource {
+                        path: path.clone(),
+                        face_index,
+                        codepoints,
+                        catalog_entry: CatalogFontEntry {
+                            family,
+                            style,
+                            glyphs,
+                            start,
+                            end,
+                        },
                     },
-                });
+                );
             }
         }
     }

martin/src/source.rs

@@ -1,8 +1,9 @@
-use std::collections::{BTreeMap, HashMap};
+use std::collections::HashMap;
 use std::fmt::Debug;
 
 use actix_web::error::ErrorNotFound;
 use async_trait::async_trait;
+use dashmap::DashMap;
 use log::debug;
 use martin_tile_utils::{TileCoord, TileInfo};
 use serde::{Deserialize, Serialize};
@@ -18,8 +19,8 @@ pub type TileInfoSource = Box<dyn Source>;
 pub type TileInfoSources = Vec<TileInfoSource>;
 
 #[derive(Default, Clone)]
-pub struct TileSources(HashMap<String, Box<dyn Source>>);
-pub type TileCatalog = BTreeMap<String, CatalogSourceEntry>;
+pub struct TileSources(DashMap<String, TileInfoSource>);
+pub type TileCatalog = DashMap<String, CatalogSourceEntry>;
 
 impl TileSources {
     #[must_use]
@@ -37,16 +38,17 @@ impl TileSources {
     pub fn get_catalog(&self) -> TileCatalog {
         self.0
             .iter()
-            .map(|(id, src)| (id.to_string(), src.get_catalog_entry()))
+            .map(|v| (v.key().to_string(), v.get_catalog_entry()))
             .collect()
     }
 
-    pub fn get_source(&self, id: &str) -> actix_web::Result<&dyn Source> {
+    pub fn get_source(&self, id: &str) -> actix_web::Result<TileInfoSource> {
         Ok(self
             .0
             .get(id)
             .ok_or_else(|| ErrorNotFound(format!("Source {id} does not exist")))?
-            .as_ref())
+            .value()
+            .clone())
     }
 
     /// Get a list of sources, and the tile info for the merged sources.
@@ -56,7 +58,7 @@ impl TileSources {
         &self,
         source_ids: &str,
         zoom: Option<u8>,
-    ) -> actix_web::Result<(Vec<&dyn Source>, bool, TileInfo)> {
+    ) -> actix_web::Result<(Vec<TileInfoSource>, bool, TileInfo)> {
         let mut sources = Vec::new();
         let mut info: Option<TileInfo> = None;
         let mut use_url_query = false;
@@ -78,7 +80,7 @@ impl TileSources {
 
             // TODO: Use chained-if-let once available
             if match zoom {
-                Some(zoom) if Self::check_zoom(src, id, zoom) => true,
+                Some(zoom) if Self::check_zoom(&*src, id, zoom) => true,
                 None => true,
                 _ => false,
             } {
@@ -107,7 +109,7 @@ pub trait Source: Send + Debug {
 
     fn get_tile_info(&self) -> TileInfo;
 
-    fn clone_source(&self) -> Box<dyn Source>;
+    fn clone_source(&self) -> TileInfoSource;
 
     fn support_url_query(&self) -> bool {
         false
@@ -139,7 +141,7 @@ pub trait Source: Send + Debug {
     }
 }
 
-impl Clone for Box<dyn Source> {
+impl Clone for TileInfoSource {
     fn clone(&self) -> Self {
         self.clone_source()
     }