Try to fix this spaghetti

Author: Mitron57

rust/benches/bench.rs

@@ -1,28 +1,20 @@
 #![feature(allocator_api)]
-#![feature(box_syntax)]
+mod benchmarks;
 
-use criterion::criterion_group;
 use {
-    create::create_links,
-    criterion::criterion_main,
-    delete::delete_links,
-    each::{each_all, each_concrete, each_identity, each_incoming, each_outgoing},
-    update::update_links,
+    benchmarks::create_links,
+    criterion::{criterion_group, criterion_main},
 };
-mod create;
-mod delete;
-mod each;
-mod update;
 
 criterion_group!(
     benches,
     create_links,
-    delete_links,
-    each_identity,
-    each_concrete,
-    each_outgoing,
-    each_incoming,
-    each_all,
-    update_links
+    //delete_links,
+    //each_identity,
+    //each_concrete,
+    //each_outgoing,
+    //each_incoming,
+    //each_all,
+    //update_links
 );
 criterion_main!(benches);

rust/benches/benchmarks/create.rs

@@ -0,0 +1,78 @@
+use {
+    linkspsql::{connect, Sql},
+    criterion::{measurement::WallTime, BenchmarkGroup, Criterion},
+    doublets::{data::LinkType, mem::Alloc, split, unit, Doublets},
+    linkspsql::{
+        benchmark, elapsed, prepare_file, Benched, Client, Fork, Result, Transaction,
+        BACKGROUND_LINKS,
+    },
+    std::{
+        alloc::Global,
+        time::{Duration, Instant},
+    },
+    tokio::runtime::{Builder, Runtime},
+};
+
+fn bench<S: Benched + Doublets<T>, T: LinkType>(
+    builder: S::Builder<'_>,
+    id: &str,
+    group: &mut BenchmarkGroup<WallTime>,
+) -> Result<()> {
+    let mut storage = S::setup(builder)?;
+    group.bench_function(id, |b| {
+        benchmark! {
+            b,
+            let mut fork = storage.fork();
+            for _ in 0..1_000 {
+                let _ = fork.create_point();
+            }
+        }
+    });
+    Ok(())
+}
+
+pub fn create_links(c: &mut Criterion) -> Result<()> {
+    let mut group = c.benchmark_group("Create");
+    //let united = prepare_file("united.links")?;
+    //let split_data = prepare_file("split_data.links")?;
+    //let split_index = prepare_file("split_index.links")?;
+    //bench::<Client<usize>, _>(&runtime, "PSQL_NonTransaction", &mut group).unwrap();
+    {
+        let runtime = Runtime::new().unwrap();
+        let mut client = runtime.block_on(connect()).unwrap();
+        bench::<Transaction<'_, usize>, _>(&mut client, "PSQL_Transaction", &mut group).unwrap();
+    }
+
+    /*bench::<unit::Store<usize, Alloc<LinkPart<_>, _>>, _>(
+        Global,
+        "Doublets_United_Volatile",
+        &mut group,
+    )
+    .unwrap();
+
+    bench::<unit::Store<usize, FileMapped<_>>, _>(
+        prepare_file("united.links")?,
+        "Doublets_United_NonVolatile",
+        &mut group,
+    )
+    .unwrap();
+
+    bench::<split::Store<usize, Alloc<DataPart<_>, _>, Alloc<IndexPart<_>, _>>, _>(
+        Global,
+        "Doublets_Split_Volatile",
+        &mut group,
+    )
+    .unwrap();
+
+    bench::<split::Store<usize, FileMapped<_>, FileMapped<_>>, _>(
+        (
+            prepare_file("split_data.links")?,
+            prepare_file("split_index.links")?,
+        ),
+        "Doublets_Split_NonVolatile",
+        &mut group,
+    )
+    .unwrap();*/
+    group.finish();
+    Ok(())
+}

rust/benches/delete.rs rust/benches/benchmarks/delete.rsrust/benches/delete.rs renamed to rust/benches/benchmarks/delete.rs

@@ -1,13 +1,12 @@
-#![feature(allocator_api)]
-
 use {
     criterion::Criterion,
     doublets::{
         mem::{Alloc, FileMapped},
         split, unit, Doublets,
     },
-    linkspsql::{benchmark, connect, elapsed, prepare_file, SetupTeardown, BACKGROUND_LINKS},
+    linkspsql::{benchmark, connect, elapsed, prepare_file, Benched, BACKGROUND_LINKS},
     std::{
+        alloc::Global,
         error::Error,
         time::{Duration, Instant},
     },
@@ -17,7 +16,6 @@ use {
 pub fn delete_links(c: &mut Criterion) -> Result<(), Box<dyn Error>> {
     let runtime = Runtime::new()?;
     let mut group = c.benchmark_group("Delete");
-    let allocator = std::alloc::Global;
     let united = prepare_file("united.links")?;
     let split_data = prepare_file("split_data.links")?;
     let split_index = prepare_file("split_index.links")?;
@@ -70,7 +68,7 @@ pub fn delete_links(c: &mut Criterion) -> Result<(), Box<dyn Error>> {
         let _ = client.transaction()?.teardown();
     }
     {
-        let storage = Alloc::new(allocator);
+        let storage = Alloc::new(Global);
         let mut links = unit::Store::<usize, _>::new(storage)?;
         let _ = links.setup();
         benchmark! {
@@ -110,8 +108,8 @@ pub fn delete_links(c: &mut Criterion) -> Result<(), Box<dyn Error>> {
         let _ = links.teardown();
     }
     {
-        let data = Alloc::new(allocator);
-        let index = Alloc::new(allocator);
+        let data = Alloc::new(Global);
+        let index = Alloc::new(Global);
         let mut links = split::Store::<usize, _, _>::new(data, index)?;
         let _ = links.setup();
         benchmark! {

rust/benches/each/all.rs rust/benches/benchmarks/each/all.rsrust/benches/each/all.rs renamed to rust/benches/benchmarks/each/all.rs

@@ -1,4 +1,3 @@
-#![feature(allocator_api)]
 mod all;
 mod concrete;
 mod identity;

rust/benches/each/concrete.rs rust/benches/benchmarks/each/concrete.rsrust/benches/each/concrete.rs renamed to rust/benches/benchmarks/each/concrete.rs

@@ -0,0 +1,5 @@
+mod create;
+//mod delete;
+///mod each;
+//mod update;
+pub use create::create_links;