Instant Column gRPC Filters: Fix Range Quick Filters and use MatchFil…

…ter over ConditionFilter (#5671)
deephaven · Jun 26, 2024 · 98b62cb · 98b62cb
1 parent 559d39e
commit 98b62cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/server/src/main/java/io/deephaven/server/table/ops/filter/FilterFactory.java b/server/src/main/java/io/deephaven/server/table/ops/filter/FilterFactory.java
@@ -25,7 +25,6 @@
 import io.deephaven.proto.backplane.grpc.NotCondition;
 import io.deephaven.proto.backplane.grpc.Reference;
 import io.deephaven.proto.backplane.grpc.Value;
-import io.deephaven.time.DateTimeUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.text.DecimalFormat;
@@ -139,7 +138,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());
                 break;
             case VALUE_NOT_SET:
             default:
@@ -184,8 +183,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());
             } else {
                 values[i] = FilterPrinter.printNoEscape(literal);
             }

diff --git a/server/src/main/java/io/deephaven/server/table/ops/filter/FilterPrinter.java b/server/src/main/java/io/deephaven/server/table/ops/filter/FilterPrinter.java
@@ -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: