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.

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

Jump to bottom

Instant Column gRPC Filters: Fix Range Quick Filters and use MatchFilter over ConditionFilter #5671

Merged
merged 3 commits into from
Jun 26, 2024
Merged

Instant Column gRPC Filters: Fix Range Quick Filters and use MatchFilter over ConditionFilter #5671

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd7b8fc
Fix Instant Filters To Use New RangeFilter Semantics and MatchFilter
nbauernfeind Jun 26, 2024
912a54e
Colin's feedback
nbauernfeind Jun 26, 2024
bb200f8
rm unused import
nbauernfeind Jun 26, 2024
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
5 changes: 2 additions & 3 deletions server/src/main/java/io/deephaven/server/table/ops/filter/FilterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private WhereFilter generateNumericConditionFilter(CompareCondition.CompareOpera
valueString = Long.toString(value.getLongValue());
break;
case NANO_TIME_VALUE:
valueString = Long.toString(value.getNanoTimeValue());
valueString = String.format("'%d'", value.getNanoTimeValue());
nbauernfeind marked this conversation as resolved.
Show resolved Hide resolved
break;
case VALUE_NOT_SET:
default:
Expand Down Expand Up @@ -184,8 +184,7 @@ public WhereFilter onIn(Value target, List<Value> candidatesList, CaseSensitivit
Literal literal = d.getLiteral();
// all other literals get created from a toString except DateTime
if (literal.getValueCase() == Literal.ValueCase.NANO_TIME_VALUE) {
values[i] = "'" + DateTimeUtils.formatDateTime(
DateTimeUtils.epochNanosToInstant(literal.getNanoTimeValue()), DateTimeUtils.timeZone()) + "'";
values[i] = String.format("'%d'", literal.getNanoTimeValue());
nbauernfeind marked this conversation as resolved.
Show resolved Hide resolved
} else {
values[i] = FilterPrinter.printNoEscape(literal);
}
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/io/deephaven/server/table/ops/filter/FilterPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ private void onLiteral(Literal literal) {
sb.append(literal.getLongValue());
break;
case NANO_TIME_VALUE:
sb.append("DateTimeUtils.epochNanosToInstant(").append(literal.getNanoTimeValue()).append(")");
sb.append("'").append(literal.getNanoTimeValue()).append("'");
break;
case VALUE_NOT_SET:
default:
Expand Down
Loading