No compression

Author: Sweattypalms

src/database/chunks.rs

@@ -26,10 +26,11 @@ impl<'a, T: Encode + 'a> BytesEncode<'a> for Zstd<T> {
     fn bytes_encode(item: &'a Self::EItem) -> Result<Cow<'a, [u8]>, heed::BoxedError> {
 
         // Compress
-        let mut bytes = Vec::new();
+        /*let mut bytes = Vec::new();
         let mut compressor = zstd::Encoder::new(&mut bytes, 6)?;
         bincode::encode_into_std_write(item, &mut compressor, standard())?;
-        compressor.finish()?;
+        compressor.finish()?;*/
+        let bytes= bincode::encode_to_vec(item, standard())?;
 
         Ok(Cow::Owned(bytes))
     }
@@ -39,10 +40,11 @@ impl<'a, T: Decode + 'a> BytesDecode<'a> for Zstd<T> {
     type DItem = T;
 
     fn bytes_decode(bytes: &'a [u8]) -> Result<Self::DItem, heed::BoxedError> {
-        
-        let mut decompressor = zstd::Decoder::new(bytes)?;
+        /*let mut decompressor = zstd::Decoder::new(bytes)?;
         let decoded = bincode::decode_from_std_read(&mut decompressor, standard())?;
-        Ok(decoded)
+        Ok(decoded)*/
+        let decoded = bincode::decode_from_slice(bytes, standard())?;
+        Ok(decoded.0)
     }
 }
 
@@ -170,6 +172,7 @@ impl Database {
         Ok(())
     }
 
+    #[allow(dead_code)]
     async fn load_into_cache(&self, key: u64) -> Result<(), Error> {
         Database::load_into_cache_standalone(self.db.clone(), self.cache.clone(), key).await
     }

src/database/mod.rs

@@ -19,7 +19,7 @@ use crate::utils::error::Error;
 use crate::world::chunk_format::Chunk;
 pub mod chunks;
 
-const LMDB_MIN_PAGE_SIZE: usize = 50 * 1024usize.pow(2); // 50MB
+const LMDB_MIN_PAGE_SIZE: usize = 1800 * 1024usize.pow(2); // 1800MB
 const LMDB_PAGE_SIZE_INCREMENT: usize = 250*1024usize.pow(2); // 250MB
 const LMDB_MAX_DBS: u32 = 10;
 

src/world/importing.rs

@@ -87,6 +87,7 @@ fn process_chunk(chunk_data: Vec<u8>, file_name: &str, bar: Arc<ProgressBar>) ->
         })?;
 
     final_chunk.dimension = Some("overworld".to_string());
+
     Ok(final_chunk)
 }
 
@@ -121,7 +122,6 @@ pub async fn import_regions(state: GlobalState) -> Result<()> {
         while !chunks.is_empty() {
             let chunk_batch: Vec<ChunkData> = chunks.drain(..std::cmp::min(batch_size, chunks.len())).collect();
 
-            let start = std::time::Instant::now();
             let processed_chunks: Vec<Chunk> = chunk_batch.into_par_iter()
                 .filter_map(|chunk| {
                     let data = chunk.data.clone();
@@ -138,13 +138,9 @@ pub async fn import_regions(state: GlobalState) -> Result<()> {
                     }
                 })
                 .collect();
-            info!("Processed {} chunks in {:?}", processed_chunks.len(), start.elapsed());
 
             // Insert the batch of processed chunks
-            let start = std::time::Instant::now();
-            let chunks_len = processed_chunks.len();
             insert_chunks(&state, processed_chunks, &bar).await?;
-            info!("Inserted {} chunks in {:?}", chunks_len, start.elapsed());
         }
 
         /*