Skip to content

Commit

Permalink
add releases/0.7.73, update README
Browse files Browse the repository at this point in the history
  • Loading branch information
jtmoon79 committed Jun 3, 2024
1 parent 330fbb4 commit 4ed4f46
Show file tree
Hide file tree
Showing 19 changed files with 66,985 additions and 12 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,9 @@ _MSRV 1.70.0_
- (DOCS) CHANGELOG fix missing links for long short hashes ([3a500a4a])
- (DOCS) README.md add badge CHANGELOG ([e8ae1ae5])
- (DOCS) src/ update docstrings printer/ filedecompressor.rs ([6ab5a2a5])
- (LIB) blockreader.rs larger buf for BZ2 LZ4 data extract ([b76c05d3])
- (PROJECT) add log dtf7-20-LEVELS-outoforder.log ([801ab5c8])
- (TOOLS) flamegraphs.sh use log gen-1000-3-foobar.log.bz2, journal.bz2 ([af851e2d])
- (TOOLS) flamegraphs.sh simplify to a for loop ([46d58621])
- (TOOLS) flamegraph.sh rm perf help ([4b115c29])

Expand Down Expand Up @@ -2425,6 +2427,7 @@ EVERYTHING AFTER THE FOLLOWING COMMENT WILL BE DELETED AND REPLACED BY `tools/ch
[aee27e45]: https://github.com/jtmoon79/super-speedy-syslog-searcher/commit/aee27e45bc52c5a6839a66266d03a304d2608351
[aeed87f6]: https://github.com/jtmoon79/super-speedy-syslog-searcher/commit/aeed87f64b21581afb83924035cd22fd98d3dddc
[af468519]: https://github.com/jtmoon79/super-speedy-syslog-searcher/commit/af46851919ced5582dd8d6c5b236edd3ac078061
[af851e2d]: https://github.com/jtmoon79/super-speedy-syslog-searcher/commit/af851e2dfe1dc6a42824df5fe7bf5083a01eefd0
[af93d662]: https://github.com/jtmoon79/super-speedy-syslog-searcher/commit/af93d662852bbed6a3c13ca4f54ae4a63af56c20
[afc0dab5]: https://github.com/jtmoon79/super-speedy-syslog-searcher/commit/afc0dab53064bef4aec0f5181e25b8f96e0169f4
[b03da488]: https://github.com/jtmoon79/super-speedy-syslog-searcher/commit/b03da48883f07bd1e089f080dc4bc6fa9cfc8578
Expand All @@ -2450,6 +2453,7 @@ EVERYTHING AFTER THE FOLLOWING COMMENT WILL BE DELETED AND REPLACED BY `tools/ch
[b6d359fe]: https://github.com/jtmoon79/super-speedy-syslog-searcher/commit/b6d359fe3efb94ba8f85c7eaa1788665c392021d
[b715be55]: https://github.com/jtmoon79/super-speedy-syslog-searcher/commit/b715be5564b434b10e566aba23a1737860ccc37f
[b723fed8]: https://github.com/jtmoon79/super-speedy-syslog-searcher/commit/b723fed816b98dc1bfa9484909c53a8078a1335d
[b76c05d3]: https://github.com/jtmoon79/super-speedy-syslog-searcher/commit/b76c05d3bd5dd062408b55a1b4202c4ef5aeda90
[b7a25d09]: https://github.com/jtmoon79/super-speedy-syslog-searcher/commit/b7a25d0905f7aa8426eb97ada89a516620d81e77
[b875e10f]: https://github.com/jtmoon79/super-speedy-syslog-searcher/commit/b875e10f8792292446465e8855b7dbb7048d4c4a
[b8989f3f]: https://github.com/jtmoon79/super-speedy-syslog-searcher/commit/b8989f3f0e848138b6de90b81b2c774e775a015d
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ Speedily search and merge log messages by datetime.
* Must update parameters `branch=` and `version=` per release; replace the version
-->

[![MSRV](https://img.shields.io/crates/msrv/super_speedy_syslog_searcher/0.7.72?logo=rust&logoColor=800000&cacheSeconds=6000)](https://github.com/jtmoon79/super-speedy-syslog-searcher/blob/0.7.72/Cargo.toml#L19)
[![MSRV](https://img.shields.io/crates/msrv/super_speedy_syslog_searcher/0.7.73?logo=rust&logoColor=800000&cacheSeconds=6000)](https://github.com/jtmoon79/super-speedy-syslog-searcher/blob/0.7.73/Cargo.toml#L19)
[![License](https://img.shields.io/crates/l/super-speedy-syslog-searcher?style=flat-square)](https://github.com/jtmoon79/super-speedy-syslog-searcher/blob/main/LICENSE.txt)
[![docs.rs](https://img.shields.io/docsrs/super_speedy_syslog_searcher/0.7.72?badge.svg&style=flat-square&logo=docsdotrs)](https://docs.rs/super_speedy_syslog_searcher/0.7.72/)
[![docs.rs](https://img.shields.io/docsrs/super_speedy_syslog_searcher/0.7.73?badge.svg&style=flat-square&logo=docsdotrs)](https://docs.rs/super_speedy_syslog_searcher/0.7.73/)

[![crates.io version](https://img.shields.io/crates/v/super-speedy-syslog-searcher.svg?style=flat-square&logo=rust&logoColor=800000?branch=0.7.72&version=0.7.72)](https://crates.io/crates/super-speedy-syslog-searcher/0.7.72)
[![crates.io version](https://img.shields.io/crates/v/super-speedy-syslog-searcher.svg?style=flat-square&logo=rust&logoColor=800000?branch=0.7.73&version=0.7.73)](https://crates.io/crates/super-speedy-syslog-searcher/0.7.73)
[![crates.io downloads](https://img.shields.io/crates/d/super-speedy-syslog-searcher.svg?style=flat-square&logo=rust&logoColor=800000)](https://crates.io/crates/super-speedy-syslog-searcher#:~:text=Downloads%20all%20time)
[![crates.io downloads (version)](https://img.shields.io/crates/dv/super_speedy_syslog_searcher/0.7.72?style=flat-square&logo=rust&logoColor=800000)](https://crates.io/crates/super-speedy-syslog-searcher/0.7.72)
[![crates.io downloads (version)](https://img.shields.io/crates/dv/super_speedy_syslog_searcher/0.7.73?style=flat-square&logo=rust&logoColor=800000)](https://crates.io/crates/super-speedy-syslog-searcher/0.7.73)
[![CHANGELOG](https://img.shields.io/badge/CHANGELOG-blue?style=flat-square&logo=keep-a-changelog&logoColor=FFFFFF&color=E05735)](https://github.com/jtmoon79/super-speedy-syslog-searcher/blob/main/CHANGELOG.md#0772)
[![lib.rs](https://img.shields.io/badge/lib.rs-white?style=flat-square&logo=rust&logoColor=202020)](https://lib.rs/crates/super_speedy_syslog_searcher/)

[![Build status](https://img.shields.io/github/actions/workflow/status/jtmoon79/super-speedy-syslog-searcher/rust.yml?branch=0.7.72&style=flat-square&logo=github&logoColor=000000)](https://github.com/jtmoon79/super-speedy-syslog-searcher/actions?query=workflow%3Arust)
[![coveralls.io](https://img.shields.io/coverallsCoverage/github/jtmoon79/super-speedy-syslog-searcher?style=flat-square&logo=coveralls&logoColor=b94947&branch=0.7.72&version=0.7.72)](https://coveralls.io/github/jtmoon79/super-speedy-syslog-searcher?branch=0.7.72)
[![Commits since](https://img.shields.io/github/commits-since/jtmoon79/super-speedy-syslog-searcher/0.7.72.svg?logo=github&logoColor=000000)](https://github.com/jtmoon79/super-speedy-syslog-searcher/commits/main)
[![Build status](https://img.shields.io/github/actions/workflow/status/jtmoon79/super-speedy-syslog-searcher/rust.yml?branch=0.7.73&style=flat-square&logo=github&logoColor=000000)](https://github.com/jtmoon79/super-speedy-syslog-searcher/actions?query=workflow%3Arust)
[![coveralls.io](https://img.shields.io/coverallsCoverage/github/jtmoon79/super-speedy-syslog-searcher?style=flat-square&logo=coveralls&logoColor=b94947&branch=0.7.73&version=0.7.73)](https://coveralls.io/github/jtmoon79/super-speedy-syslog-searcher?branch=0.7.73)
[![Commits since](https://img.shields.io/github/commits-since/jtmoon79/super-speedy-syslog-searcher/0.7.73.svg?logo=github&logoColor=000000)](https://github.com/jtmoon79/super-speedy-syslog-searcher/commits/main)

_Super Speedy Syslog Searcher_ (`s4`) is a command-line tool to search
and merge varying log messages from varying log files, sorted by datetime.
Expand Down Expand Up @@ -621,22 +621,22 @@ A comparison of merging three large log files:

|Program |real|user|sys |
|- |- |- |- |
|`grep \| sort`|0.04|0.04|0.00|
|`s4` |0.04|0.05|0.02|
|`logmerger` |0.80|0.76|0.03|
|`grep \| sort`|0.04|0.03|0.00|
|`s4` |0.05|0.06|0.01|
|`logmerger` |0.72|0.69|0.02|
|`tl` |1.30|0.47|0.06|

This informal runtime comparison used GNU `time` running on Ubuntu 22 on WSL2.

- `grep` 3.7, `sort` 8.32
- `s4` 0.7.72
- `s4` 0.7.73
- `logmerger` 0.9.0 on Python 3.10.12
- `tl` 1.5.0 on Python 3.10.12

See directory [compare-log-mergers] and results in [`compare-log-mergers.txt`].

[compare-log-mergers]: ./tools/compare-log-mergers/
[`compare-log-mergers.txt`]: ./releases/0.7.72/compare-log-mergers.txt
[`compare-log-mergers.txt`]: ./releases/0.7.73/compare-log-mergers.txt

---

Expand Down
57 changes: 57 additions & 0 deletions releases/0.7.73/compare-log-mergers.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
+ git log -n1 --oneline -1
b76c05d3 (HEAD -> main) blockreader.rs larger buf for BZ2 LZ4 data extract
+ /usr/bin/time --version
time (GNU Time) UNKNOWN
+ python --version
Python 3.10.12
+ python -m pip install --upgrade --force --quiet logmerger==0.9.0
+ python -m pip install --upgrade --force --quiet toolong==1.5.0
+ python -m pip install --upgrade --force --quiet logdissect==3.1.1
----------------------------------------
+ /usr/bin/grep --version
grep (GNU grep) 3.7
+ /usr/bin/sort --version
sort (GNU coreutils) 8.32

+ /usr/bin/time -p -- bash -c '/usr/bin/grep -hEe '\''^2000-01-01T00\:([234][[:digit:]]\:[[:digit:]]{2}|50\:00)'\'' -- ./tools/compare-log-mergers/gen-5000-1-faces.log ./tools/compare-log-mergers/gen-2500-1-faces.log ./tools/compare-log-mergers/gen-2000-1-faces.log | /usr/bin/sort -t '\'' '\'' -k 1 -s > '\''/tmp/compare-log-mergers_iHwXP.out'\'''
real 0.04
user 0.03
sys 0.00

4403 /tmp/compare-log-mergers_iHwXP.out
----------------------------------------
+ ./target/release/s4 --version
super_speedy_syslog_searcher 0.7.73

+ /usr/bin/time -p -- ./target/release/s4 -a 2000-01-01T00:20:00 -b 2000-01-01T00:50:00 --color=never ./tools/compare-log-mergers/gen-5000-1-faces.log ./tools/compare-log-mergers/gen-2500-1-faces.log ./tools/compare-log-mergers/gen-2000-1-faces.log
real 0.05
user 0.06
sys 0.01

4403 /tmp/compare-log-mergers_iHwXP.out
----------------------------------------
+ logmerger --version
logmerger 0.9.0

+ /usr/bin/time -p -- logmerger --inline --output=- --start 2000-01-01T00:20:00 --end 2000-01-01T00:50:00 ./tools/compare-log-mergers/gen-5000-1-faces.log ./tools/compare-log-mergers/gen-2500-1-faces.log ./tools/compare-log-mergers/gen-2000-1-faces.log
real 0.72
user 0.69
sys 0.02

4908 /tmp/compare-log-mergers_iHwXP.out
----------------------------------------
+ logdissect --version
logdissect 3.1.1

TODO: figure out how to use logdissect. I'm unable to get it to match on ANY files.

----------------------------------------
+ tl --version
tl, version 1.5.0

+ /usr/bin/time -p -- tl --merge --output-merge /tmp/compare-log-mergers_iHwXP.out ./tools/compare-log-mergers/gen-5000-1-faces.log ./tools/compare-log-mergers/gen-2500-1-faces.log ./tools/compare-log-mergers/gen-2000-1-faces.log
real 1.22
user 0.47
sys 0.02

10003 /tmp/compare-log-mergers_iHwXP.out
Loading

0 comments on commit 4ed4f46

Please sign in to comment.