Use database ids to identify crates and versions

Author: Nemo157

src/metrics/mod.rs

@@ -79,26 +79,25 @@ metrics! {
 
 #[derive(Debug, Default)]
 pub(crate) struct RecentlyAccessedReleases {
-    krates: DashMap<String, Instant>,
-    versions: DashMap<String, Instant>,
-    platforms: DashMap<String, Instant>,
+    krates: DashMap<i32, Instant>,
+    versions: DashMap<i32, Instant>,
+    platforms: DashMap<(i32, String), Instant>,
 }
 
 impl RecentlyAccessedReleases {
     pub(crate) fn new() -> Self {
         Self::default()
     }
 
-    pub(crate) fn record(&self, krate: &str, version: &str, target: &str) {
-        self.krates.insert(krate.to_owned(), Instant::now());
-        self.versions
-            .insert(format!("{}/{}", krate, version), Instant::now());
+    pub(crate) fn record(&self, krate: i32, version: i32, target: &str) {
+        self.krates.insert(krate, Instant::now());
+        self.versions.insert(version, Instant::now());
         self.platforms
-            .insert(format!("{}/{}/{}", krate, version, target), Instant::now());
+            .insert((version, target.to_owned()), Instant::now());
     }
 
     pub(crate) fn gather(&self, metrics: &Metrics) {
-        fn inner(map: &DashMap<String, Instant>, metric: &IntGaugeVec) {
+        fn inner<K: std::hash::Hash + Eq>(map: &DashMap<K, Instant>, metric: &IntGaugeVec) {
             let mut hour_count = 0;
             let mut half_hour_count = 0;
             let mut five_minute_count = 0;

src/web/crate_details.rs

@@ -46,6 +46,10 @@ pub struct CrateDetails {
     documentation_url: Option<String>,
     total_items: Option<f32>,
     documented_items: Option<f32>,
+    /// Database id for this crate
+    pub(crate) crate_id: i32,
+    /// Database id for this release
+    pub(crate) release_id: i32,
 }
 
 fn optional_markdown<S>(markdown: &Option<String>, serializer: S) -> Result<S::Ok, S::Error>
@@ -190,6 +194,8 @@ impl CrateDetails {
             documentation_url: krate.get("documentation_url"),
             documented_items: documented_items.map(|v| v as f32),
             total_items: total_items.map(|v| v as f32),
+            crate_id,
+            release_id,
         };
 
         if let Some(repository_url) = crate_details.repository_url.clone() {

src/web/rustdoc.rs

@@ -407,7 +407,7 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
 
     metrics
         .recently_accessed_releases
-        .record(&name, &version, target);
+        .record(krate.crate_id, krate.release_id, target);
 
     rendering_time.step("rewrite html");
     RustdocPage {