Final stages of FFM Phase 7, lots of cleanup.

Author: leerho

src/main/java/org/apache/datasketches/common/ArrayOfBooleansSerDe.java

@@ -19,10 +19,10 @@
 
 package org.apache.datasketches.common;
 
-import java.util.Objects;
+import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 
-import org.apache.datasketches.memory.Memory;
-import org.apache.datasketches.memory.WritableMemory;
+import java.lang.foreign.MemorySegment;
+import java.util.Objects;
 
 /**
  * Methods of serializing and deserializing arrays of Boolean as a bit array.
@@ -54,42 +54,42 @@ public byte[] serializeToByteArray(final Boolean[] items) {
     Objects.requireNonNull(items, "Items must not be null");
     final int bytesNeeded = computeBytesNeeded(items.length);
     final byte[] bytes = new byte[bytesNeeded];
-    final WritableMemory mem = WritableMemory.writableWrap(bytes);
+    final MemorySegment seg = MemorySegment.ofArray(bytes);
 
     byte val = 0;
     for (int i = 0; i < items.length; ++i) {
       if (items[i]) {
         val |= 0x1 << (i & 0x7);
       }
       if ((i & 0x7) == 0x7) {
-        mem.putByte(i >>> 3, val);
+        seg.set(JAVA_BYTE, i >>> 3, val);
         val = 0;
       }
     }
     // write out any remaining values (if val=0, still good to be explicit)
     if ((items.length & 0x7) > 0) {
-      mem.putByte(bytesNeeded - 1, val);
+      seg.set(JAVA_BYTE, bytesNeeded - 1, val);
     }
     return bytes;
   }
 
   @Override
-  public Boolean[] deserializeFromMemory(final Memory mem, final int numItems) {
-    return deserializeFromMemory(mem, 0, numItems);
+  public Boolean[] deserializeFromMemorySegment(final MemorySegment seg, final int numItems) {
+    return deserializeFromMemorySegment(seg, 0, numItems);
   }
 
   @Override
-  public Boolean[] deserializeFromMemory(final Memory mem, final long offsetBytes, final int numItems) {
-    Objects.requireNonNull(mem, "Memory must not be null");
+  public Boolean[] deserializeFromMemorySegment(final MemorySegment seg, final long offsetBytes, final int numItems) {
+    Objects.requireNonNull(seg, "MemorySegment must not be null");
     if (numItems <= 0) { return new Boolean[0]; }
     final int numBytes = computeBytesNeeded(numItems);
-    Util.checkBounds(offsetBytes, numBytes, mem.getCapacity());
+    Util.checkBounds(offsetBytes, numBytes, seg.byteSize());
     final Boolean[] array = new Boolean[numItems];
 
     byte srcVal = 0;
     for (int i = 0, b = 0; i < numItems; ++i) {
       if ((i & 0x7) == 0x0) { // should trigger on first iteration
-        srcVal = mem.getByte(offsetBytes + b++);
+        srcVal = seg.get(JAVA_BYTE, offsetBytes + b++);
       }
       array[i] = ((srcVal >>> (i & 0x7)) & 0x1) == 1;
     }
@@ -109,8 +109,8 @@ public int sizeOf(final Boolean[] items) {
   }
 
   @Override
-  public int sizeOf(final Memory mem, final long offsetBytes, final int numItems) {
-    Objects.requireNonNull(mem, "Memory must not be null");
+  public int sizeOf(final MemorySegment seg, final long offsetBytes, final int numItems) {
+    Objects.requireNonNull(seg, "MemorySegment must not be null");
     return computeBytesNeeded(numItems);
   }
 

src/main/java/org/apache/datasketches/common/ArrayOfBooleansSerDe2.java

@@ -19,13 +19,12 @@
 
 package org.apache.datasketches.common;
 
+import static java.lang.foreign.ValueLayout.JAVA_DOUBLE_UNALIGNED;
 import static org.apache.datasketches.common.ByteArrayUtil.putDoubleLE;
 
+import java.lang.foreign.MemorySegment;
 import java.util.Objects;
 
-import org.apache.datasketches.memory.Memory;
-import org.apache.datasketches.memory.WritableMemory;
-
 /**
  * Methods of serializing and deserializing arrays of Double.
  *
@@ -46,30 +45,30 @@ public byte[] serializeToByteArray(final Double[] items) {
     Objects.requireNonNull(items, "Items must not be null");
     if (items.length == 0) { return new byte[0]; }
     final byte[] bytes = new byte[Double.BYTES * items.length];
-    final WritableMemory mem = WritableMemory.writableWrap(bytes);
+    final MemorySegment seg = MemorySegment.ofArray(bytes);
     long offset = 0;
     for (int i = 0; i < items.length; i++) {
-      mem.putDouble(offset, items[i]);
+      seg.set(JAVA_DOUBLE_UNALIGNED, offset, items[i]);
       offset += Double.BYTES;
     }
     return bytes;
   }
 
   @Override
-  public Double[] deserializeFromMemory(final Memory mem, final int numItems) {
-    return deserializeFromMemory(mem, 0, numItems);
+  public Double[] deserializeFromMemorySegment(final MemorySegment seg, final int numItems) {
+    return deserializeFromMemorySegment(seg, 0, numItems);
   }
 
   @Override
-  public Double[] deserializeFromMemory(final Memory mem, final long offsetBytes, final int numItems) {
-    Objects.requireNonNull(mem, "Memory must not be null");
+  public Double[] deserializeFromMemorySegment(final MemorySegment seg, final long offsetBytes, final int numItems) {
+    Objects.requireNonNull(seg, "MemorySegment must not be null");
     if (numItems <= 0) { return new Double[0]; }
     long offset = offsetBytes;
-    Util.checkBounds(offset, Double.BYTES * (long)numItems, mem.getCapacity());
+    Util.checkBounds(offset, Double.BYTES * (long)numItems, seg.byteSize());
     final Double[] array = new Double[numItems];
 
     for (int i = 0; i < numItems; i++) {
-      array[i] = mem.getDouble(offset);
+      array[i] = seg.get(JAVA_DOUBLE_UNALIGNED, offset);
       offset += Double.BYTES;
     }
     return array;
@@ -88,8 +87,8 @@ public int sizeOf(final Double[] items) {
   }
 
   @Override
-  public int sizeOf(final Memory mem, final long offsetBytes, final int numItems) {
-    Objects.requireNonNull(mem, "Memory must not be null");
+  public int sizeOf(final MemorySegment seg, final long offsetBytes, final int numItems) {
+    Objects.requireNonNull(seg, "MemorySegment must not be null");
     return numItems * Double.BYTES;
   }