From 647a51af15ef8035c98597db06fcb9eeff338d4d Mon Sep 17 00:00:00 2001 From: k Date: Thu, 31 Oct 2024 09:57:06 +0100 Subject: [PATCH] parser: fix defrag --- .gitignore | 3 +++ parser/src/databases/_database.rs | 12 ++++-------- parser/src/lib.rs | 5 +++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 4652da58c..973e24fd2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,9 @@ out /datasets /datasets2 /price +*..* +/txout_* +/db # Sync .stfolder diff --git a/parser/src/databases/_database.rs b/parser/src/databases/_database.rs index c23207b9c..014fa1d47 100644 --- a/parser/src/databases/_database.rs +++ b/parser/src/databases/_database.rs @@ -69,7 +69,7 @@ where btree::iter(&self.txn, &self.db, None).unwrap() } - fn iter_collect(&self) -> BTreeMap + pub fn iter_collect(&self) -> BTreeMap where Value: Clone, { @@ -244,14 +244,10 @@ where let mut s = Self::open(&folder, &file).unwrap(); - if !s.is_empty() { - dbg!(s.len()); - panic!("Database isn't empty"); + if s.is_empty() { + s.cached_puts = btree; + s.export().unwrap(); } - - s.db_multi_put(btree).unwrap(); - - s.export().unwrap(); } } diff --git a/parser/src/lib.rs b/parser/src/lib.rs index c9f0b324a..c0b5efd29 100644 --- a/parser/src/lib.rs +++ b/parser/src/lib.rs @@ -9,10 +9,11 @@ mod utils; pub use crate::{ actions::iter_blocks, + databases::{AnyDatabase, Database}, io::{Binary, Json, Serialization, COMPRESSED_BIN_EXTENSION, JSON_EXTENSION}, structs::{ - Config, Date, DateMap, Exit, Height, HeightMap, MapChunkId, MapValue, SerializedBTreeMap, - SerializedVec, HEIGHT_MAP_CHUNK_SIZE, OHLC, + Amount, Config, Date, DateMap, Exit, Height, HeightMap, MapChunkId, MapValue, + SerializedBTreeMap, SerializedVec, TxoutIndex, HEIGHT_MAP_CHUNK_SIZE, OHLC, }, utils::{create_rpc, log, reset_logs}, };