This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch integrateJava17_v3
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
The following commit(s) were added to refs/heads/integrateJava17_v3 by this
push:
new 3c82633 Creating compatibility between a ds-java 7.X.X and a Memory
3.X.X
3c82633 is described below
commit 3c826331d662af00178fe7def2094cfdf46617b1
Author: Lee Rhodes <[email protected]>
AuthorDate: Fri May 31 16:36:28 2024 -0700
Creating compatibility between a ds-java 7.X.X and a Memory 3.X.X
---
.../java/org/apache/datasketches/memory/BaseState.java | 12 +++++++-----
src/main/java/org/apache/datasketches/memory/Buffer.java | 6 +++---
.../datasketches/memory/DefaultMemoryRequestServer.java | 2 +-
src/main/java/org/apache/datasketches/memory/Memory.java | 6 ++++--
.../org/apache/datasketches/memory/WritableBuffer.java | 8 +++++++-
.../org/apache/datasketches/memory/WritableMemory.java | 6 +++---
.../datasketches/memory/internal/BaseStateImpl.java | 8 ++++----
.../memory/internal/BaseWritableBufferImpl.java | 9 +++++++--
.../memory/internal/BaseWritableMemoryImpl.java | 2 +-
.../apache/datasketches/memory/internal/Buffer2Test.java | 2 +-
.../apache/datasketches/memory/internal/BufferTest.java | 2 +-
.../memory/internal/ExampleMemoryRequestServerTest.java | 2 +-
.../datasketches/memory/internal/LeafImplTest.java | 16 ++++++++--------
.../apache/datasketches/memory/internal/MemoryTest.java | 8 ++++----
.../memory/internal/NativeWritableBufferImplTest.java | 8 ++++----
.../memory/internal/NonNativeWritableBufferImplTest.java | 16 ++++++++--------
.../memory/internal/NonNativeWritableMemoryImplTest.java | 2 +-
.../datasketches/memory/internal/SpecificLeafTest.java | 8 ++++----
.../datasketches/memory/internal/WritableMemoryTest.java | 14 +++++++-------
19 files changed, 76 insertions(+), 61 deletions(-)
diff --git a/src/main/java/org/apache/datasketches/memory/BaseState.java
b/src/main/java/org/apache/datasketches/memory/BaseState.java
index 977b98b..583f95d 100644
--- a/src/main/java/org/apache/datasketches/memory/BaseState.java
+++ b/src/main/java/org/apache/datasketches/memory/BaseState.java
@@ -105,11 +105,13 @@ public interface BaseState {
long getCapacity();
/**
- * Gets the base offset of <i>that</i> with respect to the base of
<i>this</i>.
- * @param that
- * @return
+ * Gets the relative base offset of <i>this</i> with respect to <i>that</i>,
defined as: <i>this</i> - <i>that</i>.
+ * This method is only valid for <i>native</i> (off-heap) allocated
resources.
+ * @throws IllegalArgumentException if one of the resources is on-heap.
+ * @param that the given resource.
+ * @return <i>this</i> - <i>that</i> offset
*/
- long getCumulativeOffset(BaseState that);
+ long getRelativeOffset(BaseState that);
/**
* Returns the configured MemoryRequestSever or null, if it has not been
configured.
@@ -122,7 +124,7 @@ public interface BaseState {
* This may be different from the ByteOrder of the backing resource and of
the Native Byte Order.
* @return the current Type ByteOrder.
*/
- ByteOrder getByteOrder();
+ ByteOrder getTypeByteOrder();
/**
* Return the owner thread of the underlying ResourceScope, or null.
diff --git a/src/main/java/org/apache/datasketches/memory/Buffer.java
b/src/main/java/org/apache/datasketches/memory/Buffer.java
index 465eb9a..4ab0cf3 100644
--- a/src/main/java/org/apache/datasketches/memory/Buffer.java
+++ b/src/main/java/org/apache/datasketches/memory/Buffer.java
@@ -81,7 +81,7 @@ public interface Buffer extends BaseBuffer {
* <i>start</i>, <i>position</i> and <i>end</i>.
*/
default Buffer duplicate() {
- return duplicate(getByteOrder());
+ return duplicate(getTypeByteOrder());
}
/**
@@ -122,7 +122,7 @@ public interface Buffer extends BaseBuffer {
* <i>position</i> and <i>end</i>.
*/
default Buffer region() {
- return region(getPosition(), getEnd() - getPosition(), getByteOrder());
+ return region(getPosition(), getEnd() - getPosition(), getTypeByteOrder());
}
/**
@@ -154,7 +154,7 @@ public interface Buffer extends BaseBuffer {
* @return Memory
*/
default Memory asMemory() {
- return asMemory(getByteOrder());
+ return asMemory(getTypeByteOrder());
}
/**
diff --git
a/src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java
b/src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java
index f8f828c..51c2d2b 100644
---
a/src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java
+++
b/src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java
@@ -73,7 +73,7 @@ public final class DefaultMemoryRequestServer implements
MemoryRequestServer {
*/
@Override
public WritableMemory request(final WritableMemory currentWritableMemory,
final long capacityBytes) {
- final WritableMemory wmem = WritableMemory.allocate((int)capacityBytes,
currentWritableMemory.getByteOrder());
+ final WritableMemory wmem = WritableMemory.allocate((int)capacityBytes,
currentWritableMemory.getTypeByteOrder());
return wmem;
}
diff --git a/src/main/java/org/apache/datasketches/memory/Memory.java
b/src/main/java/org/apache/datasketches/memory/Memory.java
index b83238f..389732c 100644
--- a/src/main/java/org/apache/datasketches/memory/Memory.java
+++ b/src/main/java/org/apache/datasketches/memory/Memory.java
@@ -142,7 +142,7 @@ public interface Memory extends BaseState {
* offsetBytes and capacityBytes.
*/
default Memory region(long offsetBytes, long capacityBytes) {
- return region(offsetBytes, capacityBytes, getByteOrder());
+ return region(offsetBytes, capacityBytes, getTypeByteOrder());
}
/**
@@ -174,7 +174,7 @@ public interface Memory extends BaseState {
* @return a new <i>Buffer</i>
*/
default Buffer asBuffer() {
- return asBuffer(getByteOrder());
+ return asBuffer(getTypeByteOrder());
}
/**
@@ -291,6 +291,8 @@ public interface Memory extends BaseState {
//PRIMITIVE getX() and getXArray()
+
+
/**
* Gets the boolean value at the given offset
* @param offsetBytes offset bytes relative to this Memory start
diff --git a/src/main/java/org/apache/datasketches/memory/WritableBuffer.java
b/src/main/java/org/apache/datasketches/memory/WritableBuffer.java
index 11f2a03..1854558 100644
--- a/src/main/java/org/apache/datasketches/memory/WritableBuffer.java
+++ b/src/main/java/org/apache/datasketches/memory/WritableBuffer.java
@@ -120,7 +120,7 @@ public interface WritableBuffer extends Buffer {
* @return a new <i>WritableBuffer</i> representing the defined writable
region.
*/
default WritableBuffer writableRegion() {
- return writableRegion(getPosition(), getEnd() - getPosition(),
getByteOrder());
+ return writableRegion(getPosition(), getEnd() - getPosition(),
getTypeByteOrder());
}
/**
@@ -374,6 +374,12 @@ public interface WritableBuffer extends Buffer {
*/
void fill(byte value);
+ /**
+ * Returns a copy of the primitive backing byte array.
+ * @return a copy of the primitive backing byte array.
+ */
+ byte[] getArray();
+
//NO fill(offsetBytes, lengthBytes, value)
//NO setBits(...)
diff --git a/src/main/java/org/apache/datasketches/memory/WritableMemory.java
b/src/main/java/org/apache/datasketches/memory/WritableMemory.java
index 1ad46ed..df2cec0 100644
--- a/src/main/java/org/apache/datasketches/memory/WritableMemory.java
+++ b/src/main/java/org/apache/datasketches/memory/WritableMemory.java
@@ -139,7 +139,7 @@ public interface WritableMemory extends Memory {
* @return WritableMemory for this off-heap, native resource.
*/
static WritableMemory allocateDirect(long capacityBytes, MemoryRequestServer
memReqSvr) {
- return allocateDirect(capacityBytes, 8, ByteOrder.nativeOrder(),
memReqSvr);
+ return allocateDirect(capacityBytes, 1, ByteOrder.nativeOrder(),
memReqSvr);
}
/**
@@ -204,7 +204,7 @@ public interface WritableMemory extends Memory {
* @return a new <i>WritableMemory</i> representing the defined writable
region.
*/
default WritableMemory writableRegion(long offsetBytes, long capacityBytes) {
- return writableRegion(offsetBytes, capacityBytes, getByteOrder());
+ return writableRegion(offsetBytes, capacityBytes, getTypeByteOrder());
}
/**
@@ -238,7 +238,7 @@ public interface WritableMemory extends Memory {
* @return a new <i>WritableBuffer</i> with a view of this WritableMemory
*/
default WritableBuffer asWritableBuffer() {
- return asWritableBuffer(getByteOrder());
+ return asWritableBuffer(getTypeByteOrder());
}
/**
diff --git
a/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java
b/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java
index 012791c..6f3a5c8 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java
@@ -245,7 +245,7 @@ abstract class BaseStateImpl implements BaseState {
sb.append("MemoryAddress hashCode : ").append(addHCStr).append(LS);
sb.append("MemReqSvr, hashCode : ").append(memReqStr).append(LS);
sb.append("Read Only :
").append(state.isReadOnly()).append(LS);
- sb.append("Type Byte Order :
").append(state.getByteOrder().toString()).append(LS);
+ sb.append("Type Byte Order :
").append(state.getTypeByteOrder().toString()).append(LS);
sb.append("Native Byte Order :
").append(ByteOrder.nativeOrder().toString()).append(LS);
sb.append("JDK Runtime Version : ").append(JDK).append(LS);
//Data detail
@@ -303,7 +303,7 @@ abstract class BaseStateImpl implements BaseState {
}
@Override
- public final long getCumulativeOffset(final BaseState that) {
+ public final long getRelativeOffset(final BaseState that) {
final BaseStateImpl that2 = (BaseStateImpl) that;
return this.seg.address().segmentOffset(that2.seg);
}
@@ -314,7 +314,7 @@ abstract class BaseStateImpl implements BaseState {
}
@Override
- public final ByteOrder getByteOrder() {
+ public final ByteOrder getTypeByteOrder() {
return (typeId & NONNATIVE) > 0 ? NON_NATIVE_BYTE_ORDER :
ByteOrder.nativeOrder();
}
@@ -339,7 +339,7 @@ abstract class BaseStateImpl implements BaseState {
@Override
public final boolean isByteOrderCompatible(final ByteOrder byteOrder) {
- final ByteOrder typeBO = getByteOrder();
+ final ByteOrder typeBO = getTypeByteOrder();
return typeBO == ByteOrder.nativeOrder() && typeBO == byteOrder;
}
diff --git
a/src/main/java/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java
b/src/main/java/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java
index a92e75c..773a565 100644
---
a/src/main/java/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java
+++
b/src/main/java/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java
@@ -150,7 +150,7 @@ public abstract class BaseWritableBufferImpl extends
BaseBufferImpl implements W
//DUPLICATES, DERIVED
@Override
public Buffer duplicate() {
- return duplicateImpl(true, getByteOrder());
+ return duplicateImpl(true, getTypeByteOrder());
}
@Override
@@ -163,7 +163,7 @@ public abstract class BaseWritableBufferImpl extends
BaseBufferImpl implements W
if (isReadOnly()) {
throw new IllegalArgumentException("Cannot create a writable duplicate
from a read-only Buffer.");
}
- return duplicateImpl(false, getByteOrder());
+ return duplicateImpl(false, getTypeByteOrder());
}
@Override
@@ -330,4 +330,9 @@ public abstract class BaseWritableBufferImpl extends
BaseBufferImpl implements W
public final void fill(final byte value) {
seg.fill(value);
}
+
+ @Override
+ public final byte[] getArray() {
+ return seg.toByteArray();
+ }
}
diff --git
a/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java
b/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java
index 9aaa27f..660a900 100644
---
a/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java
+++
b/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java
@@ -365,7 +365,7 @@ public abstract class BaseWritableMemoryImpl extends
BaseStateImpl implements Wr
@Override
public final byte[] getArray() {
- return seg.toByteArray();
+ return seg.toByteArray();
}
@Override
diff --git
a/src/test/java/org/apache/datasketches/memory/internal/Buffer2Test.java
b/src/test/java/org/apache/datasketches/memory/internal/Buffer2Test.java
index a5849da..8df8553 100644
--- a/src/test/java/org/apache/datasketches/memory/internal/Buffer2Test.java
+++ b/src/test/java/org/apache/datasketches/memory/internal/Buffer2Test.java
@@ -324,7 +324,7 @@ public class Buffer2Test {
for (int i = 0; i < n; i++) { arr[i] = i; }
Memory mem = Memory.wrap(arr);
Buffer buf = mem.asBuffer();
- Buffer reg = buf.region(n2 * 8, n2 * 8, buf.getByteOrder()); //top half
+ Buffer reg = buf.region(n2 * 8, n2 * 8, buf.getTypeByteOrder()); //top half
for (int i = 0; i < n2; i++) {
long v = reg.getLong(i * 8);
long e = i + n2;
diff --git
a/src/test/java/org/apache/datasketches/memory/internal/BufferTest.java
b/src/test/java/org/apache/datasketches/memory/internal/BufferTest.java
index 25f2baf..821c39a 100644
--- a/src/test/java/org/apache/datasketches/memory/internal/BufferTest.java
+++ b/src/test/java/org/apache/datasketches/memory/internal/BufferTest.java
@@ -205,7 +205,7 @@ public class BufferTest {
ByteBuffer bb = ByteBuffer.allocate(n * 8);
bb.order(BaseState.NON_NATIVE_BYTE_ORDER);
Buffer buf = Buffer.wrap(bb);
- assertEquals(buf.getByteOrder(), ByteOrder.nativeOrder());
+ assertEquals(buf.getTypeByteOrder(), ByteOrder.nativeOrder());
}
@Test
diff --git
a/src/test/java/org/apache/datasketches/memory/internal/ExampleMemoryRequestServerTest.java
b/src/test/java/org/apache/datasketches/memory/internal/ExampleMemoryRequestServerTest.java
index eacc079..9646968 100644
---
a/src/test/java/org/apache/datasketches/memory/internal/ExampleMemoryRequestServerTest.java
+++
b/src/test/java/org/apache/datasketches/memory/internal/ExampleMemoryRequestServerTest.java
@@ -104,7 +104,7 @@ public class ExampleMemoryRequestServerTest {
@SuppressWarnings("resource")
@Override
public WritableMemory request(WritableMemory currentWMem, long
newCapacityBytes) {
- ByteOrder order = currentWMem.getByteOrder();
+ ByteOrder order = currentWMem.getTypeByteOrder();
WritableMemory wmem;
if (offHeap) {
wmem = WritableMemory.allocateDirect(newCapacityBytes, 8,
ResourceScope.newConfinedScope(), order, this);
diff --git
a/src/test/java/org/apache/datasketches/memory/internal/LeafImplTest.java
b/src/test/java/org/apache/datasketches/memory/internal/LeafImplTest.java
index a56410a..4de6350 100644
--- a/src/test/java/org/apache/datasketches/memory/internal/LeafImplTest.java
+++ b/src/test/java/org/apache/datasketches/memory/internal/LeafImplTest.java
@@ -86,7 +86,7 @@ public class LeafImplTest {
WritableMemory mem = WritableMemory.writableWrap(bb, NBO, dummyMemReqSvr);
assertEquals(bb.isDirect(), mem.isDirect());
- checkCombinations(mem, off, cap, mem.isDirect(), mem.getByteOrder(), true,
false);
+ checkCombinations(mem, off, cap, mem.isDirect(), mem.getTypeByteOrder(),
true, false);
//BB off heap, native order, has ByteBuffer, has MemReqSvr
ByteBuffer dbb = ByteBuffer.allocateDirect((int)cap);
@@ -95,7 +95,7 @@ public class LeafImplTest {
mem = WritableMemory.writableWrap(dbb, NBO, dummyMemReqSvr);
assertEquals(dbb.isDirect(), mem.isDirect());
- checkCombinations(mem, off, cap, mem.isDirect(), mem.getByteOrder(),
true, false);
+ checkCombinations(mem, off, cap, mem.isDirect(), mem.getTypeByteOrder(),
true, false);
//BB on heap, non native order, has ByteBuffer, has MemReqSvr
bb = ByteBuffer.allocate((int)cap);
@@ -104,7 +104,7 @@ public class LeafImplTest {
mem = WritableMemory.writableWrap(bb, NNBO, dummyMemReqSvr);
assertEquals(bb.isDirect(), mem.isDirect());
- checkCombinations(mem, off, cap, mem.isDirect(), mem.getByteOrder(), true,
false);
+ checkCombinations(mem, off, cap, mem.isDirect(), mem.getTypeByteOrder(),
true, false);
//BB off heap, non native order, has ByteBuffer, has MemReqSvr
dbb = ByteBuffer.allocateDirect((int)cap);
@@ -113,7 +113,7 @@ public class LeafImplTest {
mem = WritableMemory.writableWrap(dbb, NNBO, dummyMemReqSvr);
assertEquals(dbb.isDirect(), mem.isDirect());
- checkCombinations(mem, off, cap, mem.isDirect(), mem.getByteOrder(),
true, false);
+ checkCombinations(mem, off, cap, mem.isDirect(), mem.getTypeByteOrder(),
true, false);
}
@Test
@@ -170,7 +170,7 @@ public class LeafImplTest {
assertEquals(mem.writableRegion(off, cap, oo).getShort(0), 256);
assertEquals(mem.asWritableBuffer(bo).getShort(0), 1);
assertEquals(mem.asWritableBuffer(oo).getShort(0), 256);
- assertTrue(mem.getByteOrder() == bo);
+ assertTrue(mem.getTypeByteOrder() == bo);
if (fromByteBuffer) { assertTrue(mem.hasByteBuffer()); }
else { assertFalse(mem.hasByteBuffer()); }
@@ -194,7 +194,7 @@ public class LeafImplTest {
assertEquals(buf.writableRegion(off, cap, oo).getShort(0), 256);
assertEquals(buf.writableDuplicate(bo).getShort(0), 1);
assertEquals(buf.writableDuplicate(oo).getShort(0), 256);
- assertTrue(buf.getByteOrder() == bo);
+ assertTrue(buf.getTypeByteOrder() == bo);
if (fromByteBuffer) { assertTrue(buf.hasByteBuffer()); }
@@ -218,7 +218,7 @@ public class LeafImplTest {
assertEquals(nnMem.asWritableBuffer(bo).getShort(0), 1);
assertEquals(nnMem.asWritableBuffer(oo).getShort(0), 256);
- assertTrue(nnMem.getByteOrder() == oo);
+ assertTrue(nnMem.getTypeByteOrder() == oo);
if (fromByteBuffer) { assertTrue(nnMem.hasByteBuffer()); }
@@ -242,7 +242,7 @@ public class LeafImplTest {
assertEquals(nnBuf.writableDuplicate(bo).getShort(0), 1);
assertEquals(nnBuf.writableDuplicate(oo).getShort(0), 256);
- assertTrue(nnBuf.getByteOrder() == oo);
+ assertTrue(nnBuf.getTypeByteOrder() == oo);
if (fromByteBuffer) { assertTrue(nnBuf.hasByteBuffer()); }
diff --git
a/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java
b/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java
index 49752fc..cb9253d 100644
--- a/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java
+++ b/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java
@@ -238,12 +238,12 @@ public class MemoryTest {
ByteBuffer bb = ByteBuffer.allocate(n * 8);
bb.order(ByteOrder.BIG_ENDIAN); //ignored
Memory mem = Memory.wrap(bb); //Defaults to LE
- assertTrue(mem.getByteOrder() == ByteOrder.nativeOrder());
- assertEquals(mem.getByteOrder(), ByteOrder.LITTLE_ENDIAN);
+ assertTrue(mem.getTypeByteOrder() == ByteOrder.nativeOrder());
+ assertEquals(mem.getTypeByteOrder(), ByteOrder.LITTLE_ENDIAN);
//Now explicitly set it
mem = Memory.wrap(bb, BaseState.NON_NATIVE_BYTE_ORDER);
- assertFalse(mem.getByteOrder() == ByteOrder.nativeOrder());
- assertEquals(mem.getByteOrder(), ByteOrder.BIG_ENDIAN);
+ assertFalse(mem.getTypeByteOrder() == ByteOrder.nativeOrder());
+ assertEquals(mem.getTypeByteOrder(), ByteOrder.BIG_ENDIAN);
}
@Test
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 c7ea876..2f7002c 100644
---
a/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java
+++
b/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java
@@ -216,7 +216,7 @@ public class NativeWritableBufferImplTest {
try (ResourceScope scope = ResourceScope.newConfinedScope()) {
WritableMemory wmem = WritableMemory.allocateDirect(memCapacity, 1,
scope, ByteOrder.nativeOrder(), memReqSvr);
WritableBuffer wbuf = wmem.asWritableBuffer();
- wbuf.writableRegion(1, 64, wbuf.getByteOrder()); //wrong!
+ wbuf.writableRegion(1, 64, wbuf.getTypeByteOrder()); //wrong!
}
}
@@ -515,13 +515,13 @@ public class NativeWritableBufferImplTest {
ByteBuffer bb = ByteBuffer.allocate(64);
WritableBuffer wbuf = WritableBuffer.writableWrap(bb);
@SuppressWarnings("unused")
- WritableBuffer wreg = wbuf.writableRegion(0, 1, wbuf.getByteOrder());
+ WritableBuffer wreg = wbuf.writableRegion(0, 1, wbuf.getTypeByteOrder());
try {
Buffer buf = Buffer.wrap(bb);
wbuf = (WritableBuffer) buf;
@SuppressWarnings("unused")
- WritableBuffer wreg2 = wbuf.writableRegion(0, 1, wbuf.getByteOrder());
+ WritableBuffer wreg2 = wbuf.writableRegion(0, 1,
wbuf.getTypeByteOrder());
Assert.fail();
} catch (IllegalArgumentException expected) {
// ignore
@@ -532,7 +532,7 @@ public class NativeWritableBufferImplTest {
public void checkZeroBuffer() {
WritableMemory wmem = WritableMemory.allocate(8);
WritableBuffer wbuf = wmem.asWritableBuffer();
- WritableBuffer reg = wbuf.writableRegion(0, 0, wbuf.getByteOrder());
+ WritableBuffer reg = wbuf.writableRegion(0, 0, wbuf.getTypeByteOrder());
assertEquals(reg.getCapacity(), 0);
}
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 ab42ba6..155409b 100644
---
a/src/test/java/org/apache/datasketches/memory/internal/NonNativeWritableBufferImplTest.java
+++
b/src/test/java/org/apache/datasketches/memory/internal/NonNativeWritableBufferImplTest.java
@@ -240,10 +240,10 @@ public class NonNativeWritableBufferImplTest {
WritableMemory wmem = WritableMemory.writableWrap(bArr,
ByteOrder.BIG_ENDIAN);
WritableBuffer wbuf = wmem.asWritableBuffer();
WritableBuffer wdup = wbuf.writableDuplicate();
- assertEquals(wdup.getByteOrder(), ByteOrder.BIG_ENDIAN);
+ assertEquals(wdup.getTypeByteOrder(), ByteOrder.BIG_ENDIAN);
WritableBuffer wreg = wbuf.writableRegion();
- assertEquals(wreg.getByteOrder(), ByteOrder.BIG_ENDIAN);
+ assertEquals(wreg.getTypeByteOrder(), ByteOrder.BIG_ENDIAN);
}
@Test
@@ -251,27 +251,27 @@ public class NonNativeWritableBufferImplTest {
byte[] bArr = new byte[8];
bArr[1] = 1;
WritableMemory wmem = WritableMemory.writableWrap(bArr,
ByteOrder.BIG_ENDIAN);
- assertEquals(wmem.getByteOrder(), ByteOrder.BIG_ENDIAN);
+ assertEquals(wmem.getTypeByteOrder(), ByteOrder.BIG_ENDIAN);
assertEquals(wmem.getChar(0), 1);
Buffer buf = wmem.asBuffer();
- assertEquals(buf.getByteOrder(), ByteOrder.BIG_ENDIAN); //
+ assertEquals(buf.getTypeByteOrder(), ByteOrder.BIG_ENDIAN); //
assertEquals(buf.getChar(0), 1);
Buffer dup = buf.duplicate();
- assertEquals(dup.getByteOrder(), ByteOrder.BIG_ENDIAN);
+ assertEquals(dup.getTypeByteOrder(), ByteOrder.BIG_ENDIAN);
assertEquals(dup.getChar(0), 1);
Buffer reg = buf.region();
- assertEquals(reg.getByteOrder(), ByteOrder.BIG_ENDIAN);
+ assertEquals(reg.getTypeByteOrder(), ByteOrder.BIG_ENDIAN);
assertEquals(reg.getChar(0), 1);
Memory mem = reg.asMemory();
- assertEquals(mem.getByteOrder(), ByteOrder.BIG_ENDIAN);
+ assertEquals(mem.getTypeByteOrder(), ByteOrder.BIG_ENDIAN);
assertEquals(mem.getChar(0), 1);
Memory mreg = mem.region(0, 8);
- assertEquals(mreg.getByteOrder(), ByteOrder.BIG_ENDIAN);
+ assertEquals(mreg.getTypeByteOrder(), ByteOrder.BIG_ENDIAN);
assertEquals(mreg.getChar(0), 1);
}
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 5746390..fcfff82 100644
---
a/src/test/java/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImplTest.java
+++
b/src/test/java/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImplTest.java
@@ -170,7 +170,7 @@ public class NonNativeWritableMemoryImplTest {
@Test
public void checkRegion() {
WritableMemory wreg = wmem.writableRegion(0, wmem.getCapacity());
- assertEquals(wreg.getByteOrder(), ByteOrder.BIG_ENDIAN);
+ assertEquals(wreg.getTypeByteOrder(), ByteOrder.BIG_ENDIAN);
}
}
diff --git
a/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java
b/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java
index 6e6e771..6d30f29 100644
---
a/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java
+++
b/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java
@@ -57,7 +57,7 @@ public class SpecificLeafTest {
assertFalse(mem.isMapped());
checkCrossLeafTypeIds(mem);
Buffer buf = mem.asBuffer().region(0, bytes, ByteOrder.nativeOrder());
- assertEquals(buf.getByteOrder(), BaseState.NATIVE_BYTE_ORDER);
+ assertEquals(buf.getTypeByteOrder(), BaseState.NATIVE_BYTE_ORDER);
bb.order(BaseState.NON_NATIVE_BYTE_ORDER);
Memory mem2 = Memory.wrap(bb).region(0, bytes,
BaseState.NON_NATIVE_BYTE_ORDER);
@@ -129,7 +129,7 @@ public class SpecificLeafTest {
assertTrue(reg.isRegion());
assertTrue(reg2.isRegion());
- assertEquals(reg2.getByteOrder(), BaseState.NON_NATIVE_BYTE_ORDER);
+ assertEquals(reg2.getTypeByteOrder(), BaseState.NON_NATIVE_BYTE_ORDER);
assertTrue(buf.isRegion());
assertFalse(buf.isMemory());
assertTrue(buf2.isRegion());
@@ -188,14 +188,14 @@ public class SpecificLeafTest {
assertTrue(buf3.isRegion());
assertTrue(buf3.isBuffer());
assertTrue(buf3.isDuplicate());
- assertEquals(buf3.getByteOrder(), BaseState.NON_NATIVE_BYTE_ORDER);
+ assertEquals(buf3.getTypeByteOrder(), BaseState.NON_NATIVE_BYTE_ORDER);
assertTrue(buf3.isReadOnly());
Memory mem3 = buf3.asMemory();
assertTrue(mem3.isRegion());
assertFalse(mem3.isBuffer());
assertTrue(mem3.isDuplicate());
- assertEquals(mem3.getByteOrder(), BaseState.NON_NATIVE_BYTE_ORDER);
+ assertEquals(mem3.getTypeByteOrder(), BaseState.NON_NATIVE_BYTE_ORDER);
assertTrue(mem3.isReadOnly());
}
diff --git
a/src/test/java/org/apache/datasketches/memory/internal/WritableMemoryTest.java
b/src/test/java/org/apache/datasketches/memory/internal/WritableMemoryTest.java
index 27981ba..ebe9e97 100644
---
a/src/test/java/org/apache/datasketches/memory/internal/WritableMemoryTest.java
+++
b/src/test/java/org/apache/datasketches/memory/internal/WritableMemoryTest.java
@@ -38,9 +38,9 @@ public class WritableMemoryTest {
public void wrapBigEndian() {
ByteBuffer bb = ByteBuffer.allocate(64); //big endian
WritableMemory wmem = WritableMemory.writableWrap(bb);
- assertEquals(wmem.getByteOrder(), ByteOrder.LITTLE_ENDIAN); //ignore BB
endianness
+ assertEquals(wmem.getTypeByteOrder(), ByteOrder.LITTLE_ENDIAN); //ignore
BB endianness
wmem = WritableMemory.writableWrap(bb, ByteOrder.nativeOrder(),
BaseState.defaultMemReqSvr);
- assertEquals(wmem.getByteOrder(), ByteOrder.LITTLE_ENDIAN);
+ assertEquals(wmem.getTypeByteOrder(), ByteOrder.LITTLE_ENDIAN);
}
@Test
@@ -54,11 +54,11 @@ public class WritableMemoryTest {
@Test
public void allocateWithByteOrder() {
WritableMemory wmem = WritableMemory.allocate(64, ByteOrder.BIG_ENDIAN);
- assertEquals(wmem.getByteOrder(), ByteOrder.BIG_ENDIAN);
+ assertEquals(wmem.getTypeByteOrder(), ByteOrder.BIG_ENDIAN);
wmem = WritableMemory.allocate(64, ByteOrder.LITTLE_ENDIAN);
- assertEquals(wmem.getByteOrder(), ByteOrder.LITTLE_ENDIAN);
+ assertEquals(wmem.getTypeByteOrder(), ByteOrder.LITTLE_ENDIAN);
wmem = WritableMemory.writableWrap(new byte[64], 32, 32,
ByteOrder.BIG_ENDIAN);
- assertEquals(wmem.getByteOrder(), ByteOrder.BIG_ENDIAN);
+ assertEquals(wmem.getTypeByteOrder(), ByteOrder.BIG_ENDIAN);
}
@Test
@@ -149,11 +149,11 @@ public class WritableMemoryTest {
@Test
public void checkWrapWithBO() {
WritableMemory wmem = WritableMemory.writableWrap(new byte[0],
ByteOrder.BIG_ENDIAN);
- boolean nativeBO = wmem.getByteOrder() == ByteOrder.nativeOrder();
+ boolean nativeBO = wmem.getTypeByteOrder() == ByteOrder.nativeOrder();
assertFalse(nativeBO);
println("" + nativeBO);
wmem = WritableMemory.writableWrap(new byte[8], ByteOrder.BIG_ENDIAN);
- nativeBO = wmem.getByteOrder() == ByteOrder.nativeOrder();
+ nativeBO = wmem.getTypeByteOrder() == ByteOrder.nativeOrder();
assertFalse(nativeBO);
println("" + nativeBO);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
