You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2022/11/21 00:40:57 UTC
[datasketches-memory] branch IntegrateJava17_v2 updated (97fec0c -> 81d49e8)
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a change to branch IntegrateJava17_v2
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
from 97fec0c Consolidating the location of LS.
new 12adce1 Changing references of ByteOrder.nativeByteOrder() to NATIVE_BYTE_ORDER
new 70c954b Continued changing references to Util.*_NATIVE_BYTE_ORDER.
new 81d49e8 More ByteOrder cleanup.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/datasketches/memory/BaseState.java | 11 ++---
.../memory/internal/BaseStateImpl.java | 2 +
.../memory/internal/BaseWritableBufferImpl.java | 2 +
.../memory/internal/BaseWritableMemoryImpl.java | 1 +
.../internal/NonNativeWritableBufferImpl.java | 3 ++
.../internal/NonNativeWritableMemoryImpl.java | 3 ++
.../apache/datasketches/memory/internal/Util.java | 10 +++++
.../memory/internal/AllocateDirectMemoryTest.java | 3 +-
.../AllocateDirectWritableMapMemoryTest.java | 3 +-
.../datasketches/memory/internal/BufferTest.java | 3 +-
.../datasketches/memory/internal/LeafImplTest.java | 7 ++--
.../datasketches/memory/internal/MemoryTest.java | 16 +++----
.../internal/NativeWritableBufferImplTest.java | 3 +-
.../internal/NativeWritableMemoryImplTest.java | 3 +-
.../memory/internal/SpecificLeafTest.java | 36 ++++++++--------
.../org/apache/datasketches/memory/Memory.java | 25 +++++------
.../apache/datasketches/memory/WritableBuffer.java | 4 +-
.../apache/datasketches/memory/WritableMemory.java | 23 +++++-----
.../memory/internal/BaseStateImpl.java | 11 ++---
.../apache/datasketches/memory/internal/Util.java | 9 +++-
.../internal/AllocateDirectMapMemoryTest.java | 16 +++----
.../memory/internal/AllocateDirectMemoryTest.java | 3 +-
.../AllocateDirectWritableMapMemoryTest.java | 12 +++---
.../memory/internal/BaseStateTest.java | 7 ++--
.../datasketches/memory/internal/Buffer2Test.java | 28 ++++++-------
.../datasketches/memory/internal/BufferTest.java | 13 +++---
.../memory/internal/DruidIssue11544Test.java | 4 +-
.../internal/ExampleMemoryRequestServerTest.java | 5 ++-
.../datasketches/memory/internal/LeafImplTest.java | 3 +-
.../memory/internal/MemoryReadWriteSafetyTest.java | 11 ++---
.../datasketches/memory/internal/MemoryTest.java | 18 ++++----
.../internal/NativeWritableBufferImplTest.java | 21 +++++-----
.../internal/NativeWritableMemoryImplTest.java | 18 ++++----
.../memory/internal/SpecificLeafTest.java | 49 +++++++++++-----------
.../memory/internal/WritableMemoryTest.java | 7 ++--
35 files changed, 221 insertions(+), 172 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[datasketches-memory] 03/03: More ByteOrder cleanup.
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch IntegrateJava17_v2
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit 81d49e8e8709f341a2c1476ea2e4aeeb2dc7c314
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Sun Nov 20 16:40:50 2022 -0800
More ByteOrder cleanup.
---
.../java/org/apache/datasketches/memory/internal/BaseStateImpl.java | 3 ++-
.../memory/internal/AllocateDirectWritableMapMemoryTest.java | 3 ++-
.../java/org/apache/datasketches/memory/internal/MemoryTest.java | 5 +++--
.../datasketches/memory/internal/NativeWritableMemoryImplTest.java | 3 ++-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java
index 87f2b23..08a3175 100644
--- a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java
+++ b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java
@@ -23,6 +23,7 @@ import static org.apache.datasketches.memory.internal.UnsafeUtil.assertBounds;
import static org.apache.datasketches.memory.internal.UnsafeUtil.checkBounds;
import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe;
import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
@@ -101,7 +102,7 @@ public abstract class BaseStateImpl implements BaseState {
@Override
public final ByteOrder getTypeByteOrder() {
- return isNonNativeType() ? Util.NON_NATIVE_BYTE_ORDER : NATIVE_BYTE_ORDER;
+ return isNonNativeType() ? NON_NATIVE_BYTE_ORDER : NATIVE_BYTE_ORDER;
}
/**
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java
index 376efdb..723d137 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java
@@ -26,6 +26,7 @@ package org.apache.datasketches.memory.internal;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.datasketches.memory.internal.Util.LS;
import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import static org.apache.datasketches.memory.internal.Util.getResourceFile;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
@@ -129,7 +130,7 @@ public class AllocateDirectWritableMapMemoryTest {
file.deleteOnExit(); //comment out if you want to examine the file.
final long bytes = 8;
- try (WritableMapHandle h = WritableMemory.writableMap(file, 0L, bytes, Util.NON_NATIVE_BYTE_ORDER)) {
+ try (WritableMapHandle h = WritableMemory.writableMap(file, 0L, bytes, NON_NATIVE_BYTE_ORDER)) {
WritableMemory wmem = h.getWritable();
wmem.putChar(0, (char) 1);
assertEquals(wmem.getByte(1), (byte) 1);
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java
index 1bbe26d..cf6a998 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java
@@ -25,6 +25,7 @@ package org.apache.datasketches.memory.internal;
import static org.apache.datasketches.memory.internal.Util.LS;
import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import static org.apache.datasketches.memory.internal.Util.getResourceFile;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
@@ -267,7 +268,7 @@ public class MemoryTest {
long[] arr = new long[n];
for (int i = 0; i < n; i++) { arr[i] = i; }
Memory mem = Memory.wrap(arr);
- Memory reg = mem.region(n2 * 8, n2 * 8, Util.NON_NATIVE_BYTE_ORDER); //top half
+ Memory reg = mem.region(n2 * 8, n2 * 8, NON_NATIVE_BYTE_ORDER); //top half
for (int i = 0; i < n2; i++) {
long v = Long.reverseBytes(reg.getLong(i * 8));
long e = i + n2;
@@ -307,7 +308,7 @@ public class MemoryTest {
//println("" + wmem.getLong(i * 8));
}
//println("");
- WritableMemory reg = wmem.writableRegion(n2 * 8, n2 * 8, Util.NON_NATIVE_BYTE_ORDER);
+ WritableMemory reg = wmem.writableRegion(n2 * 8, n2 * 8, NON_NATIVE_BYTE_ORDER);
for (int i = 0; i < n2; i++) { reg.putLong(i * 8, i); }
for (int i = 0; i < n; i++) {
long v = wmem.getLong(i * 8);
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java
index 8d71db1..a83d5bd 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java
@@ -20,6 +20,7 @@
package org.apache.datasketches.memory.internal;
import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -705,7 +706,7 @@ public class NativeWritableMemoryImplTest {
public void checkAsBufferNonNative() {
WritableMemory wmem = WritableMemory.allocate(64);
wmem.putShort(0, (short) 1);
- Buffer buf = wmem.asBuffer(Util.NON_NATIVE_BYTE_ORDER);
+ Buffer buf = wmem.asBuffer(NON_NATIVE_BYTE_ORDER);
assertEquals(buf.getShort(0), 256);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[datasketches-memory] 02/03: Continued changing references to Util.*_NATIVE_BYTE_ORDER.
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch IntegrateJava17_v2
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit 70c954b0aea0a073cad257ce194754f63832a47c
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Sun Nov 20 16:00:52 2022 -0800
Continued changing references to Util.*_NATIVE_BYTE_ORDER.
---
.../memory/internal/AllocateDirectMemoryTest.java | 3 +-
.../internal/NativeWritableBufferImplTest.java | 3 +-
.../memory/internal/SpecificLeafTest.java | 32 +++++++++++-----------
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMemoryTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMemoryTest.java
index 7ebe3e5..c041e4e 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMemoryTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMemoryTest.java
@@ -19,6 +19,7 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.fail;
@@ -90,7 +91,7 @@ public class AllocateDirectMemoryTest {
@Test
public void checkNonNativeDirect() throws Exception {
- try (WritableHandle h = WritableMemory.allocateDirect(128, Util.NON_NATIVE_BYTE_ORDER, null)) {
+ try (WritableHandle h = WritableMemory.allocateDirect(128, NON_NATIVE_BYTE_ORDER, null)) {
WritableMemory wmem = h.getWritable();
wmem.putChar(0, (char) 1);
assertEquals(wmem.getByte(1), (byte) 1);
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java
index 01d72cf..f29841a 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java
@@ -20,6 +20,7 @@
package org.apache.datasketches.memory.internal;
import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
@@ -581,7 +582,7 @@ public class NativeWritableBufferImplTest {
public void checkDuplicateNonNative() {
WritableMemory wmem = WritableMemory.allocate(64);
wmem.putShort(0, (short) 1);
- Buffer buf = wmem.asWritableBuffer().duplicate(Util.NON_NATIVE_BYTE_ORDER);
+ Buffer buf = wmem.asWritableBuffer().duplicate(NON_NATIVE_BYTE_ORDER);
assertEquals(buf.getShort(0), 256);
}
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java
index 8575b05..dbccbc0 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java
@@ -20,13 +20,13 @@
package org.apache.datasketches.memory.internal;
import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
import org.apache.datasketches.memory.Buffer;
import org.apache.datasketches.memory.Memory;
@@ -46,15 +46,15 @@ public class SpecificLeafTest {
ByteBuffer bb = ByteBuffer.allocate(bytes);
bb.order(NATIVE_BYTE_ORDER);
- Memory mem = Memory.wrap(bb).region(0, bytes, ByteOrder.nativeOrder());
+ Memory mem = Memory.wrap(bb).region(0, bytes, NATIVE_BYTE_ORDER);
assertTrue(((BaseStateImpl)mem).isBBType());
assertTrue(mem.isReadOnly());
checkCrossLeafTypeIds(mem);
- Buffer buf = mem.asBuffer().region(0, bytes, ByteOrder.nativeOrder());
+ Buffer buf = mem.asBuffer().region(0, bytes, NATIVE_BYTE_ORDER);
- bb.order(Util.NON_NATIVE_BYTE_ORDER);
- Memory mem2 = Memory.wrap(bb).region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
- Buffer buf2 = mem2.asBuffer().region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
+ bb.order(NON_NATIVE_BYTE_ORDER);
+ Memory mem2 = Memory.wrap(bb).region(0, bytes, NON_NATIVE_BYTE_ORDER);
+ Buffer buf2 = mem2.asBuffer().region(0, bytes, NON_NATIVE_BYTE_ORDER);
Buffer buf3 = buf2.duplicate();
assertTrue(((BaseStateImpl)mem).isRegionType());
@@ -72,14 +72,14 @@ public class SpecificLeafTest {
assertTrue(((BaseStateImpl)wmem).isDirectType());
assertFalse(wmem.isReadOnly());
checkCrossLeafTypeIds(wmem);
- WritableMemory nnwmem = wmem.writableRegion(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
+ WritableMemory nnwmem = wmem.writableRegion(0, bytes, NON_NATIVE_BYTE_ORDER);
Memory mem = wmem.region(0, bytes, NATIVE_BYTE_ORDER);
Buffer buf = mem.asBuffer().region(0, bytes, NATIVE_BYTE_ORDER);
- Memory mem2 = nnwmem.region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
- Buffer buf2 = mem2.asBuffer().region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
+ Memory mem2 = nnwmem.region(0, bytes, NON_NATIVE_BYTE_ORDER);
+ Buffer buf2 = mem2.asBuffer().region(0, bytes, NON_NATIVE_BYTE_ORDER);
Buffer buf3 = buf2.duplicate();
assertTrue(((BaseStateImpl)mem).isRegionType());
@@ -112,14 +112,14 @@ public class SpecificLeafTest {
assertTrue(((BaseStateImpl)mem).isMapType());
assertFalse(mem.isReadOnly());
checkCrossLeafTypeIds(mem);
- Memory nnreg = mem.region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
+ Memory nnreg = mem.region(0, bytes, NON_NATIVE_BYTE_ORDER);
Memory reg = mem.region(0, bytes, NATIVE_BYTE_ORDER);
Buffer buf = reg.asBuffer().region(0, bytes, NATIVE_BYTE_ORDER);
Buffer buf4 = buf.duplicate();
- Memory reg2 = nnreg.region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
- Buffer buf2 = reg2.asBuffer().region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
+ Memory reg2 = nnreg.region(0, bytes, NON_NATIVE_BYTE_ORDER);
+ Buffer buf2 = reg2.asBuffer().region(0, bytes, NON_NATIVE_BYTE_ORDER);
Buffer buf3 = buf2.duplicate();
assertTrue(((BaseStateImpl)reg).isRegionType());
@@ -138,14 +138,14 @@ public class SpecificLeafTest {
assertTrue(((BaseStateImpl)mem).isHeapType());
assertTrue(((BaseStateImpl)mem).isReadOnlyType());
checkCrossLeafTypeIds(mem);
- Memory nnreg = mem.region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
+ Memory nnreg = mem.region(0, bytes, NON_NATIVE_BYTE_ORDER);
Memory reg = mem.region(0, bytes, NATIVE_BYTE_ORDER);
Buffer buf = reg.asBuffer().region(0, bytes, NATIVE_BYTE_ORDER);
Buffer buf4 = buf.duplicate();
- Memory reg2 = nnreg.region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
- Buffer buf2 = reg2.asBuffer().region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
+ Memory reg2 = nnreg.region(0, bytes, NON_NATIVE_BYTE_ORDER);
+ Buffer buf2 = reg2.asBuffer().region(0, bytes, NON_NATIVE_BYTE_ORDER);
Buffer buf3 = buf2.duplicate();
assertFalse(((BaseStateImpl)mem).isRegionType());
@@ -177,7 +177,7 @@ public class SpecificLeafTest {
assertFalse(((BaseStateImpl)mem2).isDuplicateType());
assertTrue(mem2.isReadOnly());
- Buffer buf3 = buf1.duplicate(Util.NON_NATIVE_BYTE_ORDER);
+ Buffer buf3 = buf1.duplicate(NON_NATIVE_BYTE_ORDER);
assertTrue(((BaseStateImpl)buf3).isRegionType());
assertTrue(((BaseStateImpl)buf3).isBufferType());
assertTrue(((BaseStateImpl)buf3).isDuplicateType());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[datasketches-memory] 01/03: Changing references of ByteOrder.nativeByteOrder() to NATIVE_BYTE_ORDER
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch IntegrateJava17_v2
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit 12adce1f719384874277f98b846f7ee22d5d4e15
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Sun Nov 20 15:35:20 2022 -0800
Changing references of ByteOrder.nativeByteOrder() to NATIVE_BYTE_ORDER
---
.../org/apache/datasketches/memory/BaseState.java | 11 ++-----
.../memory/internal/BaseStateImpl.java | 2 ++
.../memory/internal/BaseWritableBufferImpl.java | 2 ++
.../memory/internal/BaseWritableMemoryImpl.java | 1 +
.../internal/NonNativeWritableBufferImpl.java | 3 ++
.../internal/NonNativeWritableMemoryImpl.java | 3 ++
.../apache/datasketches/memory/internal/Util.java | 10 ++++++
.../memory/internal/AllocateDirectMemoryTest.java | 3 +-
.../AllocateDirectWritableMapMemoryTest.java | 3 +-
.../datasketches/memory/internal/BufferTest.java | 3 +-
.../datasketches/memory/internal/LeafImplTest.java | 7 +++--
.../datasketches/memory/internal/MemoryTest.java | 16 +++++-----
.../internal/NativeWritableBufferImplTest.java | 3 +-
.../internal/NativeWritableMemoryImplTest.java | 3 +-
.../memory/internal/SpecificLeafTest.java | 36 ++++++++++++----------
.../org/apache/datasketches/memory/Memory.java | 25 +++++++--------
.../apache/datasketches/memory/WritableBuffer.java | 4 ++-
.../apache/datasketches/memory/WritableMemory.java | 23 +++++++-------
.../memory/internal/BaseStateImpl.java | 10 +++---
.../apache/datasketches/memory/internal/Util.java | 9 ++++--
.../internal/AllocateDirectMapMemoryTest.java | 16 +++++-----
.../AllocateDirectWritableMapMemoryTest.java | 9 +++---
.../memory/internal/BaseStateTest.java | 7 ++---
.../datasketches/memory/internal/Buffer2Test.java | 28 ++++++++---------
.../datasketches/memory/internal/BufferTest.java | 13 ++++----
.../memory/internal/DruidIssue11544Test.java | 4 +--
.../internal/ExampleMemoryRequestServerTest.java | 5 +--
.../datasketches/memory/internal/LeafImplTest.java | 3 +-
.../memory/internal/MemoryReadWriteSafetyTest.java | 11 ++++---
.../datasketches/memory/internal/MemoryTest.java | 13 ++++----
.../internal/NativeWritableBufferImplTest.java | 18 +++++------
.../internal/NativeWritableMemoryImplTest.java | 15 ++++-----
.../memory/internal/SpecificLeafTest.java | 17 +++++-----
.../memory/internal/WritableMemoryTest.java | 7 +++--
34 files changed, 193 insertions(+), 150 deletions(-)
diff --git a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/BaseState.java b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/BaseState.java
index 0eca005..21b4308 100644
--- a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/BaseState.java
+++ b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/BaseState.java
@@ -33,14 +33,9 @@ import jdk.incubator.foreign.ResourceScope;
*/
public interface BaseState {
- /**
- * The java line separator character as a String.
- */
- static final String LS = System.getProperty("line.separator");
-
- static final ByteOrder NATIVE_BYTE_ORDER = ByteOrder.nativeOrder();
- static final ByteOrder NON_NATIVE_BYTE_ORDER =
- (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) ? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN;
+// static final ByteOrder NATIVE_BYTE_ORDER = ByteOrder.nativeOrder();
+// static final ByteOrder NON_NATIVE_BYTE_ORDER =
+// (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) ? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN;
/**
* Currently used only for test, hold for possible future use
diff --git a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseStateImpl.java b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseStateImpl.java
index 891f283..fc09f2c 100644
--- a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseStateImpl.java
+++ b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseStateImpl.java
@@ -20,6 +20,8 @@
package org.apache.datasketches.memory.internal;
import static jdk.incubator.foreign.MemoryAccess.getByteAtOffset;
+import static org.apache.datasketches.memory.internal.Util.LS;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
diff --git a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java
index a92e75c..7b7ffa9 100644
--- a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java
+++ b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java
@@ -19,6 +19,8 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
+
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.Objects;
diff --git a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java
index c458d80..895d951 100644
--- a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java
+++ b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java
@@ -21,6 +21,7 @@ package org.apache.datasketches.memory.internal;
import static java.nio.channels.FileChannel.MapMode.READ_ONLY;
import static java.nio.channels.FileChannel.MapMode.READ_WRITE;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import java.io.ByteArrayOutputStream;
import java.io.File;
diff --git a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/NonNativeWritableBufferImpl.java b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/NonNativeWritableBufferImpl.java
index a27878e..092ef89 100644
--- a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/NonNativeWritableBufferImpl.java
+++ b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/NonNativeWritableBufferImpl.java
@@ -19,6 +19,9 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
+
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.WritableBuffer;
diff --git a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImpl.java b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImpl.java
index c699e8e..d8254be 100644
--- a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImpl.java
+++ b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImpl.java
@@ -19,6 +19,9 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
+
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.WritableMemory;
diff --git a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/Util.java b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/Util.java
index 07c0a7a..6d42e3f 100644
--- a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/Util.java
+++ b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/Util.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
+import java.nio.ByteOrder;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Objects;
@@ -33,8 +34,17 @@ import java.util.Objects;
*/
@SuppressWarnings("javadoc")
final class Util {
+
+ /**
+ * The java line separator character as a String.
+ */
static final String LS = System.getProperty("line.separator");
+ static final ByteOrder NATIVE_BYTE_ORDER = ByteOrder.nativeOrder();
+ static final ByteOrder NON_NATIVE_BYTE_ORDER =
+ (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) ? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN;
+
+
private Util() { }
/**
diff --git a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectMemoryTest.java b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectMemoryTest.java
index 0497a66..2c234e7 100644
--- a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectMemoryTest.java
+++ b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectMemoryTest.java
@@ -19,6 +19,7 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -83,7 +84,7 @@ public class AllocateDirectMemoryTest {
WritableMemory wmem = null;
try (ResourceScope scope = ResourceScope.newConfinedScope()) {
wmem = WritableMemory.allocateDirect( 128, 8, scope,
- BaseState.NON_NATIVE_BYTE_ORDER, memReqSvr);
+ NON_NATIVE_BYTE_ORDER, memReqSvr);
wmem.putChar(0, (char) 1);
assertEquals(wmem.getByte(1), (byte) 1);
}
diff --git a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java
index af68cee..89cf2fb 100644
--- a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java
+++ b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java
@@ -25,6 +25,7 @@ package org.apache.datasketches.memory.internal;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.datasketches.memory.internal.Util.LS;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import static org.apache.datasketches.memory.internal.Util.getResourceFile;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
@@ -122,7 +123,7 @@ public class AllocateDirectWritableMapMemoryTest {
final long bytes = 8;
WritableMemory wmem = null;
try (ResourceScope scope = ResourceScope.newConfinedScope()) {
- wmem = WritableMemory.writableMap(file, 0L, bytes, scope, BaseState.NON_NATIVE_BYTE_ORDER);
+ wmem = WritableMemory.writableMap(file, 0L, bytes, scope, NON_NATIVE_BYTE_ORDER);
wmem.putChar(0, (char) 1);
assertEquals(wmem.getByte(1), (byte) 1);
}
diff --git a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/BufferTest.java b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/BufferTest.java
index c9e58f0..5727ef3 100644
--- a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/BufferTest.java
+++ b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/BufferTest.java
@@ -19,6 +19,7 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import java.nio.ByteBuffer;
@@ -203,7 +204,7 @@ public class BufferTest {
public void checkByteBufBigEndianOrder() {
int n = 1024; //longs
ByteBuffer bb = ByteBuffer.allocate(n * 8);
- bb.order(BaseState.NON_NATIVE_BYTE_ORDER);
+ bb.order(NON_NATIVE_BYTE_ORDER);
Buffer buf = Buffer.wrap(bb);
assertEquals(buf.getByteOrder(), ByteOrder.nativeOrder());
}
diff --git a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/LeafImplTest.java b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/LeafImplTest.java
index a56410a..4dffd0c 100644
--- a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/LeafImplTest.java
+++ b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/LeafImplTest.java
@@ -19,6 +19,8 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -28,7 +30,6 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import org.apache.datasketches.memory.BaseState;
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.WritableBuffer;
import org.apache.datasketches.memory.WritableMemory;
@@ -40,8 +41,8 @@ import jdk.incubator.foreign.ResourceScope;
* @author Lee Rhodes
*/
public class LeafImplTest {
- private static final ByteOrder NBO = ByteOrder.nativeOrder();
- private static final ByteOrder NNBO = BaseState.NON_NATIVE_BYTE_ORDER;
+ private static final ByteOrder NBO = NATIVE_BYTE_ORDER;
+ private static final ByteOrder NNBO = NON_NATIVE_BYTE_ORDER;
private static final MemoryRequestServer dummyMemReqSvr = new DummyMemoryRequestServer();
static class DummyMemoryRequestServer implements MemoryRequestServer {
diff --git a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/MemoryTest.java b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/MemoryTest.java
index 37d1034..9a52298 100644
--- a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/MemoryTest.java
+++ b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/MemoryTest.java
@@ -24,6 +24,8 @@
package org.apache.datasketches.memory.internal;
import static org.apache.datasketches.memory.internal.Util.LS;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
@@ -177,7 +179,7 @@ public class MemoryTest {
int n = 10; //longs
byte[] arr = new byte[n * 8];
ByteBuffer bb = ByteBuffer.wrap(arr); //non-native order
- WritableMemory wmem = WritableMemory.writableWrap(bb, BaseState.NON_NATIVE_BYTE_ORDER, memReqSvr);
+ WritableMemory wmem = WritableMemory.writableWrap(bb, NON_NATIVE_BYTE_ORDER, memReqSvr);
for (int i = 0; i < n; i++) { //write to wmem
wmem.putLong(i * 8, i);
}
@@ -189,7 +191,7 @@ public class MemoryTest {
long v = bb.getLong(i * 8);
assertEquals(v, i);
}
- Memory mem1 = Memory.wrap(arr, BaseState.NON_NATIVE_BYTE_ORDER);
+ Memory mem1 = Memory.wrap(arr, NON_NATIVE_BYTE_ORDER);
for (int i = 0; i < n; i++) { //read from wrapped arr
long v = mem1.getLong(i * 8);
assertEquals(v, i);
@@ -238,10 +240,10 @@ 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());
+ assertTrue(mem.getByteOrder() == NATIVE_BYTE_ORDER);
assertEquals(mem.getByteOrder(), ByteOrder.LITTLE_ENDIAN);
//Now explicitly set it
- mem = Memory.wrap(bb, BaseState.NON_NATIVE_BYTE_ORDER);
+ mem = Memory.wrap(bb, NON_NATIVE_BYTE_ORDER);
assertFalse(mem.getByteOrder() == ByteOrder.nativeOrder());
assertEquals(mem.getByteOrder(), ByteOrder.BIG_ENDIAN);
}
@@ -298,7 +300,7 @@ public class MemoryTest {
long[] arr = new long[n];
for (int i = 0; i < n; i++) { arr[i] = i; }
Memory mem = Memory.wrap(arr);
- Memory reg = mem.region(n2 * 8, n2 * 8, BaseState.NON_NATIVE_BYTE_ORDER); //top half
+ Memory reg = mem.region(n2 * 8, n2 * 8, NON_NATIVE_BYTE_ORDER); //top half
for (int i = 0; i < n2; i++) {
long v = Long.reverseBytes(reg.getLong(i * 8));
long e = i + n2;
@@ -338,7 +340,7 @@ public class MemoryTest {
//println("" + wmem.getLong(i * 8));
}
//println("");
- WritableMemory reg = wmem.writableRegion(n2 * 8, n2 * 8, BaseState.NON_NATIVE_BYTE_ORDER);
+ WritableMemory reg = wmem.writableRegion(n2 * 8, n2 * 8, NON_NATIVE_BYTE_ORDER);
for (int i = 0; i < n2; i++) { reg.putLong(i * 8, i); }
for (int i = 0; i < n; i++) {
long v = wmem.getLong(i * 8);
@@ -401,7 +403,7 @@ public class MemoryTest {
assertNull(wbuf.getMemoryRequestServer());
//ON HEAP
- wmem = WritableMemory.writableWrap(new byte[16], 0, 16, BaseState.NATIVE_BYTE_ORDER, memReqSvr);
+ wmem = WritableMemory.writableWrap(new byte[16], 0, 16, NATIVE_BYTE_ORDER, memReqSvr);
assertNotNull(wmem.getMemoryRequestServer());
wbuf = wmem.asWritableBuffer();
assertNotNull(wbuf.getMemoryRequestServer());
diff --git a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java
index 31957de..2a4c751 100644
--- a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java
+++ b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java
@@ -19,6 +19,7 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
@@ -540,7 +541,7 @@ public class NativeWritableBufferImplTest {
public void checkDuplicateNonNative() {
WritableMemory wmem = WritableMemory.allocate(64);
wmem.putShort(0, (short) 1);
- Buffer buf = wmem.asWritableBuffer().duplicate(BaseState.NON_NATIVE_BYTE_ORDER);
+ Buffer buf = wmem.asWritableBuffer().duplicate(NON_NATIVE_BYTE_ORDER);
assertEquals(buf.getShort(0), 256);
}
diff --git a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java
index 8e5e082..139dfd5 100644
--- a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java
+++ b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java
@@ -19,6 +19,7 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -660,7 +661,7 @@ public class NativeWritableMemoryImplTest {
public void checkAsBufferNonNative() {
WritableMemory wmem = WritableMemory.allocate(64);
wmem.putShort(0, (short) 1);
- Buffer buf = wmem.asBuffer(BaseState.NON_NATIVE_BYTE_ORDER);
+ Buffer buf = wmem.asBuffer(NON_NATIVE_BYTE_ORDER);
assertEquals(buf.getShort(0), 256);
}
diff --git a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/SpecificLeafTest.java b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/SpecificLeafTest.java
index 962097d..993cb4b 100644
--- a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/SpecificLeafTest.java
+++ b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/SpecificLeafTest.java
@@ -19,6 +19,8 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
+import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -57,11 +59,11 @@ 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.getByteOrder(), NATIVE_BYTE_ORDER);
- bb.order(BaseState.NON_NATIVE_BYTE_ORDER);
- Memory mem2 = Memory.wrap(bb).region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER);
- Buffer buf2 = mem2.asBuffer().region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER);
+ bb.order(NON_NATIVE_BYTE_ORDER);
+ Memory mem2 = Memory.wrap(bb).region(0, bytes, NON_NATIVE_BYTE_ORDER);
+ Buffer buf2 = mem2.asBuffer().region(0, bytes, NON_NATIVE_BYTE_ORDER);
Buffer buf3 = buf2.duplicate();
assertTrue(mem.isRegion());
@@ -81,14 +83,14 @@ public class SpecificLeafTest {
assertFalse(wmem.isHeap());
assertFalse(wmem.isReadOnly());
checkCrossLeafTypeIds(wmem);
- WritableMemory nnwmem = wmem.writableRegion(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER);
+ WritableMemory nnwmem = wmem.writableRegion(0, bytes, NON_NATIVE_BYTE_ORDER);
Memory mem = wmem.region(0, bytes, ByteOrder.nativeOrder());
Buffer buf = mem.asBuffer().region(0, bytes, ByteOrder.nativeOrder());
- Memory mem2 = nnwmem.region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER);
- Buffer buf2 = mem2.asBuffer().region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER);
+ Memory mem2 = nnwmem.region(0, bytes, NON_NATIVE_BYTE_ORDER);
+ Buffer buf2 = mem2.asBuffer().region(0, bytes, NON_NATIVE_BYTE_ORDER);
Buffer buf3 = buf2.duplicate();
assertTrue(mem.isRegion());
@@ -117,19 +119,19 @@ public class SpecificLeafTest {
assertTrue(mem.isMapped());
assertFalse(mem.isReadOnly());
checkCrossLeafTypeIds(mem);
- Memory nnreg = mem.region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER);
+ Memory nnreg = mem.region(0, bytes, NON_NATIVE_BYTE_ORDER);
Memory reg = mem.region(0, bytes, ByteOrder.nativeOrder());
Buffer buf = reg.asBuffer().region(0, bytes, ByteOrder.nativeOrder());
Buffer buf4 = buf.duplicate();
- Memory reg2 = nnreg.region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER);
- Buffer buf2 = reg2.asBuffer().region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER);
+ Memory reg2 = nnreg.region(0, bytes, NON_NATIVE_BYTE_ORDER);
+ Buffer buf2 = reg2.asBuffer().region(0, bytes, NON_NATIVE_BYTE_ORDER);
Buffer buf3 = buf2.duplicate();
assertTrue(reg.isRegion());
assertTrue(reg2.isRegion());
- assertEquals(reg2.getByteOrder(), BaseState.NON_NATIVE_BYTE_ORDER);
+ assertEquals(reg2.getByteOrder(), NON_NATIVE_BYTE_ORDER);
assertTrue(buf.isRegion());
assertFalse(buf.isMemory());
assertTrue(buf2.isRegion());
@@ -145,14 +147,14 @@ public class SpecificLeafTest {
assertTrue(mem.isHeap());
assertTrue(((BaseStateImpl)mem).isReadOnly());
checkCrossLeafTypeIds(mem);
- Memory nnreg = mem.region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER);
+ Memory nnreg = mem.region(0, bytes, NON_NATIVE_BYTE_ORDER);
Memory reg = mem.region(0, bytes, ByteOrder.nativeOrder());
Buffer buf = reg.asBuffer().region(0, bytes, ByteOrder.nativeOrder());
Buffer buf4 = buf.duplicate();
- Memory reg2 = nnreg.region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER);
- Buffer buf2 = reg2.asBuffer().region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER);
+ Memory reg2 = nnreg.region(0, bytes, NON_NATIVE_BYTE_ORDER);
+ Buffer buf2 = reg2.asBuffer().region(0, bytes, NON_NATIVE_BYTE_ORDER);
Buffer buf3 = buf2.duplicate();
assertFalse(mem.isRegion());
@@ -184,18 +186,18 @@ public class SpecificLeafTest {
assertFalse(mem2.isDuplicate());
assertTrue(mem2.isReadOnly());
- Buffer buf3 = buf1.duplicate(BaseState.NON_NATIVE_BYTE_ORDER);
+ Buffer buf3 = buf1.duplicate(NON_NATIVE_BYTE_ORDER);
assertTrue(buf3.isRegion());
assertTrue(buf3.isBuffer());
assertTrue(buf3.isDuplicate());
- assertEquals(buf3.getByteOrder(), BaseState.NON_NATIVE_BYTE_ORDER);
+ assertEquals(buf3.getByteOrder(), 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.getByteOrder(), NON_NATIVE_BYTE_ORDER);
assertTrue(mem3.isReadOnly());
}
diff --git a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/Memory.java b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/Memory.java
index 83fe2d0..414cdc9 100644
--- a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/Memory.java
+++ b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/Memory.java
@@ -19,6 +19,7 @@
package org.apache.datasketches.memory;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
import static org.apache.datasketches.memory.internal.Util.negativeCheck;
import java.io.File;
@@ -75,7 +76,7 @@ public interface Memory extends BaseState {
* Please read Javadocs for {@link Handle}.
*/
static MapHandle map(File file) {
- return map(file, 0, file.length(), ByteOrder.nativeOrder());
+ return map(file, 0, file.length(), NATIVE_BYTE_ORDER);
}
/**
@@ -109,7 +110,7 @@ public interface Memory extends BaseState {
* offsetBytes and capacityBytes.
*/
default Memory region(long offsetBytes, long capacityBytes) {
- return region(offsetBytes, capacityBytes, ByteOrder.nativeOrder());
+ return region(offsetBytes, capacityBytes, NATIVE_BYTE_ORDER);
}
/**
@@ -141,7 +142,7 @@ public interface Memory extends BaseState {
* @return a new <i>Buffer</i>
*/
default Buffer asBuffer() {
- return asBuffer(ByteOrder.nativeOrder());
+ return asBuffer(NATIVE_BYTE_ORDER);
}
/**
@@ -168,7 +169,7 @@ public interface Memory extends BaseState {
*/
static Memory wrap(byte[] array) {
Objects.requireNonNull(array, "array must be non-null");
- return wrap(array, 0, array.length, ByteOrder.nativeOrder());
+ return wrap(array, 0, array.length, NATIVE_BYTE_ORDER);
}
/**
@@ -195,7 +196,7 @@ public interface Memory extends BaseState {
negativeCheck(offsetBytes, "offsetBytes");
negativeCheck(lengthBytes, "lengthBytes");
UnsafeUtil.checkBounds(offsetBytes, lengthBytes, array.length);
- return BaseWritableMemoryImpl.wrapHeapArray(array, 0, lengthBytes, true, ByteOrder.nativeOrder(), null);
+ return BaseWritableMemoryImpl.wrapHeapArray(array, 0, lengthBytes, true, NATIVE_BYTE_ORDER, null);
}
/**
@@ -206,7 +207,7 @@ public interface Memory extends BaseState {
static Memory wrap(boolean[] array) {
Objects.requireNonNull(array, "array must be non-null");
final long lengthBytes = array.length << Prim.BOOLEAN.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(array, 0, lengthBytes, true, ByteOrder.nativeOrder(), null);
+ return BaseWritableMemoryImpl.wrapHeapArray(array, 0, lengthBytes, true, NATIVE_BYTE_ORDER, null);
}
/**
@@ -217,7 +218,7 @@ public interface Memory extends BaseState {
static Memory wrap(char[] array) {
Objects.requireNonNull(array, "array must be non-null");
final long lengthBytes = array.length << Prim.CHAR.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, true, ByteOrder.nativeOrder(), null);
+ return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, true, NATIVE_BYTE_ORDER, null);
}
/**
@@ -228,7 +229,7 @@ public interface Memory extends BaseState {
static Memory wrap(short[] array) {
Objects.requireNonNull(array, "arr must be non-null");
final long lengthBytes = array.length << Prim.SHORT.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, true, ByteOrder.nativeOrder(), null);
+ return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, true, NATIVE_BYTE_ORDER, null);
}
/**
@@ -239,7 +240,7 @@ public interface Memory extends BaseState {
static Memory wrap(int[] array) {
Objects.requireNonNull(array, "arr must be non-null");
final long lengthBytes = array.length << Prim.INT.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, true, ByteOrder.nativeOrder(), null);
+ return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, true, NATIVE_BYTE_ORDER, null);
}
/**
@@ -250,7 +251,7 @@ public interface Memory extends BaseState {
static Memory wrap(long[] array) {
Objects.requireNonNull(array, "arr must be non-null");
final long lengthBytes = array.length << Prim.LONG.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, true, ByteOrder.nativeOrder(), null);
+ return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, true, NATIVE_BYTE_ORDER, null);
}
/**
@@ -261,7 +262,7 @@ public interface Memory extends BaseState {
static Memory wrap(float[] array) {
Objects.requireNonNull(array, "arr must be non-null");
final long lengthBytes = array.length << Prim.FLOAT.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, true, ByteOrder.nativeOrder(), null);
+ return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, true, NATIVE_BYTE_ORDER, null);
}
/**
@@ -272,7 +273,7 @@ public interface Memory extends BaseState {
static Memory wrap(double[] array) {
Objects.requireNonNull(array, "arr must be non-null");
final long lengthBytes = array.length << Prim.DOUBLE.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, true, ByteOrder.nativeOrder(), null);
+ return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, true, NATIVE_BYTE_ORDER, null);
}
//PRIMITIVE getX() and getXArray()
diff --git a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/WritableBuffer.java b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/WritableBuffer.java
index b6aebe0..965ae16 100644
--- a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/WritableBuffer.java
+++ b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/WritableBuffer.java
@@ -19,6 +19,8 @@
package org.apache.datasketches.memory;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
+
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.Objects;
@@ -151,7 +153,7 @@ public interface WritableBuffer extends Buffer {
* @return WritableMemory
*/
default WritableMemory asWritableMemory() {
- return asWritableMemory(ByteOrder.nativeOrder());
+ return asWritableMemory(NATIVE_BYTE_ORDER);
}
/**
diff --git a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/WritableMemory.java b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/WritableMemory.java
index cdc1635..0c03c1a 100644
--- a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/WritableMemory.java
+++ b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/WritableMemory.java
@@ -19,6 +19,7 @@
package org.apache.datasketches.memory;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
import static org.apache.datasketches.memory.internal.Util.negativeCheck;
import java.io.File;
@@ -88,7 +89,7 @@ public interface WritableMemory extends Memory {
* Please read Javadocs for {@link Handle}.
*/
static WritableMapHandle writableMap(File file) {
- return writableMap(file, 0, file.length(), ByteOrder.nativeOrder());
+ return writableMap(file, 0, file.length(), NATIVE_BYTE_ORDER);
}
/**
@@ -128,7 +129,7 @@ public interface WritableMemory extends Memory {
* Please read Javadocs for {@link Handle}.
*/
static WritableHandle allocateDirect(long capacityBytes) {
- return allocateDirect(capacityBytes, ByteOrder.nativeOrder(), defaultMemReqSvr);
+ return allocateDirect(capacityBytes, NATIVE_BYTE_ORDER, defaultMemReqSvr);
}
/**
@@ -227,7 +228,7 @@ public interface WritableMemory extends Memory {
* @return a new WritableMemory for write operations on a new byte array.
*/
static WritableMemory allocate(int capacityBytes) {
- return allocate(capacityBytes, ByteOrder.nativeOrder(), defaultMemReqSvr);
+ return allocate(capacityBytes, NATIVE_BYTE_ORDER, defaultMemReqSvr);
}
/**
@@ -265,7 +266,7 @@ public interface WritableMemory extends Memory {
* @return a new WritableMemory for write operations on the given primitive array.
*/
static WritableMemory writableWrap(byte[] array) {
- return writableWrap(array, 0, array.length, ByteOrder.nativeOrder(), defaultMemReqSvr);
+ return writableWrap(array, 0, array.length, NATIVE_BYTE_ORDER, defaultMemReqSvr);
}
/**
@@ -329,7 +330,7 @@ public interface WritableMemory extends Memory {
static WritableMemory writableWrap(boolean[] array) {
Objects.requireNonNull(array, "array must be non-null");
final long lengthBytes = array.length << Prim.BOOLEAN.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(array, 0, lengthBytes, false, ByteOrder.nativeOrder(), null);
+ return BaseWritableMemoryImpl.wrapHeapArray(array, 0, lengthBytes, false, NATIVE_BYTE_ORDER, null);
}
/**
@@ -340,7 +341,7 @@ public interface WritableMemory extends Memory {
static WritableMemory writableWrap(char[] array) {
Objects.requireNonNull(array, "array must be non-null");
final long lengthBytes = array.length << Prim.CHAR.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, false, ByteOrder.nativeOrder(), null);
+ return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, false, NATIVE_BYTE_ORDER, null);
}
/**
@@ -351,7 +352,7 @@ public interface WritableMemory extends Memory {
static WritableMemory writableWrap(short[] array) {
Objects.requireNonNull(array, "arr must be non-null");
final long lengthBytes = array.length << Prim.SHORT.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, false, ByteOrder.nativeOrder(), null);
+ return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, false,NATIVE_BYTE_ORDER, null);
}
/**
@@ -362,7 +363,7 @@ public interface WritableMemory extends Memory {
static WritableMemory writableWrap(int[] array) {
Objects.requireNonNull(array, "arr must be non-null");
final long lengthBytes = array.length << Prim.INT.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, false, ByteOrder.nativeOrder(), null);
+ return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, false, NATIVE_BYTE_ORDER, null);
}
/**
@@ -373,7 +374,7 @@ public interface WritableMemory extends Memory {
static WritableMemory writableWrap(long[] array) {
Objects.requireNonNull(array, "arr must be non-null");
final long lengthBytes = array.length << Prim.LONG.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, false, ByteOrder.nativeOrder(), null);
+ return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, false, NATIVE_BYTE_ORDER, null);
}
/**
@@ -384,7 +385,7 @@ public interface WritableMemory extends Memory {
static WritableMemory writableWrap(float[] array) {
Objects.requireNonNull(array, "arr must be non-null");
final long lengthBytes = array.length << Prim.FLOAT.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, false, ByteOrder.nativeOrder(), null);
+ return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, false, NATIVE_BYTE_ORDER, null);
}
/**
@@ -395,7 +396,7 @@ public interface WritableMemory extends Memory {
static WritableMemory writableWrap(double[] array) {
Objects.requireNonNull(array, "arr must be non-null");
final long lengthBytes = array.length << Prim.DOUBLE.shift();
- return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, false, ByteOrder.nativeOrder(), null);
+ return BaseWritableMemoryImpl.wrapHeapArray(array, 0L, lengthBytes, false, NATIVE_BYTE_ORDER, null);
}
//END OF CONSTRUCTOR-TYPE METHODS
diff --git a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java
index 2aab739..87f2b23 100644
--- a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java
+++ b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java
@@ -22,7 +22,7 @@ package org.apache.datasketches.memory.internal;
import static org.apache.datasketches.memory.internal.UnsafeUtil.assertBounds;
import static org.apache.datasketches.memory.internal.UnsafeUtil.checkBounds;
import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe;
-import static org.apache.datasketches.memory.internal.Util.LS;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
@@ -101,7 +101,7 @@ public abstract class BaseStateImpl implements BaseState {
@Override
public final ByteOrder getTypeByteOrder() {
- return isNonNativeType() ? Util.NON_NATIVE_BYTE_ORDER : ByteOrder.nativeOrder();
+ return isNonNativeType() ? Util.NON_NATIVE_BYTE_ORDER : NATIVE_BYTE_ORDER;
}
/**
@@ -113,13 +113,13 @@ public abstract class BaseStateImpl implements BaseState {
if (byteOrder == null) {
throw new IllegalArgumentException("ByteOrder parameter cannot be null.");
}
- return ByteOrder.nativeOrder() == byteOrder;
+ return NATIVE_BYTE_ORDER == byteOrder;
}
@Override
public final boolean isByteOrderCompatible(final ByteOrder byteOrder) {
final ByteOrder typeBO = getTypeByteOrder();
- return typeBO == ByteOrder.nativeOrder() && typeBO == byteOrder;
+ return typeBO == NATIVE_BYTE_ORDER && typeBO == byteOrder;
}
@Override
@@ -438,7 +438,7 @@ public abstract class BaseStateImpl implements BaseState {
sb.append("Valid : ").append(state.isValid()).append(LS);
sb.append("Read Only : ").append(state.isReadOnly()).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("Native Byte Order : ").append(NATIVE_BYTE_ORDER.toString()).append(LS);
sb.append("JDK Runtime Version : ").append(UnsafeUtil.JDK).append(LS);
//Data detail
sb.append("Data, littleEndian : 0 1 2 3 4 5 6 7");
diff --git a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/Util.java b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/Util.java
index 7660dca..aadb067 100644
--- a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/Util.java
+++ b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/Util.java
@@ -36,14 +36,19 @@ import org.apache.datasketches.memory.Memory;
* @author Lee Rhodes
*/
public final class Util {
+
+ /**
+ * The java line separator character as a String.
+ */
public static final String LS = System.getProperty("line.separator");
//Byte Order related
- public static final ByteOrder NON_NATIVE_BYTE_ORDER = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN
+ public static final ByteOrder NATIVE_BYTE_ORDER = ByteOrder.nativeOrder();
+ public static final ByteOrder NON_NATIVE_BYTE_ORDER = NATIVE_BYTE_ORDER == ByteOrder.LITTLE_ENDIAN
? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN;
public static ByteOrder otherByteOrder(final ByteOrder order) {
- return (order == ByteOrder.nativeOrder()) ? NON_NATIVE_BYTE_ORDER : ByteOrder.nativeOrder();
+ return (order == NATIVE_BYTE_ORDER) ? NON_NATIVE_BYTE_ORDER : ByteOrder.nativeOrder();
}
/**
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMapMemoryTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMapMemoryTest.java
index 54a6b3f..34dcb1e 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMapMemoryTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMapMemoryTest.java
@@ -24,6 +24,7 @@
package org.apache.datasketches.memory.internal;
import static org.apache.datasketches.memory.internal.Util.LS;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
import static org.apache.datasketches.memory.internal.Util.getResourceFile;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
@@ -31,7 +32,6 @@ import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import java.io.File;
-import java.nio.ByteOrder;
import org.apache.datasketches.memory.MapHandle;
import org.apache.datasketches.memory.Memory;
@@ -59,13 +59,13 @@ public class AllocateDirectMapMemoryTest {
@Test
public void testIllegalArguments() throws Exception {
File file = getResourceFile("GettysburgAddress.txt");
- try (MapHandle rh = Memory.map(file, -1, Integer.MAX_VALUE, ByteOrder.nativeOrder())) {
+ try (MapHandle rh = Memory.map(file, -1, Integer.MAX_VALUE, NATIVE_BYTE_ORDER)) {
fail("Failed: testIllegalArgumentException: Position was negative.");
} catch (IllegalArgumentException e) {
//ok
}
- try (MapHandle rh = Memory.map(file, 0, -1, ByteOrder.nativeOrder())) {
+ try (MapHandle rh = Memory.map(file, 0, -1, NATIVE_BYTE_ORDER)) {
fail("Failed: testIllegalArgumentException: Size was negative.");
} catch (IllegalArgumentException e) {
//ok
@@ -76,7 +76,7 @@ public class AllocateDirectMapMemoryTest {
public void testMapAndMultipleClose() throws Exception {
File file = getResourceFile("GettysburgAddress.txt");
long memCapacity = file.length();
- try (MapHandle rh = Memory.map(file, 0, memCapacity, ByteOrder.nativeOrder())) {
+ try (MapHandle rh = Memory.map(file, 0, memCapacity, NATIVE_BYTE_ORDER)) {
Memory map = rh.get();
assertEquals(memCapacity, map.getCapacity());
rh.close();
@@ -91,7 +91,7 @@ public class AllocateDirectMapMemoryTest {
public void testReadFailAfterClose() throws Exception {
File file = getResourceFile("GettysburgAddress.txt");
long memCapacity = file.length();
- try (MapHandle rh = Memory.map(file, 0, memCapacity, ByteOrder.nativeOrder())) {
+ try (MapHandle rh = Memory.map(file, 0, memCapacity, NATIVE_BYTE_ORDER)) {
Memory mmf = rh.get();
rh.close();
mmf.getByte(0);
@@ -104,7 +104,7 @@ public class AllocateDirectMapMemoryTest {
public void testLoad() throws Exception {
File file = getResourceFile("GettysburgAddress.txt");
long memCapacity = file.length();
- try (MapHandle rh = Memory.map(file, 0, memCapacity, ByteOrder.nativeOrder())) {
+ try (MapHandle rh = Memory.map(file, 0, memCapacity, NATIVE_BYTE_ORDER)) {
rh.load();
assertTrue(rh.isLoaded());
rh.close();
@@ -116,7 +116,7 @@ public class AllocateDirectMapMemoryTest {
File file = getResourceFile("GettysburgAddress.txt");
long memCapacity = file.length();
Memory mem;
- try (MapHandle rh = Memory.map(file, 0, memCapacity, ByteOrder.nativeOrder())) {
+ try (MapHandle rh = Memory.map(file, 0, memCapacity, NATIVE_BYTE_ORDER)) {
rh.load();
assertTrue(rh.isLoaded());
hand = rh;
@@ -130,7 +130,7 @@ public class AllocateDirectMapMemoryTest {
public void testHandoffWithoutClose() throws Exception {
File file = getResourceFile("GettysburgAddress.txt");
long memCapacity = file.length();
- MapHandle rh = Memory.map(file, 0, memCapacity, ByteOrder.nativeOrder());
+ MapHandle rh = Memory.map(file, 0, memCapacity, NATIVE_BYTE_ORDER);
rh.load();
assertTrue(rh.isLoaded());
hand = rh;
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java
index 77df9e3..376efdb 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java
@@ -25,6 +25,7 @@ package org.apache.datasketches.memory.internal;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.datasketches.memory.internal.Util.LS;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
import static org.apache.datasketches.memory.internal.Util.getResourceFile;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
@@ -93,7 +94,7 @@ public class AllocateDirectWritableMapMemoryTest {
try (
WritableMapHandle dstHandle
- = WritableMemory.writableMap(file, 0, bytes, ByteOrder.nativeOrder());
+ = WritableMemory.writableMap(file, 0, bytes, NATIVE_BYTE_ORDER);
WritableHandle srcHandle = WritableMemory.allocateDirect(bytes)) {
WritableMemory dstMem = dstHandle.getWritable();
@@ -139,7 +140,7 @@ public class AllocateDirectWritableMapMemoryTest {
public void testMapException() throws IOException {
File dummy = createFile("dummy.txt", ""); //zero length
//throws java.lang.reflect.InvocationTargetException
- Memory.map(dummy, 0, dummy.length(), ByteOrder.nativeOrder());
+ Memory.map(dummy, 0, dummy.length(), NATIVE_BYTE_ORDER);
}
@Test(expectedExceptions = ReadOnlyException.class)
@@ -156,7 +157,7 @@ public class AllocateDirectWritableMapMemoryTest {
public void checkOverLength() throws Exception {
File file = getResourceFile("GettysburgAddress.txt");
try (WritableMapHandle rh =
- WritableMemory.writableMap(file, 0, 1 << 20, ByteOrder.nativeOrder())) {
+ WritableMemory.writableMap(file, 0, 1 << 20, NATIVE_BYTE_ORDER)) {
//
} catch (IOException e) {
throw new RuntimeException(e);
@@ -173,7 +174,7 @@ public class AllocateDirectWritableMapMemoryTest {
byte[] correctByteArr = correctStr.getBytes(UTF_8);
long corrBytes = correctByteArr.length;
- try (MapHandle rh = Memory.map(origFile, 0, origBytes, ByteOrder.nativeOrder())) {
+ try (MapHandle rh = Memory.map(origFile, 0, origBytes, NATIVE_BYTE_ORDER)) {
Memory map = rh.get();
rh.load();
assertTrue(rh.isLoaded());
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/BaseStateTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/BaseStateTest.java
index 430dfa1..20c96ca 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/BaseStateTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/BaseStateTest.java
@@ -20,13 +20,12 @@
package org.apache.datasketches.memory.internal;
import static org.apache.datasketches.memory.internal.UnsafeUtil.ARRAY_DOUBLE_INDEX_SCALE;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
-import java.nio.ByteOrder;
-
import org.apache.datasketches.memory.Buffer;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.WritableBuffer;
@@ -94,7 +93,7 @@ public class BaseStateTest {
@Test
public void checkIsByteOrderCompatible() {
WritableMemory wmem = WritableMemory.allocate(8);
- assertTrue(wmem.isByteOrderCompatible(ByteOrder.nativeOrder()));
+ assertTrue(wmem.isByteOrderCompatible(NATIVE_BYTE_ORDER));
}
@Test(expectedExceptions = IllegalArgumentException.class)
@@ -105,7 +104,7 @@ public class BaseStateTest {
@Test
public void checkIsNativeByteOrder() {
- assertTrue(BaseStateImpl.isNativeByteOrder(ByteOrder.nativeOrder()));
+ assertTrue(BaseStateImpl.isNativeByteOrder(NATIVE_BYTE_ORDER));
try {
BaseStateImpl.isNativeByteOrder(null);
fail();
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/Buffer2Test.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/Buffer2Test.java
index e625cb4..3d9cb20 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/Buffer2Test.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/Buffer2Test.java
@@ -19,13 +19,13 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.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.nio.ByteBuffer;
-import java.nio.ByteOrder;
import org.apache.datasketches.memory.Buffer;
import org.apache.datasketches.memory.DefaultMemoryRequestServer;
@@ -39,7 +39,7 @@ public class Buffer2Test {
@Test
public void testWrapByteBuf() {
- ByteBuffer bb = ByteBuffer.allocate(64).order(ByteOrder.nativeOrder());
+ ByteBuffer bb = ByteBuffer.allocate(64).order(NATIVE_BYTE_ORDER);
Byte b = 0;
while (bb.hasRemaining()) {
@@ -48,7 +48,7 @@ public class Buffer2Test {
}
bb.position(0);
- Buffer buffer = Buffer.wrap(bb.asReadOnlyBuffer().order(ByteOrder.nativeOrder()));
+ Buffer buffer = Buffer.wrap(bb.asReadOnlyBuffer().order(NATIVE_BYTE_ORDER));
while (buffer.hasRemaining()) {
assertEquals(bb.get(), buffer.getByte());
}
@@ -59,7 +59,7 @@ public class Buffer2Test {
@Test
public void testWrapDirectBB() {
- ByteBuffer bb = ByteBuffer.allocateDirect(64).order(ByteOrder.nativeOrder());
+ ByteBuffer bb = ByteBuffer.allocateDirect(64).order(NATIVE_BYTE_ORDER);
Byte b = 0;
while (bb.hasRemaining()) {
@@ -246,7 +246,7 @@ public class Buffer2Test {
@Test
public void testByteBufferPositionPreservation() {
- ByteBuffer bb = ByteBuffer.allocate(64).order(ByteOrder.nativeOrder());
+ ByteBuffer bb = ByteBuffer.allocate(64).order(NATIVE_BYTE_ORDER);
Byte b = 0;
while (bb.hasRemaining()) {
@@ -263,7 +263,7 @@ public class Buffer2Test {
@Test
public void testGetAndHasRemaining() {
- ByteBuffer bb = ByteBuffer.allocate(64).order(ByteOrder.nativeOrder());
+ ByteBuffer bb = ByteBuffer.allocate(64).order(NATIVE_BYTE_ORDER);
Byte b = 0;
while (bb.hasRemaining()) {
@@ -279,7 +279,7 @@ public class Buffer2Test {
@Test
public void testGetSetIncResetPosition() {
- ByteBuffer bb = ByteBuffer.allocate(64).order(ByteOrder.nativeOrder());
+ ByteBuffer bb = ByteBuffer.allocate(64).order(NATIVE_BYTE_ORDER);
Byte b = 0;
while (bb.hasRemaining()) {
@@ -297,7 +297,7 @@ public class Buffer2Test {
@Test
public void testByteBufferSlice() {
- ByteBuffer bb = ByteBuffer.allocate(64).order(ByteOrder.nativeOrder());
+ ByteBuffer bb = ByteBuffer.allocate(64).order(NATIVE_BYTE_ORDER);
Byte b = 0;
while (bb.hasRemaining()) {
@@ -306,7 +306,7 @@ public class Buffer2Test {
}
bb.position(10);
- Buffer buffer = Buffer.wrap(bb.slice().order(ByteOrder.nativeOrder()));
+ Buffer buffer = Buffer.wrap(bb.slice().order(NATIVE_BYTE_ORDER));
while (buffer.hasRemaining()) {
assertEquals(bb.get(), buffer.getByte());
}
@@ -319,7 +319,7 @@ public class Buffer2Test {
@Test
public void testDuplicateAndRegion() {
- ByteBuffer bb = ByteBuffer.allocate(64).order(ByteOrder.nativeOrder());
+ ByteBuffer bb = ByteBuffer.allocate(64).order(NATIVE_BYTE_ORDER);
Byte b = 0;
while (bb.hasRemaining()) {
@@ -328,7 +328,7 @@ public class Buffer2Test {
}
bb.position(10);
- Buffer buffer = Buffer.wrap(bb.slice().order(ByteOrder.nativeOrder())); //slice = 54
+ Buffer buffer = Buffer.wrap(bb.slice().order(NATIVE_BYTE_ORDER)); //slice = 54
buffer.setPosition(30);//remaining = 24
Buffer dupBuffer = buffer.duplicate(); //all 54
Buffer regionBuffer = buffer.region(); //24
@@ -361,7 +361,7 @@ public class Buffer2Test {
@Test
public void testAsMemory() {
- ByteBuffer bb = ByteBuffer.allocate(64).order(ByteOrder.nativeOrder());
+ ByteBuffer bb = ByteBuffer.allocate(64).order(NATIVE_BYTE_ORDER);
Byte b = 0;
while (bb.hasRemaining()) {
@@ -410,9 +410,9 @@ public class Buffer2Test {
@Test
public void checkWritableWrap() {
ByteBuffer bb = ByteBuffer.allocate(16);
- WritableBuffer buf = WritableBuffer.writableWrap(bb, ByteOrder.nativeOrder(), null);
+ WritableBuffer buf = WritableBuffer.writableWrap(bb, NATIVE_BYTE_ORDER, null);
assertNotNull(buf);
- buf = WritableBuffer.writableWrap(bb, ByteOrder.nativeOrder(), new DefaultMemoryRequestServer());
+ buf = WritableBuffer.writableWrap(bb, NATIVE_BYTE_ORDER, new DefaultMemoryRequestServer());
assertNotNull(buf);
}
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/BufferTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/BufferTest.java
index 64b3c77..cb877b7 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/BufferTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/BufferTest.java
@@ -19,16 +19,17 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.List;
-import org.apache.datasketches.memory.WritableHandle;
import org.apache.datasketches.memory.Buffer;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.WritableBuffer;
+import org.apache.datasketches.memory.WritableHandle;
import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
import org.testng.collections.Lists;
@@ -113,7 +114,7 @@ public class BufferTest {
int n = 1024; //longs
byte[] arr = new byte[n * 8];
ByteBuffer bb = ByteBuffer.wrap(arr);
- bb.order(ByteOrder.nativeOrder());
+ bb.order(NATIVE_BYTE_ORDER);
WritableBuffer wbuf = WritableBuffer.writableWrap(bb);
for (int i = 0; i < n; i++) { //write to wbuf
@@ -135,7 +136,7 @@ public class BufferTest {
int n = 1024; //longs
byte[] arr = new byte[n * 8];
ByteBuffer bb = ByteBuffer.wrap(arr);
- bb.order(ByteOrder.nativeOrder());
+ bb.order(NATIVE_BYTE_ORDER);
WritableBuffer wbuf = WritableBuffer.writableWrap(bb);
for (int i = 0; i < n; i++) { //write to wbuf
@@ -168,7 +169,7 @@ public class BufferTest {
public void checkByteBufDirect() {
int n = 1024; //longs
ByteBuffer bb = ByteBuffer.allocateDirect(n * 8);
- bb.order(ByteOrder.nativeOrder());
+ bb.order(NATIVE_BYTE_ORDER);
WritableBuffer wbuf = WritableBuffer.writableWrap(bb);
for (int i = 0; i < n; i++) { //write to wmem
@@ -209,12 +210,12 @@ public class BufferTest {
@Test
public void checkReadOnlyHeapByteBuffer() {
ByteBuffer bb = ByteBuffer.allocate(128);
- bb.order(ByteOrder.nativeOrder());
+ bb.order(NATIVE_BYTE_ORDER);
for (int i = 0; i < 128; i++) { bb.put(i, (byte)i); }
bb.position(64);
ByteBuffer slice = bb.slice().asReadOnlyBuffer();
- slice.order(ByteOrder.nativeOrder());
+ slice.order(NATIVE_BYTE_ORDER);
Buffer buf = Buffer.wrap(slice);
for (int i = 0; i < 64; i++) {
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/DruidIssue11544Test.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/DruidIssue11544Test.java
index 581bdda..73e1832 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/DruidIssue11544Test.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/DruidIssue11544Test.java
@@ -19,13 +19,13 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.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.nio.ByteBuffer;
-import java.nio.ByteOrder;
import org.apache.datasketches.memory.DefaultMemoryRequestServer;
import org.apache.datasketches.memory.MemoryRequestServer;
@@ -57,7 +57,7 @@ public class DruidIssue11544Test {
//Start with a ByteBuffer
ByteBuffer bb = ByteBuffer.allocateDirect(size1);
- bb.order(ByteOrder.nativeOrder());
+ bb.order(NATIVE_BYTE_ORDER);
//Wrap bb into WritableMemory
WritableMemory mem1 = WritableMemory.writableWrap(bb);
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/ExampleMemoryRequestServerTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/ExampleMemoryRequestServerTest.java
index 0cf345c..f2f4547 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/ExampleMemoryRequestServerTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/ExampleMemoryRequestServerTest.java
@@ -19,6 +19,7 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertFalse;
import java.nio.ByteOrder;
@@ -65,7 +66,7 @@ public class ExampleMemoryRequestServerTest {
public void checkExampleMemoryRequestServer2() throws Exception {
int bytes = 8;
ExampleMemoryRequestServer svr = new ExampleMemoryRequestServer();
- try (WritableHandle handle = WritableMemory.allocateDirect(bytes, ByteOrder.nativeOrder(), svr)) {
+ try (WritableHandle handle = WritableMemory.allocateDirect(bytes, NATIVE_BYTE_ORDER, svr)) {
WritableMemory memStart = handle.getWritable();
MemoryClient client = new MemoryClient(memStart);
client.process();
@@ -76,7 +77,7 @@ public class ExampleMemoryRequestServerTest {
@Test(expectedExceptions = IllegalArgumentException.class)
public void checkZeroCapacity() throws Exception {
ExampleMemoryRequestServer svr = new ExampleMemoryRequestServer();
- try (WritableHandle wh = WritableMemory.allocateDirect(0, ByteOrder.nativeOrder(), svr)) {
+ try (WritableHandle wh = WritableMemory.allocateDirect(0, NATIVE_BYTE_ORDER, svr)) {
}
}
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/LeafImplTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/LeafImplTest.java
index f1ef17e..a6706c9 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/LeafImplTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/LeafImplTest.java
@@ -19,6 +19,7 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
import static org.apache.datasketches.memory.internal.Util.NON_NATIVE_BYTE_ORDER;
import static org.apache.datasketches.memory.internal.Util.otherByteOrder;
import static org.testng.Assert.assertEquals;
@@ -43,7 +44,7 @@ import org.testng.annotations.Test;
* @author Lee Rhodes
*/
public class LeafImplTest {
- private static final ByteOrder NBO = ByteOrder.nativeOrder();
+ private static final ByteOrder NBO = NATIVE_BYTE_ORDER;
private static final ByteOrder NNBO = NON_NATIVE_BYTE_ORDER;
private static final MemoryRequestServer dummyMemReqSvr = new DummyMemoryRequestServer();
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/MemoryReadWriteSafetyTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/MemoryReadWriteSafetyTest.java
index 553c432..e21eae7 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/MemoryReadWriteSafetyTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/MemoryReadWriteSafetyTest.java
@@ -19,10 +19,11 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
+
import java.io.File;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
import org.apache.datasketches.memory.MapHandle;
import org.apache.datasketches.memory.Memory;
@@ -132,13 +133,13 @@ public class MemoryReadWriteSafetyTest {
@Test(expectedExceptions = AssertionError.class)
public void testByteArrayWrapWithBO() {
- WritableMemory mem1 = (WritableMemory) Memory.wrap(new byte[8], ByteOrder.nativeOrder());
+ WritableMemory mem1 = (WritableMemory) Memory.wrap(new byte[8], NATIVE_BYTE_ORDER);
mem1.putInt(0, 1);
}
@Test(expectedExceptions = AssertionError.class)
public void testByteArrayWrapWithOffsetsAndBO() {
- WritableMemory mem1 = (WritableMemory) Memory.wrap(new byte[8], 0, 4, ByteOrder.nativeOrder());
+ WritableMemory mem1 = (WritableMemory) Memory.wrap(new byte[8], 0, 4, NATIVE_BYTE_ORDER);
mem1.putInt(0, 1);
}
@@ -210,7 +211,7 @@ public class MemoryReadWriteSafetyTest {
File tempFile = File.createTempFile("test", "test");
tempFile.deleteOnExit();
new RandomAccessFile(tempFile, "rw").setLength(8);
- try (MapHandle h = Memory.map(tempFile, 0, 4, ByteOrder.nativeOrder())) {
+ try (MapHandle h = Memory.map(tempFile, 0, 4, NATIVE_BYTE_ORDER)) {
((WritableMemory) h.get()).putInt(0, 1);
}
}
@@ -221,7 +222,7 @@ public class MemoryReadWriteSafetyTest {
File tempFile = File.createTempFile("test", "test");
tempFile.deleteOnExit();
new RandomAccessFile(tempFile, "rw").setLength(8);
- try (MapHandle unused = Memory.map(tempFile, 0, 16, ByteOrder.nativeOrder())) {
+ try (MapHandle unused = Memory.map(tempFile, 0, 16, NATIVE_BYTE_ORDER)) {
}
}
}
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java
index 07de3b4..1bbe26d 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java
@@ -24,6 +24,7 @@
package org.apache.datasketches.memory.internal;
import static org.apache.datasketches.memory.internal.Util.LS;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
import static org.apache.datasketches.memory.internal.Util.getResourceFile;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
@@ -93,7 +94,7 @@ public class MemoryTest {
long v = wmem.getLong(i * 8);
assertEquals(v, i);
}
- Memory mem = Memory.wrap(arr, ByteOrder.nativeOrder());
+ Memory mem = Memory.wrap(arr, NATIVE_BYTE_ORDER);
for (int i = 0; i < n; i++) {
long v = mem.getLong(i * 8);
assertEquals(v, i);
@@ -148,7 +149,7 @@ public class MemoryTest {
int n = 1024; //longs
byte[] arr = new byte[n * 8];
ByteBuffer bb = ByteBuffer.wrap(arr);
- bb.order(ByteOrder.nativeOrder());
+ bb.order(NATIVE_BYTE_ORDER);
WritableMemory wmem = WritableMemory.writableWrap(bb);
for (int i = 0; i < n; i++) { //write to wmem
wmem.putLong(i * 8, i);
@@ -178,7 +179,7 @@ public class MemoryTest {
public void checkByteBufDirect() {
int n = 1024; //longs
ByteBuffer bb = ByteBuffer.allocateDirect(n * 8);
- bb.order(ByteOrder.nativeOrder());
+ bb.order(NATIVE_BYTE_ORDER);
WritableMemory wmem = WritableMemory.writableWrap(bb);
for (int i = 0; i < n; i++) { //write to wmem
wmem.putLong(i * 8, i);
@@ -210,18 +211,18 @@ public class MemoryTest {
ByteBuffer bb = ByteBuffer.allocate(n * 8);
bb.order(ByteOrder.BIG_ENDIAN);
Memory mem = Memory.wrap(bb);
- assertFalse(mem.getTypeByteOrder() == ByteOrder.nativeOrder());
+ assertFalse(mem.getTypeByteOrder() == NATIVE_BYTE_ORDER);
assertEquals(mem.getTypeByteOrder(), ByteOrder.BIG_ENDIAN);
}
@Test
public void checkReadOnlyHeapByteBuffer() {
ByteBuffer bb = ByteBuffer.allocate(128);
- bb.order(ByteOrder.nativeOrder());
+ bb.order(NATIVE_BYTE_ORDER);
for (int i = 0; i < 128; i++) { bb.put(i, (byte)i); }
bb.position(64);
ByteBuffer slice = bb.slice().asReadOnlyBuffer();
- slice.order(ByteOrder.nativeOrder());
+ slice.order(NATIVE_BYTE_ORDER);
Memory mem = Memory.wrap(slice);
for (int i = 0; i < 64; i++) {
assertEquals(mem.getByte(i), 64 + i);
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java
index 0461104..01d72cf 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java
@@ -19,13 +19,13 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.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.nio.ByteBuffer;
-import java.nio.ByteOrder;
import org.apache.datasketches.memory.Buffer;
import org.apache.datasketches.memory.Memory;
@@ -241,7 +241,7 @@ public class NativeWritableBufferImplTest {
public void checkByteBufferWrap() {
int memCapacity = 64;
ByteBuffer byteBuf = ByteBuffer.allocate(memCapacity);
- byteBuf.order(ByteOrder.nativeOrder());
+ byteBuf.order(NATIVE_BYTE_ORDER);
for (int i=0; i<memCapacity; i++) {
byteBuf.put(i, (byte) i);
@@ -263,7 +263,7 @@ public class NativeWritableBufferImplTest {
public void checkWrapWithBBReadonly1() {
int memCapacity = 64;
ByteBuffer byteBuf = ByteBuffer.allocate(memCapacity);
- byteBuf.order(ByteOrder.nativeOrder());
+ byteBuf.order(NATIVE_BYTE_ORDER);
for (int i = 0; i < memCapacity; i++) {
byteBuf.put(i, (byte) i);
@@ -282,9 +282,9 @@ public class NativeWritableBufferImplTest {
public void checkWrapWithBBReadonly2() {
int memCapacity = 64;
ByteBuffer byteBuf = ByteBuffer.allocate(memCapacity);
- byteBuf.order(ByteOrder.nativeOrder());
+ byteBuf.order(NATIVE_BYTE_ORDER);
ByteBuffer byteBufRO = byteBuf.asReadOnlyBuffer();
- byteBufRO.order(ByteOrder.nativeOrder());
+ byteBufRO.order(NATIVE_BYTE_ORDER);
assertTrue(true);
WritableBuffer wbuf = WritableBuffer.writableWrap(byteBufRO);
assertTrue(wbuf.isReadOnly());
@@ -294,13 +294,13 @@ public class NativeWritableBufferImplTest {
public void checkWrapWithDirectBBReadonly() {
int memCapacity = 64;
ByteBuffer byteBuf = ByteBuffer.allocateDirect(memCapacity);
- byteBuf.order(ByteOrder.nativeOrder());
+ byteBuf.order(NATIVE_BYTE_ORDER);
for (int i = 0; i < memCapacity; i++) {
byteBuf.put(i, (byte) i);
}
ByteBuffer byteBufRO = byteBuf.asReadOnlyBuffer();
- byteBufRO.order(ByteOrder.nativeOrder());
+ byteBufRO.order(NATIVE_BYTE_ORDER);
Buffer buf = Buffer.wrap(byteBufRO);
@@ -316,7 +316,7 @@ public class NativeWritableBufferImplTest {
int memCapacity = 64;
ByteBuffer byteBuf = ByteBuffer.allocateDirect(memCapacity);
ByteBuffer byteBufRO = byteBuf.asReadOnlyBuffer();
- byteBufRO.order(ByteOrder.nativeOrder());
+ byteBufRO.order(NATIVE_BYTE_ORDER);
WritableBuffer.writableWrap(byteBufRO);
}
@@ -325,7 +325,7 @@ public class NativeWritableBufferImplTest {
public void checkByteBufferWrapDirectAccess() {
int memCapacity = 64;
ByteBuffer byteBuf = ByteBuffer.allocateDirect(memCapacity);
- byteBuf.order(ByteOrder.nativeOrder());
+ byteBuf.order(NATIVE_BYTE_ORDER);
for (int i=0; i<memCapacity; i++) {
byteBuf.put(i, (byte) i);
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java
index 8d52250..8d71db1 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java
@@ -19,6 +19,7 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -27,11 +28,11 @@ import static org.testng.Assert.fail;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import org.apache.datasketches.memory.WritableHandle;
import org.apache.datasketches.memory.Buffer;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.ReadOnlyException;
import org.apache.datasketches.memory.WritableBuffer;
+import org.apache.datasketches.memory.WritableHandle;
import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@@ -436,7 +437,7 @@ public class NativeWritableMemoryImplTest {
public void checkByteBufferWrap() {
int memCapacity = 64;
ByteBuffer byteBuf = ByteBuffer.allocate(memCapacity);
- byteBuf.order(ByteOrder.nativeOrder());
+ byteBuf.order(NATIVE_BYTE_ORDER);
for (int i=0; i<memCapacity; i++) {
byteBuf.put(i, (byte) i);
@@ -477,7 +478,7 @@ public class NativeWritableMemoryImplTest {
public void checkWrapWithBBReadonly2() {
int memCapacity = 64;
ByteBuffer byteBuf = ByteBuffer.allocate(memCapacity);
- byteBuf.order(ByteOrder.nativeOrder());
+ byteBuf.order(NATIVE_BYTE_ORDER);
ByteBuffer byteBufRO = byteBuf.asReadOnlyBuffer();
WritableMemory.writableWrap(byteBufRO);
@@ -487,13 +488,13 @@ public class NativeWritableMemoryImplTest {
public void checkWrapWithDirectBBReadonly() {
int memCapacity = 64;
ByteBuffer byteBuf = ByteBuffer.allocateDirect(memCapacity);
- byteBuf.order(ByteOrder.nativeOrder());
+ byteBuf.order(NATIVE_BYTE_ORDER);
for (int i = 0; i < memCapacity; i++) {
byteBuf.put(i, (byte) i);
}
ByteBuffer byteBufRO = byteBuf.asReadOnlyBuffer();
- byteBufRO.order(ByteOrder.nativeOrder());
+ byteBufRO.order(NATIVE_BYTE_ORDER);
Memory mem = Memory.wrap(byteBufRO);
@@ -509,7 +510,7 @@ public class NativeWritableMemoryImplTest {
int memCapacity = 64;
ByteBuffer byteBuf = ByteBuffer.allocateDirect(memCapacity);
ByteBuffer byteBufRO = byteBuf.asReadOnlyBuffer();
- byteBufRO.order(ByteOrder.nativeOrder());
+ byteBufRO.order(NATIVE_BYTE_ORDER);
WritableMemory.writableWrap(byteBufRO);
}
@@ -518,7 +519,7 @@ public class NativeWritableMemoryImplTest {
public void checkByteBufferWrapDirectAccess() {
int memCapacity = 64;
ByteBuffer byteBuf = ByteBuffer.allocateDirect(memCapacity);
- byteBuf.order(ByteOrder.nativeOrder());
+ byteBuf.order(NATIVE_BYTE_ORDER);
for (int i=0; i<memCapacity; i++) {
byteBuf.put(i, (byte) i);
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java
index 87f7e35..8575b05 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java
@@ -19,6 +19,7 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -43,7 +44,7 @@ public class SpecificLeafTest {
public void checkByteBufferLeafs() {
int bytes = 128;
ByteBuffer bb = ByteBuffer.allocate(bytes);
- bb.order(ByteOrder.nativeOrder());
+ bb.order(NATIVE_BYTE_ORDER);
Memory mem = Memory.wrap(bb).region(0, bytes, ByteOrder.nativeOrder());
assertTrue(((BaseStateImpl)mem).isBBType());
@@ -73,8 +74,8 @@ public class SpecificLeafTest {
checkCrossLeafTypeIds(wmem);
WritableMemory nnwmem = wmem.writableRegion(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
- Memory mem = wmem.region(0, bytes, ByteOrder.nativeOrder());
- Buffer buf = mem.asBuffer().region(0, bytes, ByteOrder.nativeOrder());
+ Memory mem = wmem.region(0, bytes, NATIVE_BYTE_ORDER);
+ Buffer buf = mem.asBuffer().region(0, bytes, NATIVE_BYTE_ORDER);
Memory mem2 = nnwmem.region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
@@ -106,15 +107,15 @@ public class SpecificLeafTest {
final long bytes = 128;
- try (WritableMapHandle h = WritableMemory.writableMap(file, 0L, bytes, ByteOrder.nativeOrder())) {
+ try (WritableMapHandle h = WritableMemory.writableMap(file, 0L, bytes, NATIVE_BYTE_ORDER)) {
WritableMemory mem = h.getWritable(); //native mem
assertTrue(((BaseStateImpl)mem).isMapType());
assertFalse(mem.isReadOnly());
checkCrossLeafTypeIds(mem);
Memory nnreg = mem.region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
- Memory reg = mem.region(0, bytes, ByteOrder.nativeOrder());
- Buffer buf = reg.asBuffer().region(0, bytes, ByteOrder.nativeOrder());
+ Memory reg = mem.region(0, bytes, NATIVE_BYTE_ORDER);
+ Buffer buf = reg.asBuffer().region(0, bytes, NATIVE_BYTE_ORDER);
Buffer buf4 = buf.duplicate();
Memory reg2 = nnreg.region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
@@ -139,8 +140,8 @@ public class SpecificLeafTest {
checkCrossLeafTypeIds(mem);
Memory nnreg = mem.region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
- Memory reg = mem.region(0, bytes, ByteOrder.nativeOrder());
- Buffer buf = reg.asBuffer().region(0, bytes, ByteOrder.nativeOrder());
+ Memory reg = mem.region(0, bytes, NATIVE_BYTE_ORDER);
+ Buffer buf = reg.asBuffer().region(0, bytes, NATIVE_BYTE_ORDER);
Buffer buf4 = buf.duplicate();
Memory reg2 = nnreg.region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/WritableMemoryTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/WritableMemoryTest.java
index 1226cc5..2d11a44 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/WritableMemoryTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/WritableMemoryTest.java
@@ -19,6 +19,7 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -39,7 +40,7 @@ public class WritableMemoryTest {
ByteBuffer bb = ByteBuffer.allocate(64); //big endian
WritableMemory wmem = WritableMemory.writableWrap(bb);
assertEquals(wmem.getTypeByteOrder(), ByteOrder.BIG_ENDIAN);
- wmem = WritableMemory.writableWrap(bb, ByteOrder.nativeOrder());
+ wmem = WritableMemory.writableWrap(bb, NATIVE_BYTE_ORDER);
assertEquals(wmem.getTypeByteOrder(), ByteOrder.LITTLE_ENDIAN);
}
@@ -163,11 +164,11 @@ public class WritableMemoryTest {
@Test
public void checkWrapWithBO() {
WritableMemory wmem = WritableMemory.writableWrap(new byte[0], ByteOrder.BIG_ENDIAN);
- boolean nativeBO = wmem.getTypeByteOrder() == ByteOrder.nativeOrder();
+ boolean nativeBO = wmem.getTypeByteOrder() == NATIVE_BYTE_ORDER;
assertFalse(nativeBO);
println("" + nativeBO);
wmem = WritableMemory.writableWrap(new byte[8], ByteOrder.BIG_ENDIAN);
- nativeBO = wmem.getTypeByteOrder() == ByteOrder.nativeOrder();
+ nativeBO = wmem.getTypeByteOrder() == NATIVE_BYTE_ORDER;
assertFalse(nativeBO);
println("" + nativeBO);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org