change consistency check failure on resize factor to force-promote in X1 case

Author: jmalkin

src/main/java/com/yahoo/sketches/theta/DirectQuickSelectSketch.java

@@ -161,8 +161,7 @@ static DirectQuickSelectSketch writableWrap(final WritableMemory srcMem, final l
     final ResizeFactor myRF = ResizeFactor.getRF(lgRF);
     if ((myRF == ResizeFactor.X1)
             && (lgArrLongs != Util.startingSubMultiple(lgNomLongs + 1, myRF, MIN_LG_ARR_LONGS))) {
-      throw new SketchesArgumentException("Possible corruption: ResizeFactor X1, but provided "
-              + "array too small for sketch size");
+      insertLgResizeFactor(memObj, memAdd, ResizeFactor.X2.lg());
     }
 
     final DirectQuickSelectSketch dqss =

src/main/java/com/yahoo/sketches/theta/HeapQuickSelectSketch.java

@@ -115,14 +115,13 @@ static HeapQuickSelectSketch heapifyInstance(final Memory srcMem, final long see
 
     final float p = extractP(memObj, memAdd);                             //bytes 12-15
     final int lgRF = extractLgResizeFactor(memObj, memAdd);               //byte 0
-    final ResizeFactor myRF = ResizeFactor.getRF(lgRF);
+    ResizeFactor myRF = ResizeFactor.getRF(lgRF);
     final int familyID = extractFamilyID(memObj, memAdd);
     final Family family = Family.idToFamily(familyID);
 
     if (myRF == ResizeFactor.X1
             && lgArrLongs != Util.startingSubMultiple(lgNomLongs + 1, myRF, MIN_LG_ARR_LONGS)) {
-      throw new SketchesArgumentException("Possible corruption: ResizeFactor X1, but provided "
-              + "array too small for sketch size");
+      myRF = ResizeFactor.X2;
     }
 
     final HeapQuickSelectSketch hqss = new HeapQuickSelectSketch(lgNomLongs, seed, p, myRF,

src/test/java/com/yahoo/sketches/theta/DirectQuickSelectSketchTest.java

@@ -723,12 +723,8 @@ public void checkCorruptRFWithInsufficientArray() {
     usk.update(0);
 
     insertLgResizeFactor(mem.getArray(), mem.getCumulativeOffset(0L), 0); // corrupt RF: X1
-    try {
-      DirectQuickSelectSketch.writableWrap(mem, DEFAULT_UPDATE_SEED);
-      fail("Expected SketchesArgumentException");
-    } catch (SketchesArgumentException e) {
-      //Pass
-    }
+    UpdateSketch dqss = DirectQuickSelectSketch.writableWrap(mem, DEFAULT_UPDATE_SEED);
+    assertEquals(dqss.getResizeFactor(), ResizeFactor.X2); // force-promote to X2
   }
 
   @Test

src/test/java/com/yahoo/sketches/theta/HeapQuickSelectSketchTest.java

@@ -602,12 +602,8 @@ public void checkMemSerDeExceptions() {
 
     // force ResizeFactor.X1, but allocated capacity too small
     insertLgResizeFactor(mem.getArray(), mem.getCumulativeOffset(0L), ResizeFactor.X1.lg());
-    try {
-      HeapQuickSelectSketch.heapifyInstance(mem, DEFAULT_UPDATE_SEED);
-      fail();
-    } catch (SketchesArgumentException e) {
-      //expected
-    }
+    UpdateSketch hqss = HeapQuickSelectSketch.heapifyInstance(mem, DEFAULT_UPDATE_SEED);
+    assertEquals(hqss.getResizeFactor(), ResizeFactor.X2); // force-promote to X2
   }
 
   private static void tryBadMem(WritableMemory mem, int byteOffset, int byteValue) {