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:59 UTC
[datasketches-memory] 02/03: Continued changing references to Util.*_NATIVE_BYTE_ORDER.
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