Another intermediate step

src/constants.rs

@@ -2,6 +2,8 @@ mod nullable;
 pub use nullable::Nullable;
 
 mod page_settings;
+pub use page_settings::MAX_FILE_HANDLE_COUNT;
+pub use page_settings::MAX_PAGE_CACHE;
 pub use page_settings::PAGES_PER_FILE;
 pub use page_settings::PAGE_SIZE;
 

src/constants/page_settings.rs

@@ -5,3 +5,10 @@ pub const PAGE_SIZE: u16 = 4096;
 /// I have been careful to use usize in most places, as a result a variety of limits
 /// will be lower on a 32bit platform.
 pub const PAGES_PER_FILE: usize = 256;
+
+/// Number of pages to hold in cache, each will consume PAGE_SIZE of memory
+pub const MAX_PAGE_CACHE: usize = 128;
+
+/// Linux seems to limit to 1024, macos 256, windows 512 but I'm staying low until
+/// a benchmark proves I need to change it.
+pub const MAX_FILE_HANDLE_COUNT: usize = 128;

src/engine/analyzer/definition_lookup.rs

@@ -322,9 +322,6 @@ pub enum DefinitionLookupError {
 mod tests {
     use tempfile::TempDir;
 
-    use crate::engine::io::block_layer::file_manager::FileManager;
-    use crate::engine::io::block_layer::lock_cache_manager::LockCacheManager;
-
     // Note this useful idiom: importing names from outer (for mod tests) scope.
     use super::super::super::io::RowManager;
     use super::super::super::transactions::TransactionManager;

src/engine/io/block_layer.rs

@@ -27,10 +27,14 @@
         let page = get_page_for_read()
 */
 
-pub mod file_manager;
+//pub mod file_manager;
+pub mod file_manager2;
 
-pub mod free_space_manager;
+pub mod file_operations;
 
-pub mod lock_cache_manager;
+pub mod free_space_manager;
 
 pub mod lock_manager;
+
+mod resource_formatter;
+pub use resource_formatter::ResourceFormatter;

src/engine/io/block_layer/file_manager.rs

@@ -11,15 +11,7 @@ use tokio::sync::mpsc::{self, UnboundedSender};
 use tokio::sync::oneshot::error::RecvError;
 use tokio::sync::oneshot::{self, Sender};
 
-//Inner Types
-mod file_executor;
-use file_executor::FileExecutor;
-use file_executor::FileExecutorError;
-mod file_operations;
-mod request_type;
-use request_type::RequestType;
-mod resource_formatter;
-pub use resource_formatter::ResourceFormatter;
+
 
 #[derive(Clone, Debug)]
 pub struct FileManager {