Throw exception when minLength > maxLength even if minLength >= array.length

Author: Stefan Vodita

lucene/core/src/java/org/apache/lucene/util/ArrayUtil.java

@@ -337,9 +337,6 @@ public static int[] growExact(int[] array, int newLength) {
   public static int[] growInRange(int[] array, int minLength, int maxLength) {
     assert minLength >= 0
         : "length must be positive (got " + minLength + "): likely integer overflow?";
-    if (array.length >= minLength) {
-      return array;
-    }
 
     if (minLength > maxLength) {
       throw new IllegalArgumentException(
@@ -349,6 +346,10 @@ public static int[] growInRange(int[] array, int minLength, int maxLength) {
               + maxLength);
     }
 
+    if (array.length >= minLength) {
+      return array;
+    }
+
     int potentialLength = oversize(minLength, Integer.BYTES);
     return growExact(array, Math.min(maxLength, potentialLength));
   }

lucene/core/src/test/org/apache/lucene/util/TestArrayUtil.java

@@ -376,18 +376,21 @@ public void testGrowExact() {
   public void testGrowInRange() {
     int[] array = new int[] {1, 2, 3};
 
-    // maxLength does not matter as long as minLength is enough
-    assertSame(array, growInRange(array, 1, 4));
-    assertSame(array, growInRange(array, 1, 4));
-    assertSame(array, growInRange(array, 1, 2));
-    assertSame(array, growInRange(array, 1, 1));
-    assertSame(array, growInRange(array, 1, 0));
-    assertSame(array, growInRange(array, 1, -1));
+    // If minLength is negative, maxLength does not matter
+    expectThrows(AssertionError.class, () -> growInRange(array, -1, 4));
+    expectThrows(AssertionError.class, () -> growInRange(array, -1, 0));
+    expectThrows(AssertionError.class, () -> growInRange(array, -1, -1));
 
-    // maxLength < minLength if the array has to be grown throws an exception
+    // If minLength > maxLength, we throw an exception
+    expectThrows(IllegalArgumentException.class, () -> growInRange(array, 1, 0));
     expectThrows(IllegalArgumentException.class, () -> growInRange(array, 4, 3));
     expectThrows(IllegalArgumentException.class, () -> growInRange(array, 5, 4));
 
+    // If minLength is sufficient, we return the array
+    assertSame(array, growInRange(array, 1, 4));
+    assertSame(array, growInRange(array, 1, 2));
+    assertSame(array, growInRange(array, 1, 1));
+
     int minLength = 4;
     int maxLength = Integer.MAX_VALUE;
 

lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java

@@ -327,7 +327,8 @@ public int[] getBulkOrdinals(FacetLabel... categoryPaths) throws IOException {
     }
     // First try to find results in the cache:
     int[] result = new int[categoryPaths.length];
-    int[] indexesMissingFromCache = new int[10]; // initial size, will grow when required
+    // Will grow when required, but never beyond categoryPaths.length
+    int[] indexesMissingFromCache = new int[Math.min(10, categoryPaths.length)];
     int numberOfMissingFromCache = 0;
     FacetLabel cp;
     Integer res;