Ensure we compare buytes in the same way accumulo does (#3160)

Author: ivakegg

warehouse/query-core/src/main/java/datawave/query/util/sortedset/ByteArrayComparator.java

@@ -2,26 +2,12 @@
 
 import java.util.Comparator;
 
+import org.apache.hadoop.io.WritableComparator;
+
 public class ByteArrayComparator implements Comparator<byte[]> {
 
     @Override
     public int compare(byte[] data, byte[] term) {
-        int minSize = data.length;
-        if (term.length < minSize)
-            minSize = term.length;
-        int comparison = 0;
-        for (int i = 0; i < minSize; i++) {
-            comparison = new Byte(data[i]).compareTo(term[i]);
-            if (comparison != 0)
-                break;
-        }
-        if (comparison == 0) {
-            if (minSize < data.length) {
-                comparison = 1;
-            } else if (minSize < term.length) {
-                comparison = -1;
-            }
-        }
-        return comparison;
+        return WritableComparator.compareBytes(data, 0, data.length, term, 0, term.length);
     }
 }

warehouse/query-core/src/test/java/datawave/query/util/sortedset/ByteArrayComparatorTest.java

@@ -0,0 +1,52 @@
+package datawave.query.util.sortedset;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Random;
+
+import org.junit.Test;
+
+public class ByteArrayComparatorTest {
+    ByteArrayComparator comparator = new ByteArrayComparator();
+
+    @Test
+    public void testCompareEqualLen() {
+        Random random = new Random();
+        byte[] bytes1 = new byte[20];
+        byte[] bytes2 = new byte[20];
+        random.nextBytes(bytes1);
+        System.arraycopy(bytes1, 0, bytes2, 0, 20);
+        assertTrue(comparator.compare(bytes1, bytes2) == 0);
+        assertTrue(comparator.compare(bytes2, bytes1) == 0);
+
+        bytes1[10] = (byte) 10;
+        bytes2[10] = (byte) 11;
+
+        assertTrue(comparator.compare(bytes1, bytes2) < 0);
+        assertTrue(comparator.compare(bytes2, bytes1) > 0);
+
+        bytes1[10] = (byte) -181; // as an unsigned byte this should be greater than 11
+
+        assertTrue(comparator.compare(bytes1, bytes2) > 0);
+        assertTrue(comparator.compare(bytes2, bytes1) < 0);
+    }
+
+    @Test
+    public void testCompareUnequalLen() {
+        Random random = new Random();
+        byte[] bytes1 = new byte[20];
+        byte[] bytes2 = new byte[30];
+        random.nextBytes(bytes1);
+        System.arraycopy(bytes1, 0, bytes2, 0, 20);
+
+        assertTrue(comparator.compare(bytes1, bytes2) < 0);
+        assertTrue(comparator.compare(bytes2, bytes1) > 0);
+
+        bytes2[10] = (byte) 11;
+        bytes1[10] = (byte) -181; // as an unsigned byte this should be greater than 11
+
+        assertTrue(comparator.compare(bytes1, bytes2) > 0);
+        assertTrue(comparator.compare(bytes2, bytes1) < 0);
+    }
+
+}