Unverified Commit 2e0bdeec authored by kenshin samourai's avatar kenshin samourai Committed by GitHub
Browse files

Merge pull request #8 from Samourai-Wallet/develop_dojo

merge develop into master for v0.2.0
parents 97c89723 93b58831
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# It is not intended for manual editing. # It is not intended for manual editing.
[[package]] [[package]]
name = "addrindexrs" name = "addrindexrs"
version = "0.1.0" version = "0.2.0"
dependencies = [ dependencies = [
"base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
......
[package] [package]
name = "addrindexrs" name = "addrindexrs"
version = "0.1.0" version = "0.2.0"
authors = ["Roman Zeyde <me@romanzey.de>", "kenshin-samourai <kenshin_samourai@tutanota.com>"] authors = ["Roman Zeyde <me@romanzey.de>", "kenshin-samourai <kenshin_samourai@tutanota.com>"]
description = "An efficient address indexer in Rust" description = "An efficient address indexer in Rust"
license = "MIT" license = "MIT"
......
# addrindexrs # addrindexrs
## 0.1.0 (TBD)
## Releases ##
- [v0.2.0](#0_2_0)
- [v0.1.0](#0_1_0)
<a name="0_2_0"/>
## addrindexrs v0.2.0 ##
### Change log ###
- [#6](https://github.com/Samourai-Wallet/addrindexrs/pull/6) store the compaction marker before the full compaction
- [#7](https://github.com/Samourai-Wallet/addrindexrs/pull/7) add trace for indexed block
#### Credits ###
- kenshin-samourai
<a name="0_1_0"/>
## addrindexrs v0.1.0 ##
Initial release
# Prior releases (electrs) # Prior releases (electrs)
......
...@@ -393,6 +393,7 @@ impl Index { ...@@ -393,6 +393,7 @@ impl Index {
let rows_iter = batch.iter().flat_map(|block| { let rows_iter = batch.iter().flat_map(|block| {
let blockhash = block.bitcoin_hash(); let blockhash = block.bitcoin_hash();
info!("indexing block {}", blockhash);
index_block(block).chain(std::iter::once(last_indexed_block(&blockhash))) index_block(block).chain(std::iter::once(last_indexed_block(&blockhash)))
}); });
......
...@@ -209,11 +209,9 @@ fn full_compaction_marker() -> Row { ...@@ -209,11 +209,9 @@ fn full_compaction_marker() -> Row {
} }
pub fn full_compaction(store: DBStore) -> DBStore { pub fn full_compaction(store: DBStore) -> DBStore {
store.flush();
let store = store.compact().enable_compaction();
store.write(vec![full_compaction_marker()]); store.write(vec![full_compaction_marker()]);
// Make sure full compaction marker isn't left behind
store.flush(); store.flush();
let store = store.compact().enable_compaction();
store store
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment