Update test scanner code to support scan hints, add example scan hint…

…s to test QueryLogicFactory.xml (#2573)
NationalSecurityAgency · Sep 30, 2024 · 0c90817 · 0c90817
1 parent 50f9284
commit 0c90817
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/warehouse/query-core/src/test/java/datawave/query/RebuildingScannerTestHelper.java b/warehouse/query-core/src/test/java/datawave/query/RebuildingScannerTestHelper.java
@@ -525,6 +525,11 @@ public void setConsistencyLevel(ConsistencyLevel consistencyLevel) {
 
         }
 
+        @Override
+        public synchronized void setExecutionHints(Map<String,String> hints) {
+            // no-op
+        }
+
         @Override
         public void setRange(Range range) {
             ((InMemoryScanner) delegate).setRange(range);
@@ -596,6 +601,11 @@ public void setConsistencyLevel(ConsistencyLevel consistencyLevel) {
 
         }
 
+        @Override
+        public synchronized void setExecutionHints(Map<String,String> hints) {
+            // no-op
+        }
+
         @Override
         public void setRanges(Collection<Range> ranges) {
             ((InMemoryBatchScanner) delegate).setRanges(ranges);

diff --git a/warehouse/query-core/src/test/resources/datawave/query/QueryLogicFactory.xml b/warehouse/query-core/src/test/resources/datawave/query/QueryLogicFactory.xml
@@ -231,6 +231,18 @@
                 <!-- JEXL is the default Jexl query syntax -->
             </map>
         </property>
+
+        <property name="tableHints">
+            <map key-type="java.lang.String" value-type="java.util.Map">
+                <entry key="shard">
+                    <map><entry key="scan_type" value="shard-table-executor-event"/></map>
+                </entry>
+                <entry key="shardIndex">
+                    <map><entry key="scan_type" value="index-table-executor-event"/></map>
+                </entry>
+            </map>
+        </property>
+
         <property name="queryPlanner" ref="DefaultQueryPlanner" />
         <!--<property name="queryMacroFunction" ref="queryMacroFunction" />-->
         <property name="markingFunctions" ref="markingFunctions" />
@@ -275,6 +287,16 @@
                 <value>datawave.query.function.NormalizedVersionPredicate</value>
             </list>
         </property>
+        <property name="tableHints">
+            <map key-type="java.lang.String" value-type="java.util.Map">
+                <entry key="shard">
+                    <map><entry key="scan_type" value="shard-table-executor-tld"/></map>
+                </entry>
+                <entry key="shardIndex">
+                    <map><entry key="scan_type" value="index-table-executor-tld"/></map>
+                </entry>
+            </map>
+        </property>
     </bean>
 
     <bean id="FacetedQuery" parent="BaseEventQuery" scope="prototype" class="datawave.query.tables.facets.FacetedQueryLogic">