This is an automated email from the ASF dual-hosted git repository. leerho pushed a commit to branch integrateJava17_v3 in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit 923336c8f3ce5bcaddb1eca711fe7364eac1b75c Author: Lee Rhodes <[email protected]> AuthorDate: Tue Jun 4 11:46:00 2024 -0700 Rename BaseStateImpl to ResourceImpl --- .../memory/internal/BaseBufferImpl.java | 2 +- .../memory/internal/BaseWritableBufferImpl.java | 2 +- .../memory/internal/BaseWritableMemoryImpl.java | 6 +-- .../memory/internal/MurmurHash3v3.java | 2 +- .../{BaseStateImpl.java => ResourceImpl.java} | 30 ++++++------ .../datasketches/memory/internal/XxHash64.java | 12 ++--- .../memory/internal/BaseStateTest.java | 56 +++++++++++----------- .../internal/NativeWritableBufferImplTest.java | 2 +- .../internal/NativeWritableMemoryImplTest.java | 4 +- .../memory/internal/SpecificLeafTest.java | 4 +- 10 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/main/java/org/apache/datasketches/memory/internal/BaseBufferImpl.java b/src/main/java/org/apache/datasketches/memory/internal/BaseBufferImpl.java index 5d50d7c..a16c788 100644 --- a/src/main/java/org/apache/datasketches/memory/internal/BaseBufferImpl.java +++ b/src/main/java/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/src/main/java/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java b/src/main/java/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java index d1bb61a..30a3524a 100644 --- a/src/main/java/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/BaseWritableBufferImpl.java @@ -285,7 +285,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/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java b/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java index 885d343..ccc2e2a 100644 --- a/src/main/java/org/apache/datasketches/memory/internal/BaseWritableMemoryImpl.java +++ b/src/main/java/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( @@ -319,14 +319,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/src/main/java/org/apache/datasketches/memory/internal/MurmurHash3v3.java b/src/main/java/org/apache/datasketches/memory/internal/MurmurHash3v3.java index ba48823..0d34a9c 100644 --- a/src/main/java/org/apache/datasketches/memory/internal/MurmurHash3v3.java +++ b/src/main/java/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/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java b/src/main/java/org/apache/datasketches/memory/internal/ResourceImpl.java similarity index 93% rename from src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java rename to src/main/java/org/apache/datasketches/memory/internal/ResourceImpl.java index c56ece9..65aa65f 100644 --- a/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/ResourceImpl.java @@ -34,12 +34,12 @@ import jdk.incubator.foreign.MemorySegment; import jdk.incubator.foreign.ResourceScope; /** - * Keeps key configuration state for MemoryImpl and BufferImpl plus some common static variables + * Base implementation class for MemoryImpl and BufferImpl plus some common static variables * and check methods. * * @author Lee Rhodes */ -abstract class BaseStateImpl implements Resource { +abstract class ResourceImpl implements Resource { static final String JDK; //must be at least "1.8" static final int JDK_MAJOR; //8, 11, 12, etc @@ -86,7 +86,7 @@ abstract class BaseStateImpl implements Resource { MemoryRequestServer memReqSvr; - 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; @@ -217,35 +217,35 @@ abstract class BaseStateImpl implements Resource { /** * Returns a formatted hex string of an area of this object. * Used primarily for testing. - * @param state the BaseStateImpl + * @param resourceImpl 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 resourceImpl, final String comment, final long offsetBytes, final int lengthBytes, final boolean withData) { - final MemorySegment seg = state.seg; + final MemorySegment seg = resourceImpl.seg; final long capacity = seg.byteSize(); checkBounds(offsetBytes, lengthBytes, capacity); final StringBuilder sb = new StringBuilder(); final String theComment = (comment != null) ? comment : ""; final String addHCStr = "" + Integer.toHexString(seg.address().hashCode()); - final MemoryRequestServer memReqSvr = state.getMemoryRequestServer(); + final MemoryRequestServer memReqSvr = resourceImpl.getMemoryRequestServer(); final String memReqStr = memReqSvr != null ? memReqSvr.getClass().getSimpleName() + ", " + Integer.toHexString(memReqSvr.hashCode()) : "null"; sb.append(LS + "### DataSketches Memory Component SUMMARY ###").append(LS); sb.append("Optional Comment : ").append(theComment).append(LS); - sb.append("TypeId String : ").append(typeDecode(state.typeId)).append(LS); + sb.append("TypeId String : ").append(typeDecode(resourceImpl.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.getTypeByteOrder().toString()).append(LS); + sb.append("Read Only : ").append(resourceImpl.isReadOnly()).append(LS); + sb.append("Type Byte Order : ").append(resourceImpl.getTypeByteOrder().toString()).append(LS); sb.append("Native Byte Order : ").append(ByteOrder.nativeOrder().toString()).append(LS); sb.append("JDK Runtime Version : ").append(JDK).append(LS); //Data detail @@ -291,7 +291,7 @@ abstract class BaseStateImpl implements Resource { public final boolean equalTo(final long thisOffsetBytes, final Resource that, final long thatOffsetBytes, final long lengthBytes) { Objects.requireNonNull(that); - return CompareAndCopy.equals(seg, thisOffsetBytes, ((BaseStateImpl) that).seg, thatOffsetBytes, lengthBytes); + return CompareAndCopy.equals(seg, thisOffsetBytes, ((ResourceImpl) that).seg, thatOffsetBytes, lengthBytes); } @Override @@ -304,7 +304,7 @@ abstract class BaseStateImpl implements Resource { @Override public final long getRelativeOffset(final Resource that) { - final BaseStateImpl that2 = (BaseStateImpl) that; + final ResourceImpl that2 = (ResourceImpl) that; return this.seg.address().segmentOffset(that2.seg); } @@ -391,7 +391,7 @@ abstract class BaseStateImpl implements Resource { @Override public final boolean isSameResource(final Resource that) { - final BaseStateImpl that2 = (BaseStateImpl) that; + final ResourceImpl that2 = (ResourceImpl) that; return this.seg.address().equals(that2.seg.address()); } @@ -402,7 +402,7 @@ abstract class BaseStateImpl implements Resource { public long mismatch(final Resource that) { Objects.requireNonNull(that); if (!that.isAlive()) { throw new IllegalArgumentException("Given argument is not alive."); } - final BaseStateImpl thatBSI = (BaseStateImpl) that; + final ResourceImpl thatBSI = (ResourceImpl) that; return seg.mismatch(thatBSI.seg); } @@ -410,7 +410,7 @@ abstract class BaseStateImpl implements Resource { public final long nativeOverlap(final Resource that) { if (that == null) { return 0; } if (!that.isAlive()) { return 0; } - final BaseStateImpl thatBSI = (BaseStateImpl) that; + final ResourceImpl thatBSI = (ResourceImpl) that; if (this == thatBSI) { return seg.byteSize(); } return nativeOverlap(seg, thatBSI.seg); } diff --git a/src/main/java/org/apache/datasketches/memory/internal/XxHash64.java b/src/main/java/org/apache/datasketches/memory/internal/XxHash64.java index 994cb02..39d6075 100644 --- a/src/main/java/org/apache/datasketches/memory/internal/XxHash64.java +++ b/src/main/java/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/src/test/java/org/apache/datasketches/memory/internal/BaseStateTest.java b/src/test/java/org/apache/datasketches/memory/internal/BaseStateTest.java index d4c0bbf..a145af7 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/BaseStateTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/BaseStateTest.java @@ -39,36 +39,36 @@ public class BaseStateTest { public void checkNativeOverlap() { MemorySegment par = MemorySegment.allocateNative(100, ResourceScope.newImplicitScope()); //Equal sizes - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 0, 20), getSeg(par, 40, 60)), 0); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 0, 20), getSeg(par, 20, 40)), 0); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 0, 20), getSeg(par, 0, 20)), 20); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 0, 20), getSeg(par, 10, 30)), 10); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 10, 30), getSeg(par, 0, 20)), -10); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 20, 40), getSeg(par, 0, 20)), 0); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 0, 0), getSeg(par, 0, 0)), 0); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 0, 20), getSeg(par, 40, 60)), 0); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 0, 20), getSeg(par, 20, 40)), 0); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 0, 20), getSeg(par, 0, 20)), 20); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 0, 20), getSeg(par, 10, 30)), 10); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 10, 30), getSeg(par, 0, 20)), -10); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 20, 40), getSeg(par, 0, 20)), 0); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 0, 0), getSeg(par, 0, 0)), 0); //Unequal Sizes A > B - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 0, 40), getSeg(par, 60, 80)), 0); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 0, 40), getSeg(par, 40, 60)), 0); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 0, 40), getSeg(par, 30, 50)), 10); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 0, 40), getSeg(par, 20, 40)), 20); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 0, 40), getSeg(par, 10, 30)), 20); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 0, 40), getSeg(par, 0, 20)), 20); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 10, 50), getSeg(par, 0, 20)), -10); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 20, 60), getSeg(par, 0, 20)), 0); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 40, 80), getSeg(par, 0, 20)), 0); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 40, 80), getSeg(par, 0, 0)), 0); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 0, 40), getSeg(par, 60, 80)), 0); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 0, 40), getSeg(par, 40, 60)), 0); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 0, 40), getSeg(par, 30, 50)), 10); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 0, 40), getSeg(par, 20, 40)), 20); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 0, 40), getSeg(par, 10, 30)), 20); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 0, 40), getSeg(par, 0, 20)), 20); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 10, 50), getSeg(par, 0, 20)), -10); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 20, 60), getSeg(par, 0, 20)), 0); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 40, 80), getSeg(par, 0, 20)), 0); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 40, 80), getSeg(par, 0, 0)), 0); //Unequal Sizes B > A - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 60, 80), getSeg(par, 0, 40)), 0); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 40, 60), getSeg(par, 0, 40)), 0); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 30, 50), getSeg(par, 0, 40)), -10); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 20, 40), getSeg(par, 0, 40)), -20); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 10, 30), getSeg(par, 0, 40)), -20); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 0, 20), getSeg(par, 0, 40)), 20); - assertEquals(BaseStateImpl.nativeOverlap( getSeg(par, 0, 20), getSeg(par, 10, 50)), 10); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 0, 20), getSeg(par, 20, 60)), 0); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 0, 20), getSeg(par, 40, 80)), 0); - assertEquals(BaseStateImpl.nativeOverlap(getSeg(par, 0, 0), getSeg(par, 40, 80)), 0); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 60, 80), getSeg(par, 0, 40)), 0); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 40, 60), getSeg(par, 0, 40)), 0); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 30, 50), getSeg(par, 0, 40)), -10); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 20, 40), getSeg(par, 0, 40)), -20); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 10, 30), getSeg(par, 0, 40)), -20); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 0, 20), getSeg(par, 0, 40)), 20); + assertEquals(ResourceImpl.nativeOverlap( getSeg(par, 0, 20), getSeg(par, 10, 50)), 10); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 0, 20), getSeg(par, 20, 60)), 0); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 0, 20), getSeg(par, 40, 80)), 0); + assertEquals(ResourceImpl.nativeOverlap(getSeg(par, 0, 0), getSeg(par, 40, 80)), 0); } private static MemorySegment getSeg(MemorySegment parent, long left, long right) { @@ -101,7 +101,7 @@ public class BaseStateTest { @Test public void checkTypeDecode() { for (int i = 0; i < 256; i++) { - String str = BaseStateImpl.typeDecode(i); + String str = ResourceImpl.typeDecode(i); println(i + "\t" + str); } } diff --git a/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java b/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java index 76f4134..1776acc 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java @@ -353,7 +353,7 @@ public class NativeWritableBufferImplTest { @Test public void checkGoodBounds() { - BaseStateImpl.checkBounds(50, 50, 100); + ResourceImpl.checkBounds(50, 50, 100); } @Test diff --git a/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java b/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java index 706bda3..195f69d 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java @@ -540,7 +540,7 @@ public class NativeWritableMemoryImplTest { @Test public void checkGoodBounds() { - BaseStateImpl.checkBounds(50, 50, 100); + ResourceImpl.checkBounds(50, 50, 100); } @Test @@ -569,7 +569,7 @@ public class NativeWritableMemoryImplTest { assertEquals(comp, 0); comp = mem3.compareTo(0, 4, mem4, 1, 4); assertEquals(comp, -1); - BaseStateImpl.checkBounds(0, 5, mem3.getCapacity()); + ResourceImpl.checkBounds(0, 5, mem3.getCapacity()); } @Test diff --git a/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java b/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java index e6b8d70..7966e56 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java @@ -76,7 +76,7 @@ public class SpecificLeafTest { int bytes = 128; try (ResourceScope scope = ResourceScope.newConfinedScope()) { WritableMemory wmem = WritableMemory.allocateDirect(bytes, 1, scope, ByteOrder.nativeOrder(), memReqSvr); - assertFalse(((BaseStateImpl)wmem).isReadOnly()); + assertFalse(((ResourceImpl)wmem).isReadOnly()); assertTrue(wmem.isDirect()); assertFalse(wmem.isHeap()); assertFalse(wmem.isReadOnly()); @@ -143,7 +143,7 @@ public class SpecificLeafTest { int bytes = 128; Memory mem = Memory.wrap(new byte[bytes]); assertTrue(mem.isHeap()); - assertTrue(((BaseStateImpl)mem).isReadOnly()); + assertTrue(((ResourceImpl)mem).isReadOnly()); checkCrossLeafTypeIds(mem); Memory nnreg = mem.region(0, bytes, Resource.NON_NATIVE_BYTE_ORDER); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
