Prevent the IteratorBuildingVisitor from making unnecessary source de…

…ep copies (#2686) IteratorBuildingVisitor now tracks the number of source deep copies Update TLD and Ancestor variants now delegate to source deep copy method
NationalSecurityAgency · Jan 15, 2025 · 9d85196 · 9d85196
1 parent dc0cf07
commit 9d85196
Show file tree

Hide file tree

Showing 5 changed files with 199 additions and 130 deletions.
diff --git a/warehouse/query-core/src/main/java/datawave/query/ancestor/AncestorIndexBuildingVisitor.java b/warehouse/query-core/src/main/java/datawave/query/ancestor/AncestorIndexBuildingVisitor.java
@@ -50,14 +50,14 @@ protected SortedKeyValueIterator<Key,Value> getSourceIterator(final ASTEQNode no
             if (limitLookup && !negation) {
                 final String identifier = JexlASTHelper.getIdentifier(node);
                 if (!disableFiEval && fieldsToAggregate.contains(identifier)) {
-                    final SortedKeyValueIterator<Key,Value> baseIterator = source.deepCopy(env);
+                    final SortedKeyValueIterator<Key,Value> baseIterator = deepCopySource();
                     kvIter = new AncestorChildExpansionIterator(baseIterator, getMembers(), equality);
                     seekIndexOnlyDocument(kvIter, node);
                 } else {
                     kvIter = new IteratorToSortedKeyValueIterator(getNodeEntry(node).iterator());
                 }
             } else {
-                kvIter = source.deepCopy(env);
+                kvIter = deepCopySource();
                 seekIndexOnlyDocument(kvIter, node);
             }
 
@@ -105,7 +105,7 @@ private List<String> getMembers() {
 
         // use the cached tree if available
         if (members == null) {
-            SortedKeyValueIterator<Key,Value> kvIter = source.deepCopy(env);
+            SortedKeyValueIterator<Key,Value> kvIter = deepCopySource();
             members = getMembers(wholeDocRange.getStartKey().getRow().toString(), tld, dataType, kvIter);
 
             // set the members for later use
@@ -132,7 +132,7 @@ protected Collection<Map.Entry<Key,Value>> getNodeEntry(ASTEQNode node) {
 
         // use the cached tree if available
         if (members == null) {
-            SortedKeyValueIterator<Key,Value> kvIter = source.deepCopy(env);
+            SortedKeyValueIterator<Key,Value> kvIter = deepCopySource();
             members = getMembers(wholeDocRange.getStartKey().getRow().toString(), tld, dataType, kvIter);
 
             // set the members for later use