Actually set the evaluation filter so that filtering works for standa…

…rd event queries (#2701)
NationalSecurityAgency · Jan 22, 2025 · f1cd50b · f1cd50b
1 parent 8ff3420
commit f1cd50b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 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
@@ -822,6 +822,11 @@ public EventDataQueryFilter getEventEvaluationFilter() {
             // allows standard event queries to perform a seeking aggregation with field filtering
             evaluationFilter = getEventFilter();
         }
+
+        if (evaluationFilter != null) {
+            eventEvaluationFilter = evaluationFilter.clone();
+        }
+
         return eventEvaluationFilter != null ? eventEvaluationFilter.clone() : null;
     }
 

diff --git a/warehouse/query-core/src/main/java/datawave/query/planner/DefaultQueryPlanner.java b/warehouse/query-core/src/main/java/datawave/query/planner/DefaultQueryPlanner.java
@@ -74,9 +74,6 @@
 import datawave.query.CloseableIterable;
 import datawave.query.Constants;
 import datawave.query.QueryParameters;
-import datawave.query.attributes.ExcerptFields;
-import datawave.query.attributes.UniqueFields;
-import datawave.query.common.grouping.GroupFields;
 import datawave.query.composite.CompositeMetadata;
 import datawave.query.composite.CompositeUtils;
 import datawave.query.config.ScanHintRule;

diff --git a/warehouse/query-core/src/main/java/datawave/query/predicate/EventDataQueryFieldFilter.java b/warehouse/query-core/src/main/java/datawave/query/predicate/EventDataQueryFieldFilter.java
@@ -54,6 +54,7 @@ public EventDataQueryFieldFilter(EventDataQueryFieldFilter other) {
         this.maxNextCount = other.maxNextCount;
         this.fields = other.fields;
         this.parser = other.parser;
+        this.parser.clearState();
         // do not copy nextCount or currentField because that is internal state
         this.nextCount = 0;
         this.currentField = null;