From dac888dc51254a6b1115ea63dfc2cd03389fb03b Mon Sep 17 00:00:00 2001 From: Yuriy Dupyn <2153100+omedusyo@users.noreply.github.com> Date: Sun, 4 Feb 2024 15:46:43 +0100 Subject: [PATCH] Move concrete Cursor definitions on top --- storage_engine/src/cursor.rs | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/storage_engine/src/cursor.rs b/storage_engine/src/cursor.rs index c9913b9..05f14db 100644 --- a/storage_engine/src/cursor.rs +++ b/storage_engine/src/cursor.rs @@ -15,6 +15,25 @@ use crate::entry_header::{EntryHeaderWithDataSize, EntryHeader}; use crate::store_header::StoreHeader; use crate::storage_engine::{Store, FilePosition, Column, Result, ROWS_FILE_NAME, GARBAGE_COLLECTION_INTERMEDIATE_ROWS_FILE_NAME}; +// ===Concrete Cursors=== +pub struct ReadCursor { + header: StoreHeader, + file: File, + data_type: PhantomData, + + eof_file_position: FilePosition, +} + +pub struct WriteCursor<'a, T> { + header: &'a mut StoreHeader, + file: File, + data_type: PhantomData, + + eof_file_position: FilePosition, +} + + +// ===Traits=== #[async_trait] // TODO: Make this private pub trait PrimitiveCursor { @@ -206,23 +225,6 @@ pub trait CursorWithStoreHeader: PrimitiveCursor { } -// ===Concrete Cursors=== -pub struct ReadCursor { - header: StoreHeader, - file: File, - data_type: PhantomData, - - eof_file_position: FilePosition, -} - -pub struct WriteCursor<'a, T> { - header: &'a mut StoreHeader, - file: File, - data_type: PhantomData, - - eof_file_position: FilePosition, -} - // ===PrimitiveCursor=== impl PrimitiveCursor for ReadCursor { fn file(&mut self) -> &mut File {