Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sort: Implement stable sort, ignore non-printing, month sort dedup, auto parallel sort through rayon, zero terminated sort, check silent #2008

Merged
merged 115 commits into from
Apr 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
6811bfe
Reword the "why" a bit
sylvestre Mar 24, 2021
ac0de89
update it
sylvestre Mar 24, 2021
787471e
Last fix
sylvestre Mar 25, 2021
9da594f
sort: Add a Random Sorter
kimono-koans Mar 26, 2021
754cbd3
Implement remove leading blanks
kimono-koans Mar 26, 2021
cb9b4f6
Replace md5 with a fast non-crypto hash, xxhash64
kimono-koans Mar 26, 2021
1a198c7
replace fasthash with twox-hash crate, which builds one all targets
kimono-koans Mar 26, 2021
22018f3
Update src/uu/sort/src/sort.rs
kimono-koans Mar 26, 2021
b270970
Ran rustfmt
kimono-koans Mar 26, 2021
281e9ad
Merge branch 'master' of https://github.com/electricboogie/coreutils
kimono-koans Mar 26, 2021
74ee630
Fixed numeric compare to match the GNU format, added some tests
kimono-koans Mar 27, 2021
0328ee9
Some minor cleanup
kimono-koans Mar 27, 2021
4af903e
More fixes to human and numeric compare, a few more tests
kimono-koans Mar 27, 2021
1078170
Minor cleanup to comment
kimono-koans Mar 27, 2021
d19e62b
Changes to build with 1.40 toolchain
kimono-koans Mar 27, 2021
065c2a0
Adopted master Cargo.lock and built once, don't know why I might have…
kimono-koans Mar 27, 2021
e0033cd
Add back comment
kimono-koans Mar 27, 2021
0b5daed
Added integration tests, stopped short of doing too many, because I d…
kimono-koans Mar 27, 2021
46ad158
Merge branch 'master' of github.com:uutils/coreutils
kimono-koans Mar 27, 2021
0a642ec
Add Master Cargo.lock
kimono-koans Mar 27, 2021
fae9a25
Passed "cargo +1.40.0 update"
kimono-koans Mar 27, 2021
700c47a
Downgraded rand for minrustv, might be why I can't push without errors
kimono-koans Mar 27, 2021
3f82809
Update src/uu/sort/src/sort.rs
kimono-koans Mar 28, 2021
69219b9
Ran rustfmt on test_sort
kimono-koans Mar 28, 2021
ae7e558
Take master Cargo.lock and build once
kimono-koans Mar 28, 2021
a90b2e7
Match sort -nu behavior
kimono-koans Mar 28, 2021
40f1039
Add comments re: sort -nu
kimono-koans Mar 28, 2021
c2f853e
Match GNU sort empty line behavior for non-unique lines
kimono-koans Mar 28, 2021
de699b7
Cleanup names, etc.
kimono-koans Mar 28, 2021
ac24948
Cleanup comment
kimono-koans Mar 28, 2021
c5146b4
Small fix in --help
kimono-koans Mar 28, 2021
fc3b5c1
Attempt at resolving Cargo.lock issues
kimono-koans Mar 29, 2021
9474e90
Merge branch 'master' of https://github.com/uutils/coreutils
kimono-koans Mar 29, 2021
04058da
Another attempt resolve this conflict
kimono-koans Mar 29, 2021
924a3b2
Ran rustfmt
kimono-koans Mar 29, 2021
fb23ef6
Use constants alloted and whitespace def for blank char
kimono-koans Mar 29, 2021
729751e
Replace old numeric with GNU numeric compare. Move old numeric compa…
kimono-koans Mar 29, 2021
6e16759
Replace xxHash with FNV because it's better with smaller inputs
kimono-koans Mar 29, 2021
55ffeb9
Implement ignore non-printing
kimono-koans Mar 29, 2021
601422f
Ran rustfmt
kimono-koans Mar 29, 2021
df29be1
Cleanup fn name, add comment re float ordering
kimono-koans Mar 29, 2021
ee82d0f
Merge branch 'master' of https://github.com/uutils/coreutils
kimono-koans Mar 29, 2021
47deb9a
Fix reverse
kimono-koans Mar 29, 2021
bc5e41a
More small fixes to match GNU behavior
kimono-koans Mar 29, 2021
6275b85
More iterative fixes for sort -unr
kimono-koans Mar 29, 2021
372767b
End of fooling around with numeric_compare
kimono-koans Mar 30, 2021
55fdef2
Close enough on sort -un, we stop short of doing a 2nd pass after num…
kimono-koans Mar 30, 2021
57849e2
Small sort -un fixes
kimono-koans Mar 30, 2021
5145440
Implement stable sort and last resort compare
kimono-koans Mar 30, 2021
b949687
Remove noop
kimono-koans Mar 30, 2021
284b161
Minor cleanup
kimono-koans Mar 30, 2021
57858c4
Add back tests
kimono-koans Mar 30, 2021
ee61dd1
Added new tests. Found a good crate to get the actual ignore non-pri…
kimono-koans Mar 30, 2021
4c8e333
Ran rustfmt
kimono-koans Mar 30, 2021
2998b73
Remove two tmpfiles
kimono-koans Mar 30, 2021
aeff62e
Al tests working
kimono-koans Mar 30, 2021
8dce220
Ran rustfmt
kimono-koans Mar 30, 2021
b1cb6c7
Figured out nonprinting chars with a test!
kimono-koans Mar 31, 2021
bc7637c
Merge branch 'master' of https://github.com/uutils/coreutils
kimono-koans Mar 31, 2021
d4958f3
Pull Cargo.lock
kimono-koans Mar 31, 2021
8fe46db
Remove returns
kimono-koans Mar 31, 2021
3ebbaf1
Fix: Panic on unwrap of non value
kimono-koans Mar 31, 2021
84e4462
Prevention of panic of unwrap of None value
kimono-koans Mar 31, 2021
318a1e5
Fix month parse not matching on JUNNNNN, etc.
kimono-koans Mar 31, 2021
768c180
Tests say this is not necessary, and trim seems eliminate the whitespace
kimono-koans Mar 31, 2021
5d0a839
Small fix to comment
kimono-koans Mar 31, 2021
fdd4a53
Fix dash sign creating a negative # in the middle of a string
kimono-koans Mar 31, 2021
1604e7f
Fix sort -Mu and include a test
kimono-koans Mar 31, 2021
a28c521
Remove my own non-working tests re: sort -h, add months dedup test an…
kimono-koans Mar 31, 2021
8b9395d
Change MINUS_SIGN to NEGATIVE
kimono-koans Mar 31, 2021
38a7188
Ran rustfmt, removed exponent test, git ignore DS_Store files
kimono-koans Apr 1, 2021
07a569b
Implement exponent parsing and positive parsing
kimono-koans Apr 1, 2021
6641574
Allow exponents only for sort -g
kimono-koans Apr 1, 2021
f68c548
Prepare for zero delimited
kimono-koans Apr 1, 2021
32add97
Add zero terminated option
kimono-koans Apr 2, 2021
8769f3e
Implement check silent with a test
kimono-koans Apr 2, 2021
9a8bddb
Ran rustfmt
kimono-koans Apr 2, 2021
0af86d5
Remove unused dependency
kimono-koans Apr 2, 2021
8fbd8a4
Can't forget new Cargo.lock
kimono-koans Apr 2, 2021
84b398b
Oops flubbed a long name for random
kimono-koans Apr 2, 2021
34f5b1b
Merge branch 'master' of https://github.com/uutils/coreutils
kimono-koans Apr 2, 2021
d06d1fb
Make control flow clearer re: MiDeb's comment
kimono-koans Apr 2, 2021
0dd2c69
Ran rustfmt
kimono-koans Apr 2, 2021
bca6a07
&& where there should have been an ||
kimono-koans Apr 2, 2021
d86326e
Fix comment
kimono-koans Apr 2, 2021
51d5362
Remove unneeded for loop re: miDeb suggestion
kimono-koans Apr 3, 2021
99cee5c
Remove an unneeded string allocation per miDeb's suggestion
kimono-koans Apr 3, 2021
440629d
Add parallel num threads cmdline option
kimono-koans Apr 3, 2021
62373cc
Fixes re: Code Coverage
kimono-koans Apr 3, 2021
19db6b8
Ran rustfmt
kimono-koans Apr 3, 2021
e76a41c
Allow zero terminated files to be checked
kimono-koans Apr 4, 2021
5dff249
Revert "Allow zero terminated files to be checked"
kimono-koans Apr 4, 2021
ce1959d
Cleanup loops
kimono-koans Apr 4, 2021
becd1fe
Merge branch 'master' of https://github.com/electricboogie/coreutils
kimono-koans Apr 5, 2021
0c62166
Update src/uu/sort/src/sort.rs
kimono-koans Apr 5, 2021
9cf24de
Add documentation of leading number functions, some unit tests re: ra…
kimono-koans Apr 5, 2021
a84d80d
Cleanup
kimono-koans Apr 5, 2021
ab3c98d
Merge branch 'sylvestre-patch-1' of https://github.com/uutils/coreutils
kimono-koans Apr 5, 2021
3eee777
Merge branch 'master' of https://github.com/uutils/coreutils
kimono-koans Apr 5, 2021
55910ff
Merge branch 'master' of https://github.com/electricboogie/coreutils
kimono-koans Apr 5, 2021
626df3c
Changes got overriden so empty commit
kimono-koans Apr 5, 2021
92d1f47
Implement suggested tests re: random shuffle
kimono-koans Apr 5, 2021
199cdf7
Random Tests: Add a few more asserts that initial sort order is not t…
kimono-koans Apr 5, 2021
4aa87a9
Implement check with zero terminated lines
kimono-koans Apr 5, 2021
823f58d
Comment cleanup
kimono-koans Apr 5, 2021
a1955f2
Ran rustfmt
kimono-koans Apr 5, 2021
84dc029
Cleanup
kimono-koans Apr 5, 2021
85e1164
Remove inline for compare_by
kimono-koans Apr 6, 2021
9510da8
Cleanup comments
kimono-koans Apr 6, 2021
8d15f4f
Add comment re: human sort
kimono-koans Apr 6, 2021
89809c2
to_owned is faster than to_string for str
kimono-koans Apr 6, 2021
5d8a98c
Implement -S bufsize
kimono-koans Apr 6, 2021
284a28f
Revert "Implement -S bufsize"
kimono-koans Apr 7, 2021
06309aa
Implement files0-from, cleanup comments, ran rustfmt
kimono-koans Apr 7, 2021
5bcd7df
Remove unneeded condition
kimono-koans Apr 7, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/uu/sort/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ edition = "2018"
path = "src/sort.rs"

[dependencies]
rayon = "1.5"
rand = "0.7"
clap = "2.33"
twox-hash = "1.6.0"
fnv = "1.0.7"
itertools = "0.8.0"
semver = "0.9.0"
uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["fs"] }
Expand Down
Loading