This is an automated email from the ASF dual-hosted git repository. leerho pushed a commit to branch Redo_var_names in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit 072294345eca9329254e45ad0fdab0c5c88d21c1 Author: Lee Rhodes <[email protected]> AuthorDate: Mon Feb 3 17:19:20 2025 -0800 Redo var names --- .../internal/NativeWritableBufferImplTest.java | 55 ++++----- .../internal/NativeWritableMemoryImplTest.java | 100 +++++++-------- .../internal/NonNativeWritableBufferImplTest.java | 94 +++++++------- .../internal/NonNativeWritableMemoryImplTest.java | 137 ++++++++++----------- .../datasketches/memory/internal/UtilForTest.java | 10 -- 5 files changed, 179 insertions(+), 217 deletions(-) diff --git a/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java b/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java index b72f0da5..c84b5b6a 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java @@ -19,20 +19,13 @@ package org.apache.datasketches.memory.internal; -import java.lang.foreign.Arena; -import static org.apache.datasketches.memory.internal.UtilForTest.CB; -import static org.apache.datasketches.memory.internal.UtilForTest.DB; -import static org.apache.datasketches.memory.internal.UtilForTest.FB; -import static org.apache.datasketches.memory.internal.UtilForTest.IB; -import static org.apache.datasketches.memory.internal.UtilForTest.LB; -import static org.apache.datasketches.memory.internal.UtilForTest.NBO; -import static org.apache.datasketches.memory.internal.UtilForTest.NNBO; -import static org.apache.datasketches.memory.internal.UtilForTest.SB; +import static org.apache.datasketches.memory.internal.ResourceImpl.NATIVE_BYTE_ORDER; +import static org.apache.datasketches.memory.internal.ResourceImpl.NON_NATIVE_BYTE_ORDER; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import java.lang.foreign.Arena; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -72,7 +65,7 @@ public class NativeWritableBufferImplTest { boolean[] srcArray = {true, false, true, false, false, true, false, true}; final int len = srcArray.length; final int half = len / 2; - WritableBuffer wbuf = WritableMemory.allocate(len, NBO).asWritableBuffer(); + WritableBuffer wbuf = WritableMemory.allocate(len, NATIVE_BYTE_ORDER).asWritableBuffer(); //put for (int i = 0; i < half; i++) { wbuf.putBoolean(srcArray[i]); } //put*(value) for (int i = half; i < len; i++) { wbuf.putBoolean(i, srcArray[i]); } //put*(add, value) @@ -89,7 +82,7 @@ public class NativeWritableBufferImplTest { byte[] srcArray = { 1, -2, 3, -4, 5, -6, 7, -8 }; final int len = srcArray.length; final int half = len / 2; - WritableBuffer wbuf = WritableMemory.allocate(len, NBO).asWritableBuffer(); + WritableBuffer wbuf = WritableMemory.allocate(len, NATIVE_BYTE_ORDER).asWritableBuffer(); //put wbuf.putByte(srcArray[0]); //put*(value) wbuf.putByteArray(srcArray, 1, 2); //put*Array(src[], srcOff, len) @@ -110,19 +103,19 @@ public class NativeWritableBufferImplTest { char[] srcArray = { 'a','b','c','d','e','f','g','h' }; final int len = srcArray.length; final int half = len / 2; - WritableBuffer wbuf = WritableMemory.allocate(len * CB, NBO).asWritableBuffer(); + WritableBuffer wbuf = WritableMemory.allocate(len * Character.BYTES, NATIVE_BYTE_ORDER).asWritableBuffer(); //put wbuf.putChar(srcArray[0]); //put*(value) wbuf.putCharArray(srcArray, 1, 2); //put*Array(src[], srcOff, len) wbuf.putChar(srcArray[3]); //put*(value) - for (int i = half; i < len; i++) { wbuf.putChar(i * CB, srcArray[i]); } //put*(add, value) + for (int i = half; i < len; i++) { wbuf.putChar(i * Character.BYTES, srcArray[i]); } //put*(add, value) wbuf.resetPosition(); //get char[] dstArray = new char[len]; dstArray[0] = wbuf.getChar(); //get*() wbuf.getCharArray(dstArray, 1, 2); //get*Array(dst[], dstOff, len) dstArray[3] = wbuf.getChar(); //get*() - for (int i = half; i < len; i++) { dstArray[i] = wbuf.getChar(i * CB); } //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wbuf.getChar(i * Character.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -131,19 +124,19 @@ public class NativeWritableBufferImplTest { double[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableBuffer wbuf = WritableMemory.allocate(len * DB, NBO).asWritableBuffer(); + WritableBuffer wbuf = WritableMemory.allocate(len * Double.BYTES, NATIVE_BYTE_ORDER).asWritableBuffer(); //put wbuf.putDouble(srcArray[0]); //put*(value) wbuf.putDoubleArray(srcArray, 1, 2); //put*Array(src[], srcOff, len) wbuf.putDouble(srcArray[3]); //put*(value) - for (int i = half; i < len; i++) { wbuf.putDouble(i * DB, srcArray[i]); } //put*(add, value) + for (int i = half; i < len; i++) { wbuf.putDouble(i * Double.BYTES, srcArray[i]); } //put*(add, value) wbuf.resetPosition(); //get double[] dstArray = new double[len]; dstArray[0] = wbuf.getDouble(); //get*() wbuf.getDoubleArray(dstArray, 1, 2); //get*Array(dst[], dstOff, len) dstArray[3] = wbuf.getDouble(); //get*() - for (int i = half; i < len; i++) { dstArray[i] = wbuf.getDouble(i * DB); } //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wbuf.getDouble(i * Double.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -152,19 +145,19 @@ public class NativeWritableBufferImplTest { float[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableBuffer wbuf = WritableMemory.allocate(len * FB, NBO).asWritableBuffer(); + WritableBuffer wbuf = WritableMemory.allocate(len * Float.BYTES, NATIVE_BYTE_ORDER).asWritableBuffer(); //put wbuf.putFloat(srcArray[0]); //put*(value) wbuf.putFloatArray(srcArray, 1, 2); //put*Array(src[], srcOff, len) wbuf.putFloat(srcArray[3]); //put*(value) - for (int i = half; i < len; i++) { wbuf.putFloat(i * FB, srcArray[i]); } //put*(add, value) + for (int i = half; i < len; i++) { wbuf.putFloat(i * Float.BYTES, srcArray[i]); } //put*(add, value) wbuf.resetPosition(); //get float[] dstArray = new float[len]; dstArray[0] = wbuf.getFloat(); //get*() wbuf.getFloatArray(dstArray, 1, 2); //get*Array(dst[], dstOff, len) dstArray[3] = wbuf.getFloat(); //get*() - for (int i = half; i < len; i++) { dstArray[i] = wbuf.getFloat(i * FB); } //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wbuf.getFloat(i * Float.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -173,19 +166,19 @@ public class NativeWritableBufferImplTest { int[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableBuffer wbuf = WritableMemory.allocate(len * IB, NBO).asWritableBuffer(); + WritableBuffer wbuf = WritableMemory.allocate(len * Integer.BYTES, NATIVE_BYTE_ORDER).asWritableBuffer(); //put wbuf.putInt(srcArray[0]); //put*(value) wbuf.putIntArray(srcArray, 1, 2); //put*Array(src[], srcOff, len) wbuf.putInt(srcArray[3]); //put*(value) - for (int i = half; i < len; i++) { wbuf.putInt(i * IB, srcArray[i]); } //put*(add, value) + for (int i = half; i < len; i++) { wbuf.putInt(i * Integer.BYTES, srcArray[i]); } //put*(add, value) wbuf.resetPosition(); //get int[] dstArray = new int[len]; dstArray[0] = wbuf.getInt(); //get*() wbuf.getIntArray(dstArray, 1, 2); //get*Array(dst[], dstOff, len) dstArray[3] = wbuf.getInt(); //get*() - for (int i = half; i < len; i++) { dstArray[i] = wbuf.getInt(i * IB); } //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wbuf.getInt(i * Integer.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -194,19 +187,19 @@ public class NativeWritableBufferImplTest { long[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableBuffer wbuf = WritableMemory.allocate(len * LB, NNBO).asWritableBuffer(); + WritableBuffer wbuf = WritableMemory.allocate(len * Long.BYTES, NATIVE_BYTE_ORDER).asWritableBuffer(); //put wbuf.putLong(srcArray[0]); //put*(value) wbuf.putLongArray(srcArray, 1, 2); //put*Array(src[], srcOff, len) wbuf.putLong(srcArray[3]); //put*(value) - for (int i = half; i < len; i++) { wbuf.putLong(i * LB, srcArray[i]); } //put*(add, value) + for (int i = half; i < len; i++) { wbuf.putLong(i * Long.BYTES, srcArray[i]); } //put*(add, value) wbuf.resetPosition(); //get long[] dstArray = new long[len]; dstArray[0] = wbuf.getLong(); //get*() wbuf.getLongArray(dstArray, 1, 2); //get*Array(dst[], dstOff, len) dstArray[3] = wbuf.getLong(); //get*() - for (int i = half; i < len; i++) { dstArray[i] = wbuf.getLong(i * LB); } //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wbuf.getLong(i * Long.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -215,19 +208,19 @@ public class NativeWritableBufferImplTest { short[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableBuffer wbuf = WritableMemory.allocate(len * SB, NBO).asWritableBuffer(); + WritableBuffer wbuf = WritableMemory.allocate(len * Short.BYTES, NATIVE_BYTE_ORDER).asWritableBuffer(); //put wbuf.putShort(srcArray[0]); //put*(value) wbuf.putShortArray(srcArray, 1, 2); //put*Array(src[], srcOff, len) wbuf.putShort(srcArray[3]); //put*(value) - for (int i = half; i < len; i++) { wbuf.putShort(i * SB, srcArray[i]); } //put*(add, value) + for (int i = half; i < len; i++) { wbuf.putShort(i * Short.BYTES, srcArray[i]); } //put*(add, value) wbuf.resetPosition(); //get short[] dstArray = new short[len]; dstArray[0] = wbuf.getShort(); //get*() wbuf.getShortArray(dstArray, 1, 2); //get*Array(dst[], dstOff, len) dstArray[3] = wbuf.getShort(); //get*() - for (int i = half; i < len; i++) { dstArray[i] = wbuf.getShort(i * SB); } //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wbuf.getShort(i * Short.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -512,7 +505,7 @@ public class NativeWritableBufferImplTest { public void checkDuplicateNonNative() { WritableMemory wmem = WritableMemory.allocate(64); wmem.putShort(0, (short) 1); - Buffer buf = wmem.asWritableBuffer().duplicate(NNBO); + Buffer buf = wmem.asWritableBuffer().duplicate(NON_NATIVE_BYTE_ORDER); assertEquals(buf.getShort(0), 256); } diff --git a/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java b/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java index 07726dd3..92fef543 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java @@ -19,14 +19,8 @@ package org.apache.datasketches.memory.internal; -import static org.apache.datasketches.memory.internal.UtilForTest.CB; -import static org.apache.datasketches.memory.internal.UtilForTest.DB; -import static org.apache.datasketches.memory.internal.UtilForTest.FB; -import static org.apache.datasketches.memory.internal.UtilForTest.IB; -import static org.apache.datasketches.memory.internal.UtilForTest.LB; -import static org.apache.datasketches.memory.internal.UtilForTest.NBO; -import static org.apache.datasketches.memory.internal.UtilForTest.NNBO; -import static org.apache.datasketches.memory.internal.UtilForTest.SB; +import static org.apache.datasketches.memory.internal.ResourceImpl.NATIVE_BYTE_ORDER; +import static org.apache.datasketches.memory.internal.ResourceImpl.NON_NATIVE_BYTE_ORDER; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -71,7 +65,7 @@ public class NativeWritableMemoryImplTest { public void checkPutGetBooleans() { boolean[] srcArray = {true, false, true, false, false, true, false, true}; final int len = srcArray.length; - WritableMemory wmem = WritableMemory.allocate(len, NBO); + WritableMemory wmem = WritableMemory.allocate(len, NATIVE_BYTE_ORDER); //put for (int i = 0; i < len; i++) { wmem.putBoolean(i, srcArray[i]); } //put*(add, value) //get @@ -85,7 +79,7 @@ public class NativeWritableMemoryImplTest { byte[] srcArray = { 1, -2, 3, -4, 5, -6, 7, -8 }; final int len = srcArray.length; final int half = len / 2; - WritableMemory wmem = WritableMemory.allocate(len, NBO); + WritableMemory wmem = WritableMemory.allocate(len, NATIVE_BYTE_ORDER); //put wmem.putByte(0, srcArray[0]); //put*(add, value) wmem.putByteArray(1, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) @@ -105,18 +99,18 @@ public class NativeWritableMemoryImplTest { char[] srcArray = { 'a','b','c','d','e','f','g','h' }; final int len = srcArray.length; final int half = len / 2; - WritableMemory wmem = WritableMemory.allocate(len * CB, NBO); + WritableMemory wmem = WritableMemory.allocate(len * Character.BYTES, NATIVE_BYTE_ORDER); //put wmem.putChar(0, srcArray[0]); //put*(add, value) - wmem.putCharArray(1 * CB, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) - wmem.putChar(3 * CB, srcArray[3]); //put*(add, value) - for (int i = half; i < len; i++) { wmem.putChar(i * CB, srcArray[i]); } //put*(add, value) + wmem.putCharArray(1 * Character.BYTES, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) + wmem.putChar(3 * Character.BYTES, srcArray[3]); //put*(add, value) + for (int i = half; i < len; i++) { wmem.putChar(i * Character.BYTES, srcArray[i]); } //put*(add, value) //get char[] dstArray = new char[len]; dstArray[0] = wmem.getChar(0); //get*(add) - wmem.getCharArray(1 * CB, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) - dstArray[3] = wmem.getChar(3 * CB); //get*(add) - for (int i = half; i < len; i++) { dstArray[i] = wmem.getChar(i * CB); } //get*(add) + wmem.getCharArray(1 * Character.BYTES, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) + dstArray[3] = wmem.getChar(3 * Character.BYTES); //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wmem.getChar(i * Character.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -125,18 +119,18 @@ public class NativeWritableMemoryImplTest { double[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableMemory wmem = WritableMemory.allocate(len * DB, NBO); + WritableMemory wmem = WritableMemory.allocate(len * Double.BYTES, NATIVE_BYTE_ORDER); //put wmem.putDouble(0, srcArray[0]); //put*(add, value) - wmem.putDoubleArray(1 * DB, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) - wmem.putDouble(3 * DB, srcArray[3]); //put*(add, value) - for (int i = half; i < len; i++) { wmem.putDouble(i * DB, srcArray[i]); } //put*(add, value) + wmem.putDoubleArray(1 * Double.BYTES, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) + wmem.putDouble(3 * Double.BYTES, srcArray[3]); //put*(add, value) + for (int i = half; i < len; i++) { wmem.putDouble(i * Double.BYTES, srcArray[i]); } //put*(add, value) //get double[] dstArray = new double[len]; dstArray[0] = wmem.getDouble(0); //get*(add) - wmem.getDoubleArray(1 * DB, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) - dstArray[3] = wmem.getDouble(3 * DB); //get*(add) - for (int i = half; i < len; i++) { dstArray[i] = wmem.getDouble(i * DB); } //get*(add) + wmem.getDoubleArray(1 * Double.BYTES, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) + dstArray[3] = wmem.getDouble(3 * Double.BYTES); //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wmem.getDouble(i * Double.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -145,18 +139,18 @@ public class NativeWritableMemoryImplTest { float[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableMemory wmem = WritableMemory.allocate(len * FB, NBO); + WritableMemory wmem = WritableMemory.allocate(len * Float.BYTES, NATIVE_BYTE_ORDER); //put wmem.putFloat(0, srcArray[0]); //put*(add, value) - wmem.putFloatArray(1 * FB, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) - wmem.putFloat(3 * FB, srcArray[3]); //put*(add, value) - for (int i = half; i < len; i++) { wmem.putFloat(i * FB, srcArray[i]); } //put*(add, value) + wmem.putFloatArray(1 * Float.BYTES, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) + wmem.putFloat(3 * Float.BYTES, srcArray[3]); //put*(add, value) + for (int i = half; i < len; i++) { wmem.putFloat(i * Float.BYTES, srcArray[i]); } //put*(add, value) //get float[] dstArray = new float[len]; dstArray[0] = wmem.getFloat(0); //get*(add) - wmem.getFloatArray(1 * FB, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) - dstArray[3] = wmem.getFloat(3 * FB); //get*(add) - for (int i = half; i < len; i++) { dstArray[i] = wmem.getFloat(i * FB); } //get*(add) + wmem.getFloatArray(1 * Float.BYTES, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) + dstArray[3] = wmem.getFloat(3 * Float.BYTES); //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wmem.getFloat(i * Float.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -165,18 +159,18 @@ public class NativeWritableMemoryImplTest { int[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableMemory wmem = WritableMemory.allocate(len * IB, NBO); + WritableMemory wmem = WritableMemory.allocate(len * Integer.BYTES, NATIVE_BYTE_ORDER); //put wmem.putInt(0, srcArray[0]); //put*(add, value) - wmem.putIntArray(1 * IB, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) - wmem.putInt(3 * IB, srcArray[3]); //put*(add, value) - for (int i = half; i < len; i++) { wmem.putInt(i * IB, srcArray[i]); } //put*(add, value) + wmem.putIntArray(1 * Integer.BYTES, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) + wmem.putInt(3 * Integer.BYTES, srcArray[3]); //put*(add, value) + for (int i = half; i < len; i++) { wmem.putInt(i * Integer.BYTES, srcArray[i]); } //put*(add, value) //get int[] dstArray = new int[len]; dstArray[0] = wmem.getInt(0); //get*(add) - wmem.getIntArray(1 * IB, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) - dstArray[3] = wmem.getInt(3 * IB); //get*(add) - for (int i = half; i < len; i++) { dstArray[i] = wmem.getInt(i * IB); } //get*(add) + wmem.getIntArray(1 * Integer.BYTES, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) + dstArray[3] = wmem.getInt(3 * Integer.BYTES); //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wmem.getInt(i * Integer.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -185,18 +179,18 @@ public class NativeWritableMemoryImplTest { long[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableMemory wmem = WritableMemory.allocate(len * LB, NBO); + WritableMemory wmem = WritableMemory.allocate(len * Long.BYTES, NATIVE_BYTE_ORDER); //put wmem.putLong(0, srcArray[0]); //put*(add, value) - wmem.putLongArray(1 * LB, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) - wmem.putLong(3 * LB, srcArray[3]); //put*(add, value) - for (int i = half; i < len; i++) { wmem.putLong(i * LB, srcArray[i]); } //put*(add, value) + wmem.putLongArray(1 * Long.BYTES, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) + wmem.putLong(3 * Long.BYTES, srcArray[3]); //put*(add, value) + for (int i = half; i < len; i++) { wmem.putLong(i * Long.BYTES, srcArray[i]); } //put*(add, value) //get long[] dstArray = new long[len]; dstArray[0] = wmem.getLong(0); //get*(add) - wmem.getLongArray(1 * LB, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) - dstArray[3] = wmem.getLong(3 * LB); //get*(add) - for (int i = half; i < len; i++) { dstArray[i] = wmem.getLong(i * LB); } //get*(add) + wmem.getLongArray(1 * Long.BYTES, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) + dstArray[3] = wmem.getLong(3 * Long.BYTES); //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wmem.getLong(i * Long.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -205,18 +199,18 @@ public class NativeWritableMemoryImplTest { short[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableMemory wmem = WritableMemory.allocate(len * SB, NBO); + WritableMemory wmem = WritableMemory.allocate(len * Short.BYTES, NATIVE_BYTE_ORDER); //put wmem.putShort(0, srcArray[0]); //put*(add, value) - wmem.putShortArray(1 * SB, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) - wmem.putShort(3 * SB, srcArray[3]); //put*(add, value) - for (int i = half; i < len; i++) { wmem.putShort(i * SB, srcArray[i]); } //put*(add, value) + wmem.putShortArray(1 * Short.BYTES, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) + wmem.putShort(3 * Short.BYTES, srcArray[3]); //put*(add, value) + for (int i = half; i < len; i++) { wmem.putShort(i * Short.BYTES, srcArray[i]); } //put*(add, value) //get short[] dstArray = new short[len]; dstArray[0] = wmem.getShort(0); //get*(add) - wmem.getShortArray(1 * SB, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) - dstArray[3] = wmem.getShort(3 * SB); //get*(add) - for (int i = half; i < len; i++) { dstArray[i] = wmem.getShort(i * SB); } //get*(add) + wmem.getShortArray(1 * Short.BYTES, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) + dstArray[3] = wmem.getShort(3 * Short.BYTES); //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wmem.getShort(i * Short.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -630,7 +624,7 @@ public class NativeWritableMemoryImplTest { public void checkAsBufferNonNative() { WritableMemory wmem = WritableMemory.allocate(64); wmem.putShort(0, (short) 1); - Buffer buf = wmem.asBuffer(NNBO); + Buffer buf = wmem.asBuffer(NON_NATIVE_BYTE_ORDER); assertEquals(buf.getShort(0), 256); } diff --git a/src/test/java/org/apache/datasketches/memory/internal/NonNativeWritableBufferImplTest.java b/src/test/java/org/apache/datasketches/memory/internal/NonNativeWritableBufferImplTest.java index a10a9fd2..43dc54c7 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/NonNativeWritableBufferImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/NonNativeWritableBufferImplTest.java @@ -19,14 +19,8 @@ package org.apache.datasketches.memory.internal; -import static org.apache.datasketches.memory.internal.UtilForTest.CB; -import static org.apache.datasketches.memory.internal.UtilForTest.DB; -import static org.apache.datasketches.memory.internal.UtilForTest.FB; -import static org.apache.datasketches.memory.internal.UtilForTest.IB; -import static org.apache.datasketches.memory.internal.UtilForTest.LB; -import static org.apache.datasketches.memory.internal.UtilForTest.NBO; -import static org.apache.datasketches.memory.internal.UtilForTest.NNBO; -import static org.apache.datasketches.memory.internal.UtilForTest.SB; +import static org.apache.datasketches.memory.internal.ResourceImpl.NATIVE_BYTE_ORDER; +import static org.apache.datasketches.memory.internal.ResourceImpl.NON_NATIVE_BYTE_ORDER; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -48,16 +42,16 @@ public class NonNativeWritableBufferImplTest { char[] srcArray = { 'a','b','c','d','e','f','g','h' }; final int len = srcArray.length; final int half = len / 2; - WritableBuffer wbuf = WritableMemory.allocate(len * CB, NNBO).asWritableBuffer(); + WritableBuffer wbuf = WritableMemory.allocate(len * Character.BYTES, NON_NATIVE_BYTE_ORDER).asWritableBuffer(); //put wbuf.putChar(srcArray[0]); //put*(value) wbuf.putCharArray(srcArray, 1, 2); //put*Array(src[], srcOff, len) wbuf.putChar(srcArray[3]); //put*(value) - for (int i = half; i < len; i++) { wbuf.putChar(i * CB, srcArray[i]); } //put*(add, value) + for (int i = half; i < len; i++) { wbuf.putChar(i * Character.BYTES, srcArray[i]); } //put*(add, value) wbuf.resetPosition(); //confirm - WritableBuffer wbuf2 = WritableMemory.allocate(len * CB, NBO).asWritableBuffer(); - for (int i = 0; i < len * CB; i++) { wbuf2.putByte(wbuf.getByte()); } + WritableBuffer wbuf2 = WritableMemory.allocate(len * Character.BYTES, NATIVE_BYTE_ORDER).asWritableBuffer(); + for (int i = 0; i < len * Character.BYTES; i++) { wbuf2.putByte(wbuf.getByte()); } wbuf2.resetPosition(); for (int i = 0; i < len; i++) { assertTrue(srcArray[i] == Character.reverseBytes(wbuf2.getChar())); @@ -68,7 +62,7 @@ public class NonNativeWritableBufferImplTest { dstArray[0] = wbuf.getChar(); //get*() wbuf.getCharArray(dstArray, 1, 2); //get*Array(dst[], dstOff, len) dstArray[3] = wbuf.getChar(); //get*() - for (int i = half; i < len; i++) { dstArray[i] = wbuf.getChar(i * CB); } //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wbuf.getChar(i * Character.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -77,16 +71,16 @@ public class NonNativeWritableBufferImplTest { double[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableBuffer wbuf = WritableMemory.allocate(len * DB, NNBO).asWritableBuffer(); + WritableBuffer wbuf = WritableMemory.allocate(len * Double.BYTES, NON_NATIVE_BYTE_ORDER).asWritableBuffer(); //put wbuf.putDouble(srcArray[0]); //put*(value) wbuf.putDoubleArray(srcArray, 1, 2); //put*Array(src[], srcOff, len) wbuf.putDouble(srcArray[3]); //put*(value) - for (int i = half; i < len; i++) { wbuf.putDouble(i * DB, srcArray[i]); } //put*(add, value) + for (int i = half; i < len; i++) { wbuf.putDouble(i * Double.BYTES, srcArray[i]); } //put*(add, value) wbuf.resetPosition(); //confirm - WritableBuffer wbuf2 = WritableMemory.allocate(len * DB, NBO).asWritableBuffer(); - for (int i = 0; i < len * DB; i++) { wbuf2.putByte(wbuf.getByte()); } + WritableBuffer wbuf2 = WritableMemory.allocate(len * Double.BYTES, NATIVE_BYTE_ORDER).asWritableBuffer(); + for (int i = 0; i < len * Double.BYTES; i++) { wbuf2.putByte(wbuf.getByte()); } wbuf2.resetPosition(); for (int i = 0; i < len; i++) { assertTrue(srcArray[i] == UtilForTest.doubleReverseBytes(wbuf2.getDouble())); @@ -97,7 +91,7 @@ public class NonNativeWritableBufferImplTest { dstArray[0] = wbuf.getDouble(); //get*() wbuf.getDoubleArray(dstArray, 1, 2); //get*Array(dst[], dstOff, len) dstArray[3] = wbuf.getDouble(); //get*() - for (int i = half; i < len; i++) { dstArray[i] = wbuf.getDouble(i * DB); } //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wbuf.getDouble(i * Double.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -106,16 +100,16 @@ public class NonNativeWritableBufferImplTest { float[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableBuffer wbuf = WritableMemory.allocate(len * FB, NNBO).asWritableBuffer(); + WritableBuffer wbuf = WritableMemory.allocate(len * Float.BYTES, NON_NATIVE_BYTE_ORDER).asWritableBuffer(); //put wbuf.putFloat(srcArray[0]); //put*(value) wbuf.putFloatArray(srcArray, 1, 2); //put*Array(src[], srcOff, len) wbuf.putFloat(srcArray[3]); //put*(value) - for (int i = half; i < len; i++) { wbuf.putFloat(i * FB, srcArray[i]); } //put*(add, value) + for (int i = half; i < len; i++) { wbuf.putFloat(i * Float.BYTES, srcArray[i]); } //put*(add, value) wbuf.resetPosition(); //confirm - WritableBuffer wbuf2 = WritableMemory.allocate(len * FB, NBO).asWritableBuffer(); - for (int i = 0; i < len * FB; i++) { wbuf2.putByte(wbuf.getByte()); } + WritableBuffer wbuf2 = WritableMemory.allocate(len * Float.BYTES, NATIVE_BYTE_ORDER).asWritableBuffer(); + for (int i = 0; i < len * Float.BYTES; i++) { wbuf2.putByte(wbuf.getByte()); } wbuf2.resetPosition(); for (int i = 0; i < len; i++) { assertTrue(srcArray[i] == UtilForTest.floatReverseBytes(wbuf2.getFloat())); @@ -126,7 +120,7 @@ public class NonNativeWritableBufferImplTest { dstArray[0] = wbuf.getFloat(); //get*() wbuf.getFloatArray(dstArray, 1, 2); //get*Array(dst[], dstOff, len) dstArray[3] = wbuf.getFloat(); //get*() - for (int i = half; i < len; i++) { dstArray[i] = wbuf.getFloat(i * FB); } //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wbuf.getFloat(i * Float.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -135,16 +129,16 @@ public class NonNativeWritableBufferImplTest { int[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableBuffer wbuf = WritableMemory.allocate(len * IB, NNBO).asWritableBuffer(); + WritableBuffer wbuf = WritableMemory.allocate(len * Integer.BYTES, NON_NATIVE_BYTE_ORDER).asWritableBuffer(); //put wbuf.putInt(srcArray[0]); //put*(value) wbuf.putIntArray(srcArray, 1, 2); //put*Array(src[], srcOff, len) wbuf.putInt(srcArray[3]); //put*(value) - for (int i = half; i < len; i++) { wbuf.putInt(i * IB, srcArray[i]); } //put*(add, value) + for (int i = half; i < len; i++) { wbuf.putInt(i * Integer.BYTES, srcArray[i]); } //put*(add, value) wbuf.resetPosition(); //confirm - WritableBuffer wbuf2 = WritableMemory.allocate(len * IB, NBO).asWritableBuffer(); - for (int i = 0; i < len * IB; i++) { wbuf2.putByte(wbuf.getByte()); } + WritableBuffer wbuf2 = WritableMemory.allocate(len * Integer.BYTES, NATIVE_BYTE_ORDER).asWritableBuffer(); + for (int i = 0; i < len * Integer.BYTES; i++) { wbuf2.putByte(wbuf.getByte()); } wbuf2.resetPosition(); for (int i = 0; i < len; i++) { assertTrue(srcArray[i] == Integer.reverseBytes(wbuf2.getInt())); @@ -155,7 +149,7 @@ public class NonNativeWritableBufferImplTest { dstArray[0] = wbuf.getInt(); //get*() wbuf.getIntArray(dstArray, 1, 2); //get*Array(dst[], dstOff, len) dstArray[3] = wbuf.getInt(); //get*() - for (int i = half; i < len; i++) { dstArray[i] = wbuf.getInt(i * IB); } //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wbuf.getInt(i * Integer.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -164,16 +158,16 @@ public class NonNativeWritableBufferImplTest { long[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableBuffer wbuf = WritableMemory.allocate(len * LB, NNBO).asWritableBuffer(); + WritableBuffer wbuf = WritableMemory.allocate(len * Long.BYTES, NON_NATIVE_BYTE_ORDER).asWritableBuffer(); //put wbuf.putLong(srcArray[0]); //put*(value) wbuf.putLongArray(srcArray, 1, 2); //put*Array(src[], srcOff, len) wbuf.putLong(srcArray[3]); //put*(value) - for (int i = half; i < len; i++) { wbuf.putLong(i * LB, srcArray[i]); } //put*(add, value) + for (int i = half; i < len; i++) { wbuf.putLong(i * Long.BYTES, srcArray[i]); } //put*(add, value) wbuf.resetPosition(); //confirm - WritableBuffer wbuf2 = WritableMemory.allocate(len * LB, NBO).asWritableBuffer(); - for (int i = 0; i < len * LB; i++) { wbuf2.putByte(wbuf.getByte()); } + WritableBuffer wbuf2 = WritableMemory.allocate(len * Long.BYTES, NATIVE_BYTE_ORDER).asWritableBuffer(); + for (int i = 0; i < len * Long.BYTES; i++) { wbuf2.putByte(wbuf.getByte()); } wbuf2.resetPosition(); for (int i = 0; i < len; i++) { assertTrue(srcArray[i] == Long.reverseBytes(wbuf2.getLong())); @@ -184,7 +178,7 @@ public class NonNativeWritableBufferImplTest { dstArray[0] = wbuf.getLong(); //get*() wbuf.getLongArray(dstArray, 1, 2); //get*Array(dst[], dstOff, len) dstArray[3] = wbuf.getLong(); //get*() - for (int i = half; i < len; i++) { dstArray[i] = wbuf.getLong(i * LB); } //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wbuf.getLong(i * Long.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -193,16 +187,16 @@ public class NonNativeWritableBufferImplTest { short[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableBuffer wbuf = WritableMemory.allocate(len * SB, NNBO).asWritableBuffer(); + WritableBuffer wbuf = WritableMemory.allocate(len * Short.BYTES, NON_NATIVE_BYTE_ORDER).asWritableBuffer(); //put wbuf.putShort(srcArray[0]); //put*(value) wbuf.putShortArray(srcArray, 1, 2); //put*Array(src[], srcOff, len) wbuf.putShort(srcArray[3]); //put*(value) - for (int i = half; i < len; i++) { wbuf.putShort(i * SB, srcArray[i]); } //put*(add, value) + for (int i = half; i < len; i++) { wbuf.putShort(i * Short.BYTES, srcArray[i]); } //put*(add, value) wbuf.resetPosition(); //confirm - WritableBuffer wbuf2 = WritableMemory.allocate(len * SB, NBO).asWritableBuffer(); - for (int i = 0; i < len * SB; i++) { wbuf2.putByte(wbuf.getByte()); } + WritableBuffer wbuf2 = WritableMemory.allocate(len * Short.BYTES, NATIVE_BYTE_ORDER).asWritableBuffer(); + for (int i = 0; i < len * Short.BYTES; i++) { wbuf2.putByte(wbuf.getByte()); } wbuf2.resetPosition(); for (int i = 0; i < len; i++) { assertTrue(srcArray[i] == Short.reverseBytes(wbuf2.getShort())); @@ -213,7 +207,7 @@ public class NonNativeWritableBufferImplTest { dstArray[0] = wbuf.getShort(); //get*() wbuf.getShortArray(dstArray, 1, 2); //get*Array(dst[], dstOff, len) dstArray[3] = wbuf.getShort(); //get*() - for (int i = half; i < len; i++) { dstArray[i] = wbuf.getShort(i * SB); } //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wbuf.getShort(i * Short.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -221,48 +215,48 @@ public class NonNativeWritableBufferImplTest { @Test public void checkDuplicate() { byte[] bArr = new byte[8]; - WritableMemory wmem = WritableMemory.writableWrap(bArr, NNBO); + WritableMemory wmem = WritableMemory.writableWrap(bArr, NON_NATIVE_BYTE_ORDER); WritableBuffer wbuf = wmem.asWritableBuffer(); WritableBuffer wdup = wbuf.writableDuplicate(); - assertEquals(wdup.getTypeByteOrder(), NNBO); + assertEquals(wdup.getTypeByteOrder(), NON_NATIVE_BYTE_ORDER); WritableBuffer wreg = wbuf.writableRegion(); - assertEquals(wreg.getTypeByteOrder(), NNBO); + assertEquals(wreg.getTypeByteOrder(), NON_NATIVE_BYTE_ORDER); } @Test public void checkConversionByteOrder() { byte[] bArr = new byte[8]; bArr[1] = 1; - WritableMemory wmem = WritableMemory.writableWrap(bArr, NNBO); - assertEquals(wmem.getTypeByteOrder(), NNBO); + WritableMemory wmem = WritableMemory.writableWrap(bArr, NON_NATIVE_BYTE_ORDER); + assertEquals(wmem.getTypeByteOrder(), NON_NATIVE_BYTE_ORDER); assertEquals(wmem.getChar(0), 1); Buffer buf = wmem.asBuffer(); - assertEquals(buf.getTypeByteOrder(), NNBO); // + assertEquals(buf.getTypeByteOrder(), NON_NATIVE_BYTE_ORDER); // assertEquals(buf.getChar(0), 1); Buffer dup = buf.duplicate(); - assertEquals(dup.getTypeByteOrder(), NNBO); + assertEquals(dup.getTypeByteOrder(), NON_NATIVE_BYTE_ORDER); assertEquals(dup.getChar(0), 1); Buffer reg = buf.region(); - assertEquals(reg.getTypeByteOrder(), NNBO); + assertEquals(reg.getTypeByteOrder(), NON_NATIVE_BYTE_ORDER); assertEquals(reg.getChar(0), 1); Memory mem = reg.asMemory(); - assertEquals(mem.getTypeByteOrder(), NNBO); + assertEquals(mem.getTypeByteOrder(), NON_NATIVE_BYTE_ORDER); assertEquals(mem.getChar(0), 1); Memory mreg = mem.region(0, 8); - assertEquals(mreg.getTypeByteOrder(), NNBO); + assertEquals(mreg.getTypeByteOrder(), NON_NATIVE_BYTE_ORDER); assertEquals(mreg.getChar(0), 1); } @Test public void checkPutIntArray() { - WritableMemory wmem = WritableMemory.allocate(12, NNBO); - WritableBuffer wbuf = wmem.asWritableBuffer(NNBO); + WritableMemory wmem = WritableMemory.allocate(12, NON_NATIVE_BYTE_ORDER); + WritableBuffer wbuf = wmem.asWritableBuffer(NON_NATIVE_BYTE_ORDER); wbuf.putInt(1); int[] array = new int[] { 2 }; diff --git a/src/test/java/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImplTest.java b/src/test/java/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImplTest.java index f296d430..7c0685a1 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImplTest.java @@ -19,20 +19,11 @@ package org.apache.datasketches.memory.internal; -import static org.apache.datasketches.memory.internal.UtilForTest.CB; -import static org.apache.datasketches.memory.internal.UtilForTest.DB; -import static org.apache.datasketches.memory.internal.UtilForTest.FB; -import static org.apache.datasketches.memory.internal.UtilForTest.IB; -import static org.apache.datasketches.memory.internal.UtilForTest.LB; -import static org.apache.datasketches.memory.internal.UtilForTest.NBO; -import static org.apache.datasketches.memory.internal.UtilForTest.NNBO; -import static org.apache.datasketches.memory.internal.UtilForTest.SB; +import static org.apache.datasketches.memory.internal.ResourceImpl.NATIVE_BYTE_ORDER; +import static org.apache.datasketches.memory.internal.ResourceImpl.NON_NATIVE_BYTE_ORDER; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import java.lang.foreign.MemorySegment; -import java.nio.ByteOrder; - import org.apache.datasketches.memory.WritableMemory; import org.testng.annotations.Test; @@ -41,7 +32,7 @@ import org.testng.annotations.Test; */ public class NonNativeWritableMemoryImplTest { private byte[] bArr = new byte[8]; - private final WritableMemory wmem = WritableMemory.writableWrap(bArr, NNBO); + private final WritableMemory wmem = WritableMemory.writableWrap(bArr, NON_NATIVE_BYTE_ORDER); //Check primitives @@ -50,24 +41,24 @@ public class NonNativeWritableMemoryImplTest { char[] srcArray = { 'a','b','c','d','e','f','g','h' }; final int len = srcArray.length; final int half = len / 2; - WritableMemory wmem = WritableMemory.allocate(len * CB, NNBO); + WritableMemory wmem = WritableMemory.allocate(len * Character.BYTES, NON_NATIVE_BYTE_ORDER); //put wmem.putChar(0, srcArray[0]); //put*(add, value) - wmem.putCharArray(1 * CB, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) - wmem.putChar(3 * CB, srcArray[3]); //put*(add, value) - for (int i = half; i < len; i++) { wmem.putChar(i * CB, srcArray[i]); } //put*(add, value) + wmem.putCharArray(1 * Character.BYTES, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) + wmem.putChar(3 * Character.BYTES, srcArray[3]); //put*(add, value) + for (int i = half; i < len; i++) { wmem.putChar(i * Character.BYTES, srcArray[i]); } //put*(add, value) //confirm - WritableMemory wmem2 = WritableMemory.allocate(len * CB, NBO); - wmem.copyTo(0, wmem2, 0, len * CB); + WritableMemory wmem2 = WritableMemory.allocate(len * Character.BYTES, NATIVE_BYTE_ORDER); + wmem.copyTo(0, wmem2, 0, len * Character.BYTES); for (int i = 0; i < len; i++) { - assertTrue(srcArray[i] == Character.reverseBytes(wmem2.getChar(i * CB))); + assertTrue(srcArray[i] == Character.reverseBytes(wmem2.getChar(i * Character.BYTES))); } //get char[] dstArray = new char[len]; dstArray[0] = wmem.getChar(0); //get*(add) - wmem.getCharArray(1 * CB, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) - dstArray[3] = wmem.getChar(3 * CB); //get*(add) - for (int i = half; i < len; i++) { dstArray[i] = wmem.getChar(i * CB); } //get*(add) + wmem.getCharArray(1 * Character.BYTES, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) + dstArray[3] = wmem.getChar(3 * Character.BYTES); //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wmem.getChar(i * Character.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -76,24 +67,24 @@ public class NonNativeWritableMemoryImplTest { double[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableMemory wmem = WritableMemory.allocate(len * DB, NNBO); + WritableMemory wmem = WritableMemory.allocate(len * Double.BYTES, NON_NATIVE_BYTE_ORDER); //put wmem.putDouble(0, srcArray[0]); //put*(add, value) - wmem.putDoubleArray(1 * DB, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) - wmem.putDouble(3 * DB, srcArray[3]); //put*(add, value) - for (int i = half; i < len; i++) { wmem.putDouble(i * DB, srcArray[i]); } //put*(add, value) + wmem.putDoubleArray(1 * Double.BYTES, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) + wmem.putDouble(3 * Double.BYTES, srcArray[3]); //put*(add, value) + for (int i = half; i < len; i++) { wmem.putDouble(i * Double.BYTES, srcArray[i]); } //put*(add, value) //confirm - WritableMemory wmem2 = WritableMemory.allocate(len * DB, NBO); - wmem.copyTo(0, wmem2, 0, len * DB); + WritableMemory wmem2 = WritableMemory.allocate(len * Double.BYTES, NATIVE_BYTE_ORDER); + wmem.copyTo(0, wmem2, 0, len * Double.BYTES); for (int i = 0; i < len; i++) { - assertTrue(srcArray[i] == UtilForTest.doubleReverseBytes(wmem2.getDouble(i * DB))); + assertTrue(srcArray[i] == UtilForTest.doubleReverseBytes(wmem2.getDouble(i * Double.BYTES))); } //get double[] dstArray = new double[len]; dstArray[0] = wmem.getDouble(0); //get*(add) - wmem.getDoubleArray(1 * DB, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) - dstArray[3] = wmem.getDouble(3 * DB); //get*(add) - for (int i = half; i < len; i++) { dstArray[i] = wmem.getDouble(i * DB); } //get*(add) + wmem.getDoubleArray(1 * Double.BYTES, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) + dstArray[3] = wmem.getDouble(3 * Double.BYTES); //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wmem.getDouble(i * Double.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -102,24 +93,24 @@ public class NonNativeWritableMemoryImplTest { float[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableMemory wmem = WritableMemory.allocate(len * FB, NNBO); + WritableMemory wmem = WritableMemory.allocate(len * Float.BYTES, NON_NATIVE_BYTE_ORDER); //put wmem.putFloat(0, srcArray[0]); //put*(add, value) - wmem.putFloatArray(1 * FB, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) - wmem.putFloat(3 * FB, srcArray[3]); //put*(add, value) - for (int i = half; i < len; i++) { wmem.putFloat(i * FB, srcArray[i]); } //put*(add, value) + wmem.putFloatArray(1 * Float.BYTES, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) + wmem.putFloat(3 * Float.BYTES, srcArray[3]); //put*(add, value) + for (int i = half; i < len; i++) { wmem.putFloat(i * Float.BYTES, srcArray[i]); } //put*(add, value) //confirm - WritableMemory wmem2 = WritableMemory.allocate(len * FB, NBO); - wmem.copyTo(0, wmem2, 0, len * FB); + WritableMemory wmem2 = WritableMemory.allocate(len * Float.BYTES, NATIVE_BYTE_ORDER); + wmem.copyTo(0, wmem2, 0, len * Float.BYTES); for (int i = 0; i < len; i++) { - assertTrue(srcArray[i] == UtilForTest.floatReverseBytes(wmem2.getFloat(i * FB))); + assertTrue(srcArray[i] == UtilForTest.floatReverseBytes(wmem2.getFloat(i * Float.BYTES))); } //get float[] dstArray = new float[len]; dstArray[0] = wmem.getFloat(0); //get*(add) - wmem.getFloatArray(1 * FB, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) - dstArray[3] = wmem.getFloat(3 * FB); //get*(add) - for (int i = half; i < len; i++) { dstArray[i] = wmem.getFloat(i * FB); } //get*(add) + wmem.getFloatArray(1 * Float.BYTES, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) + dstArray[3] = wmem.getFloat(3 * Float.BYTES); //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wmem.getFloat(i * Float.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -128,24 +119,24 @@ public class NonNativeWritableMemoryImplTest { int[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableMemory wmem = WritableMemory.allocate(len * IB, NNBO); + WritableMemory wmem = WritableMemory.allocate(len * Integer.BYTES, NON_NATIVE_BYTE_ORDER); //put wmem.putInt(0, srcArray[0]); //put*(add, value) - wmem.putIntArray(1 * IB, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) - wmem.putInt(3 * IB, srcArray[3]); //put*(add, value) - for (int i = half; i < len; i++) { wmem.putInt(i * IB, srcArray[i]); } //put*(add, value) + wmem.putIntArray(1 * Integer.BYTES, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) + wmem.putInt(3 * Integer.BYTES, srcArray[3]); //put*(add, value) + for (int i = half; i < len; i++) { wmem.putInt(i * Integer.BYTES, srcArray[i]); } //put*(add, value) //confirm - WritableMemory wmem2 = WritableMemory.allocate(len * IB, NBO); - wmem.copyTo(0, wmem2, 0, len * IB); + WritableMemory wmem2 = WritableMemory.allocate(len * Integer.BYTES, NATIVE_BYTE_ORDER); + wmem.copyTo(0, wmem2, 0, len * Integer.BYTES); for (int i = 0; i < len; i++) { - assertTrue(srcArray[i] == Integer.reverseBytes(wmem2.getInt(i * IB))); + assertTrue(srcArray[i] == Integer.reverseBytes(wmem2.getInt(i * Integer.BYTES))); } //get int[] dstArray = new int[len]; dstArray[0] = wmem.getInt(0); //get*(add) - wmem.getIntArray(1 * IB, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) - dstArray[3] = wmem.getInt(3 * IB); //get*(add) - for (int i = half; i < len; i++) { dstArray[i] = wmem.getInt(i * IB); } //get*(add) + wmem.getIntArray(1 * Integer.BYTES, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) + dstArray[3] = wmem.getInt(3 * Integer.BYTES); //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wmem.getInt(i * Integer.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -154,24 +145,24 @@ public class NonNativeWritableMemoryImplTest { long[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableMemory wmem = WritableMemory.allocate(len * LB, NNBO); + WritableMemory wmem = WritableMemory.allocate(len * Long.BYTES, NON_NATIVE_BYTE_ORDER); //put wmem.putLong(0, srcArray[0]); //put*(add, value) - wmem.putLongArray(1 * LB, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) - wmem.putLong(3 * LB, srcArray[3]); //put*(add, value) - for (int i = half; i < len; i++) { wmem.putLong(i * LB, srcArray[i]); } //put*(add, value) + wmem.putLongArray(1 * Long.BYTES, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) + wmem.putLong(3 * Long.BYTES, srcArray[3]); //put*(add, value) + for (int i = half; i < len; i++) { wmem.putLong(i * Long.BYTES, srcArray[i]); } //put*(add, value) //confirm - WritableMemory wmem2 = WritableMemory.allocate(len * LB, NBO); - wmem.copyTo(0, wmem2, 0, len * LB); + WritableMemory wmem2 = WritableMemory.allocate(len * Long.BYTES, NATIVE_BYTE_ORDER); + wmem.copyTo(0, wmem2, 0, len * Long.BYTES); for (int i = 0; i < len; i++) { - assertTrue(srcArray[i] == Long.reverseBytes(wmem2.getLong(i * LB))); + assertTrue(srcArray[i] == Long.reverseBytes(wmem2.getLong(i * Long.BYTES))); } //get long[] dstArray = new long[len]; dstArray[0] = wmem.getLong(0); //get*(add) - wmem.getLongArray(1 * LB, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) - dstArray[3] = wmem.getLong(3 * LB); //get*(add) - for (int i = half; i < len; i++) { dstArray[i] = wmem.getLong(i * LB); } //get*(add) + wmem.getLongArray(1 * Long.BYTES, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) + dstArray[3] = wmem.getLong(3 * Long.BYTES); //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wmem.getLong(i * Long.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -180,24 +171,24 @@ public class NonNativeWritableMemoryImplTest { short[] srcArray = { 1, 2, 3, 4, 5, 6, 7, 8 }; final int len = srcArray.length; final int half = len / 2; - WritableMemory wmem = WritableMemory.allocate(len * SB, NNBO); + WritableMemory wmem = WritableMemory.allocate(len * Short.BYTES, NON_NATIVE_BYTE_ORDER); //put wmem.putShort(0, srcArray[0]); //put*(add, value) - wmem.putShortArray(1 * SB, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) - wmem.putShort(3 * SB, srcArray[3]); //put*(add, value) - for (int i = half; i < len; i++) { wmem.putShort(i * SB, srcArray[i]); } //put*(add, value) + wmem.putShortArray(1 * Short.BYTES, srcArray, 1, 2); //put*Array(add, src[], srcOff, len) + wmem.putShort(3 * Short.BYTES, srcArray[3]); //put*(add, value) + for (int i = half; i < len; i++) { wmem.putShort(i * Short.BYTES, srcArray[i]); } //put*(add, value) //confirm - WritableMemory wmem2 = WritableMemory.allocate(len * SB, NBO); - wmem.copyTo(0, wmem2, 0, len * SB); + WritableMemory wmem2 = WritableMemory.allocate(len * Short.BYTES, NATIVE_BYTE_ORDER); + wmem.copyTo(0, wmem2, 0, len * Short.BYTES); for (int i = 0; i < len; i++) { - assertTrue(srcArray[i] == Short.reverseBytes(wmem2.getShort(i * SB))); + assertTrue(srcArray[i] == Short.reverseBytes(wmem2.getShort(i * Short.BYTES))); } //get short[] dstArray = new short[len]; dstArray[0] = wmem.getShort(0); //get*(add) - wmem.getShortArray(1 * SB, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) - dstArray[3] = wmem.getShort(3 * SB); //get*(add) - for (int i = half; i < len; i++) { dstArray[i] = wmem.getShort(i * SB); } //get*(add) + wmem.getShortArray(1 * Short.BYTES, dstArray, 1, 2); //get*Array(add, dst[], dstOff, len) + dstArray[3] = wmem.getShort(3 * Short.BYTES); //get*(add) + for (int i = half; i < len; i++) { dstArray[i] = wmem.getShort(i * Short.BYTES); } //get*(add) assertEquals(srcArray, dstArray); } @@ -207,7 +198,7 @@ public class NonNativeWritableMemoryImplTest { @Test public void checkRegion() { WritableMemory wreg = wmem.writableRegion(0, wmem.getCapacity()); - assertEquals(wreg.getTypeByteOrder(), NNBO); + assertEquals(wreg.getTypeByteOrder(), NON_NATIVE_BYTE_ORDER); } } diff --git a/src/test/java/org/apache/datasketches/memory/internal/UtilForTest.java b/src/test/java/org/apache/datasketches/memory/internal/UtilForTest.java index 81be1af1..27ed4fa8 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/UtilForTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/UtilForTest.java @@ -26,16 +26,6 @@ import java.nio.ByteOrder; public class UtilForTest { - static final int BB = Byte.BYTES; - static final int CB = Character.BYTES; - static final int SB = Short.BYTES; - static final int IB = Integer.BYTES; - static final int LB = Long.BYTES; - static final int DB = Double.BYTES; - static final int FB = Float.BYTES; - static ByteOrder NNBO = NON_NATIVE_BYTE_ORDER; - static ByteOrder NBO = NATIVE_BYTE_ORDER; - //Java does not provide reverse bytes on doubles or floats static double doubleReverseBytes(double value) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
