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

state_agg API tweaks #699

Merged
merged 6 commits into from
Feb 9, 2023
Merged

state_agg API tweaks #699

merged 6 commits into from
Feb 9, 2023

Conversation

syvb
Copy link
Member

@syvb syvb commented Feb 8, 2023

  • interpolated_duration_in/duration_in/interpolated_state_periods/state_periods have the first two arguments swapped: now the aggregate is first and the state is second
  • into_values/into_int_values now returns a table with intervals instead of microseconds

@syvb syvb marked this pull request as ready for review February 8, 2023 19:41
@@ -671,6 +671,30 @@ fn state_agg_int_trans(
}
}

/// Makes an interval from an `i64` representing the number of microseconds.
fn make_interval(time: i64) -> crate::raw::Interval {
Copy link
Contributor

Choose a reason for hiding this comment

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

We actually have a impl From<i64> for Interval already in raw.rs that does most of this already. It seems cleaner to just add a justify_interval there as well and use something like justify_interval(time.into()) instead of this function.

Copy link
Member Author

@syvb syvb Feb 9, 2023

Choose a reason for hiding this comment

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

I updated that impl to always justify the intervals it creates – I don't think we rely on it creating unjustified intervals elsewhere. Outside of state_agg, it's only used for uptime and downtime in heartbeat_agg, where I think those values should be justified as well?

Copy link
Contributor

Choose a reason for hiding this comment

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

That works. I was a little reluctant to suggest this as I'm guessing the justification isn't sticky...if we add two justified intervals I don't think the result is guaranteed to be justified. However, I'm pretty sure we never actually do math on these after we convert them to intervals, so that shouldn't be a problem.

@syvb
Copy link
Member Author

syvb commented Feb 9, 2023

bors r+

bors bot added a commit that referenced this pull request Feb 9, 2023
699: state_agg API tweaks r=Smittyvb a=Smittyvb

- `interpolated_duration_in`/`duration_in`/`interpolated_state_periods`/`state_periods` have the first two arguments swapped: now the aggregate is first and the state is second
- `into_values`/`into_int_values` now returns a table with intervals instead of microseconds

Co-authored-by: Smitty <[email protected]>
@bors
Copy link
Contributor

bors bot commented Feb 9, 2023

This PR was included in a batch that successfully built, but then failed to merge into main. It will not be retried.

Additional information:

Response status code: 422
{"message":"Required status check \"license/cla\" is expected.","documentation_url":"https://docs.github.com/articles/about-protected-branches"}

@syvb
Copy link
Member Author

syvb commented Feb 9, 2023

I forced the CLA bot to recheck this PR by logging into https://cla-assistant.io/ and clicking "Recheck PRs".

bors retry

bors bot added a commit that referenced this pull request Feb 9, 2023
699: state_agg API tweaks r=Smittyvb a=Smittyvb

- `interpolated_duration_in`/`duration_in`/`interpolated_state_periods`/`state_periods` have the first two arguments swapped: now the aggregate is first and the state is second
- `into_values`/`into_int_values` now returns a table with intervals instead of microseconds

Co-authored-by: Smitty <[email protected]>
@bors
Copy link
Contributor

bors bot commented Feb 9, 2023

Build failed:

@syvb
Copy link
Member Author

syvb commented Feb 9, 2023

Looks like the flaky test_rollups test failed again.

bors retry

@epgts
Copy link
Contributor

epgts commented Feb 9, 2023 via email

@bors
Copy link
Contributor

bors bot commented Feb 9, 2023

@bors bors bot merged commit f80b630 into main Feb 9, 2023
@bors bors bot deleted the sv/duration_in-api-tweaks branch February 9, 2023 16:44
@syvb
Copy link
Member Author

syvb commented Feb 9, 2023

Looks like the flaky |test_rollups| test failed again.

Hmmm, did we know that one to be flaky?
I only remember stats_agg::tests::pg_stats_agg_fuzz...

It's this one – we added a few days ago and it's been quite flakey. We should probably make it less flakey or ignore it before the release.

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.

4 participants