Conditions and formulas applied to blink tables should be allowed to …

…use i, ii, k, and column arrays.
deephaven · Mar 4, 2024 · 05b17ec · 05b17ec
1 parent f3e620a
commit 05b17ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...ne/table/src/main/java/io/deephaven/engine/table/impl/select/AbstractConditionFilter.java b/...ne/table/src/main/java/io/deephaven/engine/table/impl/select/AbstractConditionFilter.java
@@ -241,9 +241,9 @@ public void validateSafeForRefresh(BaseTable<?> sourceTable) {
         }
         if (sourceTable.isRefreshing() && !AbstractFormulaColumn.ALLOW_UNSAFE_REFRESHING_FORMULAS) {
             // note that constant offset array accesss does not use i/ii or end up in usedColumnArrays
-            boolean isUnsafe = !sourceTable.isAppendOnly() && (usesI || usesII);
-            isUnsafe |= !sourceTable.isAddOnly() && usesK;
-            isUnsafe |= !usedColumnArrays.isEmpty();
+            boolean isUnsafe = (usesI || usesII) && !sourceTable.isAppendOnly() && !sourceTable.isBlink();
+            isUnsafe |= usesK && !sourceTable.isAddOnly() && !sourceTable.isBlink();
+            isUnsafe |= !usedColumnArrays.isEmpty() && !sourceTable.isBlink();
             if (isUnsafe) {
                 throw new IllegalArgumentException("Formula '" + formula + "' uses i, ii, k, or column array " +
                         "variables, and is not safe to refresh. Note that some usages, such as on an append-only " +

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/AbstractFormulaColumn.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/AbstractFormulaColumn.java
@@ -90,9 +90,9 @@ public void validateSafeForRefresh(BaseTable<?> sourceTable) {
         }
         if (sourceTable.isRefreshing() && !ALLOW_UNSAFE_REFRESHING_FORMULAS) {
             // note that constant offset array accesss does not use i/ii or end up in usedColumnArrays
-            boolean isUnsafe = !sourceTable.isAppendOnly() && (usesI || usesII);
-            isUnsafe |= !sourceTable.isAddOnly() && usesK;
-            isUnsafe |= !usedColumnArrays.isEmpty();
+            boolean isUnsafe = (usesI || usesII) && !sourceTable.isAppendOnly() && !sourceTable.isBlink();
+            isUnsafe |= usesK && !sourceTable.isAddOnly() && !sourceTable.isBlink();
+            isUnsafe |= !usedColumnArrays.isEmpty() && !sourceTable.isBlink();
             if (isUnsafe) {
                 throw new IllegalArgumentException("Formula '" + formulaString + "' uses i, ii, k, or column array " +
                         "variables, and is not safe to refresh. Note that some usages, such as on an append-only " +