From 1d84a78cea25c1047b2add88fa0ea918b38fc8aa Mon Sep 17 00:00:00 2001 From: Marson Kotovi4 <137284002+MarsonKotovi4@users.noreply.github.com> Date: Sat, 1 Feb 2025 13:21:08 +0200 Subject: [PATCH 1/7] Update execution.rs --- crates/stages/stages/src/stages/execution.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/execution.rs b/crates/stages/stages/src/stages/execution.rs index 8cf74bdcaeaf..577f21579011 100644 --- a/crates/stages/stages/src/stages/execution.rs +++ b/crates/stages/stages/src/stages/execution.rs @@ -181,7 +181,7 @@ where where Provider: StaticFileProviderFactory + DBProvider + BlockReader + HeaderProvider, { - // If thre's any receipts pruning configured, receipts are written directly to database and + // If there's any receipts pruning configured, receipts are written directly to database and // inconsistencies are expected. if provider.prune_modes_ref().has_receipts_pruning() { return Ok(()) From 75b93dcb07a1d8706ef9cd082a2af7567044c117 Mon Sep 17 00:00:00 2001 From: Marson Kotovi4 <137284002+MarsonKotovi4@users.noreply.github.com> Date: Sat, 1 Feb 2025 13:23:36 +0200 Subject: [PATCH 2/7] Update mdbx.c --- crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.c b/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.c index 21b0dfe3c6c0..9c52c4ab7e85 100644 --- a/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.c +++ b/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.c @@ -11383,7 +11383,7 @@ retry_gc_refresh_oldest:; txnid_t oldest = txn_oldest_reader(txn); retry_gc_have_oldest: if (unlikely(oldest >= txn->mt_txnid)) { - ERROR("unexpected/invalid oldest-readed txnid %" PRIaTXN + ERROR("unexpected/invalid oldest-read txnid %" PRIaTXN " for current-txnid %" PRIaTXN, oldest, txn->mt_txnid); ret.err = MDBX_PROBLEM; From b9349527f479d8ed344e25f36bde6ea1d0c60f55 Mon Sep 17 00:00:00 2001 From: Marson Kotovi4 <137284002+MarsonKotovi4@users.noreply.github.com> Date: Sat, 1 Feb 2025 13:25:48 +0200 Subject: [PATCH 3/7] Update mdbx.c --- crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.c b/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.c index 9c52c4ab7e85..8a46c0f61a34 100644 --- a/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.c +++ b/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.c @@ -11512,7 +11512,7 @@ next_gc:; } } - /* Remember ID of readed GC record */ + /* Remember ID of read GC record */ txn->tw.last_reclaimed = id; if (flags & MDBX_ALLOC_LIFO) { ret.err = txl_append(&txn->tw.lifo_reclaimed, id); @@ -11526,7 +11526,7 @@ next_gc:; goto fail; if (LOG_ENABLED(MDBX_LOG_EXTRA)) { - DEBUG_EXTRA("readed GC-pnl txn %" PRIaTXN " root %" PRIaPGNO + DEBUG_EXTRA("read GC-pnl txn %" PRIaTXN " root %" PRIaPGNO " len %zu, PNL", id, txn->mt_dbs[FREE_DBI].md_root, gc_len); for (size_t i = gc_len; i; i--) From 8581f8810a875eeef99e52e56d647ea4adfff068 Mon Sep 17 00:00:00 2001 From: Marson Kotovi4 <137284002+MarsonKotovi4@users.noreply.github.com> Date: Sat, 1 Feb 2025 13:27:48 +0200 Subject: [PATCH 4/7] Update mdbx.h --- crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.h b/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.h index 2665931de527..53fb02d6a242 100644 --- a/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.h +++ b/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.h @@ -1283,7 +1283,7 @@ enum MDBX_env_flags_t { * to several times in a best case scenario. * * LIFO recycling policy means that for reuse pages will be taken which became - * unused the lastest (i.e. just now or most recently). Therefore the loop of + * unused the latest (i.e. just now or most recently). Therefore the loop of * database pages circulation becomes as short as possible. In other words, * the number of pages, that are overwritten in memory and on disk during a * series of write transactions, will be as small as possible. Thus creates From 2eedcdde8767b57a0356b6a966cbd569b5c40b00 Mon Sep 17 00:00:00 2001 From: Marson Kotovi4 <137284002+MarsonKotovi4@users.noreply.github.com> Date: Sat, 1 Feb 2025 13:30:30 +0200 Subject: [PATCH 5/7] Update tables.rs --- crates/cli/commands/src/test_vectors/tables.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/cli/commands/src/test_vectors/tables.rs b/crates/cli/commands/src/test_vectors/tables.rs index f845d2a66130..c51d5063e51d 100644 --- a/crates/cli/commands/src/test_vectors/tables.rs +++ b/crates/cli/commands/src/test_vectors/tables.rs @@ -124,19 +124,19 @@ where // We want to control our repeated keys let mut seen_keys = HashSet::new(); - let strat_values = proptest::collection::vec(arb::(), 100..300).no_shrink().boxed(); + let start_values = proptest::collection::vec(arb::(), 100..300).no_shrink().boxed(); - let strat_keys = arb::().no_shrink().boxed(); + let start_keys = arb::().no_shrink().boxed(); while rows.len() < per_table { - let key: T::Key = strat_keys.new_tree(runner).map_err(|e| eyre::eyre!("{e}"))?.current(); + let key: T::Key = start_keys.new_tree(runner).map_err(|e| eyre::eyre!("{e}"))?.current(); if !seen_keys.insert(key.clone()) { continue } let mut values: Vec = - strat_values.new_tree(runner).map_err(|e| eyre::eyre!("{e}"))?.current(); + start_values.new_tree(runner).map_err(|e| eyre::eyre!("{e}"))?.current(); values.sort(); From e4b48a5f52a07016226be821d84765ae820160dc Mon Sep 17 00:00:00 2001 From: Marson Kotovi4 <137284002+MarsonKotovi4@users.noreply.github.com> Date: Sat, 1 Feb 2025 22:05:41 +0200 Subject: [PATCH 6/7] Update mdbx.h --- crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.h b/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.h index 53fb02d6a242..2665931de527 100644 --- a/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.h +++ b/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.h @@ -1283,7 +1283,7 @@ enum MDBX_env_flags_t { * to several times in a best case scenario. * * LIFO recycling policy means that for reuse pages will be taken which became - * unused the latest (i.e. just now or most recently). Therefore the loop of + * unused the lastest (i.e. just now or most recently). Therefore the loop of * database pages circulation becomes as short as possible. In other words, * the number of pages, that are overwritten in memory and on disk during a * series of write transactions, will be as small as possible. Thus creates From 41a01698eb1ac989a046a872cf4d9b0458aa897b Mon Sep 17 00:00:00 2001 From: Marson Kotovi4 <137284002+MarsonKotovi4@users.noreply.github.com> Date: Sat, 1 Feb 2025 22:07:14 +0200 Subject: [PATCH 7/7] Update mdbx.c --- crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.c b/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.c index 8a46c0f61a34..21b0dfe3c6c0 100644 --- a/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.c +++ b/crates/storage/libmdbx-rs/mdbx-sys/libmdbx/mdbx.c @@ -11383,7 +11383,7 @@ retry_gc_refresh_oldest:; txnid_t oldest = txn_oldest_reader(txn); retry_gc_have_oldest: if (unlikely(oldest >= txn->mt_txnid)) { - ERROR("unexpected/invalid oldest-read txnid %" PRIaTXN + ERROR("unexpected/invalid oldest-readed txnid %" PRIaTXN " for current-txnid %" PRIaTXN, oldest, txn->mt_txnid); ret.err = MDBX_PROBLEM; @@ -11512,7 +11512,7 @@ next_gc:; } } - /* Remember ID of read GC record */ + /* Remember ID of readed GC record */ txn->tw.last_reclaimed = id; if (flags & MDBX_ALLOC_LIFO) { ret.err = txl_append(&txn->tw.lifo_reclaimed, id); @@ -11526,7 +11526,7 @@ next_gc:; goto fail; if (LOG_ENABLED(MDBX_LOG_EXTRA)) { - DEBUG_EXTRA("read GC-pnl txn %" PRIaTXN " root %" PRIaPGNO + DEBUG_EXTRA("readed GC-pnl txn %" PRIaTXN " root %" PRIaPGNO " len %zu, PNL", id, txn->mt_dbs[FREE_DBI].md_root, gc_len); for (size_t i = gc_len; i; i--)