From 7a8f78b531c9bbf22937ed524af609ad1a683497 Mon Sep 17 00:00:00 2001 From: Ivan Bella Date: Wed, 27 Sep 2023 14:15:23 +0000 Subject: [PATCH 1/2] Updated to override the transformIterator to avoid failures when filtered --- .../query/logic/filtered/FilteredQueryLogic.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/web-services/query/src/main/java/datawave/webservice/query/logic/filtered/FilteredQueryLogic.java b/web-services/query/src/main/java/datawave/webservice/query/logic/filtered/FilteredQueryLogic.java index c9ea82250a4..d8b708261a9 100644 --- a/web-services/query/src/main/java/datawave/webservice/query/logic/filtered/FilteredQueryLogic.java +++ b/web-services/query/src/main/java/datawave/webservice/query/logic/filtered/FilteredQueryLogic.java @@ -2,10 +2,12 @@ import datawave.webservice.query.Query; import datawave.webservice.query.configuration.GenericQueryConfiguration; +import datawave.webservice.query.iterator.DatawaveTransformIterator; import datawave.webservice.query.logic.DelegatingQueryLogic; import datawave.webservice.query.logic.QueryLogic; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.security.Authorizations; +import org.apache.commons.collections4.iterators.TransformIterator; import java.util.Collections; import java.util.Iterator; @@ -87,4 +89,13 @@ public Iterator iterator() { public Object clone() throws CloneNotSupportedException { return new FilteredQueryLogic(this); } + + @Override + public TransformIterator getTransformIterator(Query settings) { + if (!filtered) { + return super.getTransformIterator(settings); + } else { + return new DatawaveTransformIterator(iterator()); + } + } } From 3abc3009553ff7f7ae5756bbd0f72d8f1728330b Mon Sep 17 00:00:00 2001 From: Ivan Bella Date: Wed, 27 Sep 2023 14:19:12 +0000 Subject: [PATCH 2/2] formatting --- .../webservice/query/logic/filtered/FilteredQueryLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-services/query/src/main/java/datawave/webservice/query/logic/filtered/FilteredQueryLogic.java b/web-services/query/src/main/java/datawave/webservice/query/logic/filtered/FilteredQueryLogic.java index d8b708261a9..5a9926fa36b 100644 --- a/web-services/query/src/main/java/datawave/webservice/query/logic/filtered/FilteredQueryLogic.java +++ b/web-services/query/src/main/java/datawave/webservice/query/logic/filtered/FilteredQueryLogic.java @@ -89,7 +89,7 @@ public Iterator iterator() { public Object clone() throws CloneNotSupportedException { return new FilteredQueryLogic(this); } - + @Override public TransformIterator getTransformIterator(Query settings) { if (!filtered) {