mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-08-01 05:27:45 +00:00
shuf: improve performance
Use memchr crate to speed up splitting input data by a separator. Signed-off-by: Christian Menges <christian.menges@outlook.com>
This commit is contained in:
parent
95de5f6494
commit
19a43bf1b7
3 changed files with 7 additions and 12 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
@ -2808,6 +2808,7 @@ name = "uu_shuf"
|
||||||
version = "0.0.14"
|
version = "0.0.14"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"clap 3.1.18",
|
"clap 3.1.18",
|
||||||
|
"memchr 2.5.0",
|
||||||
"rand",
|
"rand",
|
||||||
"rand_core",
|
"rand_core",
|
||||||
"uucore",
|
"uucore",
|
||||||
|
|
|
@ -16,6 +16,7 @@ path = "src/shuf.rs"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
clap = { version = "3.1", features = ["wrap_help", "cargo"] }
|
clap = { version = "3.1", features = ["wrap_help", "cargo"] }
|
||||||
|
memchr = "2.5.0"
|
||||||
rand = "0.8"
|
rand = "0.8"
|
||||||
rand_core = "0.6"
|
rand_core = "0.6"
|
||||||
uucore = { version=">=0.0.11", package="uucore", path="../../uucore" }
|
uucore = { version=">=0.0.11", package="uucore", path="../../uucore" }
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
// spell-checker:ignore (ToDO) cmdline evec seps rvec fdata
|
// spell-checker:ignore (ToDO) cmdline evec seps rvec fdata
|
||||||
|
|
||||||
use clap::{crate_version, Arg, Command, Values};
|
use clap::{crate_version, Arg, Command, Values};
|
||||||
|
use memchr::memchr_iter;
|
||||||
use rand::prelude::SliceRandom;
|
use rand::prelude::SliceRandom;
|
||||||
use rand::RngCore;
|
use rand::RngCore;
|
||||||
use std::fs::File;
|
use std::fs::File;
|
||||||
|
@ -218,20 +219,12 @@ fn find_seps(data: &mut Vec<&[u8]>, sep: u8) {
|
||||||
if data[i].contains(&sep) {
|
if data[i].contains(&sep) {
|
||||||
let this = data.swap_remove(i);
|
let this = data.swap_remove(i);
|
||||||
let mut p = 0;
|
let mut p = 0;
|
||||||
let mut i = 1;
|
for i in memchr_iter(sep, this) {
|
||||||
loop {
|
data.push(&this[p..i]);
|
||||||
if i == this.len() {
|
p = i + 1;
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if this[i] == sep {
|
|
||||||
data.push(&this[p..i]);
|
|
||||||
p = i + 1;
|
|
||||||
}
|
|
||||||
i += 1;
|
|
||||||
}
|
}
|
||||||
if p < this.len() {
|
if p < this.len() {
|
||||||
data.push(&this[p..i]);
|
data.push(&this[p..]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue