Replaced IIE with datawave version

NationalSecurityAgency · Aug 27, 2024 · d6ba5bd · d6ba5bd
1 parent a1b5ec1
commit d6ba5bd
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 11 deletions.
diff --git a/warehouse/core/src/main/java/datawave/iterators/IterationInterruptedException.java b/warehouse/core/src/main/java/datawave/iterators/IterationInterruptedException.java
@@ -0,0 +1,16 @@
+package datawave.iterators;
+
+
+/**
+ * Exception thrown if an interrupt flag is detected.
+ */
+public class IterationInterruptedException extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+
+    public IterationInterruptedException() {}
+
+    public IterationInterruptedException(String msg) {
+        super(msg);
+    }
+}
diff --git a/warehouse/ingest-core/src/test/java/datawave/iterators/SortedMultiMapIterator.java b/warehouse/ingest-core/src/test/java/datawave/iterators/SortedMultiMapIterator.java
@@ -14,7 +14,7 @@
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iteratorsImpl.system.InterruptibleIterator;
-import org.apache.accumulo.core.iteratorsImpl.system.IterationInterruptedException;
+import datawave.iterators.IterationInterruptedException;
 
 import com.google.common.collect.TreeMultimap;
 

diff --git a/warehouse/query-core/src/main/java/datawave/query/function/AbstractVersionFilter.java b/warehouse/query-core/src/main/java/datawave/query/function/AbstractVersionFilter.java
@@ -19,7 +19,7 @@
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.core.iteratorsImpl.system.IterationInterruptedException;
+import datawave.iterators.IterationInterruptedException;
 import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.WritableComparator;

diff --git a/warehouse/query-core/src/main/java/datawave/query/function/DescendantCountFunction.java b/warehouse/query-core/src/main/java/datawave/query/function/DescendantCountFunction.java
@@ -19,7 +19,7 @@
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.core.iteratorsImpl.system.IterationInterruptedException;
+import datawave.iterators.IterationInterruptedException;
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.Writable;

diff --git a/warehouse/query-core/src/main/java/datawave/query/iterator/QueryIterator.java b/warehouse/query-core/src/main/java/datawave/query/iterator/QueryIterator.java
@@ -29,7 +29,7 @@
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.YieldCallback;
 import org.apache.accumulo.core.iterators.YieldingKeyValueIterator;
-import org.apache.accumulo.core.iteratorsImpl.system.IterationInterruptedException;
+import datawave.iterators.IterationInterruptedException;
 import org.apache.accumulo.tserver.tablet.TabletClosedException;
 import org.apache.commons.collections4.iterators.EmptyIterator;
 import org.apache.commons.jexl3.JexlArithmetic;

diff --git a/warehouse/query-core/src/main/java/datawave/query/iterator/logic/AndIterator.java b/warehouse/query-core/src/main/java/datawave/query/iterator/logic/AndIterator.java
@@ -15,7 +15,7 @@
 
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.iteratorsImpl.system.IterationInterruptedException;
+import datawave.iterators.IterationInterruptedException;
 import org.apache.log4j.Logger;
 
 import com.google.common.collect.TreeMultimap;

diff --git a/warehouse/query-core/src/test/java/datawave/query/RebuildingScannerTestHelper.java b/warehouse/query-core/src/test/java/datawave/query/RebuildingScannerTestHelper.java
@@ -27,7 +27,7 @@
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.core.iteratorsImpl.system.IterationInterruptedException;
+import datawave.iterators.IterationInterruptedException;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.hadoop.io.Text;
 

diff --git a/warehouse/query-core/src/test/java/datawave/query/iterator/logic/AndIteratorIT.java b/warehouse/query-core/src/test/java/datawave/query/iterator/logic/AndIteratorIT.java
@@ -16,7 +16,7 @@
 
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.iteratorsImpl.system.IterationInterruptedException;
+import datawave.iterators.IterationInterruptedException;
 import org.junit.jupiter.api.Test;
 
 import com.google.common.collect.Sets;

diff --git a/warehouse/query-core/src/test/java/datawave/query/iterator/logic/AndOrIteratorIT.java b/warehouse/query-core/src/test/java/datawave/query/iterator/logic/AndOrIteratorIT.java
@@ -20,7 +20,7 @@
 
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.iteratorsImpl.system.IterationInterruptedException;
+import datawave.iterators.IterationInterruptedException;
 import org.apache.log4j.Logger;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;

diff --git a/...house/query-core/src/test/java/datawave/query/iterator/logic/IndexIteratorBridgeTest.java b/...house/query-core/src/test/java/datawave/query/iterator/logic/IndexIteratorBridgeTest.java
@@ -12,7 +12,7 @@
 
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.iteratorsImpl.system.IterationInterruptedException;
+import datawave.iterators.IterationInterruptedException;
 import org.apache.commons.jexl3.parser.JexlNode;
 import org.junit.jupiter.api.Test;
 

diff --git a/warehouse/query-core/src/test/java/datawave/query/iterator/logic/IndexIteratorTest.java b/warehouse/query-core/src/test/java/datawave/query/iterator/logic/IndexIteratorTest.java
@@ -17,7 +17,7 @@
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.core.iteratorsImpl.system.IterationInterruptedException;
+import datawave.iterators.IterationInterruptedException;
 import org.apache.accumulo.core.iteratorsImpl.system.SortedMapIterator;
 import org.apache.hadoop.io.Text;
 import org.junit.jupiter.api.Test;

diff --git a/warehouse/query-core/src/test/java/datawave/query/iterator/logic/OrIteratorIT.java b/warehouse/query-core/src/test/java/datawave/query/iterator/logic/OrIteratorIT.java
@@ -20,7 +20,7 @@
 
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.iteratorsImpl.system.IterationInterruptedException;
+import datawave.iterators.IterationInterruptedException;
 import org.junit.jupiter.api.Test;
 
 import datawave.query.attributes.Document;