Skip to content

Redo var names #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leerho merged 1 commit into from
Feb 4, 2025
Merged

Redo var names #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 24 additions & 31 deletions src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -72,7 +65,7 @@ public void checkPutGetBooleans() {
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)
Expand All @@ -89,7 +82,7 @@ public void checkPutGetBytes() {
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)
Expand All @@ -110,19 +103,19 @@ public void checkPutGetNativeCharacters() {
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);
}

Expand All @@ -131,19 +124,19 @@ public void checkPutGetNativeDoubles() {
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);
}

Expand All @@ -152,19 +145,19 @@ public void checkPutGetNativeFloats() {
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);
}

Expand All @@ -173,19 +166,19 @@ public void checkPutGetNativeInts() {
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);
}

Expand All @@ -194,19 +187,19 @@ public void checkPutGetNativeLongs() {
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);
}

Expand All @@ -215,19 +208,19 @@ public void checkPutGetNativeShorts() {
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);
}

Expand Down Expand Up @@ -512,7 +505,7 @@ public void checkZeroBuffer() {
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);
}

Expand Down
Loading