Skip to content

fix: If events merge during flood, choose the longest endtime#143

Merged
johan-bjareholt merged 3 commits intomasterfrom
dev/flood-merge-same-timestamp
Jul 5, 2020
Merged

fix: If events merge during flood, choose the longest endtime#143
johan-bjareholt merged 3 commits intomasterfrom
dev/flood-merge-same-timestamp

Conversation

@johan-bjareholt
Copy link
Copy Markdown
Member

Fixes #140

@codecov
Copy link
Copy Markdown

codecov Bot commented Jul 3, 2020

Codecov Report

Merging #143 into master will decrease coverage by 0.57%.
The diff coverage is 86.90%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #143      +/-   ##
==========================================
- Coverage   43.90%   43.33%   -0.58%     
==========================================
  Files          48       48              
  Lines        5687     7463    +1776     
  Branches     1456     2331     +875     
==========================================
+ Hits         2497     3234     +737     
- Misses       2457     3166     +709     
- Partials      733     1063     +330     
Impacted Files Coverage Δ
aw-transform/src/filter_keyvals.rs 80.00% <50.00%> (-0.71%) ⬇️
aw-transform/src/flood.rs 81.81% <87.50%> (+1.57%) ⬆️
aw-transform/src/chunk.rs 82.35% <100.00%> (ø)
aw-models/src/event.rs 34.37% <0.00%> (-45.63%) ⬇️
aw-query/src/parser.rs 36.98% <0.00%> (-30.53%) ⬇️
aw-query/src/interpret.rs 38.69% <0.00%> (-8.02%) ⬇️
aw-query/src/functions.rs 59.69% <0.00%> (-7.18%) ⬇️
aw-query/src/lexer.rs 76.27% <0.00%> (-5.16%) ⬇️
aw-query/src/lib.rs 34.48% <0.00%> (-1.89%) ⬇️
... and 9 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2102597...a968be4. Read the comment docs.

Copy link
Copy Markdown
Member

@ErikBjare ErikBjare left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but some comments.

Comment thread aw-transform/src/flood.rs Outdated
Comment thread aw-transform/src/flood.rs Outdated
@johan-bjareholt johan-bjareholt force-pushed the dev/flood-merge-same-timestamp branch from 690665e to e0a3e57 Compare July 4, 2020 17:49
@johan-bjareholt johan-bjareholt force-pushed the dev/flood-merge-same-timestamp branch from e0a3e57 to 5b7467f Compare July 4, 2020 18:02
@johan-bjareholt johan-bjareholt force-pushed the dev/flood-merge-same-timestamp branch from 4e44dd5 to 773f2f9 Compare July 5, 2020 09:59
@johan-bjareholt johan-bjareholt force-pushed the dev/flood-merge-same-timestamp branch from 3f12ecd to a968be4 Compare July 5, 2020 10:17
@johan-bjareholt johan-bjareholt merged commit f5bf3cc into master Jul 5, 2020
@johan-bjareholt johan-bjareholt deleted the dev/flood-merge-same-timestamp branch July 5, 2020 11:15
Comment thread aw-transform/src/flood.rs
retry_e = Some(e1);
// Since we are retrying on this event we don't want to push it
// to the new_events vec
continue;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! Took me a while to understand what's going on with retry_e, but looks performant 😃

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's mostly to make the borrow checker happy, there are more readable ways to implement it if you write "unsafe" code.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Significant differences between reporting of aw-server and aw-server-rust

2 participants