Skip to content

Make randomInstantBetween always return value in range [minInstant, maxInstant] #114177

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.

Sign up for GitHub

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

Merged
parkertimmins merged 5 commits into from
Oct 7, 2024
Merged

Make randomInstantBetween always return value in range [minInstant, maxInstant] #114177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20bb8c8
Make randomInstantBetween result in min/max
parkertimmins Oct 4, 2024
853091f
change variable name to camel-case
parkertimmins Oct 4, 2024
c894398
Allow wider range of time values
parkertimmins Oct 6, 2024
a2310da
Merge branch 'main' into fix-test-random-instant-function
parkertimmins Oct 6, 2024
cce6772
Update docs/changelog/114177.yaml
parkertimmins Oct 6, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/114177.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 114177
summary: "Make `randomInstantBetween` always return value in range [minInstant, `maxInstant]`"
area: Infra/Metrics
type: bug
issues: []
9 changes: 5 additions & 4 deletions test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,10 +900,11 @@ public static long randomLongBetween(long min, long max) {
* @return a random instant between a min and a max value with a random nanosecond precision
*/
public static Instant randomInstantBetween(Instant minInstant, Instant maxInstant) {
return Instant.ofEpochSecond(
randomLongBetween(minInstant.getEpochSecond(), maxInstant.getEpochSecond()),
randomLongBetween(0, 999999999)
);
long epochSecond = randomLongBetween(minInstant.getEpochSecond(), maxInstant.getEpochSecond());
long minNanos = epochSecond == minInstant.getEpochSecond() ? minInstant.getNano() : 0;
long maxNanos = epochSecond == maxInstant.getEpochSecond() ? maxInstant.getNano() : 999999999;
long nanos = randomLongBetween(minNanos, maxNanos);
return Instant.ofEpochSecond(epochSecond, nanos);
}

/**
Expand Down