Enable field filtering during document aggregation for standard event…

… queries
NationalSecurityAgency · Nov 22, 2024 · bc22b22 · bc22b22
1 parent d9c48e4
commit bc22b22
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/warehouse/query-core/src/main/java/datawave/query/iterator/QueryOptions.java b/warehouse/query-core/src/main/java/datawave/query/iterator/QueryOptions.java
@@ -793,6 +793,10 @@ public EventDataQueryFilter getFiEvaluationFilter() {
     }
 
     public EventDataQueryFilter getEventEvaluationFilter() {
+        if (evaluationFilter == null) {
+            // allows standard event queries to perform a seeking aggregation with field filtering
+            evaluationFilter = getEventFilter();
+        }
         return eventEvaluationFilter != null ? eventEvaluationFilter.clone() : null;
     }
 

diff --git a/warehouse/query-core/src/test/resources/datawave/query/EventQueryLogicFactory.xml b/warehouse/query-core/src/test/resources/datawave/query/EventQueryLogicFactory.xml
@@ -134,6 +134,7 @@
         <property name="sortQueryPostIndexWithTermCounts" value="true" />
         <property name="sortQueryPostIndexWithFieldCounts" value="true" />
         <property name="eventFieldSeek" value="3" />
+        <property name="seekingEventAggregation" value="true"/>
     </bean>
 
     <util:list id="IvaratorCacheDirConfigs">

diff --git a/warehouse/query-core/src/test/resources/datawave/query/QueryLogicFactory.xml b/warehouse/query-core/src/test/resources/datawave/query/QueryLogicFactory.xml
@@ -265,6 +265,7 @@
         <property name="eventNextSeek" value="-1" />
         <property name="tfFieldSeek" value="-1" />
         <property name="tfNextSeek" value="-1" />
+        <property name="seekingEventAggregation" value="true"/>
         <!--    control when to log warnings for long aggregations    -->
         <property name="docAggregationThresholdMs" value="-1" />
         <property name="tfAggregationThresholdMs" value="-1" />