From ddd848c0188c78fe01c87f5fc958a2fd2d627a8d Mon Sep 17 00:00:00 2001
From: "Charles P. Wright" <charleswright@deephaven.io>
Date: Wed, 8 Jan 2025 13:48:53 -0500
Subject: [PATCH 1/2] DH-18364: Add Property to Disable Core DataIndex

---
 .../io/deephaven/engine/table/impl/QueryTable.java     | 10 +++++++++-
 .../engine/table/impl/select/MatchFilter.java          |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java
index acb8e764e29..e329a85685e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java
@@ -196,6 +196,14 @@ public interface MemoizableOperation<T extends DynamicNode & NotificationStepRec
      */
     static boolean USE_REDIRECTED_COLUMNS_FOR_SELECT =
             Configuration.getInstance().getBooleanWithDefault("QueryTable.redirectSelect", false);
+
+    /**
+     * If set to true, then permit where filters to use a data index, when applicable.  If false, data indexes are not
+     * used even if present.
+     */
+    public static boolean USE_DATA_INDEX_FOR_WHERE =
+            Configuration.getInstance().getBooleanWithDefault("QueryTable.useDataIndexForWhere", true);
+
     /**
      * For a static select(), we would prefer to flatten the table to avoid using memory unnecessarily (because the data
      * may be spread out across many blocks depending on the input RowSet). However, the select() can become slower
@@ -1225,7 +1233,7 @@ public Table where(Filter filter) {
     }
 
     private void initializeAndPrioritizeFilters(@NotNull final WhereFilter... filters) {
-        final DataIndexer dataIndexer = DataIndexer.existingOf(rowSet);
+        final DataIndexer dataIndexer = USE_DATA_INDEX_FOR_WHERE ? DataIndexer.existingOf(rowSet) : null;
         final int numFilters = filters.length;
         final BitSet priorityFilterIndexes = new BitSet(numFilters);
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/MatchFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/MatchFilter.java
index 1052a8a96fb..c34c089dea1 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/MatchFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/MatchFilter.java
@@ -15,6 +15,7 @@
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.QueryCompilerRequestProcessor;
+import io.deephaven.engine.table.impl.QueryTable;
 import io.deephaven.engine.table.impl.chunkfilter.ChunkFilter;
 import io.deephaven.engine.table.impl.chunkfilter.ChunkMatchFilterFactory;
 import io.deephaven.engine.table.impl.lang.QueryLanguageFunctionUtils;
@@ -252,6 +253,9 @@ public SafeCloseable beginOperation(@NotNull final Table sourceTable) {
         if (initialDependenciesGathered || dataIndex != null) {
             throw new IllegalStateException("Inputs already initialized, use copy() instead of re-using a WhereFilter");
         }
+        if (!QueryTable.USE_DATA_INDEX_FOR_WHERE) {
+            return () -> {};
+        }
         try (final SafeCloseable ignored = sourceTable.isRefreshing() ? LivenessScopeStack.open() : null) {
             dataIndex = DataIndexer.getDataIndex(sourceTable, columnName);
             if (dataIndex != null && dataIndex.isRefreshing()) {

From 63bda6382db47aed689a8bea3c8b53d98b0f45a8 Mon Sep 17 00:00:00 2001
From: "Charles P. Wright" <charleswright@deephaven.io>
Date: Wed, 8 Jan 2025 15:46:50 -0500
Subject: [PATCH 2/2] spotless

---
 .../main/java/io/deephaven/engine/table/impl/QueryTable.java   | 2 +-
 .../io/deephaven/engine/table/impl/select/MatchFilter.java     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java
index e329a85685e..a431891f94d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java
@@ -198,7 +198,7 @@ public interface MemoizableOperation<T extends DynamicNode & NotificationStepRec
             Configuration.getInstance().getBooleanWithDefault("QueryTable.redirectSelect", false);
 
     /**
-     * If set to true, then permit where filters to use a data index, when applicable.  If false, data indexes are not
+     * If set to true, then permit where filters to use a data index, when applicable. If false, data indexes are not
      * used even if present.
      */
     public static boolean USE_DATA_INDEX_FOR_WHERE =
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/MatchFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/MatchFilter.java
index c34c089dea1..6b84ac92776 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/MatchFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/MatchFilter.java
@@ -254,7 +254,8 @@ public SafeCloseable beginOperation(@NotNull final Table sourceTable) {
             throw new IllegalStateException("Inputs already initialized, use copy() instead of re-using a WhereFilter");
         }
         if (!QueryTable.USE_DATA_INDEX_FOR_WHERE) {
-            return () -> {};
+            return () -> {
+            };
         }
         try (final SafeCloseable ignored = sourceTable.isRefreshing() ? LivenessScopeStack.open() : null) {
             dataIndex = DataIndexer.getDataIndex(sourceTable, columnName);