Fix deserialization from old data format

All nanosecond-encoded time fields should deserialize from either a number or
the "big" Duration encoding.

Author: Mark-Simulacrum

collector/src/bin/recode.rs

@@ -1,4 +1,4 @@
-use collector::{CommitData};
+use collector::CommitData;
 use std::fs;
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -14,16 +14,15 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         if filename.starts_with("commit-") && filename.ends_with(".sz") {
             eprintln!("{:?}", filename);
             use std::io::Read;
-            let mut out =
-                String::with_capacity(snap::decompress_len(&file_contents).unwrap_or(0));
+            let mut out = String::with_capacity(snap::decompress_len(&file_contents).unwrap_or(0));
             let mut szip_reader = snap::Reader::new(&file_contents[..]);
             szip_reader.read_to_string(&mut out).unwrap();
             let file_contents = out.as_str();
 
             let contents: CommitData = match serde_json::from_str(&file_contents) {
                 Ok(json) => json,
                 Err(err) => {
-                    log::error!("Failed to parse JSON for {}: {:?}", filename, err);
+                    eprintln!("Failed to parse JSON for {}: {:?}", filename, err);
                     continue;
                 }
             };

collector/src/self_profile.rs

@@ -102,11 +102,13 @@ pub struct QueryData {
     self_time: u64,
     pub number_of_cache_hits: u32,
     pub invocation_count: u32,
+    #[serde(deserialize_with = "SerdeDuration::into_nanos")]
     blocked_time: u64,
+    #[serde(deserialize_with = "SerdeDuration::into_nanos")]
     incremental_load_time: u64,
 }
 
-#[derive(Deserialize)]
+#[derive(Debug, Deserialize)]
 #[serde(untagged)]
 enum SerdeDuration {
     Nanoseconds(u64),