Fix bug that allows re-use of memoized coalesced result that is no lo…

…nger live
deephaven · May 17, 2024 · 444ee26 · 444ee26
1 parent 84f71a7
commit 444ee26
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/DeferredViewTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/DeferredViewTable.java
@@ -7,6 +7,7 @@
 import io.deephaven.api.filter.Filter;
 import io.deephaven.base.verify.Assert;
 import io.deephaven.datastructures.util.CollectionUtil;
+import io.deephaven.engine.liveness.Liveness;
 import io.deephaven.engine.table.*;
 import io.deephaven.engine.table.impl.select.analyzers.SelectAndViewAnalyzer;
 import io.deephaven.engine.table.impl.select.MatchFilter;
@@ -89,7 +90,7 @@ public Table where(Filter filter) {
     private Table getResultTableWithWhere(WhereFilter... whereFilters) {
         {
             final Table coalesced = getCoalesced();
-            if (coalesced != null) {
+            if (Liveness.verifyCachedObjectForReuse(coalesced)) {
                 return coalesced.where(Filter.and(whereFilters));
             }
         }
@@ -259,7 +260,7 @@ public Table selectDistinct(Collection<? extends Selectable> columns) {
         /* If the cachedResult table has already been created, we can just use that. */
         {
             final Table coalesced = getCoalesced();
-            if (coalesced != null) {
+            if (Liveness.verifyCachedObjectForReuse(coalesced)) {
                 return coalesced.selectDistinct(columns);
             }
         }