switch from HashMap to FnvHashMap

Author: indirect

Cargo.lock

@@ -11,15 +11,16 @@ default-run = "kirby"
 argparse = "0.2.2"
 aws_lambda = { git = "https://github.com/srijs/rust-aws-lambda" }
 flate2 = { version = "1.0", features = ["zlib"], default-features = false }
+fnv = "1.0.6"
 futures = "0.1.24"
 lazy_static = "1.1.0"
 log = "0.4.5"
 nom = "4.0"
 rayon = "1.0.2"
 regex = "1"
+rusoto_core = { version="0.34.0", default_features=false, features=["rustls"] }
+rusoto_s3 = { version="0.34.0", default_features=false, features=["rustls"] }
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-time = "0.1"
-rusoto_core = { version="0.34.0", default_features=false, features=["rustls"] }
-rusoto_s3 = { version="0.34.0", default_features=false, features=["rustls"] }
+time = "0.1"

Cargo.toml

@@ -7,13 +7,14 @@ extern crate lazy_static;
 extern crate serde_derive;
 
 extern crate flate2;
+extern crate fnv;
 extern crate nom;
 extern crate regex;
 extern crate serde;
 extern crate serde_json;
 extern crate test;
 
-use std::collections::HashMap;
+use fnv::FnvHashMap;
 use std::io::*;
 
 mod file;
@@ -27,9 +28,9 @@ const METADATA_PATHS: [&str; 4] = [
   "/versions",
 ];
 
-type ValueMap = HashMap<String, i32>;
-type NameMap = HashMap<String, ValueMap>;
-type TimeMap = HashMap<String, NameMap>;
+type ValueMap = FnvHashMap<String, i32>;
+type NameMap = FnvHashMap<String, ValueMap>;
+type TimeMap = FnvHashMap<String, NameMap>;
 
 pub struct Options {
   pub verbose: bool,
@@ -40,9 +41,13 @@ pub struct Options {
 pub fn combine_stats(left: &TimeMap, right: &TimeMap) -> TimeMap {
   let mut left_times = left.clone();
   for (time, names) in right {
-    let left_names = left_times.entry(time.to_string()).or_insert(HashMap::new());
+    let left_names = left_times
+      .entry(time.to_string())
+      .or_insert(FnvHashMap::default());
     for (name, versions) in names {
-      let left_versions = left_names.entry(name.to_string()).or_insert(HashMap::new());
+      let left_versions = left_names
+        .entry(name.to_string())
+        .or_insert(FnvHashMap::default());
       for (version, count) in versions {
         let left_count = left_versions.entry(version.to_string()).or_insert(0);
         *left_count += count;
@@ -69,7 +74,9 @@ fn duplicate_request(r: &request::Request) -> bool {
 }
 
 fn increment(counters: &mut NameMap, name: &str, value: &str) {
-  let map = counters.entry(name.to_string()).or_insert(HashMap::new());
+  let map = counters
+    .entry(name.to_string())
+    .or_insert(FnvHashMap::default());
   let count = map.entry(String::from(value)).or_insert(0);
   *count += 1;
 }
@@ -99,7 +106,7 @@ pub fn count_line(times: &mut TimeMap, line: String) {
   }
 
   let date = r.timestamp.get(..10).unwrap().to_string();
-  let counters = times.entry(date).or_insert(HashMap::new());
+  let counters = times.entry(date).or_insert(FnvHashMap::default());
 
   increment(counters, "tls_cipher", r.tls_cipher.as_ref());
   increment(counters, "server_region", r.server_region.as_ref());
@@ -115,7 +122,7 @@ pub fn count_line(times: &mut TimeMap, line: String) {
 }
 
 pub fn stream_stats(stream: Box<BufRead>, opts: &Options) -> TimeMap {
-  let mut times = TimeMap::new();
+  let mut times = TimeMap::default();
   let mut lineno = 0;
 
   stream.lines().for_each(|line| {