-
Notifications
You must be signed in to change notification settings - Fork 188
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
Filter getRequestHistory queries by createdAt times #2117
Merged
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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
There are no files selected for viewing
99 changes: 99 additions & 0 deletions
99
SingularityBase/src/main/java/com/hubspot/singularity/SingularityRequestHistoryQuery.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| package com.hubspot.singularity; | ||
|
|
||
| import com.google.common.base.Predicate; | ||
| import com.google.common.collect.ComparisonChain; | ||
| import java.util.Comparator; | ||
| import java.util.Optional; | ||
|
|
||
| public class SingularityRequestHistoryQuery { | ||
| private final String requestId; | ||
| private final Optional<Long> createdBefore; | ||
| private final Optional<Long> createdAfter; | ||
| private final Optional<OrderDirection> orderDirection; | ||
|
|
||
| public SingularityRequestHistoryQuery( | ||
| String requestId, | ||
| Optional<Long> createdBefore, | ||
| Optional<Long> createdAfter, | ||
| Optional<OrderDirection> orderDirection | ||
| ) { | ||
| this.requestId = requestId; | ||
| this.createdBefore = createdBefore; | ||
| this.createdAfter = createdAfter; | ||
| this.orderDirection = orderDirection; | ||
| } | ||
|
|
||
| public String getRequestId() { | ||
| return requestId; | ||
| } | ||
|
|
||
| public Optional<Long> getCreatedBefore() { | ||
| return createdBefore; | ||
| } | ||
|
|
||
| public Optional<Long> getCreatedAfter() { | ||
| return createdAfter; | ||
| } | ||
|
|
||
| public Optional<OrderDirection> getOrderDirection() { | ||
| return orderDirection; | ||
| } | ||
|
|
||
| public Predicate<SingularityRequestHistory> getHistoryFilter() { | ||
| return new Predicate<SingularityRequestHistory>() { | ||
|
|
||
| @Override | ||
| public boolean apply(SingularityRequestHistory input) { | ||
| if (!requestId.equals(input.getRequest().getId())) { | ||
| return false; | ||
| } | ||
|
|
||
| if (createdAfter.isPresent() && createdAfter.get() >= input.getCreatedAt()) { | ||
| return false; | ||
| } | ||
|
|
||
| if (createdBefore.isPresent() && createdBefore.get() <= input.getCreatedAt()) { | ||
| return false; | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| public Comparator<SingularityRequestHistory> getComparator() { | ||
| final OrderDirection localOrderDirection = orderDirection.orElse(OrderDirection.DESC); | ||
|
|
||
| return new Comparator<SingularityRequestHistory>() { | ||
|
|
||
| @Override | ||
| public int compare(SingularityRequestHistory o1, SingularityRequestHistory o2) { | ||
| ComparisonChain chain = ComparisonChain.start(); | ||
|
|
||
| if (localOrderDirection == OrderDirection.ASC) { | ||
| chain = chain.compare(o1.getCreatedAt(), o2.getCreatedAt()); | ||
| } else { | ||
| chain = chain.compare(o2.getCreatedAt(), o1.getCreatedAt()); | ||
| } | ||
|
|
||
| return chain.compare(o1.getRequest().getId(), o2.getRequest().getId()).result(); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return ( | ||
| "SingularityRequestHistoryQuery{" + | ||
| "requestId=" + | ||
| requestId + | ||
| ", createdBefore=" + | ||
| createdBefore + | ||
| ", createdAfter=" + | ||
| createdAfter + | ||
| ", orderDirection=" + | ||
| orderDirection + | ||
| '}' | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this is just a constant let's declare it as a string on the class, not as a method, same for the mysql jdbi version
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The user column is named
userin the mysql version, andf_userin the postgres version. That's why I didn't declare it as a constant.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah, totally read over that difference. It can still just be a
String REQUEST_HISTORY_BASE_QUERY = "...";on each class though, vs a methodThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sry, read that again, ignore me...