memoizing codeowners

Author: perryqh

src/cache/file.rs

@@ -17,7 +17,7 @@ pub struct GlobalCache {
     file_owner_cache: Option<Box<Mutex<HashMap<PathBuf, FileOwnerCacheEntry>>>>,
 }
 
-const DEFAULT_CACHE_CAPACITY: usize = 10000;
+const DEFAULT_CACHE_CAPACITY: usize = 50000;
 
 impl Caching for GlobalCache {
     fn get_file_owner(&self, path: &Path) -> Result<Option<FileOwnerCacheEntry>, Error> {

src/ownership/codeowners_file_parser.rs

@@ -44,16 +44,7 @@ impl Parser {
             return Ok(HashMap::new());
         }
 
-        let codeowners_entries: Vec<(String, String)> =
-            build_codeowners_lines_in_priority(self.codeowners_file_path.to_string_lossy().into_owned())
-                .iter()
-                .map(|line| {
-                    line.split_once(' ')
-                        .map(|(glob, team_name)| (glob.to_string(), team_name.to_string()))
-                        .ok_or_else(|| IoError::new(std::io::ErrorKind::InvalidInput, "Invalid line"))
-                })
-                .collect::<Result<_, IoError>>()
-                .map_err(|e| Box::new(e) as Box<dyn Error>)?;
+        let codeowners_entries = parse_codeowners_entries(self.codeowners_file_path.to_string_lossy().into_owned());
 
         let teams_by_name = teams_by_github_team_name(self.absolute_team_files_globs());
 
@@ -111,7 +102,6 @@ fn teams_by_github_team_name(team_file_glob: Vec<String>) -> HashMap<String, Tea
     teams
 }
 
-#[memoize]
 fn build_codeowners_lines_in_priority(codeowners_file_path: String) -> Vec<String> {
     let codeowners_file = match fs::read_to_string(codeowners_file_path) {
         Ok(codeowners_file) => codeowners_file,
@@ -124,6 +114,16 @@ fn build_codeowners_lines_in_priority(codeowners_file_path: String) -> Vec<Strin
     stripped_lines_by_priority(&codeowners_file)
 }
 
+fn parse_codeowners_entries(codeowners_file_path: String) -> Vec<(String, String)> {
+    build_codeowners_lines_in_priority(codeowners_file_path)
+        .iter()
+        .filter_map(|line| {
+            line.split_once(' ')
+                .map(|(glob, team_name)| (glob.to_string(), team_name.to_string()))
+        })
+        .collect()
+}
+
 #[derive(Debug, Clone, PartialEq, Eq)]
 struct Section {
     heading: String,

src/runner/api.rs

@@ -73,17 +73,10 @@ pub fn teams_for_files_from_codeowners(
 }
 
 pub fn team_for_file_from_codeowners(run_config: &RunConfig, file_path: &str) -> error_stack::Result<Option<Team>, Error> {
-    let relative_file_path = crate::path_utils::relative_to(&run_config.project_root, Path::new(file_path));
-
-    let config = config_from_path(&run_config.config_path)?;
-    let res = crate::ownership::codeowners_query::team_for_file_from_codeowners(
-        &run_config.project_root,
-        &run_config.codeowners_file_path,
-        &config.team_file_glob,
-        Path::new(relative_file_path),
-    )
-    .map_err(Error::Io)?;
-    Ok(res)
+    let result = teams_for_files_from_codeowners(run_config, &[file_path.to_string()])?;
+    // Since we only passed one file, there should be exactly one result
+    debug_assert_eq!(result.len(), 1);
+    Ok(result.into_values().next().flatten())
 }
 
 // Fast path that avoids creating a full Runner for single file queries