move ByKeySpace into separate file

Author: sokra

turbopack/crates/turbo-tasks-backend/src/database/by_key_space.rs

@@ -0,0 +1,52 @@
+use crate::database::key_value_database::KeySpace;
+
+pub struct ByKeySpace<T> {
+    infra: T,
+    task_meta: T,
+    task_data: T,
+    forward_task_cache: T,
+    reverse_task_cache: T,
+}
+
+impl<T> ByKeySpace<T> {
+    pub fn new(mut factory: impl FnMut(KeySpace) -> T) -> Self {
+        Self {
+            infra: factory(KeySpace::Infra),
+            task_meta: factory(KeySpace::TaskMeta),
+            task_data: factory(KeySpace::TaskData),
+            forward_task_cache: factory(KeySpace::ForwardTaskCache),
+            reverse_task_cache: factory(KeySpace::ReverseTaskCache),
+        }
+    }
+
+    pub fn get(&self, key_space: KeySpace) -> &T {
+        match key_space {
+            KeySpace::Infra => &self.infra,
+            KeySpace::TaskMeta => &self.task_meta,
+            KeySpace::TaskData => &self.task_data,
+            KeySpace::ForwardTaskCache => &self.forward_task_cache,
+            KeySpace::ReverseTaskCache => &self.reverse_task_cache,
+        }
+    }
+
+    pub fn get_mut(&mut self, key_space: KeySpace) -> &mut T {
+        match key_space {
+            KeySpace::Infra => &mut self.infra,
+            KeySpace::TaskMeta => &mut self.task_meta,
+            KeySpace::TaskData => &mut self.task_data,
+            KeySpace::ForwardTaskCache => &mut self.forward_task_cache,
+            KeySpace::ReverseTaskCache => &mut self.reverse_task_cache,
+        }
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = (KeySpace, &T)> {
+        [
+            (KeySpace::Infra, &self.infra),
+            (KeySpace::TaskMeta, &self.task_meta),
+            (KeySpace::TaskData, &self.task_data),
+            (KeySpace::ForwardTaskCache, &self.forward_task_cache),
+            (KeySpace::ReverseTaskCache, &self.reverse_task_cache),
+        ]
+        .into_iter()
+    }
+}

turbopack/crates/turbo-tasks-backend/src/database/mod.rs

@@ -1,3 +1,4 @@
+mod by_key_space;
 pub mod db_versioning;
 pub mod fresh_db_optimization;
 pub mod key_value_database;

turbopack/crates/turbo-tasks-backend/src/database/startup_cache.rs

@@ -13,62 +13,14 @@ use byteorder::WriteBytesExt;
 use dashmap::DashMap;
 use rustc_hash::{FxHashMap, FxHasher};
 
-use crate::database::key_value_database::{KeySpace, KeyValueDatabase, WriteBatch};
+use crate::database::{
+    by_key_space::ByKeySpace,
+    key_value_database::{KeySpace, KeyValueDatabase, WriteBatch},
+};
 
 const CACHE_SIZE_LIMIT: usize = 100 * 1024 * 1024;
 const PAIR_HEADER_SIZE: usize = 9;
 
-pub struct ByKeySpace<T> {
-    infra: T,
-    task_meta: T,
-    task_data: T,
-    forward_task_cache: T,
-    reverse_task_cache: T,
-}
-
-impl<T> ByKeySpace<T> {
-    pub fn new(mut factory: impl FnMut(KeySpace) -> T) -> Self {
-        Self {
-            infra: factory(KeySpace::Infra),
-            task_meta: factory(KeySpace::TaskMeta),
-            task_data: factory(KeySpace::TaskData),
-            forward_task_cache: factory(KeySpace::ForwardTaskCache),
-            reverse_task_cache: factory(KeySpace::ReverseTaskCache),
-        }
-    }
-
-    pub fn get(&self, key_space: KeySpace) -> &T {
-        match key_space {
-            KeySpace::Infra => &self.infra,
-            KeySpace::TaskMeta => &self.task_meta,
-            KeySpace::TaskData => &self.task_data,
-            KeySpace::ForwardTaskCache => &self.forward_task_cache,
-            KeySpace::ReverseTaskCache => &self.reverse_task_cache,
-        }
-    }
-
-    pub fn get_mut(&mut self, key_space: KeySpace) -> &mut T {
-        match key_space {
-            KeySpace::Infra => &mut self.infra,
-            KeySpace::TaskMeta => &mut self.task_meta,
-            KeySpace::TaskData => &mut self.task_data,
-            KeySpace::ForwardTaskCache => &mut self.forward_task_cache,
-            KeySpace::ReverseTaskCache => &mut self.reverse_task_cache,
-        }
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = (KeySpace, &T)> {
-        [
-            (KeySpace::Infra, &self.infra),
-            (KeySpace::TaskMeta, &self.task_meta),
-            (KeySpace::TaskData, &self.task_data),
-            (KeySpace::ForwardTaskCache, &self.forward_task_cache),
-            (KeySpace::ReverseTaskCache, &self.reverse_task_cache),
-        ]
-        .into_iter()
-    }
-}
-
 pub enum ValueBuffer<'l, T: KeyValueDatabase>
 where
     T: 'l,