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
The following commit(s) were added to refs/heads/IntegrateJava17_v2 by this
push:
new de2b94b Second half of change from BaseState to Resource.
de2b94b is described below
commit de2b94bce96f9eb7f66e7a9277808eea6ec08490
Author: Lee Rhodes <[email protected]>
AuthorDate: Sun Dec 18 21:55:05 2022 -0800
Second half of change from BaseState to Resource.
---
.../org/apache/datasketches/memory/BaseBuffer.java | 2 +-
.../org/apache/datasketches/memory/Memory.java | 2 +-
.../memory/{BaseState.java => Resource.java} | 24 ++++++++--------
.../memory/internal/BaseBufferImpl.java | 2 +-
.../memory/internal/BaseWritableBufferImpl.java | 2 +-
.../memory/internal/BaseWritableMemoryImpl.java | 6 ++--
.../memory/internal/MurmurHash3v3.java | 2 +-
.../{BaseStateImpl.java => ResourceImpl.java} | 32 +++++++++++-----------
.../apache/datasketches/memory/internal/Util.java | 2 +-
.../datasketches/memory/internal/XxHash64.java | 12 ++++----
.../internal/AllocateDirectMapMemoryTest.java | 2 +-
.../memory/internal/AllocateDirectMemoryTest.java | 6 ++--
.../AllocateDirectWritableMapMemoryTest.java | 8 +++---
.../memory/internal/BaseBufferTest.java | 4 +--
.../datasketches/memory/internal/Buffer2Test.java | 4 +--
.../memory/internal/BufferInvariantsTest.java | 4 +--
.../datasketches/memory/internal/BufferTest.java | 6 ++--
.../memory/internal/CommonBufferTest.java | 4 +--
.../memory/internal/CommonMemoryTest.java | 4 +--
.../memory/internal/CopyMemoryOverlapTest.java | 4 +--
.../memory/internal/CopyMemoryTest.java | 4 +--
.../memory/internal/DruidIssue11544Test.java | 4 +--
.../memory/internal/IgnoredArrayOverflowTest.java | 4 +--
.../datasketches/memory/internal/LeafImplTest.java | 4 +--
.../datasketches/memory/internal/MemoryTest.java | 10 +++----
.../memory/internal/MemoryWriteToTest.java | 4 +--
.../memory/internal/MurmurHash3v3Test.java | 4 +--
.../internal/NativeWritableBufferImplTest.java | 8 +++---
.../internal/NativeWritableMemoryImplTest.java | 8 +++---
.../{BaseStateTest.java => ResourceTest.java} | 6 ++--
.../memory/internal/SpecificLeafTest.java | 12 ++++----
.../datasketches/memory/internal/UtilTest.java | 2 +-
.../memory/internal/WritableDirectCopyTest.java | 4 +--
.../memory/internal/WritableMemoryTest.java | 6 ++--
.../datasketches/memory/internal/XxHash64Test.java | 4 +--
.../memory/internal/ZeroCapacityTest.java | 4 +--
36 files changed, 110 insertions(+), 110 deletions(-)
diff --git
a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/BaseBuffer.java
b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/BaseBuffer.java
index 9cd824e..5101a86 100644
---
a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/BaseBuffer.java
+++
b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/BaseBuffer.java
@@ -36,7 +36,7 @@ package org.apache.datasketches.memory;
* </ul>
* @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-java17/src/main/java17/org/apache/datasketches/memory/Memory.java
b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/Memory.java
index a4eeb2e..548ca36 100644
---
a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/Memory.java
+++
b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/Memory.java
@@ -35,7 +35,7 @@ import jdk.incubator.foreign.ResourceScope;
*
* @author Lee Rhodes
*/
-public interface Memory extends BaseState {
+public interface Memory extends Resource {
//BYTE BUFFER
/**
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/Resource.java
similarity index 95%
rename from
datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/BaseState.java
rename to
datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/Resource.java
index c40c51c..950923e 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/Resource.java
@@ -31,7 +31,7 @@ import jdk.incubator.foreign.ResourceScope;
*
* @author Lee Rhodes
*/
-public interface BaseState {
+public interface Resource {
/**
* Currently used only for test, hold for possible future use
@@ -41,10 +41,10 @@ public interface BaseState {
/**
* Returns true if the given object is an instance of this class and has
equal contents to
* this object.
- * @param that the given BaseState object
+ * @param that the given Resource object
* @return true if the given object has equal contents to this object.
*/
- default boolean equalTo(BaseState that) {
+ default boolean equalTo(Resource that) {
if (that == null || this.getCapacity() != that.getCapacity()) return false;
return equalTo(0, that, 0, that.getCapacity());
}
@@ -54,12 +54,12 @@ public interface BaseState {
* this object in the given range of bytes. This will also check two
distinct ranges within the
* same object for equals.
* @param thisOffsetBytes the starting offset in bytes for this object.
- * @param that the given BaseState object
- * @param thatOffsetBytes the starting offset in bytes for the given
BaseState object
+ * @param that the given Resource object
+ * @param thatOffsetBytes the starting offset in bytes for the given
Resource object
* @param lengthBytes the size of the range in bytes
- * @return true if the given BaseState object has equal contents to this
object in the given range of bytes.
+ * @return true if the given Resource object has equal contents to this
object in the given range of bytes.
*/
- boolean equalTo(long thisOffsetBytes, BaseState that, long thatOffsetBytes,
long lengthBytes);
+ boolean equalTo(long thisOffsetBytes, Resource that, long thatOffsetBytes,
long lengthBytes);
/**
* Gets the current Type ByteOrder.
@@ -235,11 +235,11 @@ public interface BaseState {
/**
* See <a
href="https://docs.oracle.com/en/java/javase/17/docs/api/jdk.incubator.foreign/jdk/incubator/foreign/MemorySegment.html#mismatch(jdk.incubator.foreign.MemorySegment)>mismatch</a>
- * @param that the other BaseState
- * @return the relative offset, in bytes, of the first mismatch between this
and the given other BaseState object,
+ * @param that the other Resource
+ * @return the relative offset, in bytes, of the first mismatch between this
and the given other Resource object,
* otherwise -1 if no mismatch
*/
- long mismatch(BaseState that);
+ long mismatch(Resource that);
/**
* Returns a positive number if <i>this</i> overlaps <i>that</i> and
<i>this</i> base address is ≤ <i>that</i>
@@ -247,10 +247,10 @@ public interface BaseState {
* Returns a negative number if <i>this</i> overlaps <i>that</i> and
<i>this</i> base address is > <i>that</i>
* base address.
* Returns a zero if there is no overlap or if one or both objects are null,
not active or on heap.
- * @param that the other BaseState object
+ * @param that the other Resource object
* @return a long value representing the ordering and size of overlap
between <i>this</i> and <i>that</i>.
*/
- long nativeOverlap(BaseState that);
+ long nativeOverlap(Resource that);
/**
* Returns the resource scope associated with this memory segment.
diff --git
a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseBufferImpl.java
b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseBufferImpl.java
index 8c2e896..a1301d1 100644
---
a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseBufferImpl.java
+++
b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseBufferImpl.java
@@ -42,7 +42,7 @@ import jdk.incubator.foreign.MemorySegment;
*
* @author Lee Rhodes
*/
-abstract class BaseBufferImpl extends BaseStateImpl implements BaseBuffer {
+abstract class BaseBufferImpl extends ResourceImpl implements BaseBuffer {
private long capacity;
private long start = 0;
private long pos = 0;
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 07a2a31..3486dd5 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
@@ -277,7 +277,7 @@ public abstract class BaseWritableBufferImpl extends
BaseBufferImpl implements W
public final int compareTo(final long thisOffsetBytes, final long
thisLengthBytes,
final Buffer that, final long thatOffsetBytes, final long
thatLengthBytes) {
return CompareAndCopy.compare(seg, thisOffsetBytes, thisLengthBytes,
- ((BaseStateImpl)that).seg, thatOffsetBytes, thatLengthBytes);
+ ((ResourceImpl)that).seg, thatOffsetBytes, thatLengthBytes);
}
/*
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 0e043ab..5bbf903 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
@@ -56,7 +56,7 @@ import jdk.incubator.foreign.ResourceScope;
* Common base of native-ordered and non-native-ordered {@link WritableMemory}
implementations.
* Contains methods which are agnostic to the byte order.
*/
-public abstract class BaseWritableMemoryImpl extends BaseStateImpl implements
WritableMemory {
+public abstract class BaseWritableMemoryImpl extends ResourceImpl implements
WritableMemory {
//Pass-through constructor
BaseWritableMemoryImpl(
@@ -292,14 +292,14 @@ public abstract class BaseWritableMemoryImpl extends
BaseStateImpl implements Wr
public final int compareTo(final long thisOffsetBytes, final long
thisLengthBytes,
final Memory that, final long thatOffsetBytes, final long
thatLengthBytes) {
return CompareAndCopy.compare(seg, thisOffsetBytes, thisLengthBytes,
- ((BaseStateImpl)that).seg, thatOffsetBytes, thatLengthBytes);
+ ((ResourceImpl)that).seg, thatOffsetBytes, thatLengthBytes);
}
@Override
public final void copyTo(final long srcOffsetBytes, final WritableMemory
destination,
final long dstOffsetBytes, final long lengthBytes) {
CompareAndCopy.copy(seg, srcOffsetBytes,
- ((BaseStateImpl)destination).seg, dstOffsetBytes, lengthBytes);
+ ((ResourceImpl)destination).seg, dstOffsetBytes, lengthBytes);
}
@Override
diff --git
a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/MurmurHash3v3.java
b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/MurmurHash3v3.java
index c873120..5c04cf0 100644
---
a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/MurmurHash3v3.java
+++
b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/MurmurHash3v3.java
@@ -182,7 +182,7 @@ public final class MurmurHash3v3 {
public static long[] hash(final Memory mem, final long offsetBytes, final
long lengthBytes,
final long seed, final long[] hashOut) {
Objects.requireNonNull(mem, "Input Memory is null");
- final MemorySegment seg = ((BaseStateImpl)mem).seg;
+ final MemorySegment seg = ((ResourceImpl)mem).seg;
return hash(seg, offsetBytes, lengthBytes, seed, hashOut);
}
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/ResourceImpl.java
similarity index 93%
rename from
datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/BaseStateImpl.java
rename to
datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/ResourceImpl.java
index bd445f8..fedec19 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/ResourceImpl.java
@@ -26,8 +26,8 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.Objects;
-import org.apache.datasketches.memory.BaseState;
import org.apache.datasketches.memory.MemoryRequestServer;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.WritableBuffer;
import org.apache.datasketches.memory.WritableMemory;
@@ -40,7 +40,7 @@ import jdk.incubator.foreign.ResourceScope;
*
* @author Lee Rhodes
*/
-abstract class BaseStateImpl implements BaseState {
+abstract class ResourceImpl implements Resource {
static final String JDK; //must be at least "1.8"
static final int JDK_MAJOR; //8, 11, 17, etc
@@ -105,7 +105,7 @@ abstract class BaseStateImpl implements BaseState {
* @param typeId identifies the type parameters for this Memory
* @param memReqSvr the MemoryRequestServer
*/
- BaseStateImpl(final MemorySegment seg, final int typeId, final
MemoryRequestServer memReqSvr) {
+ ResourceImpl(final MemorySegment seg, final int typeId, final
MemoryRequestServer memReqSvr) {
this.seg = seg;
this.typeId = typeId;
this.memReqSvr = memReqSvr;
@@ -198,21 +198,21 @@ 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 resource the ResourceImpl
* @param comment optional unique description
* @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 comment,
final long offsetBytes,
+ static final String toHex(final ResourceImpl resource, final String comment,
final long offsetBytes,
final int lengthBytes, final boolean withData) {
- final MemorySegment seg = state.seg;
+ final MemorySegment seg = resource.seg;
final long capacity = seg.byteSize();
checkBounds(offsetBytes, lengthBytes, capacity);
final String theComment = (comment != null) ? comment : "";
final String addHCStr = "" + Integer.toHexString(seg.address().hashCode());
- final MemoryRequestServer memReqSvr = state.getMemoryRequestServer();
+ final MemoryRequestServer memReqSvr = resource.getMemoryRequestServer();
final String memReqStr = memReqSvr != null
? memReqSvr.getClass().getSimpleName() + ", " +
Integer.toHexString(memReqSvr.hashCode())
: "null";
@@ -220,14 +220,14 @@ abstract class BaseStateImpl implements BaseState {
final StringBuilder sb = new StringBuilder();
sb.append(LS + "### DataSketches Memory Component SUMMARY ###").append(LS);
sb.append("Header Comment : ").append(theComment).append(LS);
- sb.append("TypeId String :
").append(typeDecode(state.typeId)).append(LS);
+ sb.append("TypeId String :
").append(typeDecode(resource.typeId)).append(LS);
sb.append("OffsetBytes : ").append(offsetBytes).append(LS);
sb.append("LengthBytes : ").append(lengthBytes).append(LS);
sb.append("Capacity : ").append(capacity).append(LS);
sb.append("MemoryAddress hashCode : ").append(addHCStr).append(LS);
sb.append("MemReqSvr, hashCode : ").append(memReqStr).append(LS);
- sb.append("Read Only :
").append(state.isReadOnly()).append(LS);
- sb.append("Type Byte Order :
").append(state.getByteOrder().toString()).append(LS);
+ sb.append("Read Only :
").append(resource.isReadOnly()).append(LS);
+ sb.append("Type Byte Order :
").append(resource.getByteOrder().toString()).append(LS);
sb.append("Native Byte Order :
").append(NATIVE_BYTE_ORDER.toString()).append(LS);
sb.append("JDK Runtime Version : ").append(JDK).append(LS);
//Data detail
@@ -314,10 +314,10 @@ abstract class BaseStateImpl implements BaseState {
}
@Override
- public final boolean equalTo(final long thisOffsetBytes, final BaseState
that,
+ public final boolean equalTo(final long thisOffsetBytes, final Resource that,
final long thatOffsetBytes, final long lengthBytes) {
if (that == null) { return false; }
- return CompareAndCopy.equals(seg, thisOffsetBytes, ((BaseStateImpl)
that).seg, thatOffsetBytes, lengthBytes);
+ return CompareAndCopy.equals(seg, thisOffsetBytes, ((ResourceImpl)
that).seg, thatOffsetBytes, lengthBytes);
}
@Override //Java 17 only
@@ -400,18 +400,18 @@ abstract class BaseStateImpl implements BaseState {
public void load() { seg.load(); } //moved here
@Override
- public long mismatch(final BaseState that) { //Java 17 only
+ public long mismatch(final Resource that) { //Java 17 only
Objects.requireNonNull(that);
if (!that.isAlive()) { throw new IllegalArgumentException("Given argument
is not alive."); }
- BaseStateImpl thatBSI = (BaseStateImpl) that;
+ ResourceImpl thatBSI = (ResourceImpl) that;
return seg.mismatch(thatBSI.seg);
}
@Override //Java 17 only
- public final long nativeOverlap(final BaseState that) { //Java 17 only
+ public final long nativeOverlap(final Resource that) { //Java 17 only
if (that == null) { return 0; }
if (!that.isAlive()) { return 0; }
- BaseStateImpl thatBSI = (BaseStateImpl) that;
+ ResourceImpl thatBSI = (ResourceImpl) that;
if (this == thatBSI) { return seg.byteSize(); }
return nativeOverlap(seg, thatBSI.seg);
}
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 75466bb..a92d74a 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
@@ -19,7 +19,7 @@
package org.apache.datasketches.memory.internal;
-import static org.apache.datasketches.memory.internal.BaseStateImpl.LS;
+import static org.apache.datasketches.memory.internal.ResourceImpl.LS;
import java.io.File;
import java.io.IOException;
diff --git
a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/XxHash64.java
b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/XxHash64.java
index 994cb02..39d6075 100644
---
a/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/XxHash64.java
+++
b/datasketches-memory-java17/src/main/java17/org/apache/datasketches/memory/internal/XxHash64.java
@@ -22,12 +22,12 @@ package org.apache.datasketches.memory.internal;
import static jdk.incubator.foreign.MemoryAccess.getByteAtOffset;
import static jdk.incubator.foreign.MemoryAccess.getIntAtOffset;
import static jdk.incubator.foreign.MemoryAccess.getLongAtOffset;
-import static org.apache.datasketches.memory.internal.BaseStateImpl.CHAR_SHIFT;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.DOUBLE_SHIFT;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.FLOAT_SHIFT;
-import static org.apache.datasketches.memory.internal.BaseStateImpl.INT_SHIFT;
-import static org.apache.datasketches.memory.internal.BaseStateImpl.LONG_SHIFT;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.SHORT_SHIFT;
+import static org.apache.datasketches.memory.internal.ResourceImpl.CHAR_SHIFT;
+import static
org.apache.datasketches.memory.internal.ResourceImpl.DOUBLE_SHIFT;
+import static org.apache.datasketches.memory.internal.ResourceImpl.FLOAT_SHIFT;
+import static org.apache.datasketches.memory.internal.ResourceImpl.INT_SHIFT;
+import static org.apache.datasketches.memory.internal.ResourceImpl.LONG_SHIFT;
+import static org.apache.datasketches.memory.internal.ResourceImpl.SHORT_SHIFT;
import jdk.incubator.foreign.MemorySegment;
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectMapMemoryTest.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectMapMemoryTest.java
index 1cf8378..6c45472 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectMapMemoryTest.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectMapMemoryTest.java
@@ -23,7 +23,7 @@
package org.apache.datasketches.memory.internal;
-import static org.apache.datasketches.memory.internal.BaseStateImpl.LS;
+import static org.apache.datasketches.memory.internal.ResourceImpl.LS;
import static org.apache.datasketches.memory.internal.Util.getResourceFile;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
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 ff5bddb..9ff2745 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,12 +19,12 @@
package org.apache.datasketches.memory.internal;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.NON_NATIVE_BYTE_ORDER;
+import static
org.apache.datasketches.memory.internal.ResourceImpl.NON_NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@@ -32,7 +32,7 @@ import org.testng.annotations.Test;
import jdk.incubator.foreign.ResourceScope;
public class AllocateDirectMemoryTest {
- private static final MemoryRequestServer memReqSvr =
BaseState.defaultMemReqSvr;
+ private static final MemoryRequestServer memReqSvr =
Resource.defaultMemReqSvr;
//@SuppressWarnings("resource")
@Test
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 1a8d6fa..87a4f32 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
@@ -24,8 +24,8 @@
package org.apache.datasketches.memory.internal;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.datasketches.memory.internal.BaseStateImpl.LS;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.NON_NATIVE_BYTE_ORDER;
+import static org.apache.datasketches.memory.internal.ResourceImpl.LS;
+import static
org.apache.datasketches.memory.internal.ResourceImpl.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;
@@ -39,7 +39,7 @@ import java.io.UnsupportedEncodingException;
import java.nio.ByteOrder;
import java.nio.file.InvalidPathException;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.WritableMemory;
@@ -49,7 +49,7 @@ import org.testng.annotations.Test;
import jdk.incubator.foreign.ResourceScope;
public class AllocateDirectWritableMapMemoryTest {
- private final MemoryRequestServer memReqSvr = BaseState.defaultMemReqSvr;
+ private final MemoryRequestServer memReqSvr = Resource.defaultMemReqSvr;
@BeforeClass
public void setReadOnly() throws IOException {
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/BaseBufferTest.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/BaseBufferTest.java
index 73cd01f..b2d3dc3 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/BaseBufferTest.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/BaseBufferTest.java
@@ -21,7 +21,7 @@ package org.apache.datasketches.memory.internal;
import static org.testng.Assert.fail;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.Buffer;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.MemoryRequestServer;
@@ -34,7 +34,7 @@ import jdk.incubator.foreign.ResourceScope;
* @author Lee Rhodes
*/
public class BaseBufferTest {
- private static final MemoryRequestServer memReqSvr =
BaseState.defaultMemReqSvr;
+ private static final MemoryRequestServer memReqSvr =
Resource.defaultMemReqSvr;
@Test
public void checkLimits() {
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/Buffer2Test.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/Buffer2Test.java
index bbb3d91..572b5d7 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/Buffer2Test.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/Buffer2Test.java
@@ -27,7 +27,7 @@ import static org.testng.Assert.assertTrue;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.Buffer;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.WritableBuffer;
@@ -383,7 +383,7 @@ public class Buffer2Test {
@Test
public void checkWritableWrap() {
ByteBuffer bb = ByteBuffer.allocate(16);
- WritableBuffer buf = WritableBuffer.writableWrap(bb,
ByteOrder.nativeOrder(), BaseState.defaultMemReqSvr);
+ WritableBuffer buf = WritableBuffer.writableWrap(bb,
ByteOrder.nativeOrder(), Resource.defaultMemReqSvr);
assertNotNull(buf);
}
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/BufferInvariantsTest.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/BufferInvariantsTest.java
index 4b233be..d700cbb 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/BufferInvariantsTest.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/BufferInvariantsTest.java
@@ -24,7 +24,7 @@ import static org.testng.Assert.fail;
import java.nio.ByteBuffer;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.Buffer;
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.WritableBuffer;
@@ -37,7 +37,7 @@ import jdk.incubator.foreign.ResourceScope;
* @author Lee Rhodes
*/
public class BufferInvariantsTest {
- private static final MemoryRequestServer memReqSvr =
BaseState.defaultMemReqSvr;
+ private static final MemoryRequestServer memReqSvr =
Resource.defaultMemReqSvr;
@Test
public void testRegion() {
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 1f4a940..2d3929f 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,14 +19,14 @@
package org.apache.datasketches.memory.internal;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.NON_NATIVE_BYTE_ORDER;
+import static
org.apache.datasketches.memory.internal.ResourceImpl.NON_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.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.Buffer;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.MemoryRequestServer;
@@ -38,7 +38,7 @@ import org.testng.collections.Lists;
import jdk.incubator.foreign.ResourceScope;
public class BufferTest {
- private final MemoryRequestServer memReqSvr = BaseState.defaultMemReqSvr;
+ private final MemoryRequestServer memReqSvr = Resource.defaultMemReqSvr;
@Test
public void checkDirectRoundTrip() throws Exception {
int n = 1024; //longs
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/CommonBufferTest.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/CommonBufferTest.java
index 8d3b519..a165534 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/CommonBufferTest.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/CommonBufferTest.java
@@ -21,7 +21,7 @@ package org.apache.datasketches.memory.internal;
import static org.testng.Assert.assertEquals;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.WritableBuffer;
import org.apache.datasketches.memory.WritableMemory;
@@ -30,7 +30,7 @@ import org.testng.annotations.Test;
import jdk.incubator.foreign.ResourceScope;
public class CommonBufferTest {
- private final MemoryRequestServer memReqSvr = BaseState.defaultMemReqSvr;
+ private final MemoryRequestServer memReqSvr = Resource.defaultMemReqSvr;
@Test
public void checkSetGet() throws Exception {
int memCapacity = 60; //must be at least 60
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/CommonMemoryTest.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/CommonMemoryTest.java
index 9245a59..10970e5 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/CommonMemoryTest.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/CommonMemoryTest.java
@@ -27,7 +27,7 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@@ -35,7 +35,7 @@ import org.testng.annotations.Test;
import jdk.incubator.foreign.ResourceScope;
public class CommonMemoryTest {
- private final MemoryRequestServer memReqSvr = BaseState.defaultMemReqSvr;
+ private final MemoryRequestServer memReqSvr = Resource.defaultMemReqSvr;
@Test
public void checkSetGet() throws Exception {
int memCapacity = 16; //must be at least 8
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/CopyMemoryOverlapTest.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/CopyMemoryOverlapTest.java
index 8a4bdc0..c3b16e4 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/CopyMemoryOverlapTest.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/CopyMemoryOverlapTest.java
@@ -21,7 +21,7 @@ package org.apache.datasketches.memory.internal;
import static org.testng.Assert.assertEquals;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.WritableMemory;
@@ -33,7 +33,7 @@ import jdk.incubator.foreign.ResourceScope;
* @author Lee Rhodes
*/
public class CopyMemoryOverlapTest {
- private static final MemoryRequestServer memReqSvr =
BaseState.defaultMemReqSvr;
+ private static final MemoryRequestServer memReqSvr =
Resource.defaultMemReqSvr;
@Test
public void checkOverlapUsingMemory() throws Exception {
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/CopyMemoryTest.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/CopyMemoryTest.java
index f0af8c4..af79455 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/CopyMemoryTest.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/CopyMemoryTest.java
@@ -23,7 +23,7 @@ import static org.testng.Assert.assertEquals;
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.MemoryRequestServer;
import org.apache.datasketches.memory.WritableMemory;
@@ -33,7 +33,7 @@ import org.testng.annotations.Test;
import jdk.incubator.foreign.ResourceScope;
public class CopyMemoryTest {
- private static final MemoryRequestServer memReqSvr =
BaseState.defaultMemReqSvr;
+ private static final MemoryRequestServer memReqSvr =
Resource.defaultMemReqSvr;
@Test
public void heapWSource() {
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/DruidIssue11544Test.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/DruidIssue11544Test.java
index ac555b4..25ba44b 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/DruidIssue11544Test.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/DruidIssue11544Test.java
@@ -26,7 +26,7 @@ import static org.testng.Assert.assertTrue;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
@@ -48,7 +48,7 @@ import org.testng.annotations.Test;
*
*/
public class DruidIssue11544Test {
- private static final MemoryRequestServer memReqSvr =
BaseState.defaultMemReqSvr;
+ private static final MemoryRequestServer memReqSvr =
Resource.defaultMemReqSvr;
@Test
public void withByteBuffer() {
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/IgnoredArrayOverflowTest.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/IgnoredArrayOverflowTest.java
index c9d3b4b..8751441 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/IgnoredArrayOverflowTest.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/IgnoredArrayOverflowTest.java
@@ -21,7 +21,7 @@ package org.apache.datasketches.memory.internal;
import java.nio.ByteOrder;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.AfterClass;
@@ -31,7 +31,7 @@ import org.testng.annotations.Test;
import jdk.incubator.foreign.ResourceScope;
public class IgnoredArrayOverflowTest {
- private static final MemoryRequestServer memReqSvr =
BaseState.defaultMemReqSvr;
+ private static final MemoryRequestServer memReqSvr =
Resource.defaultMemReqSvr;
private WritableMemory memory;
private static final long MAX_SIZE = (1L << 10); // use 1L << 31 to test int
overrange
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 968cc95..f959848 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,8 +19,8 @@
package org.apache.datasketches.memory.internal;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.NATIVE_BYTE_ORDER;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.NON_NATIVE_BYTE_ORDER;
+import static
org.apache.datasketches.memory.internal.ResourceImpl.NATIVE_BYTE_ORDER;
+import static
org.apache.datasketches.memory.internal.ResourceImpl.NON_NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
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 94da3ec..01bcb9b 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
@@ -23,9 +23,9 @@
package org.apache.datasketches.memory.internal;
-import static org.apache.datasketches.memory.internal.BaseStateImpl.LS;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.NATIVE_BYTE_ORDER;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.NON_NATIVE_BYTE_ORDER;
+import static org.apache.datasketches.memory.internal.ResourceImpl.LS;
+import static
org.apache.datasketches.memory.internal.ResourceImpl.NATIVE_BYTE_ORDER;
+import static
org.apache.datasketches.memory.internal.ResourceImpl.NON_NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
@@ -37,7 +37,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.Memory;
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.WritableBuffer;
@@ -49,7 +49,7 @@ import org.testng.collections.Lists;
import jdk.incubator.foreign.ResourceScope;
public class MemoryTest {
- private static final MemoryRequestServer memReqSvr =
BaseState.defaultMemReqSvr;
+ private static final MemoryRequestServer memReqSvr =
Resource.defaultMemReqSvr;
@BeforeClass
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/MemoryWriteToTest.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/MemoryWriteToTest.java
index e8c0eca..2e6c2b3 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/MemoryWriteToTest.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/MemoryWriteToTest.java
@@ -26,7 +26,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
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.MemoryRequestServer;
import org.apache.datasketches.memory.WritableMemory;
@@ -35,7 +35,7 @@ import org.testng.annotations.Test;
import jdk.incubator.foreign.ResourceScope;
public class MemoryWriteToTest {
- private static final MemoryRequestServer memReqSvr =
BaseState.defaultMemReqSvr;
+ private static final MemoryRequestServer memReqSvr =
Resource.defaultMemReqSvr;
@Test
public void testOnHeapBytes() throws IOException {
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/MurmurHash3v3Test.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/MurmurHash3v3Test.java
index 3d4ce07..7c1cacb 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/MurmurHash3v3Test.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/MurmurHash3v3Test.java
@@ -23,7 +23,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.datasketches.memory.MurmurHash3.*;
import static org.testng.Assert.fail;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.WritableMemory;
@@ -40,7 +40,7 @@ import jdk.incubator.foreign.ResourceScope;
* @author Lee Rhodes
*/
public class MurmurHash3v3Test {
- private static final MemoryRequestServer memReqSvr =
BaseState.defaultMemReqSvr;
+ private static final MemoryRequestServer memReqSvr =
Resource.defaultMemReqSvr;
@Test
public void checkByteArrRemainderGT8() { //byte[], remainder > 8
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 f1a707c..9ebd6c4 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,8 +19,8 @@
package org.apache.datasketches.memory.internal;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.NON_NATIVE_BYTE_ORDER;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.checkBounds;
+import static
org.apache.datasketches.memory.internal.ResourceImpl.NON_NATIVE_BYTE_ORDER;
+import static org.apache.datasketches.memory.internal.ResourceImpl.checkBounds;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
@@ -29,7 +29,7 @@ import static org.testng.Assert.assertTrue;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.Buffer;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.MemoryRequestServer;
@@ -41,7 +41,7 @@ import org.testng.annotations.Test;
import jdk.incubator.foreign.ResourceScope;
public class NativeWritableBufferImplTest {
- private static final MemoryRequestServer memReqSvr =
BaseState.defaultMemReqSvr;
+ private static final MemoryRequestServer memReqSvr =
Resource.defaultMemReqSvr;
//Simple Native direct
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 a62ef30..07bc8aa 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,8 +19,8 @@
package org.apache.datasketches.memory.internal;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.NON_NATIVE_BYTE_ORDER;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.checkBounds;
+import static
org.apache.datasketches.memory.internal.ResourceImpl.NON_NATIVE_BYTE_ORDER;
+import static org.apache.datasketches.memory.internal.ResourceImpl.checkBounds;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -29,7 +29,7 @@ import static org.testng.Assert.fail;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.Buffer;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.MemoryRequestServer;
@@ -40,7 +40,7 @@ import org.testng.annotations.Test;
import jdk.incubator.foreign.ResourceScope;
public class NativeWritableMemoryImplTest {
- private static final MemoryRequestServer memReqSvr =
BaseState.defaultMemReqSvr;
+ private static final MemoryRequestServer memReqSvr =
Resource.defaultMemReqSvr;
//Simple Native direct
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/BaseStateTest.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/ResourceTest.java
similarity index 96%
rename from
datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/BaseStateTest.java
rename to
datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/ResourceTest.java
index 181afc2..4d919c5 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/BaseStateTest.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/ResourceTest.java
@@ -19,8 +19,8 @@
package org.apache.datasketches.memory.internal;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.nativeOverlap;
-import static org.apache.datasketches.memory.internal.BaseStateImpl.typeDecode;
+import static
org.apache.datasketches.memory.internal.ResourceImpl.nativeOverlap;
+import static org.apache.datasketches.memory.internal.ResourceImpl.typeDecode;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -35,7 +35,7 @@ import org.testng.annotations.Test;
import jdk.incubator.foreign.MemorySegment;
import jdk.incubator.foreign.ResourceScope;
-public class BaseStateTest {
+public class ResourceTest {
@Test
public void checkNativeOverlap() {
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 b08b07d..b672709 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,8 +19,8 @@
package org.apache.datasketches.memory.internal;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.NATIVE_BYTE_ORDER;
-import static
org.apache.datasketches.memory.internal.BaseStateImpl.NON_NATIVE_BYTE_ORDER;
+import static
org.apache.datasketches.memory.internal.ResourceImpl.NATIVE_BYTE_ORDER;
+import static
org.apache.datasketches.memory.internal.ResourceImpl.NON_NATIVE_BYTE_ORDER;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -30,7 +30,7 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.Buffer;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.MemoryRequestServer;
@@ -43,7 +43,7 @@ import jdk.incubator.foreign.ResourceScope;
* @author Lee Rhodes
*/
public class SpecificLeafTest {
- private static final MemoryRequestServer memReqSvr =
BaseState.defaultMemReqSvr;
+ private static final MemoryRequestServer memReqSvr =
Resource.defaultMemReqSvr;
@Test
public void checkByteBufferLeafs() {
@@ -78,7 +78,7 @@ public class SpecificLeafTest {
int bytes = 128;
try (ResourceScope scope = ResourceScope.newConfinedScope()) {
WritableMemory wmem = WritableMemory.allocateDirect(bytes, scope,
memReqSvr);
- assertFalse(((BaseStateImpl)wmem).isReadOnly());
+ assertFalse(((ResourceImpl)wmem).isReadOnly());
assertTrue(wmem.isDirectResource());
assertFalse(wmem.isReadOnly());
checkCrossLeafTypeIds(wmem);
@@ -144,7 +144,7 @@ public class SpecificLeafTest {
int bytes = 128;
Memory mem = Memory.wrap(new byte[bytes]);
assertFalse(mem.isDirectResource());
- assertTrue(((BaseStateImpl)mem).isReadOnly());
+ assertTrue(((ResourceImpl)mem).isReadOnly());
checkCrossLeafTypeIds(mem);
Memory nnreg = mem.region(0, bytes, NON_NATIVE_BYTE_ORDER);
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/UtilTest.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/UtilTest.java
index bfe30ad..88f7487 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/UtilTest.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/UtilTest.java
@@ -23,7 +23,7 @@
package org.apache.datasketches.memory.internal;
-import static org.apache.datasketches.memory.internal.BaseStateImpl.LS;
+import static org.apache.datasketches.memory.internal.ResourceImpl.LS;
import static org.apache.datasketches.memory.internal.Util.getResourceBytes;
import static org.apache.datasketches.memory.internal.Util.getResourceFile;
import static org.testng.Assert.assertTrue;
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/WritableDirectCopyTest.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/WritableDirectCopyTest.java
index 0c3afab..8e92914 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/WritableDirectCopyTest.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/WritableDirectCopyTest.java
@@ -22,7 +22,7 @@ package org.apache.datasketches.memory.internal;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.fail;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.WritableMemory;
@@ -34,7 +34,7 @@ import jdk.incubator.foreign.ResourceScope;
* @author Lee Rhodes
*/
public class WritableDirectCopyTest {
- private static final MemoryRequestServer memReqSvr =
BaseState.defaultMemReqSvr;
+ private static final MemoryRequestServer memReqSvr =
Resource.defaultMemReqSvr;
//Copy Within tests
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/WritableMemoryTest.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/WritableMemoryTest.java
index 0c1f908..5598af1 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/WritableMemoryTest.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/WritableMemoryTest.java
@@ -27,7 +27,7 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
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;
@@ -39,7 +39,7 @@ public class WritableMemoryTest {
ByteBuffer bb = ByteBuffer.allocate(64); //big endian
WritableMemory wmem = WritableMemory.writableWrap(bb);
assertEquals(wmem.getByteOrder(), ByteOrder.LITTLE_ENDIAN); //ignore BB
endianness
- wmem = WritableMemory.writableWrap(bb, ByteOrder.nativeOrder(),
BaseState.defaultMemReqSvr);
+ wmem = WritableMemory.writableWrap(bb, ByteOrder.nativeOrder(),
Resource.defaultMemReqSvr);
assertEquals(wmem.getByteOrder(), ByteOrder.LITTLE_ENDIAN);
}
@@ -47,7 +47,7 @@ public class WritableMemoryTest {
public void wrapBigEndianAsLittle() {
ByteBuffer bb = ByteBuffer.allocate(64);
bb.putChar(0, (char)1); //as NNO
- WritableMemory wmem = WritableMemory.writableWrap(bb,
ByteOrder.LITTLE_ENDIAN, BaseState.defaultMemReqSvr);
+ WritableMemory wmem = WritableMemory.writableWrap(bb,
ByteOrder.LITTLE_ENDIAN, Resource.defaultMemReqSvr);
assertEquals(wmem.getChar(0), 256);
}
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/XxHash64Test.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/XxHash64Test.java
index c894a6e..4347d13 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/XxHash64Test.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/XxHash64Test.java
@@ -34,7 +34,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;
@@ -109,7 +109,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 increases confidence that the xxHash
function implemented
* in this package is in fact the same xxHash function implemented in C.
diff --git
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/ZeroCapacityTest.java
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/ZeroCapacityTest.java
index e54b6d9..217762d 100644
---
a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/ZeroCapacityTest.java
+++
b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/ZeroCapacityTest.java
@@ -23,7 +23,7 @@ import static org.testng.Assert.assertEquals;
import java.nio.ByteBuffer;
-import org.apache.datasketches.memory.BaseState;
+import org.apache.datasketches.memory.Resource;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.WritableMemory;
@@ -36,7 +36,7 @@ import jdk.incubator.foreign.ResourceScope;
* @author Lee Rhodes
*/
public class ZeroCapacityTest {
- private static final MemoryRequestServer memReqSvr =
BaseState.defaultMemReqSvr;
+ private static final MemoryRequestServer memReqSvr =
Resource.defaultMemReqSvr;
@SuppressWarnings("resource")
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
