Skip to content

fixed operator precedence bug in setPosition() calls #253

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
Jan 30, 2025
Merged

fixed operator precedence bug in setPosition() calls #253

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
24 changes: 12 additions & 12 deletions src/main/java/org/apache/datasketches/memory/internal/NativeWritableBufferImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public char getChar(final long offsetBytes) {
public void getCharArray(final char[] dstArray, final int dstOffsetChars, final int lengthChars) {
final long pos = getPosition();
getCharArr(seg, pos, dstArray, dstOffsetChars, lengthChars);
setPosition(pos + (lengthChars) << CHAR_SHIFT);
setPosition(pos + (lengthChars << CHAR_SHIFT));
}

@Override
Expand All @@ -108,7 +108,7 @@ public double getDouble(final long offsetBytes) {
public void getDoubleArray(final double[] dstArray, final int dstOffsetDoubles, final int lengthDoubles) {
final long pos = getPosition();
getDoubleArr(seg, pos, dstArray, dstOffsetDoubles, lengthDoubles);
setPosition(pos + (lengthDoubles) << DOUBLE_SHIFT);
setPosition(pos + (lengthDoubles << DOUBLE_SHIFT));
}

@Override
Expand All @@ -127,7 +127,7 @@ public float getFloat(final long offsetBytes) {
public void getFloatArray(final float[] dstArray, final int dstOffsetFloats, final int lengthFloats) {
final long pos = getPosition();
getFloatArr(seg, pos, dstArray, dstOffsetFloats, lengthFloats);
setPosition(pos + (lengthFloats) << FLOAT_SHIFT);
setPosition(pos + (lengthFloats << FLOAT_SHIFT));
}

@Override
Expand All @@ -146,7 +146,7 @@ public int getInt(final long offsetBytes) {
public void getIntArray(final int[] dstArray, final int dstOffsetInts, final int lengthInts) {
final long pos = getPosition();
getIntArr(seg, pos, dstArray, dstOffsetInts, lengthInts);
setPosition(pos + (lengthInts) << INT_SHIFT);
setPosition(pos + (lengthInts << INT_SHIFT));
}

@Override
Expand All @@ -165,7 +165,7 @@ public long getLong(final long offsetBytes) {
public void getLongArray(final long[] dstArray, final int dstOffsetLongs, final int lengthLongs) {
final long pos = getPosition();
getLongArr(seg, pos, dstArray, dstOffsetLongs, lengthLongs);
setPosition(pos + (lengthLongs) << LONG_SHIFT);
setPosition(pos + (lengthLongs << LONG_SHIFT));
}

@Override
Expand All @@ -184,7 +184,7 @@ public short getShort(final long offsetBytes) {
public void getShortArray(final short[] dstArray, final int dstOffsetShorts, final int lengthShorts) {
final long pos = getPosition();
getShortArr(seg, pos, dstArray, dstOffsetShorts, lengthShorts);
setPosition(pos + (lengthShorts) << SHORT_SHIFT);
setPosition(pos + (lengthShorts << SHORT_SHIFT));
}

//PRIMITIVE putX() and putXArray()
Expand All @@ -204,7 +204,7 @@ public void putChar(final long offsetBytes, final char value) {
public void putCharArray(final char[] srcArray, final int srcOffsetChars, final int lengthChars) {
final long pos = getPosition();
putCharArr(seg, pos, srcArray, srcOffsetChars, lengthChars);
setPosition(pos + (lengthChars) << CHAR_SHIFT);
setPosition(pos + (lengthChars << CHAR_SHIFT));
}

@Override
Expand All @@ -223,7 +223,7 @@ public void putDouble(final long offsetBytes, final double value) {
public void putDoubleArray(final double[] srcArray, final int srcOffsetDoubles, final int lengthDoubles) {
final long pos = getPosition();
putDoubleArr(seg, pos, srcArray, srcOffsetDoubles, lengthDoubles);
setPosition(pos + (lengthDoubles) << DOUBLE_SHIFT);
setPosition(pos + (lengthDoubles << DOUBLE_SHIFT));
}

@Override
Expand All @@ -242,7 +242,7 @@ public void putFloat(final long offsetBytes, final float value) {
public void putFloatArray(final float[] srcArray, final int srcOffsetFloats, final int lengthFloats) {
final long pos = getPosition();
putFloatArr(seg, pos, srcArray, srcOffsetFloats, lengthFloats);
setPosition(pos + (lengthFloats) << FLOAT_SHIFT);
setPosition(pos + (lengthFloats << FLOAT_SHIFT));
}

@Override
Expand All @@ -261,7 +261,7 @@ public void putInt(final long offsetBytes, final int value) {
public void putIntArray(final int[] srcArray, final int srcOffsetInts, final int lengthInts) {
final long pos = getPosition();
putIntArr(seg, pos, srcArray, srcOffsetInts, lengthInts);
setPosition(pos + (lengthInts) << INT_SHIFT);
setPosition(pos + (lengthInts << INT_SHIFT));
}

@Override
Expand All @@ -280,7 +280,7 @@ public void putLong(final long offsetBytes, final long value) {
public void putLongArray(final long[] srcArray, final int srcOffsetLongs, final int lengthLongs) {
final long pos = getPosition();
putLongArr(seg, pos, srcArray, srcOffsetLongs, lengthLongs);
setPosition(pos + (lengthLongs) << LONG_SHIFT);
setPosition(pos + (lengthLongs << LONG_SHIFT));
}

@Override
Expand All @@ -299,6 +299,6 @@ public void putShort(final long offsetBytes, final short value) {
public void putShortArray(final short[] srcArray, final int srcOffsetShorts, final int lengthShorts) {
final long pos = getPosition();
putShortArr(seg, pos, srcArray, srcOffsetShorts, lengthShorts);
setPosition(pos + (lengthShorts) << SHORT_SHIFT);
setPosition(pos + (lengthShorts << SHORT_SHIFT));
}
}
24 changes: 12 additions & 12 deletions src/main/java/org/apache/datasketches/memory/internal/NonNativeWritableBufferImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public char getChar(final long offsetBytes) {
public void getCharArray(final char[] dstArray, final int dstOffsetChars, final int lengthChars) {
final long pos = getPosition();
getCharArr(seg, pos, dstArray, dstOffsetChars, lengthChars);
setPosition(pos + (lengthChars) << CHAR_SHIFT);
setPosition(pos + (lengthChars << CHAR_SHIFT));
}

@Override
Expand All @@ -109,7 +109,7 @@ public double getDouble(final long offsetBytes) {
public void getDoubleArray(final double[] dstArray, final int dstOffsetDoubles, final int lengthDoubles) {
final long pos = getPosition();
getDoubleArr(seg, pos, dstArray, dstOffsetDoubles, lengthDoubles);
setPosition(pos + (lengthDoubles) << DOUBLE_SHIFT);
setPosition(pos + (lengthDoubles << DOUBLE_SHIFT));
}

@Override
Expand All @@ -128,7 +128,7 @@ public float getFloat(final long offsetBytes) {
public void getFloatArray(final float[] dstArray, final int dstOffsetFloats, final int lengthFloats) {
final long pos = getPosition();
getFloatArr(seg, pos, dstArray, dstOffsetFloats, lengthFloats);
setPosition(pos + (lengthFloats) << FLOAT_SHIFT);
setPosition(pos + (lengthFloats << FLOAT_SHIFT));
}

@Override
Expand All @@ -147,7 +147,7 @@ public int getInt(final long offsetBytes) {
public void getIntArray(final int[] dstArray, final int dstOffsetInts, final int lengthInts) {
final long pos = getPosition();
getIntArr(seg, pos, dstArray, dstOffsetInts, lengthInts);
setPosition(pos + (lengthInts) << INT_SHIFT);
setPosition(pos + (lengthInts << INT_SHIFT));
}

@Override
Expand All @@ -166,7 +166,7 @@ public long getLong(final long offsetBytes) {
public void getLongArray(final long[] dstArray, final int dstOffsetLongs, final int lengthLongs) {
final long pos = getPosition();
getLongArr(seg, pos, dstArray, dstOffsetLongs, lengthLongs);
setPosition(pos + (lengthLongs) << LONG_SHIFT);
setPosition(pos + (lengthLongs << LONG_SHIFT));
}

@Override
Expand All @@ -185,7 +185,7 @@ public short getShort(final long offsetBytes) {
public void getShortArray(final short[] dstArray, final int dstOffsetShorts, final int lengthShorts) {
final long pos = getPosition();
getShortArr(seg, pos, dstArray, dstOffsetShorts, lengthShorts);
setPosition(pos + (lengthShorts) << SHORT_SHIFT);
setPosition(pos + (lengthShorts << SHORT_SHIFT));
}

//PRIMITIVE putX() and putXArray()
Expand All @@ -205,7 +205,7 @@ public void putChar(final long offsetBytes, final char value) {
public void putCharArray(final char[] srcArray, final int srcOffsetChars, final int lengthChars) {
final long pos = getPosition();
putCharArr(seg, pos, srcArray, srcOffsetChars, lengthChars);
setPosition(pos + (lengthChars) << CHAR_SHIFT);
setPosition(pos + (lengthChars << CHAR_SHIFT));
}

@Override
Expand All @@ -224,7 +224,7 @@ public void putDouble(final long offsetBytes, final double value) {
public void putDoubleArray(final double[] srcArray, final int srcOffsetDoubles, final int lengthDoubles) {
final long pos = getPosition();
putDoubleArr(seg, pos, srcArray, srcOffsetDoubles, lengthDoubles);
setPosition(pos + (lengthDoubles) << DOUBLE_SHIFT);
setPosition(pos + (lengthDoubles << DOUBLE_SHIFT));
}

@Override
Expand All @@ -243,7 +243,7 @@ public void putFloat(final long offsetBytes, final float value) {
public void putFloatArray(final float[] srcArray, final int srcOffsetFloats, final int lengthFloats) {
final long pos = getPosition();
putFloatArr(seg, pos, srcArray, srcOffsetFloats, lengthFloats);
setPosition(pos + (lengthFloats) << FLOAT_SHIFT);
setPosition(pos + (lengthFloats << FLOAT_SHIFT));
}

@Override
Expand All @@ -262,7 +262,7 @@ public void putInt(final long offsetBytes, final int value) {
public void putIntArray(final int[] srcArray, final int srcOffsetInts, final int lengthInts) {
final long pos = getPosition();
putIntArr(seg, pos, srcArray, srcOffsetInts, lengthInts);
setPosition(pos + (lengthInts) << INT_SHIFT);
setPosition(pos + (lengthInts << INT_SHIFT));
}

@Override
Expand All @@ -281,7 +281,7 @@ public void putLong(final long offsetBytes, final long value) {
public void putLongArray(final long[] srcArray, final int srcOffsetLongs, final int lengthLongs) {
final long pos = getPosition();
putLongArr(seg, pos, srcArray, srcOffsetLongs, lengthLongs);
setPosition(pos + (lengthLongs) << LONG_SHIFT);
setPosition(pos + (lengthLongs << LONG_SHIFT));
}

@Override
Expand All @@ -300,7 +300,7 @@ public void putShort(final long offsetBytes, final short value) {
public void putShortArray(final short[] srcArray, final int srcOffsetShorts, final int lengthShorts) {
final long pos = getPosition();
putShortArr(seg, pos, srcArray, srcOffsetShorts, lengthShorts);
setPosition(pos + (lengthShorts) << SHORT_SHIFT);
setPosition(pos + (lengthShorts << SHORT_SHIFT));
}

}
16 changes: 16 additions & 0 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 @@ -468,6 +468,22 @@ public void checkDuplicateNonNative() {
assertEquals(buf.getShort(0), 256);
}

@Test
public void checkPutIntArray() {
WritableMemory wmem = WritableMemory.allocate(12);
WritableBuffer wbuf = wmem.asWritableBuffer();

wbuf.putInt(1);
int[] array = new int[] { 2 };
wbuf.putIntArray(array, 0, 1);
wbuf.putInt(3);

Buffer buf = wmem.asWritableBuffer();
assertEquals(buf.getInt(), 1);
assertEquals(buf.getInt(), 2);
assertEquals(buf.getInt(), 3);
}

@Test
public void printlnTest() {
println("PRINTING: "+this.getClass().getName());
Expand Down
15 changes: 15 additions & 0 deletions src/test/java/org/apache/datasketches/memory/internal/NonNativeWritableBufferImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,22 @@ public void checkConversionByteOrder() {
Memory mreg = mem.region(0, 8);
assertEquals(mreg.getTypeByteOrder(), ByteOrder.BIG_ENDIAN);
assertEquals(mreg.getChar(0), 1);
}

@Test
public void checkPutIntArray() {
WritableMemory wmem = WritableMemory.allocate(12, ByteOrder.BIG_ENDIAN);
WritableBuffer wbuf = wmem.asWritableBuffer(ByteOrder.BIG_ENDIAN);

wbuf.putInt(1);
int[] array = new int[] { 2 };
wbuf.putIntArray(array, 0, 1);
wbuf.putInt(3);

Buffer buf = wmem.asWritableBuffer();
assertEquals(buf.getInt(), 1);
assertEquals(buf.getInt(), 2);
assertEquals(buf.getInt(), 3);
}

}