From b13d2f04cd24b8343aee7d9089e261c9b1656486 Mon Sep 17 00:00:00 2001
From: Yuriy Dupyn <2153100+omedusyo@users.noreply.github.com>
Date: Mon, 5 Feb 2024 03:35:43 +0100
Subject: [PATCH] Introduce segments module

---
 storage_engine/src/cursor.rs                      | 8 ++++----
 storage_engine/src/lib.rs                         | 4 +---
 storage_engine/src/main.rs                        | 6 ++----
 storage_engine/src/{ => segments}/entry.rs        | 2 +-
 storage_engine/src/{ => segments}/entry_header.rs | 0
 storage_engine/src/segments/mod.rs                | 3 +++
 storage_engine/src/{ => segments}/store_header.rs | 0
 storage_engine/src/storage_engine.rs              | 2 +-
 8 files changed, 12 insertions(+), 13 deletions(-)
 rename storage_engine/src/{ => segments}/entry.rs (95%)
 rename storage_engine/src/{ => segments}/entry_header.rs (100%)
 create mode 100644 storage_engine/src/segments/mod.rs
 rename storage_engine/src/{ => segments}/store_header.rs (100%)

diff --git a/storage_engine/src/cursor.rs b/storage_engine/src/cursor.rs
index 5acbfbe..84077fa 100644
--- a/storage_engine/src/cursor.rs
+++ b/storage_engine/src/cursor.rs
@@ -12,10 +12,10 @@ use bincode::{Decode, Encode};
 use crate::binary_coding::{encode, decode};
 
 use crate::error::{Error, DecodeErrorKind};
-use crate::entry::{Entry, EntryDetailed};
-use crate::entry_header::{EntryHeaderWithDataSize, EntryHeader};
-use crate::store_header::StoreHeader;
-use crate::storage_engine::{Store, FilePosition, Column, Result, StoreIndexes, ROWS_FILE_NAME, GARBAGE_COLLECTION_INTERMEDIATE_ROWS_FILE_NAME};
+use crate::segments::entry::{Entry, EntryDetailed};
+use crate::segments::entry_header::{EntryHeaderWithDataSize, EntryHeader};
+use crate::segments::store_header::StoreHeader;
+use crate::storage_engine::{Store, FilePosition, Column, Result, ROWS_FILE_NAME, GARBAGE_COLLECTION_INTERMEDIATE_ROWS_FILE_NAME};
 use crate::index::Index;
 
 const GARBAGE_COLLECTION_TRIGGER: usize = 100;
diff --git a/storage_engine/src/lib.rs b/storage_engine/src/lib.rs
index 65f1a06..cae01f5 100644
--- a/storage_engine/src/lib.rs
+++ b/storage_engine/src/lib.rs
@@ -3,6 +3,4 @@ mod binary_coding;
 mod error;
 mod index;
 mod cursor;
-mod entry;
-mod entry_header;
-mod store_header;
+mod segments;
diff --git a/storage_engine/src/main.rs b/storage_engine/src/main.rs
index 4681cb2..b9f8b9b 100644
--- a/storage_engine/src/main.rs
+++ b/storage_engine/src/main.rs
@@ -3,11 +3,9 @@ mod binary_coding;
 mod error;
 mod index;
 mod cursor;
-mod entry;
-mod entry_header;
-mod store_header;
+mod segments;
 
-use crate::entry::{Entry, EntryDetailed};
+use crate::segments::entry::{Entry, EntryDetailed};
 use crate::storage_engine::{Store, FilePosition};
 use crate::cursor::{ReadCursor, WriteCursor, CursorWithStoreHeader, CursorWithWriteAccessToIndex};
 
diff --git a/storage_engine/src/entry.rs b/storage_engine/src/segments/entry.rs
similarity index 95%
rename from storage_engine/src/entry.rs
rename to storage_engine/src/segments/entry.rs
index d22a46f..b42c490 100644
--- a/storage_engine/src/entry.rs
+++ b/storage_engine/src/segments/entry.rs
@@ -3,7 +3,7 @@ use bincode::{Decode, Encode};
 use crate::binary_coding::{encode_sequence, encode_sequence_with_sizes, decode_sequence};
 use crate::storage_engine::{Result, FilePosition};
 use crate::error::{Error, DecodeErrorKind};
-use crate::entry_header::{EntryHeader, EntryHeaderWithDataSize};
+use crate::segments::entry_header::{EntryHeader, EntryHeaderWithDataSize};
 
 #[derive(Debug)]
 pub struct Entry<T> {
diff --git a/storage_engine/src/entry_header.rs b/storage_engine/src/segments/entry_header.rs
similarity index 100%
rename from storage_engine/src/entry_header.rs
rename to storage_engine/src/segments/entry_header.rs
diff --git a/storage_engine/src/segments/mod.rs b/storage_engine/src/segments/mod.rs
new file mode 100644
index 0000000..b78a646
--- /dev/null
+++ b/storage_engine/src/segments/mod.rs
@@ -0,0 +1,3 @@
+pub mod entry;
+pub mod entry_header;
+pub mod store_header;
diff --git a/storage_engine/src/store_header.rs b/storage_engine/src/segments/store_header.rs
similarity index 100%
rename from storage_engine/src/store_header.rs
rename to storage_engine/src/segments/store_header.rs
diff --git a/storage_engine/src/storage_engine.rs b/storage_engine/src/storage_engine.rs
index 74ba9ad..26398f3 100644
--- a/storage_engine/src/storage_engine.rs
+++ b/storage_engine/src/storage_engine.rs
@@ -6,7 +6,7 @@ use bincode::{Decode, Encode};
 
 use crate::error::Error;
 use crate::cursor::{ReadCursor, WriteCursor, CursorWithStoreHeader};
-use crate::store_header::StoreHeader;
+use crate::segments::store_header::StoreHeader;
 use crate::index::Index;