Fix ExactMatch Filter for Non-Convertible Types; Use RangeFilter on QueryScope Vars

engine/table/src/main/java/io/deephaven/engine/table/impl/DeferredViewTable.java

@@ -212,9 +212,7 @@ private PreAndPostFilters applyFilterRenamings(WhereFilter[] filters) {
             } else if (filter instanceof MatchFilter) {
                 final MatchFilter matchFilter = (MatchFilter) filter;
                 Assert.assertion(myRenames.size() == 1, "Match Filters should only use one column!");
-                String newName = myRenames.get(matchFilter.getColumnName());
-                Assert.neqNull(newName, "newName");
-                final MatchFilter newFilter = matchFilter.renameFilter(newName);
+                final WhereFilter newFilter = matchFilter.renameFilter(myRenames);
                 newFilter.init(tableReference.getDefinition(), compilationProcessor);
                 preViewFilters.add(newFilter);
             } else if (filter instanceof ConditionFilter) {

engine/table/src/main/java/io/deephaven/engine/table/impl/select/MatchFilter.java

@@ -5,6 +5,7 @@
 
 import io.deephaven.api.literal.Literal;
 import io.deephaven.base.string.cache.CompressedString;
+import io.deephaven.base.verify.Assert;
 import io.deephaven.engine.liveness.LivenessScopeStack;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.WritableRowSet;
@@ -52,8 +53,8 @@ static MatchFilter ofLiterals(
                 literals.stream().map(AsObject::of).toArray());
     }
 
-    /** A fail-over where filter supplier should the match filter initialization fail. */
-    private final CachingSupplier<WhereFilter> failoverFilter;
+    /** A fail-over WhereFilter supplier should the match filter initialization fail. */
+    private final CachingSupplier<ConditionFilter> failoverFilter;
 
     @NotNull
     private String columnName;
@@ -84,8 +85,6 @@ public enum CaseSensitivity {
         MatchCase, IgnoreCase
     }
 
-    // TODO NATE NOCOMMIT: USE BUILDER TO CREATE MATCH FILTER??
-
     public MatchFilter(
             @NotNull final MatchType matchType,
             @NotNull final String columnName,
@@ -113,7 +112,7 @@ public MatchFilter(
     }
 
     public MatchFilter(
-            @Nullable final CachingSupplier<WhereFilter> failoverFilter,
+            @Nullable final CachingSupplier<ConditionFilter> failoverFilter,
             @NotNull final CaseSensitivity sensitivity,
             @NotNull final MatchType matchType,
             @NotNull final String columnName,
@@ -122,7 +121,7 @@ public MatchFilter(
     }
 
     private MatchFilter(
-            @Nullable final CachingSupplier<WhereFilter> failoverFilter,
+            @Nullable final CachingSupplier<ConditionFilter> failoverFilter,
             @NotNull final CaseSensitivity sensitivity,
             @NotNull final MatchType matchType,
             @NotNull final String columnName,
@@ -136,8 +135,20 @@ private MatchFilter(
         this.values = values;
     }
 
-    public MatchFilter renameFilter(String newName) {
+    private ConditionFilter getFailoverFilterIfCached() {
+        return failoverFilter != null ? failoverFilter.getIfCached() : null;
+    }
+
+    public WhereFilter renameFilter(Map<String, String> renames) {
+        final ConditionFilter failover = getFailoverFilterIfCached();
+        if (failover != null) {
+            return failover.renameFilter(renames);
+        }
+
+        final String newName = renames.get(columnName);
+        Assert.neqNull(newName, "newName");
         if (strValues == null) {
+            // when we're constructed with values then there is no failover filter
             return new MatchFilter(getMatchType(), newName, values);
         } else {
             return new MatchFilter(
@@ -146,10 +157,6 @@ public MatchFilter renameFilter(String newName) {
         }
     }
 
-    public String getColumnName() {
-        return columnName;
-    }
-
     public Object[] getValues() {
         return values;
     }
@@ -164,11 +171,25 @@ public MatchType getMatchType() {
 
     @Override
     public List<String> getColumns() {
+        if (!initialized) {
+            throw new IllegalStateException("Filter must be initialized to invoke getColumnName");
+        }
+        final WhereFilter failover = getFailoverFilterIfCached();
+        if (failover != null) {
+            return failover.getColumns();
+        }
         return Collections.singletonList(columnName);
     }
 
     @Override
     public List<String> getColumnArrays() {
+        if (!initialized) {
+            throw new IllegalStateException("Filter must be initialized to invoke getColumnArrays");
+        }
+        final WhereFilter failover = getFailoverFilterIfCached();
+        if (failover != null) {
+            return failover.getColumnArrays();
+        }
         return Collections.emptyList();
     }
 
@@ -260,7 +281,7 @@ public Stream<NotificationQueue.Dependency> getDependencyStream() {
     @Override
     public WritableRowSet filter(
             @NotNull RowSet selection, @NotNull RowSet fullSet, @NotNull Table table, boolean usePrev) {
-        final WhereFilter failover = failoverFilter != null ? failoverFilter.getIfCached() : null;
+        final WhereFilter failover = getFailoverFilterIfCached();
         if (failover != null) {
             return failover.filter(selection, fullSet, table, usePrev);
         }
@@ -273,7 +294,7 @@ public WritableRowSet filter(
     @Override
     public WritableRowSet filterInverse(
             @NotNull RowSet selection, @NotNull RowSet fullSet, @NotNull Table table, boolean usePrev) {
-        final WhereFilter failover = failoverFilter != null ? failoverFilter.getIfCached() : null;
+        final WhereFilter failover = getFailoverFilterIfCached();
         if (failover != null) {
             return failover.filterInverse(selection, fullSet, table, usePrev);
         }
@@ -284,7 +305,7 @@ public WritableRowSet filterInverse(
 
     @Override
     public boolean isSimpleFilter() {
-        final WhereFilter failover = failoverFilter != null ? failoverFilter.getIfCached() : null;
+        final WhereFilter failover = getFailoverFilterIfCached();
         if (failover != null) {
             return failover.isSimpleFilter();
         }
@@ -717,15 +738,12 @@ public boolean canMemoize() {
     public WhereFilter copy() {
         final MatchFilter copy;
         if (strValues != null) {
-            final WhereFilter failover = failoverFilter != null ? failoverFilter.getIfCached() : null;
-            if (failover != null) {
-                return failover.copy();
-            }
-
             copy = new MatchFilter(
-                    failoverFilter, caseInsensitive ? CaseSensitivity.IgnoreCase : CaseSensitivity.MatchCase,
+                    failoverFilter == null ? null : new CachingSupplier<>(() -> failoverFilter.get().copy()),
+                    caseInsensitive ? CaseSensitivity.IgnoreCase : CaseSensitivity.MatchCase,
                     getMatchType(), columnName, strValues, null);
         } else {
+            // when we're constructed with values then there is no failover filter
             copy = new MatchFilter(getMatchType(), columnName, values);
         }
         if (initialized) {

engine/table/src/main/java/io/deephaven/engine/table/impl/select/RangeFilter.java

@@ -12,6 +12,7 @@
 import io.deephaven.engine.rowset.WritableRowSet;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.gui.table.filters.Condition;
+import io.deephaven.util.annotations.VisibleForTesting;
 import io.deephaven.util.type.TypeUtils;
 import org.apache.commons.lang3.mutable.MutableObject;
 import org.jetbrains.annotations.NotNull;
@@ -23,7 +24,6 @@
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZonedDateTime;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -127,12 +127,23 @@ private static Condition conditionFromString(String conditionString) {
 
     @Override
     public List<String> getColumns() {
-        return Collections.singletonList(columnName);
+        if (filter == null) {
+            throw new IllegalStateException("Filter must be initialized to invoke getColumnName");
+        }
+        return filter.getColumns();
     }
 
     @Override
     public List<String> getColumnArrays() {
-        return Collections.emptyList();
+        if (filter == null) {
+            throw new IllegalStateException("Filter must be initialized to invoke getColumnArrays");
+        }
+        return filter.getColumnArrays();
+    }
+
+    @VisibleForTesting
+    public WhereFilter getRealFilter() {
+        return filter;
     }
 
     @Override
@@ -323,10 +334,6 @@ public void setRecomputeListener(RecomputeListener listener) {}
 
     @Override
     public WhereFilter copy() {
-        if (filter != null) {
-            return filter.copy();
-        }
-
         return new RangeFilter(columnName, condition, value, expression, filter, parserConfiguration);
     }
 

engine/table/src/main/java/io/deephaven/engine/table/impl/select/WhereFilter.java

@@ -87,13 +87,17 @@ interface RecomputeListener {
 
     /**
      * Get the columns required by this select filter.
+     * <p>
+     * This filter must already be initialized before calling this method.
      *
      * @return the columns used as input by this select filter.
      */
     List<String> getColumns();
 
     /**
      * Get the array columns required by this select filter.
+     * <p>
+     * This filter must already be initialized before calling this method.
      *
      * @return the columns used as array input by this select filter.
      */

engine/table/src/main/java/io/deephaven/engine/table/impl/select/WhereFilterFactory.java

@@ -160,8 +160,8 @@ public WhereFilter getExpression(String expression, Matcher matcher, Object... a
                 log.debug().append("WhereFilterFactory creating MatchFilter for expression: ").append(expression)
                         .endl();
                 return new MatchFilter(
-                        new CachingSupplier<>(
-                                () -> ConditionFilter.createConditionFilter(expression, parserConfiguration)),
+                        new CachingSupplier<>(() -> (ConditionFilter) ConditionFilter.createConditionFilter(expression,
+                                parserConfiguration)),
                         CaseSensitivity.MatchCase,
                         inverted ? MatchType.Inverted : MatchType.Regular,
                         columnName,

engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableWhereSingleTest.java

@@ -24,10 +24,4 @@ public void tearDown() throws Exception {
         QueryTable.FORCE_PARALLEL_WHERE = oldParallel;
         QueryTable.DISABLE_PARALLEL_WHERE = oldDisable;
     }
-
-    @Override
-    public void testRangeFilterFallback() {
-        super.testRangeFilterFallback();
-    }
 }
-

engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableWhereTest.java

@@ -1379,17 +1379,14 @@ public void testMatchFilterFallback() {
         final MatchFilter filter = new MatchFilter(
                 new CachingSupplier<>(() -> {
                     called.setValue(true);
-                    return ConditionFilter.createConditionFilter("var1 != var2");
+                    return (ConditionFilter) ConditionFilter.createConditionFilter("var1 != var2");
                 }),
                 MatchFilter.CaseSensitivity.IgnoreCase, MatchFilter.MatchType.Inverted, "var1", "var2");
 
         final Table result = table.where(filter);
         assertTableEquals(table, result);
 
         Assert.eqTrue(called.booleanValue(), "called.booleanValue()");
-
-        final WhereFilter copyFilter = filter.copy();
-        Assert.eqTrue(copyFilter instanceof ConditionFilter, "copyFilter instanceof ConditionFilter");
     }
 
     @Test
@@ -1404,7 +1401,7 @@ public void testRangeFilterFallback() {
         final Table result = table.where(filter);
         assertTableEquals(table, result);
 
-        final WhereFilter copyFilter = filter.copy();
-        Assert.eqTrue(copyFilter instanceof ConditionFilter, "copyFilter instanceof ConditionFilter");
+        final WhereFilter realFilter = filter.getRealFilter();
+        Assert.eqTrue(realFilter instanceof ConditionFilter, "realFilter instanceof ConditionFilter");
     }
 }

engine/time/src/main/java/io/deephaven/time/DateTimeUtils.java

@@ -5050,11 +5050,10 @@ public static LocalDateTime parseLocalDateTime(@NotNull final String s) {
      * Parses the string argument as a {@link LocalDateTime}.
      * <p>
      * Date time strings are formatted according to the ISO 8601 date time format
-     * {@code yyyy-MM-ddThh:mm:ss[.SSSSSSSSS] TZ} and others.
+     * {@code yyyy-MM-ddThh:mm:ss[.SSSSSSSSS]} and others.
      *
      * @param s date time string
      * @return a {@link LocalDateTime} represented by the input string, or {@code null} if the string can not be parsed
-     * @see DateTimeFormatter#ISO_INSTANT
      */
     @ScriptApi
     @Nullable