From 0bf12ec1b3cd1c3dce8bbdf9f6bf29e3cfc75a60 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Thu, 1 Aug 2024 11:45:41 +0300 Subject: [PATCH] core: Move buffer_pool.rs to storage module --- core/lib.rs | 1 - core/{ => storage}/buffer_pool.rs | 0 core/storage/mod.rs | 1 + core/storage/pager.rs | 2 +- core/storage/sqlite3_ondisk.rs | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename core/{ => storage}/buffer_pool.rs (100%) diff --git a/core/lib.rs b/core/lib.rs index 0b31f55d6..255575fb5 100644 --- a/core/lib.rs +++ b/core/lib.rs @@ -1,4 +1,3 @@ -mod buffer_pool; mod datetime; mod error; mod function; diff --git a/core/buffer_pool.rs b/core/storage/buffer_pool.rs similarity index 100% rename from core/buffer_pool.rs rename to core/storage/buffer_pool.rs diff --git a/core/storage/mod.rs b/core/storage/mod.rs index bf080a01e..894170d63 100644 --- a/core/storage/mod.rs +++ b/core/storage/mod.rs @@ -1,4 +1,5 @@ pub(crate) mod btree; +pub(crate) mod buffer_pool; pub(crate) mod pager; pub(crate) mod sqlite3_ondisk; pub(crate) mod wal; diff --git a/core/storage/pager.rs b/core/storage/pager.rs index 93e3a2b38..f7ead07a9 100644 --- a/core/storage/pager.rs +++ b/core/storage/pager.rs @@ -1,4 +1,4 @@ -use crate::buffer_pool::BufferPool; +use crate::storage::buffer_pool::BufferPool; use crate::storage::sqlite3_ondisk::{self, DatabaseHeader, PageContent}; use crate::storage::wal::Wal; use crate::{Buffer, PageSource, Result}; diff --git a/core/storage/sqlite3_ondisk.rs b/core/storage/sqlite3_ondisk.rs index 73f619a9e..79a411d74 100644 --- a/core/storage/sqlite3_ondisk.rs +++ b/core/storage/sqlite3_ondisk.rs @@ -41,9 +41,9 @@ //! //! https://www.sqlite.org/fileformat.html -use crate::buffer_pool::BufferPool; use crate::error::LimboError; use crate::io::{Buffer, Completion, ReadCompletion, WriteCompletion}; +use crate::storage::buffer_pool::BufferPool; use crate::storage::pager::{Page, Pager}; use crate::types::{OwnedRecord, OwnedValue}; use crate::{File, PageSource, Result};