diff options
| author | Ellie Huxtable <ellie@elliehuxtable.com> | 2024-06-26 12:40:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-26 12:40:17 +0100 |
| commit | 1201caee5c7b3020e1c879e527feb934fd1d8023 (patch) | |
| tree | 5af6ecc78075401e459c97b65f74689e141d5137 /crates | |
| parent | feat: add several other GitHub access token patterns (#2200) (diff) | |
| download | atuin-1201caee5c7b3020e1c879e527feb934fd1d8023.zip | |
perf(search): benchmark smart sort (#2202)
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/atuin-history/Cargo.toml | 9 | ||||
| -rw-r--r-- | crates/atuin-history/benches/smart_sort.rs | 35 | ||||
| -rw-r--r-- | crates/atuin-history/src/lib.rs | 1 | ||||
| -rw-r--r-- | crates/atuin-history/src/sort.rs (renamed from crates/atuin/src/command/client/search/sort.rs) | 0 | ||||
| -rw-r--r-- | crates/atuin/src/command/client/search.rs | 1 | ||||
| -rw-r--r-- | crates/atuin/src/command/client/search/interactive.rs | 6 |
6 files changed, 49 insertions, 3 deletions
diff --git a/crates/atuin-history/Cargo.toml b/crates/atuin-history/Cargo.toml index 4836cf74..2ed0e1a5 100644 --- a/crates/atuin-history/Cargo.toml +++ b/crates/atuin-history/Cargo.toml @@ -39,3 +39,12 @@ tracing = "0.1" uuid = { workspace = true } unicode-segmentation = "1.11.0" sysinfo = "0.30.7" + +[dev-dependencies] +tracing-tree = "0.3" +divan = "0.1.14" +rand = { workspace = true } + +[[bench]] +name = "smart_sort" +harness = false diff --git a/crates/atuin-history/benches/smart_sort.rs b/crates/atuin-history/benches/smart_sort.rs new file mode 100644 index 00000000..a78064de --- /dev/null +++ b/crates/atuin-history/benches/smart_sort.rs @@ -0,0 +1,35 @@ +use atuin_client::history::History; +use atuin_history::sort::sort; + +use rand::Rng; + +fn main() { + // Run registered benchmarks. + divan::main(); +} + +// Smart sort usually runs on 200 entries, test on a few sizes +#[divan::bench(args=[100, 200, 400, 800, 1600, 10000])] +fn smart_sort(lines: usize) { + // benchmark a few different sizes of "history" + // first we need to generate some history. This will use a whole bunch of memory, sorry + let mut rng = rand::thread_rng(); + let now = time::OffsetDateTime::now_utc().unix_timestamp(); + + let possible_commands = ["echo", "ls", "cd", "grep", "atuin", "curl"]; + let mut commands = Vec::<History>::with_capacity(lines); + + for _ in 0..lines { + let command = possible_commands[rng.gen_range(0..possible_commands.len())]; + + let command = History::import() + .command(command) + .timestamp(time::OffsetDateTime::from_unix_timestamp(rng.gen_range(0..now)).unwrap()) + .build() + .into(); + + commands.push(command); + } + + let _ = sort("curl", commands); +} diff --git a/crates/atuin-history/src/lib.rs b/crates/atuin-history/src/lib.rs index 9d34677f..e7b33916 100644 --- a/crates/atuin-history/src/lib.rs +++ b/crates/atuin-history/src/lib.rs @@ -1 +1,2 @@ +pub mod sort; pub mod stats; diff --git a/crates/atuin/src/command/client/search/sort.rs b/crates/atuin-history/src/sort.rs index 4465a142..4465a142 100644 --- a/crates/atuin/src/command/client/search/sort.rs +++ b/crates/atuin-history/src/sort.rs diff --git a/crates/atuin/src/command/client/search.rs b/crates/atuin/src/command/client/search.rs index f645d26b..f3626afe 100644 --- a/crates/atuin/src/command/client/search.rs +++ b/crates/atuin/src/command/client/search.rs @@ -21,7 +21,6 @@ mod engines; mod history_list; mod inspector; mod interactive; -mod sort; pub use duration::format_duration_into; diff --git a/crates/atuin/src/command/client/search/interactive.rs b/crates/atuin/src/command/client/search/interactive.rs index de0f4ea1..1676345b 100644 --- a/crates/atuin/src/command/client/search/interactive.rs +++ b/crates/atuin/src/command/client/search/interactive.rs @@ -31,7 +31,6 @@ use super::{ cursor::Cursor, engines::{SearchEngine, SearchState}, history_list::{HistoryList, ListState, PREFIX_LENGTH}, - sort, }; use crate::{command::client::search::engines, VERSION}; @@ -96,7 +95,10 @@ impl State { self.results_len = results.len(); if smart_sort { - Ok(sort::sort(self.search.input.as_str(), results)) + Ok(atuin_history::sort::sort( + self.search.input.as_str(), + results, + )) } else { Ok(results) } |
