This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch removeHandles
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
The following commit(s) were added to refs/heads/removeHandles by this push:
new 9d0c885 Rename BaseState class to Resource
9d0c885 is described below
commit 9d0c885bb5877e1ca1b6d8721c6fe025509a6b20
Author: Lee Rhodes <[email protected]>
AuthorDate: Wed Jan 25 15:33:37 2023 -0800
Rename BaseState class to Resource
and BaseStateImpl class to ResourceImpl class
Runs all tests
---
.../org/apache/datasketches/memory/BaseBuffer.java | 2 +-
.../org/apache/datasketches/memory/Memory.java | 2 +-
.../apache/datasketches/memory/MurmurHash3v2.java | 4 +-
.../memory/{BaseState.java => Resource.java} | 12 +--
.../memory/internal/AllocateDirect.java | 10 +--
.../memory/internal/AllocateDirectWritableMap.java | 10 +--
.../memory/internal/BaseBufferImpl.java | 2 +-
.../memory/internal/BaseWritableBufferImpl.java | 4 +-
.../memory/internal/BaseWritableMemoryImpl.java | 8 +-
.../memory/internal/CompareAndCopy.java | 14 ++--
.../{BaseStateImpl.java => ResourceImpl.java} | 28 +++----
.../internal/AllocateDirectMapMemoryTest.java | 8 +-
.../memory/internal/AllocateDirectMemoryTest.java | 10 +--
.../AllocateDirectWritableMapMemoryTest.java | 4 +-
.../datasketches/memory/internal/LeafImplTest.java | 44 +++++-----
.../datasketches/memory/internal/MemoryTest.java | 32 ++++----
.../internal/NativeWritableBufferImplTest.java | 2 +-
.../internal/NativeWritableMemoryImplTest.java | 2 +-
.../{BaseStateTest.java => ResourceTest.java} | 6 +-
.../memory/internal/SpecificLeafTest.java | 95 ++++++++++------------
.../datasketches/memory/internal/XxHash64Test.java | 4 +-
21 files changed, 147 insertions(+), 156 deletions(-)
diff --git
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/BaseBuffer.java
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/BaseBuffer.java
index 3e1869e..711de64 100644
---
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/BaseBuffer.java
+++
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/BaseBuffer.java
@@ -24,7 +24,7 @@ package org.apache.datasketches.memory;
*
* @author Lee Rhodes
*/
-public interface BaseBuffer extends BaseState {
+public interface BaseBuffer extends Resource {
/**
* Increments the current position by the given increment.
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..3500d93 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
@@ -37,7 +37,7 @@ import org.apache.datasketches.memory.internal.UnsafeUtil;
*
* @author Lee Rhodes
*/
-public interface Memory extends BaseState {
+public interface Memory extends Resource {
//BYTE BUFFER
diff --git
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/MurmurHash3v2.java
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/MurmurHash3v2.java
index 673490a..b862571 100644
---
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/MurmurHash3v2.java
+++
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/MurmurHash3v2.java
@@ -22,7 +22,7 @@ package org.apache.datasketches.memory;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe;
-import org.apache.datasketches.memory.internal.BaseStateImpl;
+import org.apache.datasketches.memory.internal.ResourceImpl;
/**
* <p>The MurmurHash3 is a fast, non-cryptographic, 128-bit hash function that
has
@@ -179,7 +179,7 @@ public final class MurmurHash3v2 {
if (uObj == null) {
throw new IllegalArgumentException("The backing resource of input mem is
not on-heap.");
}
- long cumOff = ((BaseStateImpl)mem).getCumulativeOffset(offsetBytes);
+ long cumOff = ((ResourceImpl)mem).getCumulativeOffset(offsetBytes);
long h1 = seed;
long h2 = seed;
diff --git
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/BaseState.java
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/Resource.java
similarity index 95%
rename from
datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/BaseState.java
rename to
datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/Resource.java
index 2c5c7f7..b635fdc 100644
---
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/BaseState.java
+++
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/Resource.java
@@ -22,7 +22,7 @@ package org.apache.datasketches.memory;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import org.apache.datasketches.memory.internal.BaseStateImpl;
+import org.apache.datasketches.memory.internal.ResourceImpl;
/**
* Keeps key configuration state for Memory and Buffer plus some common static
variables
@@ -30,7 +30,7 @@ import org.apache.datasketches.memory.internal.BaseStateImpl;
*
* @author Lee Rhodes
*/
-public interface BaseState {
+public interface Resource {
/**
* The placeholder for the default MemoryRequestServer, if set at all.
@@ -93,7 +93,7 @@ public interface BaseState {
* @return the current size of active direct memory allocated.
*/
static long getCurrentDirectMemoryAllocated() {
- return BaseStateImpl.getCurrentDirectMemoryAllocated();
+ return ResourceImpl.getCurrentDirectMemoryAllocated();
}
/**
@@ -101,7 +101,7 @@ public interface BaseState {
* @return the current number of active direct memory allocations.
*/
static long getCurrentDirectMemoryAllocations() {
- return BaseStateImpl.getCurrentDirectMemoryAllocations();
+ return ResourceImpl.getCurrentDirectMemoryAllocations();
}
/**
@@ -109,7 +109,7 @@ public interface BaseState {
* @return the current size of active direct memory map allocated.
*/
static long getCurrentDirectMemoryMapAllocated() {
- return BaseStateImpl.getCurrentDirectMemoryMapAllocated();
+ return ResourceImpl.getCurrentDirectMemoryMapAllocated();
}
/**
@@ -117,7 +117,7 @@ public interface BaseState {
* @return the current number of active direct memory map allocations.
*/
static long getCurrentDirectMemoryMapAllocations() {
- return BaseStateImpl.getCurrentDirectMemoryMapAllocations();
+ return ResourceImpl.getCurrentDirectMemoryMapAllocations();
}
//End Monitoring
diff --git
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/AllocateDirect.java
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/AllocateDirect.java
index ae649ef..f6bafd0 100644
---
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/AllocateDirect.java
+++
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/AllocateDirect.java
@@ -79,7 +79,7 @@ final class AllocateDirect {
}
return false;
} finally {
- BaseStateImpl.reachabilityFence(this);
+ ResourceImpl.reachabilityFence(this);
}
}
@@ -99,8 +99,8 @@ final class AllocateDirect {
private final StepBoolean valid = new StepBoolean(true); //only place for
this
Deallocator(final long nativeAddress, final long allocationSize, final
long capacity) {
- BaseStateImpl.currentDirectMemoryAllocations_.incrementAndGet();
- BaseStateImpl.currentDirectMemoryAllocated_.addAndGet(capacity);
+ ResourceImpl.currentDirectMemoryAllocations_.incrementAndGet();
+ ResourceImpl.currentDirectMemoryAllocated_.addAndGet(capacity);
this.nativeAddress = nativeAddress;
this.allocationSize = allocationSize;
this.capacity = capacity;
@@ -124,8 +124,8 @@ final class AllocateDirect {
}
unsafe.freeMemory(nativeAddress);
NioBits.unreserveMemory(allocationSize, capacity);
- BaseStateImpl.currentDirectMemoryAllocations_.decrementAndGet();
- BaseStateImpl.currentDirectMemoryAllocated_.addAndGet(-capacity);
+ ResourceImpl.currentDirectMemoryAllocations_.decrementAndGet();
+ ResourceImpl.currentDirectMemoryAllocated_.addAndGet(-capacity);
return true;
}
return false;
diff --git
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMap.java
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMap.java
index 96e91de..c217356 100644
---
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMap.java
+++
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMap.java
@@ -189,7 +189,7 @@ class AllocateDirectWritableMap implements WritableMap {
} catch (final Exception e) {
throw new MemoryCloseException(resource);
} finally {
- BaseStateImpl.reachabilityFence(this);
+ ResourceImpl.reachabilityFence(this);
}
}
@@ -279,8 +279,8 @@ class AllocateDirectWritableMap implements WritableMap {
Deallocator(final long nativeBaseOffset, final long capacityBytes,
final RandomAccessFile raf) {
- BaseStateImpl.currentDirectMemoryMapAllocations_.incrementAndGet();
- BaseStateImpl.currentDirectMemoryMapAllocated_.addAndGet(capacityBytes);
+ ResourceImpl.currentDirectMemoryMapAllocations_.incrementAndGet();
+ ResourceImpl.currentDirectMemoryMapAllocated_.addAndGet(capacityBytes);
myRaf = raf;
assert myRaf != null;
myFc = myRaf.getChannel();
@@ -309,8 +309,8 @@ class AllocateDirectWritableMap implements WritableMap {
unmap();
}
finally {
- BaseStateImpl.currentDirectMemoryMapAllocations_.decrementAndGet();
-
BaseStateImpl.currentDirectMemoryMapAllocated_.addAndGet(-myCapacity);
+ ResourceImpl.currentDirectMemoryMapAllocations_.decrementAndGet();
+ ResourceImpl.currentDirectMemoryMapAllocated_.addAndGet(-myCapacity);
}
return true;
}
diff --git
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseBufferImpl.java
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseBufferImpl.java
index 380b0d2..22c42eb 100644
---
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseBufferImpl.java
+++
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseBufferImpl.java
@@ -39,7 +39,7 @@ import org.apache.datasketches.memory.ReadOnlyException;
*
* @author Lee Rhodes
*/
-public abstract class BaseBufferImpl extends BaseStateImpl implements
BaseBuffer {
+public abstract class BaseBufferImpl extends ResourceImpl implements
BaseBuffer {
private long capacity;
private long start = 0;
private long pos = 0;
diff --git
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java
index d5f95f8..36106e8 100644
---
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java
+++
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java
@@ -290,8 +290,8 @@ public abstract class BaseWritableBufferImpl extends
BaseBufferImpl implements W
@Override
public final int compareTo(final long thisOffsetBytes, final long
thisLengthBytes,
final Buffer thatBuf, final long thatOffsetBytes, final long
thatLengthBytes) {
- return CompareAndCopy.compare((BaseStateImpl)this, thisOffsetBytes,
thisLengthBytes,
- (BaseStateImpl)thatBuf, thatOffsetBytes, thatLengthBytes);
+ return CompareAndCopy.compare((ResourceImpl)this, thisOffsetBytes,
thisLengthBytes,
+ (ResourceImpl)thatBuf, thatOffsetBytes, thatLengthBytes);
}
/*
diff --git
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java
index 24226e6..eea9ede 100644
---
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java
+++
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java
@@ -65,7 +65,7 @@ import org.apache.datasketches.memory.WritableMemory;
* Contains methods which are agnostic to the byte order.
*/
@SuppressWarnings("restriction")
-public abstract class BaseWritableMemoryImpl extends BaseStateImpl implements
WritableMemory {
+public abstract class BaseWritableMemoryImpl extends ResourceImpl implements
WritableMemory {
//1KB of empty bytes for speedy clear()
private final static byte[] EMPTY_BYTES;
@@ -326,14 +326,14 @@ public abstract class BaseWritableMemoryImpl extends
BaseStateImpl implements Wr
@Override
public final int compareTo(final long thisOffsetBytes, final long
thisLengthBytes,
final Memory thatMem, final long thatOffsetBytes, final long
thatLengthBytes) {
- return CompareAndCopy.compare((BaseStateImpl)this, thisOffsetBytes,
thisLengthBytes,
- (BaseStateImpl)thatMem, thatOffsetBytes, thatLengthBytes);
+ return CompareAndCopy.compare((ResourceImpl)this, thisOffsetBytes,
thisLengthBytes,
+ (ResourceImpl)thatMem, thatOffsetBytes, thatLengthBytes);
}
@Override
public final void copyTo(final long srcOffsetBytes, final WritableMemory
destination,
final long dstOffsetBytes, final long lengthBytes) {
- CompareAndCopy.copy((BaseStateImpl)this, srcOffsetBytes,
(BaseStateImpl)destination,
+ CompareAndCopy.copy((ResourceImpl)this, srcOffsetBytes,
(ResourceImpl)destination,
dstOffsetBytes, lengthBytes);
}
diff --git
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/CompareAndCopy.java
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/CompareAndCopy.java
index cb5b9b0..aa8b2e2 100644
---
a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/CompareAndCopy.java
+++
b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/CompareAndCopy.java
@@ -38,8 +38,8 @@ final class CompareAndCopy {
private CompareAndCopy() { }
static int compare(
- final BaseStateImpl state1, final long offsetBytes1, final long
lengthBytes1,
- final BaseStateImpl state2, final long offsetBytes2, final long
lengthBytes2) {
+ final ResourceImpl state1, final long offsetBytes1, final long
lengthBytes1,
+ final ResourceImpl state2, final long offsetBytes2, final long
lengthBytes2) {
state1.checkValid();
checkBounds(offsetBytes1, lengthBytes1, state1.getCapacity());
state2.checkValid();
@@ -60,7 +60,7 @@ final class CompareAndCopy {
return Long.compare(lengthBytes1, lengthBytes2);
}
- static boolean equals(final BaseStateImpl state1, final BaseStateImpl
state2) {
+ static boolean equals(final ResourceImpl state1, final ResourceImpl state2) {
final long cap1 = state1.getCapacity();
final long cap2 = state2.getCapacity();
return (cap1 == cap2) && equals(state1, 0, state2, 0, cap1);
@@ -70,8 +70,8 @@ final class CompareAndCopy {
// stop if the arrays and offsets are the same as there is only one length.
Also this can take
// advantage of chunking with longs, while compare cannot.
static boolean equals(
- final BaseStateImpl state1, final long offsetBytes1,
- final BaseStateImpl state2, final long offsetBytes2, long lengthBytes) {
+ final ResourceImpl state1, final long offsetBytes1,
+ final ResourceImpl state2, final long offsetBytes2, long lengthBytes) {
state1.checkValid();
checkBounds(offsetBytes1, lengthBytes, state1.getCapacity());
state2.checkValid();
@@ -112,8 +112,8 @@ final class CompareAndCopy {
return true;
}
- static void copy(final BaseStateImpl srcState, final long srcOffsetBytes,
- final BaseStateImpl dstState, final long dstOffsetBytes, final long
lengthBytes) {
+ static void copy(final ResourceImpl srcState, final long srcOffsetBytes,
+ final ResourceImpl dstState, final long dstOffsetBytes, final long
lengthBytes) {
srcState.checkValid();
checkBounds(srcOffsetBytes, lengthBytes, srcState.getCapacity());
dstState.checkValid();
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/ResourceImpl.java
similarity index 94%
rename from
datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java
rename to
datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/ResourceImpl.java
index baac110..178495f 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/ResourceImpl.java
@@ -28,9 +28,9 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.datasketches.memory.BaseState;
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.ReadOnlyException;
+import org.apache.datasketches.memory.Resource;
/**
* Keeps key configuration state for MemoryImpl and BufferImpl plus some
common static variables
@@ -39,7 +39,7 @@ import org.apache.datasketches.memory.ReadOnlyException;
* @author Lee Rhodes
*/
@SuppressWarnings("restriction")
-public abstract class BaseStateImpl implements BaseState {
+public abstract class ResourceImpl implements Resource {
//Monitoring
static final AtomicLong currentDirectMemoryAllocations_ = new AtomicLong();
@@ -75,7 +75,7 @@ public abstract class BaseStateImpl implements BaseState {
/**
* The root of the Memory inheritance hierarchy
*/
- BaseStateImpl() { }
+ ResourceImpl() { }
final void assertValid() {
assert isValid() : "MemoryImpl not valid.";
@@ -123,16 +123,16 @@ public abstract class BaseStateImpl implements BaseState {
@Override
public final boolean equals(final Object that) {
if (this == that) { return true; }
- return that instanceof BaseStateImpl
- ? CompareAndCopy.equals(this, (BaseStateImpl) that)
+ return that instanceof ResourceImpl
+ ? CompareAndCopy.equals(this, (ResourceImpl) that)
: false;
}
@Override
public final boolean equalTo(final long thisOffsetBytes, final Object that,
final long thatOffsetBytes, final long lengthBytes) {
- return that instanceof BaseStateImpl
- ? CompareAndCopy.equals(this, thisOffsetBytes, (BaseStateImpl) that,
thatOffsetBytes, lengthBytes)
+ return that instanceof ResourceImpl
+ ? CompareAndCopy.equals(this, thisOffsetBytes, (ResourceImpl) that,
thatOffsetBytes, lengthBytes)
: false;
}
@@ -171,7 +171,7 @@ public abstract class BaseStateImpl implements BaseState {
* @return the current size of active direct memory allocated.
*/
public static final long getCurrentDirectMemoryAllocated() {
- return BaseStateImpl.currentDirectMemoryAllocated_.get();
+ return ResourceImpl.currentDirectMemoryAllocated_.get();
}
/**
@@ -179,7 +179,7 @@ public abstract class BaseStateImpl implements BaseState {
* @return the current number of active direct memory allocations.
*/
public static final long getCurrentDirectMemoryAllocations() {
- return BaseStateImpl.currentDirectMemoryAllocations_.get();
+ return ResourceImpl.currentDirectMemoryAllocations_.get();
}
/**
@@ -187,7 +187,7 @@ public abstract class BaseStateImpl implements BaseState {
* @return the current size of active direct memory map allocated.
*/
public static final long getCurrentDirectMemoryMapAllocated() {
- return BaseStateImpl.currentDirectMemoryMapAllocated_.get();
+ return ResourceImpl.currentDirectMemoryMapAllocated_.get();
}
/**
@@ -195,7 +195,7 @@ public abstract class BaseStateImpl implements BaseState {
* @return the current number of active direct memory map allocations.
*/
public static final long getCurrentDirectMemoryMapAllocations() {
- return BaseStateImpl.currentDirectMemoryMapAllocations_.get();
+ return ResourceImpl.currentDirectMemoryMapAllocations_.get();
}
//END monitoring
@@ -314,7 +314,7 @@ public abstract class BaseStateImpl implements BaseState {
public boolean isSameResource(final Object that) {
checkValid();
if (that == null) { return false; }
- final BaseStateImpl that1 = (BaseStateImpl) that;
+ final ResourceImpl that1 = (ResourceImpl) that;
that1.checkValid();
if (this == that1) { return true; }
@@ -338,13 +338,13 @@ public abstract class BaseStateImpl implements BaseState {
/**
* Returns a formatted hex string of an area of this object.
* Used primarily for testing.
- * @param state the BaseStateImpl
+ * @param state the ResourceImpl
* @param preamble a descriptive header
* @param offsetBytes offset bytes relative to the MemoryImpl start
* @param lengthBytes number of bytes to convert to a hex string
* @return a formatted hex string in a human readable array
*/
- static final String toHex(final BaseStateImpl state, final String preamble,
final long offsetBytes,
+ static final String toHex(final ResourceImpl state, final String preamble,
final long offsetBytes,
final int lengthBytes) {
final long capacity = state.getCapacity();
UnsafeUtil.checkBounds(offsetBytes, lengthBytes, capacity);
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 861e027..8ee0f5c 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
@@ -63,9 +63,9 @@ public class AllocateDirectMapMemoryTest {
{
Memory mem = rh.get();
println("Mem Cap: " + mem.getCapacity());
- println("Native Off: " + ((BaseStateImpl)mem).getNativeBaseOffset());
+ println("Native Off: " + ((ResourceImpl)mem).getNativeBaseOffset());
println("Total Offset: " + mem.getTotalOffset());
- println("Cum Offset: " + ((BaseStateImpl)mem).getCumulativeOffset(0));
+ println("Cum Offset: " + ((ResourceImpl)mem).getCumulativeOffset(0));
println("Total Offset: " + mem.getTotalOffset());
StringBuilder sb = new StringBuilder();
mem.getCharsFromUtf8(43, 176, sb);
@@ -74,9 +74,9 @@ public class AllocateDirectMapMemoryTest {
println("");
Memory mem2 = mem.region(43 + 76, 20);
println("Mem Cap: " + mem2.getCapacity());
- println("Native Off: " + ((BaseStateImpl)mem).getNativeBaseOffset());
+ println("Native Off: " + ((ResourceImpl)mem).getNativeBaseOffset());
println("Offset: " + mem.getTotalOffset());
- println("Cum Offset: " +
((BaseStateImpl)mem2).getCumulativeOffset(0));
+ println("Cum Offset: " + ((ResourceImpl)mem2).getCumulativeOffset(0));
println("Total Offset: " + mem2.getTotalOffset());
StringBuilder sb2 = new StringBuilder();
mem2.getCharsFromUtf8(0, 12, sb2);
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 b297f4a..7e2e89a 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
@@ -23,7 +23,7 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.fail;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.DefaultMemoryRequestServer;
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.WritableHandle;
@@ -44,12 +44,12 @@ public class AllocateDirectMemoryTest {
assertEquals(wMem.getLong(i << 3), i);
}
//inside the TWR block the memory should be valid
- ((BaseStateImpl)wMem).checkValid();
+ ((ResourceImpl)wMem).checkValid();
//OK
}
//The TWR block has exited, so the memory should be invalid
try {
- ((BaseStateImpl)wMem).checkValid();
+ ((ResourceImpl)wMem).checkValid();
fail();
} catch (final RuntimeException e) {
//OK
@@ -71,7 +71,7 @@ public class AllocateDirectMemoryTest {
int longs2 = 64;
int bytes2 = longs2 << 3;
MemoryRequestServer memReqSvr;
- if (BaseState.defaultMemReqSvr == null) {
+ if (Resource.defaultMemReqSvr == null) {
memReqSvr = new DefaultMemoryRequestServer();
} else {
memReqSvr = origWmem.getMemoryRequestServer();
@@ -108,7 +108,7 @@ public class AllocateDirectMemoryTest {
@AfterClass
public void checkDirectCounter() {
WritableMemory.writableWrap(new byte[8]);
- long count = BaseState.getCurrentDirectMemoryAllocations();
+ long count = Resource.getCurrentDirectMemoryAllocations();
if (count != 0) {
println("" + count);
fail();
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 6017fac..2997c0e 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
@@ -36,7 +36,7 @@ import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.nio.ByteOrder;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.MapHandle;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.ReadOnlyException;
@@ -224,7 +224,7 @@ public class AllocateDirectWritableMapMemoryTest {
@AfterClass
public void checkDirectCounter() {
- long count = BaseState.getCurrentDirectMemoryMapAllocations();
+ long count = Resource.getCurrentDirectMemoryMapAllocations();
if (count != 0) {
println("" + count);
fail();
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 af0abe5..01e9577 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
@@ -64,7 +64,7 @@ public class LeafImplTest {
try (WritableHandle wdh = WritableMemory.allocateDirect(cap, NBO,
dummyMemReqSvr)) {
WritableMemory memNO = wdh.getWritable();
memNO.putShort(0, (short) 1);
- assertNull(((BaseStateImpl)memNO).getUnsafeObject());
+ assertNull(((ResourceImpl)memNO).getUnsafeObject());
assertTrue(memNO.isDirect());
checkCombinations(memNO, off, cap, memNO.isDirect(), NBO, false, true);
}
@@ -72,7 +72,7 @@ public class LeafImplTest {
try (WritableHandle wdh = WritableMemory.allocateDirect(cap, NNBO,
dummyMemReqSvr)) {
WritableMemory memNNO = wdh.getWritable();
memNNO.putShort(0, (short) 1);
- assertNull(((BaseStateImpl)memNNO).getUnsafeObject());
+ assertNull(((ResourceImpl)memNNO).getUnsafeObject());
assertTrue(memNNO.isDirect());
checkCombinations(memNNO, off, cap, memNNO.isDirect(), NNBO, false,
true);
}
@@ -88,7 +88,7 @@ public class LeafImplTest {
bb.putShort(0, (short) 1);
WritableMemory mem = WritableMemory.writableWrap(bb, NBO, dummyMemReqSvr);
assertEquals(bb.isDirect(), mem.isDirect());
- assertNotNull(((BaseStateImpl)mem).getUnsafeObject());
+ assertNotNull(((ResourceImpl)mem).getUnsafeObject());
checkCombinations(mem, off, cap, mem.isDirect(), mem.getByteOrder(), true,
true);
//BB off heap, native order, has ByteBuffer, has MemReqSvr
@@ -97,7 +97,7 @@ public class LeafImplTest {
dbb.putShort(0, (short) 1);
mem = WritableMemory.writableWrap(dbb, NBO, dummyMemReqSvr);
assertEquals(dbb.isDirect(), mem.isDirect());
- assertNull(((BaseStateImpl)mem).getUnsafeObject());
+ assertNull(((ResourceImpl)mem).getUnsafeObject());
checkCombinations(mem, off, cap, mem.isDirect(), mem.getByteOrder(),
true, true);
//BB on heap, non native order, has ByteBuffer, has MemReqSvr
@@ -106,7 +106,7 @@ public class LeafImplTest {
bb.putShort(0, (short) 1);
mem = WritableMemory.writableWrap(bb, NNBO, dummyMemReqSvr);
assertEquals(bb.isDirect(), mem.isDirect());
- assertNotNull(((BaseStateImpl)mem).getUnsafeObject());
+ assertNotNull(((ResourceImpl)mem).getUnsafeObject());
checkCombinations(mem, off, cap, mem.isDirect(), mem.getByteOrder(), true,
true);
//BB off heap, non native order, has ByteBuffer, has MemReqSvr
@@ -115,7 +115,7 @@ public class LeafImplTest {
dbb.putShort(0, (short) 1);
mem = WritableMemory.writableWrap(dbb, NNBO, dummyMemReqSvr);
assertEquals(dbb.isDirect(), mem.isDirect());
- assertNull(((BaseStateImpl)mem).getUnsafeObject());
+ assertNull(((ResourceImpl)mem).getUnsafeObject());
checkCombinations(mem, off, cap, mem.isDirect(), mem.getByteOrder(),
true, true);
}
@@ -139,7 +139,7 @@ public class LeafImplTest {
try (WritableMapHandle wmh = WritableMemory.writableMap(file, off, cap,
NBO)) {
WritableMemory memNO = wmh.getWritable();
memNO.putShort(0, (short) 1);
- assertNull(((BaseStateImpl)memNO).getUnsafeObject());
+ assertNull(((ResourceImpl)memNO).getUnsafeObject());
assertTrue(memNO.isDirect());
checkCombinations(memNO, off, cap, memNO.isDirect(), NBO, false, false);
}
@@ -147,7 +147,7 @@ public class LeafImplTest {
try (WritableMapHandle wmh = WritableMemory.writableMap(file, off, cap,
NNBO)) {
WritableMemory memNNO = wmh.getWritable();
memNNO.putShort(0, (short) 1);
- assertNull(((BaseStateImpl)memNNO).getUnsafeObject());
+ assertNull(((ResourceImpl)memNNO).getUnsafeObject());
assertTrue(memNNO.isDirect());
checkCombinations(memNNO, off, cap, memNNO.isDirect(), NNBO, false,
false);
}
@@ -160,13 +160,13 @@ public class LeafImplTest {
// On Heap, Native order, No ByteBuffer, No MemReqSvr
WritableMemory memNO = WritableMemory.allocate((int)cap); //assumes NBO
memNO.putShort(0, (short) 1);
- assertNotNull(((BaseStateImpl)memNO).getUnsafeObject());
+ assertNotNull(((ResourceImpl)memNO).getUnsafeObject());
assertFalse(memNO.isDirect());
checkCombinations(memNO, off, cap, memNO.isDirect(), NBO, false, false);
// On Heap, Non-native order, No ByteBuffer, No MemReqSvr
WritableMemory memNNO = WritableMemory.allocate((int)cap, NNBO);
memNNO.putShort(0, (short) 1);
- assertNotNull(((BaseStateImpl)memNNO).getUnsafeObject());
+ assertNotNull(((ResourceImpl)memNNO).getUnsafeObject());
assertFalse(memNNO.isDirect());
checkCombinations(memNNO, off, cap, memNNO.isDirect(), NNBO, false, false);
}
@@ -189,15 +189,15 @@ public class LeafImplTest {
if (hasMemReqSvr) { assertTrue(mem.getMemoryRequestServer() instanceof
DummyMemoryRequestServer); }
else { assertNull(mem.getMemoryRequestServer()); }
- Object obj = ((BaseStateImpl)mem).getUnsafeObject();
+ Object obj = ((ResourceImpl)mem).getUnsafeObject();
if (direct) {
assertTrue(mem.isDirect());
assertNull(obj);
- assertTrue(((BaseStateImpl)mem).getNativeBaseOffset() != 0);
+ assertTrue(((ResourceImpl)mem).getNativeBaseOffset() != 0);
} else {
assertFalse(mem.isDirect());
assertNotNull(obj);
- assertTrue(((BaseStateImpl)mem).getNativeBaseOffset() == 0);
+ assertTrue(((ResourceImpl)mem).getNativeBaseOffset() == 0);
}
assertTrue(mem.isValid() == true);
@@ -218,15 +218,15 @@ public class LeafImplTest {
if (hasMemReqSvr) { assertTrue(buf.getMemoryRequestServer() instanceof
DummyMemoryRequestServer); }
else { assertNull(buf.getMemoryRequestServer()); }
- obj = ((BaseStateImpl)buf).getUnsafeObject();
+ obj = ((ResourceImpl)buf).getUnsafeObject();
if (direct) {
assertTrue(buf.isDirect());
assertNull(obj);
- assertTrue(((BaseStateImpl)buf).getNativeBaseOffset() != 0);
+ assertTrue(((ResourceImpl)buf).getNativeBaseOffset() != 0);
} else {
assertFalse(buf.isDirect());
assertNotNull(obj);
- assertTrue(((BaseStateImpl)buf).getNativeBaseOffset() == 0);
+ assertTrue(((ResourceImpl)buf).getNativeBaseOffset() == 0);
}
assertTrue(buf.isValid() == true);
@@ -245,15 +245,15 @@ public class LeafImplTest {
if (hasMemReqSvr) { assertTrue(nnMem.getMemoryRequestServer() instanceof
DummyMemoryRequestServer); }
- obj = ((BaseStateImpl)nnMem).getUnsafeObject();
+ obj = ((ResourceImpl)nnMem).getUnsafeObject();
if (direct) {
assertTrue(nnMem.isDirect());
assertNull(obj);
- assertTrue(((BaseStateImpl)nnMem).getNativeBaseOffset() != 0);
+ assertTrue(((ResourceImpl)nnMem).getNativeBaseOffset() != 0);
} else {
assertFalse(nnMem.isDirect());
assertNotNull(obj);
- assertTrue(((BaseStateImpl)nnMem).getNativeBaseOffset() == 0);
+ assertTrue(((ResourceImpl)nnMem).getNativeBaseOffset() == 0);
}
assertTrue(nnMem.isValid() == true);
@@ -272,15 +272,15 @@ public class LeafImplTest {
if (hasMemReqSvr) { assertTrue(nnBuf.getMemoryRequestServer() instanceof
DummyMemoryRequestServer); }
- obj = ((BaseStateImpl)nnBuf).getUnsafeObject();
+ obj = ((ResourceImpl)nnBuf).getUnsafeObject();
if (direct) {
assertTrue(nnBuf.isDirect());
assertNull(obj);
- assertTrue(((BaseStateImpl)nnBuf).getNativeBaseOffset() != 0);
+ assertTrue(((ResourceImpl)nnBuf).getNativeBaseOffset() != 0);
} else {
assertFalse(nnBuf.isDirect());
assertNotNull(obj);
- assertTrue(((BaseStateImpl)nnBuf).getNativeBaseOffset() == 0);
+ assertTrue(((ResourceImpl)nnBuf).getNativeBaseOffset() == 0);
}
assertTrue(nnBuf.isValid() == true);
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 620d2e6..4d43e47 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
@@ -35,7 +35,7 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.List;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.MapHandle;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.WritableBuffer;
@@ -345,23 +345,23 @@ public class MemoryTest {
@Test
public void checkMonitorDirectStats() throws Exception {
int bytes = 1024;
- long curAllocations = BaseState.getCurrentDirectMemoryAllocations();
- long curAllocated = BaseState.getCurrentDirectMemoryAllocated();
+ long curAllocations = Resource.getCurrentDirectMemoryAllocations();
+ long curAllocated = Resource.getCurrentDirectMemoryAllocated();
if (curAllocations != 0) { System.err.println(curAllocations + " should be
zero!"); }
WritableHandle wh1 = WritableMemory.allocateDirect(bytes);
WritableHandle wh2 = WritableMemory.allocateDirect(bytes);
- assertEquals(BaseState.getCurrentDirectMemoryAllocations(), 2L +
curAllocations);
- assertEquals(BaseState.getCurrentDirectMemoryAllocated(), 2 * bytes +
curAllocated);
+ assertEquals(Resource.getCurrentDirectMemoryAllocations(), 2L +
curAllocations);
+ assertEquals(Resource.getCurrentDirectMemoryAllocated(), 2 * bytes +
curAllocated);
wh1.close();
- assertEquals(BaseState.getCurrentDirectMemoryAllocations(), 1L +
curAllocations);
- assertEquals(BaseState.getCurrentDirectMemoryAllocated(), bytes +
curAllocated);
+ assertEquals(Resource.getCurrentDirectMemoryAllocations(), 1L +
curAllocations);
+ assertEquals(Resource.getCurrentDirectMemoryAllocated(), bytes +
curAllocated);
wh2.close();
wh2.close(); //check that it doesn't go negative.
//even though the handles are closed, these methods are static access
- assertEquals(BaseState.getCurrentDirectMemoryAllocations(), 0L +
curAllocations);
- assertEquals(BaseState.getCurrentDirectMemoryAllocated(), 0L +
curAllocated);
+ assertEquals(Resource.getCurrentDirectMemoryAllocations(), 0L +
curAllocations);
+ assertEquals(Resource.getCurrentDirectMemoryAllocated(), 0L +
curAllocated);
}
@Test
@@ -372,25 +372,25 @@ public class MemoryTest {
MapHandle mmh1 = Memory.map(file);
MapHandle mmh2 = Memory.map(file);
- assertEquals(BaseState.getCurrentDirectMemoryMapAllocations(), 2L);
- assertEquals(BaseState.getCurrentDirectMemoryMapAllocated(), 2 * bytes);
+ assertEquals(Resource.getCurrentDirectMemoryMapAllocations(), 2L);
+ assertEquals(Resource.getCurrentDirectMemoryMapAllocated(), 2 * bytes);
mmh1.close();
- assertEquals(BaseState.getCurrentDirectMemoryMapAllocations(), 1L);
- assertEquals(BaseState.getCurrentDirectMemoryMapAllocated(), bytes);
+ assertEquals(Resource.getCurrentDirectMemoryMapAllocations(), 1L);
+ assertEquals(Resource.getCurrentDirectMemoryMapAllocated(), bytes);
mmh2.close();
mmh2.close(); //check that it doesn't go negative.
//even though the handles are closed, these methods are static access
- assertEquals(BaseState.getCurrentDirectMemoryMapAllocations(), 0L);
- assertEquals(BaseState.getCurrentDirectMemoryMapAllocated(), 0L);
+ assertEquals(Resource.getCurrentDirectMemoryMapAllocations(), 0L);
+ assertEquals(Resource.getCurrentDirectMemoryMapAllocated(), 0L);
}
@Test
public void checkMemReqSvr() throws Exception {
WritableMemory wmem;
WritableBuffer wbuf;
- if (BaseState.defaultMemReqSvr == null) { //This is a policy choice
+ if (Resource.defaultMemReqSvr == null) { //This is a policy choice
//ON HEAP
wmem = WritableMemory.writableWrap(new byte[16]);
assertNull(wmem.getMemoryRequestServer());
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 b67699b..8711b9d 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
@@ -476,7 +476,7 @@ public class NativeWritableBufferImplTest {
WritableMemory reg = wmem.writableRegion(32, 32);
WritableBuffer buf = reg.asWritableBuffer();
assertEquals(buf.getTotalOffset(), 32);
- assertEquals(((BaseStateImpl)buf).getCumulativeOffset(0), 32 + 16);
+ assertEquals(((ResourceImpl)buf).getCumulativeOffset(0), 32 + 16);
}
@Test
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 d0d8937..737add1 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
@@ -655,7 +655,7 @@ public class NativeWritableMemoryImplTest {
WritableMemory wmem = WritableMemory.allocate(64);
WritableMemory reg = wmem.writableRegion(32, 32);
assertEquals(reg.getTotalOffset(), 32);
- assertEquals(((BaseStateImpl)reg).getCumulativeOffset(0), 32 + 16);
+ assertEquals(((ResourceImpl)reg).getCumulativeOffset(0), 32 + 16);
}
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/ResourceTest.java
similarity index 96%
rename from
datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/BaseStateTest.java
rename to
datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/ResourceTest.java
index b665784..86f4246 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/ResourceTest.java
@@ -33,7 +33,7 @@ import org.apache.datasketches.memory.WritableBuffer;
import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
-public class BaseStateTest {
+public class ResourceTest {
@Test
public void checkPrimOffset() {
@@ -87,7 +87,7 @@ public class BaseStateTest {
@Test
public void checkGetNativeBaseOffset_Heap() {
WritableMemory wmem = WritableMemory.allocate(8); //heap
- final long offset = ((BaseStateImpl)wmem).getNativeBaseOffset();
+ final long offset = ((ResourceImpl)wmem).getNativeBaseOffset();
assertEquals(offset, 0L);
}
@@ -122,7 +122,7 @@ public class BaseStateTest {
@Test
public void checkTypeDecode() {
for (int i = 0; i < 128; i++) {
- BaseStateImpl.typeDecode(i);
+ ResourceImpl.typeDecode(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 2c67d7f..7b3c955 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
@@ -46,7 +46,7 @@ public class SpecificLeafTest {
bb.order(ByteOrder.nativeOrder());
Memory mem = Memory.wrap(bb).region(0, bytes, ByteOrder.nativeOrder());
- BaseStateImpl bsi = (BaseStateImpl)mem;
+ ResourceImpl bsi = (ResourceImpl)mem;
int typeId = bsi.getTypeId();
assertTrue(bsi.isByteBufferType(typeId));
assertTrue(bsi.isNativeType(typeId));
@@ -59,11 +59,11 @@ public class SpecificLeafTest {
Buffer buf2 = mem2.asBuffer().region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
Buffer buf3 = buf2.duplicate();
-
assertTrue(((BaseStateImpl)mem).isRegionType(((BaseStateImpl)mem).getTypeId()));
-
assertTrue(((BaseStateImpl)mem2).isRegionType(((BaseStateImpl)mem2).getTypeId()));
-
assertTrue(((BaseStateImpl)buf).isRegionType(((BaseStateImpl)buf).getTypeId()));
-
assertTrue(((BaseStateImpl)buf2).isRegionType(((BaseStateImpl)buf2).getTypeId()));
-
assertTrue(((BaseStateImpl)buf3).isDuplicateType(((BaseStateImpl)buf3).getTypeId()));
+
assertTrue(((ResourceImpl)mem).isRegionType(((ResourceImpl)mem).getTypeId()));
+
assertTrue(((ResourceImpl)mem2).isRegionType(((ResourceImpl)mem2).getTypeId()));
+
assertTrue(((ResourceImpl)buf).isRegionType(((ResourceImpl)buf).getTypeId()));
+
assertTrue(((ResourceImpl)buf2).isRegionType(((ResourceImpl)buf2).getTypeId()));
+
assertTrue(((ResourceImpl)buf3).isDuplicateType(((ResourceImpl)buf3).getTypeId()));
}
@Test
@@ -71,7 +71,7 @@ public class SpecificLeafTest {
int bytes = 128;
try (WritableHandle h = WritableMemory.allocateDirect(bytes)) {
WritableMemory wmem = h.getWritable(); //native mem
-
assertTrue(((BaseStateImpl)wmem).isDirectType(((BaseStateImpl)wmem).getTypeId()));
+
assertTrue(((ResourceImpl)wmem).isDirectType(((ResourceImpl)wmem).getTypeId()));
assertFalse(wmem.isReadOnly());
checkCrossLeafTypeIds(wmem);
WritableMemory nnwmem = wmem.writableRegion(0, bytes,
Util.NON_NATIVE_BYTE_ORDER);
@@ -84,11 +84,11 @@ public class SpecificLeafTest {
Buffer buf2 = mem2.asBuffer().region(0, bytes,
Util.NON_NATIVE_BYTE_ORDER);
Buffer buf3 = buf2.duplicate();
-
assertTrue(((BaseStateImpl)mem).isRegionType(((BaseStateImpl)mem).getTypeId()));
-
assertTrue(((BaseStateImpl)mem2).isRegionType(((BaseStateImpl)mem2).getTypeId()));
-
assertTrue(((BaseStateImpl)buf).isRegionType(((BaseStateImpl)buf).getTypeId()));
-
assertTrue(((BaseStateImpl)buf2).isRegionType(((BaseStateImpl)buf2).getTypeId()));
-
assertTrue(((BaseStateImpl)buf3).isDuplicateType(((BaseStateImpl)buf3).getTypeId()));
+
assertTrue(((ResourceImpl)mem).isRegionType(((ResourceImpl)mem).getTypeId()));
+
assertTrue(((ResourceImpl)mem2).isRegionType(((ResourceImpl)mem2).getTypeId()));
+
assertTrue(((ResourceImpl)buf).isRegionType(((ResourceImpl)buf).getTypeId()));
+
assertTrue(((ResourceImpl)buf2).isRegionType(((ResourceImpl)buf2).getTypeId()));
+
assertTrue(((ResourceImpl)buf3).isDuplicateType(((ResourceImpl)buf3).getTypeId()));
}
}
@@ -96,7 +96,7 @@ public class SpecificLeafTest {
public void checkHeapLeafs() {
int bytes = 128;
Memory mem = Memory.wrap(new byte[bytes]);
- BaseStateImpl bsi = (BaseStateImpl)mem;
+ ResourceImpl bsi = (ResourceImpl)mem;
int typeId = bsi.getTypeId();
assertTrue(bsi.isHeapType(typeId));
assertTrue(bsi.isReadOnlyType(typeId));
@@ -111,12 +111,12 @@ public class SpecificLeafTest {
Buffer buf2 = reg2.asBuffer().region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
Buffer buf3 = buf2.duplicate();
-
assertFalse(((BaseStateImpl)mem).isRegionType(((BaseStateImpl)mem).getTypeId()));
-
assertTrue(((BaseStateImpl)reg2).isRegionType(((BaseStateImpl)reg2).getTypeId()));
-
assertTrue(((BaseStateImpl)buf).isRegionType(((BaseStateImpl)buf).getTypeId()));
-
assertTrue(((BaseStateImpl)buf2).isRegionType(((BaseStateImpl)buf2).getTypeId()));
-
assertTrue(((BaseStateImpl)buf3).isDuplicateType(((BaseStateImpl)buf3).getTypeId()));
-
assertTrue(((BaseStateImpl)buf4).isDuplicateType(((BaseStateImpl)buf4).getTypeId()));
+
assertFalse(((ResourceImpl)mem).isRegionType(((ResourceImpl)mem).getTypeId()));
+
assertTrue(((ResourceImpl)reg2).isRegionType(((ResourceImpl)reg2).getTypeId()));
+
assertTrue(((ResourceImpl)buf).isRegionType(((ResourceImpl)buf).getTypeId()));
+
assertTrue(((ResourceImpl)buf2).isRegionType(((ResourceImpl)buf2).getTypeId()));
+
assertTrue(((ResourceImpl)buf3).isDuplicateType(((ResourceImpl)buf3).getTypeId()));
+
assertTrue(((ResourceImpl)buf4).isDuplicateType(((ResourceImpl)buf4).getTypeId()));
}
@Test
@@ -138,7 +138,7 @@ public class SpecificLeafTest {
try (WritableMapHandle h = WritableMemory.writableMap(file, 0L, bytes,
ByteOrder.nativeOrder())) {
WritableMemory mem = h.getWritable();
-
assertTrue(((BaseStateImpl)mem).isMapType(((BaseStateImpl)mem).getTypeId()));
+
assertTrue(((ResourceImpl)mem).isMapType(((ResourceImpl)mem).getTypeId()));
assertFalse(mem.isReadOnly());
checkCrossLeafTypeIds(mem);
Memory nnreg = mem.region(0, bytes, Util.NON_NATIVE_BYTE_ORDER);
@@ -151,56 +151,47 @@ public class SpecificLeafTest {
Buffer buf2 = reg2.asBuffer().region(0, bytes,
Util.NON_NATIVE_BYTE_ORDER);
Buffer buf3 = buf2.duplicate();
-
assertTrue(((BaseStateImpl)reg).isRegionType(((BaseStateImpl)reg).getTypeId()));
-
assertTrue(((BaseStateImpl)reg2).isRegionType(((BaseStateImpl)reg2).getTypeId()));
-
assertTrue(((BaseStateImpl)buf).isRegionType(((BaseStateImpl)buf).getTypeId()));
-
assertTrue(((BaseStateImpl)buf2).isRegionType(((BaseStateImpl)buf2).getTypeId()));
-
assertTrue(((BaseStateImpl)buf3).isDuplicateType(((BaseStateImpl)buf3).getTypeId()));
-
assertTrue(((BaseStateImpl)buf4).isDuplicateType(((BaseStateImpl)buf4).getTypeId()));
+
assertTrue(((ResourceImpl)reg).isRegionType(((ResourceImpl)reg).getTypeId()));
+
assertTrue(((ResourceImpl)reg2).isRegionType(((ResourceImpl)reg2).getTypeId()));
+
assertTrue(((ResourceImpl)buf).isRegionType(((ResourceImpl)buf).getTypeId()));
+
assertTrue(((ResourceImpl)buf2).isRegionType(((ResourceImpl)buf2).getTypeId()));
+
assertTrue(((ResourceImpl)buf3).isDuplicateType(((ResourceImpl)buf3).getTypeId()));
+
assertTrue(((ResourceImpl)buf4).isDuplicateType(((ResourceImpl)buf4).getTypeId()));
}
}
-// static void theId(Memory mem) {
-// int typeId = ((BaseStateImpl)mem).getTypeId();
-// System.out.println(BaseStateImpl.typeDecode(typeId));
-// }
-// static void theId(Buffer buf) {
-// int typeId = ((BaseStateImpl)buf).getTypeId();
-// System.out.println(BaseStateImpl.typeDecode(typeId));
-// }
-
private static void checkCrossLeafTypeIds(Memory mem) {
Memory reg1 = mem.region(0, mem.getCapacity());
-
assertTrue(((BaseStateImpl)reg1).isRegionType(((BaseStateImpl)reg1).getTypeId()));
+
assertTrue(((ResourceImpl)reg1).isRegionType(((ResourceImpl)reg1).getTypeId()));
Buffer buf1 = reg1.asBuffer();
-
assertTrue(((BaseStateImpl)buf1).isRegionType(((BaseStateImpl)buf1).getTypeId()));
-
assertTrue(((BaseStateImpl)buf1).isBufferType(((BaseStateImpl)buf1).getTypeId()));
+
assertTrue(((ResourceImpl)buf1).isRegionType(((ResourceImpl)buf1).getTypeId()));
+
assertTrue(((ResourceImpl)buf1).isBufferType(((ResourceImpl)buf1).getTypeId()));
assertTrue(buf1.isReadOnly());
Buffer buf2 = buf1.duplicate();
-
assertTrue(((BaseStateImpl)buf2).isRegionType(((BaseStateImpl)buf2).getTypeId()));
-
assertTrue(((BaseStateImpl)buf2).isBufferType(((BaseStateImpl)buf2).getTypeId()));
-
assertTrue(((BaseStateImpl)buf2).isDuplicateType(((BaseStateImpl)buf2).getTypeId()));
+
assertTrue(((ResourceImpl)buf2).isRegionType(((ResourceImpl)buf2).getTypeId()));
+
assertTrue(((ResourceImpl)buf2).isBufferType(((ResourceImpl)buf2).getTypeId()));
+
assertTrue(((ResourceImpl)buf2).isDuplicateType(((ResourceImpl)buf2).getTypeId()));
assertTrue(buf2.isReadOnly());
Memory mem2 = buf1.asMemory(); //
-
assertTrue(((BaseStateImpl)mem2).isRegionType(((BaseStateImpl)mem2).getTypeId()));
-
assertFalse(((BaseStateImpl)mem2).isBufferType(((BaseStateImpl)mem2).getTypeId()));
-
assertFalse(((BaseStateImpl)mem2).isDuplicateType(((BaseStateImpl)mem2).getTypeId()));
+
assertTrue(((ResourceImpl)mem2).isRegionType(((ResourceImpl)mem2).getTypeId()));
+
assertFalse(((ResourceImpl)mem2).isBufferType(((ResourceImpl)mem2).getTypeId()));
+
assertFalse(((ResourceImpl)mem2).isDuplicateType(((ResourceImpl)mem2).getTypeId()));
assertTrue(mem2.isReadOnly());
Buffer buf3 = buf1.duplicate(Util.NON_NATIVE_BYTE_ORDER);
-
assertTrue(((BaseStateImpl)buf3).isRegionType(((BaseStateImpl)buf3).getTypeId()));
-
assertTrue(((BaseStateImpl)buf3).isBufferType(((BaseStateImpl)buf3).getTypeId()));
-
assertTrue(((BaseStateImpl)buf3).isDuplicateType(((BaseStateImpl)buf3).getTypeId()));
-
assertTrue(((BaseStateImpl)buf3).isNonNativeType(((BaseStateImpl)buf3).getTypeId()));
+
assertTrue(((ResourceImpl)buf3).isRegionType(((ResourceImpl)buf3).getTypeId()));
+
assertTrue(((ResourceImpl)buf3).isBufferType(((ResourceImpl)buf3).getTypeId()));
+
assertTrue(((ResourceImpl)buf3).isDuplicateType(((ResourceImpl)buf3).getTypeId()));
+
assertTrue(((ResourceImpl)buf3).isNonNativeType(((ResourceImpl)buf3).getTypeId()));
assertTrue(buf3.isReadOnly());
Memory mem3 = buf3.asMemory();
-
assertTrue(((BaseStateImpl)mem3).isRegionType(((BaseStateImpl)mem3).getTypeId()));
-
assertFalse(((BaseStateImpl)mem3).isBufferType(((BaseStateImpl)mem3).getTypeId()));
-
assertTrue(((BaseStateImpl)mem3).isDuplicateType(((BaseStateImpl)mem3).getTypeId()));
-
assertTrue(((BaseStateImpl)mem3).isNonNativeType(((BaseStateImpl)mem3).getTypeId()));
+
assertTrue(((ResourceImpl)mem3).isRegionType(((ResourceImpl)mem3).getTypeId()));
+
assertFalse(((ResourceImpl)mem3).isBufferType(((ResourceImpl)mem3).getTypeId()));
+
assertTrue(((ResourceImpl)mem3).isDuplicateType(((ResourceImpl)mem3).getTypeId()));
+
assertTrue(((ResourceImpl)mem3).isNonNativeType(((ResourceImpl)mem3).getTypeId()));
assertTrue(mem3.isReadOnly());
}
diff --git
a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/XxHash64Test.java
b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/XxHash64Test.java
index 59b9200..9c51eb6 100644
---
a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/XxHash64Test.java
+++
b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/XxHash64Test.java
@@ -35,7 +35,7 @@ import static org.testng.Assert.assertTrue;
import java.util.Random;
import java.util.concurrent.ThreadLocalRandom;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@@ -110,7 +110,7 @@ public class XxHash64Test {
}
/**
- * This simple test compares the output of {@link BaseState#xxHash64(long,
long, long)} with the
+ * This simple test compares the output of {@link Resource#xxHash64(long,
long, long)} with the
* output of {@link net.openhft.hashing.LongHashFunction}, that itself is
tested against the
* reference implementation in C. This increase confidence that the xxHash
function implemented
* in this package is in fact the same xxHash function implemented in C.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
