finalize magic values

src/bloom.rs

@@ -6,7 +6,7 @@ use seahash::SeaHasher;
 use std::hash::Hasher;
 use std::io::{Read, Write};
 
-pub const BLOOM_HEADER_MAGIC: &[u8] = &[b'L', b'S', b'M', b'T', b'S', b'B', b'F', b'1'];
+pub const BLOOM_HEADER_MAGIC: &[u8] = &[b'F', b'J', b'L', b'L', b'S', b'B', b'F', b'1'];
 
 /// A standard bloom filter
 ///

src/config.rs

@@ -20,7 +20,7 @@ fn absolute_path<P: AsRef<Path>>(path: P) -> PathBuf {
         .into()
 }
 
-pub const CONFIG_HEADER_MAGIC: &[u8] = &[b'L', b'S', b'M', b'T', b'C', b'F', b'G', b'1'];
+pub const CONFIG_HEADER_MAGIC: &[u8] = &[b'F', b'J', b'L', b'L', b'C', b'F', b'G', b'1'];
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 enum TreeType {
@@ -289,7 +289,7 @@ mod tests {
         #[rustfmt::skip]
         let raw = &[
             // Magic
-            b'L', b'S', b'M', b'T', b'C', b'F', b'G', b'1',
+            b'F', b'J', b'L', b'L', b'C', b'F', b'G', b'1',
 
             // Tree type
             0,

src/file.rs

@@ -1,7 +1,7 @@
 use std::{fs::File, io::Write, path::Path};
 
 #[doc(hidden)]
-pub const LSM_MARKER: &str = ".lsm";
+pub const LSM_MARKER: &str = "version";
 pub const CONFIG_FILE: &str = "config";
 pub const SEGMENTS_FOLDER: &str = "segments";
 pub const LEVELS_MANIFEST_FILE: &str = "levels";

src/levels/mod.rs

@@ -23,7 +23,7 @@ use std::{
     sync::Arc,
 };
 
-pub const LEVEL_MANIFEST_HEADER_MAGIC: &[u8] = &[b'L', b'S', b'M', b'T', b'L', b'V', b'L', b'1'];
+pub const LEVEL_MANIFEST_HEADER_MAGIC: &[u8] = &[b'F', b'J', b'L', b'L', b'L', b'V', b'L', b'1'];
 
 pub type HiddenSet = HashSet<SegmentId>;
 
@@ -456,7 +456,7 @@ mod tests {
         #[rustfmt::skip]
         let raw = &[
             // Magic
-            b'L', b'S', b'M', b'T', b'L', b'V', b'L', b'1',
+            b'F', b'J', b'L', b'L', b'L', b'V', b'L', b'1',
 
             // Count
             0,

src/merge.rs

@@ -1,8 +1,6 @@
 use crate::{value::SeqNo, UserKey, Value};
 use double_ended_peekable::{DoubleEndedPeekable, DoubleEndedPeekableExt};
 
-// TODO: rename structs
-
 // TODO: use (ParsedInternalKey, UserValue) instead of Value...
 
 pub type BoxedIterator<'a> = Box<dyn DoubleEndedIterator<Item = crate::Result<Value>> + 'a>;

src/segment/block/header.rs

@@ -6,7 +6,7 @@ use crate::{
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
 use std::io::{Read, Write};
 
-pub const BLOCK_HEADER_MAGIC: &[u8] = &[b'L', b'S', b'M', b'T', b'B', b'L', b'K', b'1'];
+pub const BLOCK_HEADER_MAGIC: &[u8] = &[b'F', b'J', b'L', b'L', b'B', b'L', b'K', b'1'];
 
 /// Header of a disk-based block
 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -95,7 +95,7 @@ mod tests {
         #[rustfmt::skip]
         let bytes = &[
             // Header
-            b'L', b'S', b'M', b'T', b'B', b'L', b'K', b'1',
+            b'F', b'J', b'L', b'L', b'B', b'L', b'K', b'1',
 
             // Compression
             1,

src/segment/meta/mod.rs

@@ -16,7 +16,7 @@ use std::{
 };
 pub use {compression::CompressionType, table_type::TableType};
 
-pub const METADATA_HEADER_MAGIC: &[u8] = &[b'L', b'S', b'M', b'T', b'S', b'M', b'D', b'1'];
+pub const METADATA_HEADER_MAGIC: &[u8] = &[b'F', b'J', b'L', b'L', b'S', b'M', b'D', b'1'];
 
 pub type SegmentId = u64;
 

src/segment/trailer.rs

@@ -10,7 +10,7 @@ use std::{
     path::Path,
 };
 
-pub const TRAILER_MAGIC: &[u8] = &[b'L', b'S', b'M', b'T', b'T', b'R', b'L', b'1'];
+pub const TRAILER_MAGIC: &[u8] = &[b'F', b'J', b'L', b'L', b'T', b'R', b'L', b'1'];
 pub const TRAILER_SIZE: usize = 256;
 
 #[derive(Debug)]

src/tree.rs

@@ -862,7 +862,7 @@ impl Tree {
 
         let inner = TreeInner::create_new(config)?;
 
-        // NOTE: Lastly, fsync .lsm marker, which contains the version
+        // NOTE: Lastly, fsync version marker, which contains the version
         // -> the LSM is fully initialized
         let mut file = File::create(marker_path)?;
         Version::V1.write_file_header(&mut file)?;

src/version.rs

@@ -32,7 +32,7 @@ impl TryFrom<u16> for Version {
     }
 }
 
-const MAGIC_BYTES: [u8; 3] = [b'L', b'S', b'M'];
+const MAGIC_BYTES: [u8; 3] = [b'F', b'J', b'L'];
 
 impl Version {
     pub fn len() -> u8 {
@@ -75,14 +75,14 @@ mod tests {
     pub fn version_serialize() -> crate::Result<()> {
         let mut bytes = vec![];
         Version::V1.write_file_header(&mut bytes)?;
-        assert_eq!(bytes, &[b'L', b'S', b'M', 0, 1]);
+        assert_eq!(bytes, &[b'F', b'J', b'L', 0, 1]);
         Ok(())
     }
 
     #[test]
     #[allow(clippy::expect_used)]
     pub fn version_deserialize_success() {
-        let version = Version::parse_file_header(&[b'L', b'S', b'M', 0, 1]);
+        let version = Version::parse_file_header(&[b'F', b'J', b'L', 0, 1]);
         assert_eq!(version, Some(Version::V1));
     }