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 2023/01/13 23:29:48 UTC
[datasketches-memory] branch master_tempfix updated: Improved testing. Coverage is 96.1% (excluding test).
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch master_tempfix
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
The following commit(s) were added to refs/heads/master_tempfix by this push:
new 72b08a0 Improved testing. Coverage is 96.1% (excluding test).
72b08a0 is described below
commit 72b08a0e4130d6761b93c503295094a51d6e2ba2
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Fri Jan 13 15:29:37 2023 -0800
Improved testing. Coverage is 96.1% (excluding test).
---
.../datasketches/memory/internal/BaseStateImpl.java | 20 --------------------
.../memory/internal/AllocateDirectMapMemoryTest.java | 4 ++--
.../datasketches/memory/internal/BaseStateTest.java | 2 +-
.../datasketches/memory/internal/LeafImplTest.java | 13 ++++++++++++-
4 files changed, 15 insertions(+), 24 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 fa75de8..8af55c6 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
@@ -466,24 +466,4 @@ public abstract class BaseStateImpl implements BaseState {
return XxHash64.hash(in, seed);
}
-//@Override
-//public final long getCumulativeOffset(final long offsetBytes) {
-// assertValid();
-// return cumBaseOffset_ + offsetBytes;
-//}
-
-//@Override
-//public final long getRegionOffset() {
-// final Object unsafeObj = getUnsafeObject();
-// final long nativeBaseOff = getNativeBaseOffset();
-// return unsafeObj == null
-// ? cumBaseOffset_ - nativeBaseOff
-// : cumBaseOffset_ - UnsafeUtil.getArrayBaseOffset(unsafeObj.getClass());
-//}
-
-//@Override
-//public final long getRegionOffset(final long offsetBytes) {
-// return getRegionOffset() + offsetBytes;
-//}
-
}
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 5845be2..38a5d3b 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
@@ -66,7 +66,7 @@ public class AllocateDirectMapMemoryTest {
println("Native Off: " + ((BaseStateImpl)mem).getNativeBaseOffset());
println("Total Offset: " + mem.getTotalOffset());
println("Cum Offset: " + ((BaseStateImpl)mem).getCumulativeOffset(0));
- println("Region Offset: " + mem.getTotalOffset());
+ println("Total Offset: " + mem.getTotalOffset());
StringBuilder sb = new StringBuilder();
mem.getCharsFromUtf8(43, 176, sb);
println(sb.toString());
@@ -77,7 +77,7 @@ public class AllocateDirectMapMemoryTest {
println("Native Off: " + ((BaseStateImpl)mem).getNativeBaseOffset());
println("Offset: " + mem.getTotalOffset());
println("Cum Offset: " + ((BaseStateImpl)mem2).getCumulativeOffset(0));
- println("Region Offset: " + mem2.getTotalOffset());
+ println("Total Offset: " + mem2.getTotalOffset());
StringBuilder sb2 = new StringBuilder();
mem2.getCharsFromUtf8(0, 12, sb2);
println(sb2.toString());
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 b4a193a..7db7926 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
@@ -85,7 +85,7 @@ public class BaseStateTest {
}
@Test
- public void checkGetNativeBaseOffset_Heap() throws Exception {
+ public void checkGetNativeBaseOffset_Heap() {
WritableMemory wmem = WritableMemory.allocate(8); //heap
final long offset = ((BaseStateImpl)wmem).getNativeBaseOffset();
assertEquals(offset, 0L);
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 e0082ff..9b40200 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
@@ -175,9 +175,9 @@ public class LeafImplTest {
assertEquals(mem.writableRegion(off, cap, bo).getShort(0), 1);
assertEquals(mem.writableRegion(off, cap, oo).getShort(0), 256);
-
assertEquals(mem.asWritableBuffer(bo).getShort(0), 1);
assertEquals(mem.asWritableBuffer(oo).getShort(0), 256);
+ assertEquals(mem.getTotalOffset(), 0);
ByteBuffer bb = mem.getByteBuffer();
assertTrue( hasByteBuffer ? bb != null : bb == null);
@@ -185,14 +185,17 @@ public class LeafImplTest {
assertTrue(mem.getByteOrder() == bo);
if (hasMemReqSvr) { assertTrue(mem.getMemoryRequestServer() instanceof DummyMemoryRequestServer); }
+ else { assertNull(mem.getMemoryRequestServer()); }
Object obj = ((BaseStateImpl)mem).getUnsafeObject();
if (direct) {
assertTrue(mem.isDirect());
assertNull(obj);
+ assertTrue(((BaseStateImpl)mem).getNativeBaseOffset() != 0);
} else {
assertFalse(mem.isDirect());
assertNotNull(obj);
+ assertTrue(((BaseStateImpl)mem).getNativeBaseOffset() == 0);
}
assertTrue(mem.isValid() == true);
@@ -203,6 +206,7 @@ public class LeafImplTest {
assertEquals(buf.writableRegion(off, cap, oo).getShort(0), 256);
assertEquals(buf.writableDuplicate(bo).getShort(0), 1);
assertEquals(buf.writableDuplicate(oo).getShort(0), 256);
+ assertEquals(buf.getTotalOffset(), 0);
bb = buf.getByteBuffer();
assertTrue(hasByteBuffer ? bb != null : bb == null);
@@ -210,14 +214,17 @@ public class LeafImplTest {
assertTrue(buf.getByteOrder() == bo);
if (hasMemReqSvr) { assertTrue(buf.getMemoryRequestServer() instanceof DummyMemoryRequestServer); }
+ else { assertNull(buf.getMemoryRequestServer()); }
obj = ((BaseStateImpl)buf).getUnsafeObject();
if (direct) {
assertTrue(buf.isDirect());
assertNull(obj);
+ assertTrue(((BaseStateImpl)buf).getNativeBaseOffset() != 0);
} else {
assertFalse(buf.isDirect());
assertNotNull(obj);
+ assertTrue(((BaseStateImpl)buf).getNativeBaseOffset() == 0);
}
assertTrue(buf.isValid() == true);
@@ -240,9 +247,11 @@ public class LeafImplTest {
if (direct) {
assertTrue(nnMem.isDirect());
assertNull(obj);
+ assertTrue(((BaseStateImpl)nnMem).getNativeBaseOffset() != 0);
} else {
assertFalse(nnMem.isDirect());
assertNotNull(obj);
+ assertTrue(((BaseStateImpl)nnMem).getNativeBaseOffset() == 0);
}
assertTrue(nnMem.isValid() == true);
@@ -265,9 +274,11 @@ public class LeafImplTest {
if (direct) {
assertTrue(nnBuf.isDirect());
assertNull(obj);
+ assertTrue(((BaseStateImpl)nnBuf).getNativeBaseOffset() != 0);
} else {
assertFalse(nnBuf.isDirect());
assertNotNull(obj);
+ assertTrue(((BaseStateImpl)nnBuf).getNativeBaseOffset() == 0);
}
assertTrue(nnBuf.isValid() == true);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org