Avoid storage caching in benchmarks (#1469)

Closes #1441

- Disabled cache for blocks in the table
- Removed usage of in memory transaction in benchmarks and replaced it
with checkpoint
- Added bloom filter
- Added customization of the block cache

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 Description of the upcoming release here.
 
 ### Added
+
+- [#1469](https://github.com/FuelLabs/fuel-core/pull/1469): Added support of bloom filter for RocksDB tables and increased the block cache.
 - [#1642](https://github.com/FuelLabs/fuel-core/pull/1462): Added benchmark to measure the performance of contract state and contract ID calculation; use for gas costing.
 - [#1465](https://github.com/FuelLabs/fuel-core/pull/1465): Improvements for keygen cli and crates
 - [#1457](https://github.com/FuelLabs/fuel-core/pull/1457): Fixing incorrect measurement for fast(µs) opcodes.
@@ -44,6 +46,7 @@ Description of the upcoming release here.
 
 ### Changed
 
+- [#1469](https://github.com/FuelLabs/fuel-core/pull/1469): Replaced usage of `MemoryTransactionView` by `Checkpoint` database in the benchmarks.
 - [#1466](https://github.com/FuelLabs/fuel-core/pull/1466): Handling overflows during arithmetic operations.
 - [#1468](https://github.com/FuelLabs/fuel-core/pull/1468): Bumped version of the `fuel-vm` to `v0.40.0`. It brings some breaking changes into consensus parameters API because of changes in the underlying types.
 - [#1460](https://github.com/FuelLabs/fuel-core/pull/1460): Change tracking branch from main to master for releasy tests.

benches/benches/vm.rs

@@ -13,7 +13,6 @@ use criterion::{
 
 use contract::*;
 use fuel_core_benches::*;
-use fuel_core_storage::transactional::Transaction;
 use fuel_core_types::fuel_asm::Instruction;
 use vm_set::*;
 
@@ -33,14 +32,12 @@ where
                 instruction,
                 diff,
             } = &mut i;
-            let original_db = vm.as_mut().database_mut().clone();
-            let mut db_txn = {
-                let db = vm.as_mut().database_mut();
-                let db_txn = db.transaction();
-                // update vm database in-place to use transaction
-                *db = db_txn.as_ref().clone();
-                db_txn
-            };
+            let checkpoint = vm
+                .as_mut()
+                .database_mut()
+                .checkpoint()
+                .expect("Should be able to create a checkpoint");
+            let original_db = core::mem::replace(vm.as_mut().database_mut(), checkpoint);
 
             let final_time;
             loop {
@@ -80,7 +77,6 @@ where
                 }
             }
 
-            db_txn.commit().unwrap();
             // restore original db
             *vm.as_mut().database_mut() = original_db;
             final_time

benches/benches/vm_set/blockchain.rs

@@ -1,7 +1,5 @@
 use std::{
-    env,
     iter::successors,
-    path::PathBuf,
     sync::Arc,
 };
 
@@ -13,7 +11,10 @@ use criterion::{
 };
 use fuel_core::{
     database::vm_database::VmDatabase,
-    state::rocks_db::RocksDb,
+    state::rocks_db::{
+        RocksDb,
+        ShallowTempDir,
+    },
 };
 use fuel_core_benches::*;
 use fuel_core_types::{
@@ -37,27 +38,6 @@ use rand::{
     SeedableRng,
 };
 
-/// Reimplementation of `tempdir::TempDir` that allows creating a new
-/// instance without actually creating a new directory on the filesystem.
-/// This is needed since rocksdb requires empty directory for checkpoints.
-pub struct ShallowTempDir {
-    path: PathBuf,
-}
-impl ShallowTempDir {
-    pub fn new() -> Self {
-        let mut rng = rand::thread_rng();
-        let mut path = env::temp_dir();
-        path.push(format!("fuel-core-bench-rocksdb-{}", rng.next_u64()));
-        Self { path }
-    }
-}
-impl Drop for ShallowTempDir {
-    fn drop(&mut self) {
-        // Ignore errors
-        let _ = std::fs::remove_dir_all(&self.path);
-    }
-}
-
 pub struct BenchDb {
     db: RocksDb,
     /// Used for RAII cleanup. Contents of this directory are deleted on drop.
@@ -70,7 +50,7 @@ impl BenchDb {
     fn new(contract: &ContractId) -> anyhow::Result<Self> {
         let tmp_dir = ShallowTempDir::new();
 
-        let db = Arc::new(RocksDb::default_open(&tmp_dir.path, None).unwrap());
+        let db = Arc::new(RocksDb::default_open(tmp_dir.path(), None).unwrap());
 
         let mut database = Database::new(db.clone());
         database.init_contract_state(
@@ -106,14 +86,9 @@ impl BenchDb {
 
     /// Create a new separate database instance using a rocksdb checkpoint
     fn checkpoint(&self) -> VmDatabase {
-        let tmp_dir = ShallowTempDir::new();
-        self.db
-            .checkpoint(&tmp_dir.path)
+        use fuel_core::state::TransactableStorage;
+        let database = TransactableStorage::checkpoint(&self.db)
             .expect("Unable to create checkpoint");
-        let db = RocksDb::default_open(&tmp_dir.path, None).unwrap();
-        let database = Database::new(Arc::new(db)).with_drop(Box::new(move || {
-            drop(tmp_dir);
-        }));
         VmDatabase::default_from_database(database)
     }
 }

benches/src/bin/collect.rs

@@ -633,6 +633,7 @@ fn linear_regression(x_y: Vec<(u64, u64)>) -> f64 {
 fn dependent_cost(name: &String, x_y: Vec<(u64, u64)>) -> (u64, u64) {
     const NEAR_LINEAR: f64 = 0.1;
 
+    #[derive(PartialEq, Eq)]
     enum Type {
         /// The points have a linear property. The first point
         /// and the last points are almost the same(The difference is < 0.1).
@@ -671,7 +672,7 @@ fn dependent_cost(name: &String, x_y: Vec<(u64, u64)>) -> (u64, u64) {
 
     let linear_regression = linear_regression(x_y.clone());
 
-    let mut x_y = x_y
+    let x_y = x_y
         .into_iter()
         .map(|(x, y)| Point { x, y })
         .collect::<Vec<_>>();
@@ -704,7 +705,15 @@ fn dependent_cost(name: &String, x_y: Vec<(u64, u64)>) -> (u64, u64) {
                 .unwrap();
             (base, amount as u64)
         }
-        Type::Logarithm => {
+        Type::Logarithm | Type::Exp => {
+            if expected_type == Type::Exp {
+                println!(
+                    "The {} is exponential. We don't support exponential chart. \
+                The opcode should be limited with upper bound. \n {:?}",
+                    name, x_y
+                );
+            }
+
             // The logarithm function slows down fast, and the point where it becomes more
             // linear is the base point. After this point we use linear strategy.
             let last = x_y.last().unwrap().amount();
@@ -726,17 +735,6 @@ fn dependent_cost(name: &String, x_y: Vec<(u64, u64)>) -> (u64, u64) {
                 .unwrap_or(last);
             (base.y, amount as u64)
         }
-        Type::Exp => {
-            println!(
-                "The {} is exponential. We don't support exponential chart. \
-                The opcode should be limited with upper bound. \n {:?}",
-                name, x_y
-            );
-
-            x_y.sort_unstable_by_key(|a| a.amount() as u64);
-            let base = x_y.last().unwrap();
-            (base.y, 0)
-        }
     }
 }
 

crates/fuel-core/src/database.rs

@@ -233,6 +233,10 @@ impl Database {
         self.into()
     }
 
+    pub fn checkpoint(&self) -> DatabaseResult<Self> {
+        self.data.checkpoint()
+    }
+
     pub fn flush(self) -> DatabaseResult<()> {
         self.data.flush()
     }

crates/fuel-core/src/state.rs

@@ -1,5 +1,7 @@
 use crate::database::{
     Column,
+    Database,
+    Error as DatabaseError,
     Result as DatabaseResult,
 };
 use fuel_core_storage::iter::{
@@ -87,6 +89,12 @@ pub enum WriteOperation {
 }
 
 pub trait TransactableStorage: BatchOperations + Debug + Send + Sync {
+    fn checkpoint(&self) -> DatabaseResult<Database> {
+        Err(DatabaseError::Other(anyhow::anyhow!(
+            "Checkpoint is not supported"
+        )))
+    }
+
     fn flush(&self) -> DatabaseResult<()>;
 }