Skip to content

Watcher: Simplify finding next date in cron schedule #33015

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
merged 3 commits into from
Aug 28, 2018
Merged

Watcher: Simplify finding next date in cron schedule #33015

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f015ff2
Watcher: Simplify finding next date in cron schedule
spinscale Aug 21, 2018
5347883
Merge branch 'master' into 1808-simplify-finding-next-cron-value
spinscale Aug 27, 2018
9f87bd6
review comment
spinscale Aug 27, 2018
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
21 changes: 8 additions & 13 deletions ...her/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronnableSchedule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,14 @@ private CronnableSchedule(Cron... crons) {
@Override
public long nextScheduledTimeAfter(long startTime, long time) {
assert time >= startTime;
long nextTime = Long.MAX_VALUE;
for (Cron cron : crons) {
long nextValidTimeAfter = cron.getNextValidTimeAfter(time);

boolean previousCronExpired = nextTime == -1;
boolean currentCronValid = nextValidTimeAfter > -1;
if (previousCronExpired && currentCronValid) {
nextTime = nextValidTimeAfter;
} else {
nextTime = Math.min(nextTime, nextValidTimeAfter);
}
}
return nextTime;
return Arrays.stream(crons)
.map(cron -> cron.getNextValidTimeAfter(time))
// filter out expired dates before sorting
.filter(nextValidTime -> nextValidTime > -1)
.sorted()
.findFirst()
// no date in the future found, return -1 to the caller
.orElse(-1L);
}

public Cron[] crons() {
Expand Down