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 7c09a24f8877ac84970d7b84292ddcbcfcd1fabd Author: Lee Rhodes <[email protected]> AuthorDate: Tue Jun 4 11:36:30 2024 -0700 Change BaseState to Resource --- .../org/apache/datasketches/memory/BaseBuffer.java | 2 +- .../org/apache/datasketches/memory/Memory.java | 2 +- .../memory/{BaseState.java => Resource.java} | 28 ++++----- .../memory/internal/BaseStateImpl.java | 16 ++--- .../memory/internal/MurmurHash3v3.java | 2 +- .../memory/internal/AllocateDirectMemoryTest.java | 6 +- .../AllocateDirectWritableMapMemoryTest.java | 6 +- .../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 | 16 ++--- .../memory/internal/MemoryWriteToTest.java | 4 +- .../memory/internal/MurmurHash3v3Test.java | 4 +- .../internal/NativeWritableBufferImplTest.java | 6 +- .../internal/NativeWritableMemoryImplTest.java | 6 +- .../memory/internal/SpecificLeafTest.java | 38 ++++++------ .../memory/internal/WritableDirectCopyTest.java | 4 +- .../memory/internal/WritableMemoryTest.java | 6 +- .../datasketches/memory/internal/XxHash64Test.java | 4 +- .../memory/internal/ZeroCapacityTest.java | 4 +- tools/FindBugsExcludeFilter.xml | 71 +--------------------- 29 files changed, 102 insertions(+), 169 deletions(-) diff --git a/src/main/java/org/apache/datasketches/memory/BaseBuffer.java b/src/main/java/org/apache/datasketches/memory/BaseBuffer.java index 9cd824e..5101a86 100644 --- a/src/main/java/org/apache/datasketches/memory/BaseBuffer.java +++ b/src/main/java/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/src/main/java/org/apache/datasketches/memory/Memory.java b/src/main/java/org/apache/datasketches/memory/Memory.java index a9a94dd..7304061 100644 --- a/src/main/java/org/apache/datasketches/memory/Memory.java +++ b/src/main/java/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/src/main/java/org/apache/datasketches/memory/BaseState.java b/src/main/java/org/apache/datasketches/memory/Resource.java similarity index 95% rename from src/main/java/org/apache/datasketches/memory/BaseState.java rename to src/main/java/org/apache/datasketches/memory/Resource.java index 4280d20..5a1d396 100644 --- a/src/main/java/org/apache/datasketches/memory/BaseState.java +++ b/src/main/java/org/apache/datasketches/memory/Resource.java @@ -26,12 +26,12 @@ import jdk.incubator.foreign.MemorySegment; import jdk.incubator.foreign.ResourceScope; /** - * Keeps key configuration state for Memory and Buffer plus some common static variables + * The base class for Memory and Buffer plus some common static variables * and check methods. * * @author Lee Rhodes */ -public interface BaseState { +public interface Resource { /** * The java line separator character as a String. @@ -79,23 +79,23 @@ 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. */ - boolean equalTo(BaseState that); + boolean equalTo(Resource that); /** * Returns true if the given object is an instance of this class and has equal contents to * 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 that the given Resource object * @param thatOffsetBytes the starting offset in bytes for the given object * @param lengthBytes the size of the range in bytes * @return true if the given object has equal contents to this object in the given range of * bytes. */ - boolean equalTo(long thisOffsetBytes, BaseState that, + boolean equalTo(long thisOffsetBytes, Resource that, long thatOffsetBytes, long lengthBytes); /** @@ -118,7 +118,7 @@ public interface BaseState { * @return <i>this</i> - <i>that</i> offset * @throws IllegalArgumentException if one of the resources is on-heap. */ - long getRelativeOffset(BaseState that); + long getRelativeOffset(Resource that); /** * Returns the configured MemoryRequestSever or null, if it has not been configured. @@ -227,10 +227,10 @@ public interface BaseState { /** * Returns true if the underlying resource is the same underlying resource as <i>that</i>. - * @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> */ - boolean isSameResource(BaseState that); + boolean isSameResource(Resource that); /** * Loads the contents of this mapped segment into physical memory. Please refer to @@ -244,18 +244,18 @@ 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); /** * 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 the resource scope associated with this memory segment. diff --git a/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java b/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java index 4f9eef2..c56ece9 100644 --- a/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java +++ b/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java @@ -25,7 +25,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Objects; -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; @@ -39,7 +39,7 @@ import jdk.incubator.foreign.ResourceScope; * * @author Lee Rhodes */ -abstract class BaseStateImpl implements BaseState { +abstract class BaseStateImpl implements Resource { static final String JDK; //must be at least "1.8" static final int JDK_MAJOR; //8, 11, 12, etc @@ -282,13 +282,13 @@ abstract class BaseStateImpl implements BaseState { } @Override - public final boolean equalTo(final BaseState that) { + public final boolean equalTo(final Resource that) { Objects.requireNonNull(that); return equalTo(0, that, 0, that.getCapacity()); } @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) { Objects.requireNonNull(that); return CompareAndCopy.equals(seg, thisOffsetBytes, ((BaseStateImpl) that).seg, thatOffsetBytes, lengthBytes); @@ -303,7 +303,7 @@ abstract class BaseStateImpl implements BaseState { } @Override - public final long getRelativeOffset(final BaseState that) { + public final long getRelativeOffset(final Resource that) { final BaseStateImpl that2 = (BaseStateImpl) that; return this.seg.address().segmentOffset(that2.seg); } @@ -390,7 +390,7 @@ abstract class BaseStateImpl implements BaseState { } @Override - public final boolean isSameResource(final BaseState that) { + public final boolean isSameResource(final Resource that) { final BaseStateImpl that2 = (BaseStateImpl) that; return this.seg.address().equals(that2.seg.address()); } @@ -399,7 +399,7 @@ abstract class BaseStateImpl implements BaseState { public void load() { seg.load(); } @Override - public long mismatch(final BaseState that) { + 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; @@ -407,7 +407,7 @@ abstract class BaseStateImpl implements BaseState { } @Override - public final long nativeOverlap(final BaseState that) { + public final long nativeOverlap(final Resource that) { if (that == null) { return 0; } if (!that.isAlive()) { return 0; } final BaseStateImpl thatBSI = (BaseStateImpl) that; 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 e3936ce..ba48823 100644 --- a/src/main/java/org/apache/datasketches/memory/internal/MurmurHash3v3.java +++ b/src/main/java/org/apache/datasketches/memory/internal/MurmurHash3v3.java @@ -304,7 +304,7 @@ public final class MurmurHash3v3 { k1 ^= (MemoryAccess.getByteAtOffset(seg, cumOff) & 0xFFL); break; } - //default: break; //can't happen + default: break; //can't happen } h1 ^= mixK1(k1); diff --git a/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMemoryTest.java b/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMemoryTest.java index 4a2b684..8b561eb 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMemoryTest.java +++ b/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.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; @@ -31,7 +31,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 @@ -78,7 +78,7 @@ public class AllocateDirectMemoryTest { @Test public void checkNonNativeDirect() { WritableMemory wmem = null; - try (ResourceScope scope = (wmem = WritableMemory.allocateDirect(128, 8, BaseState.NON_NATIVE_BYTE_ORDER, memReqSvr)).scope()) { + try (ResourceScope scope = (wmem = WritableMemory.allocateDirect(128, 8, Resource.NON_NATIVE_BYTE_ORDER, memReqSvr)).scope()) { wmem.putChar(0, (char) 1); assertEquals(wmem.getByte(1), (byte) 1); } diff --git a/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java b/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java index f4744c2..1fc19b9 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java @@ -37,7 +37,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; @@ -48,7 +48,7 @@ import jdk.incubator.foreign.ResourceScope; public class AllocateDirectWritableMapMemoryTest { private static final String LS = System.getProperty("line.separator"); - private final MemoryRequestServer memReqSvr = BaseState.defaultMemReqSvr; + private final MemoryRequestServer memReqSvr = Resource.defaultMemReqSvr; @BeforeClass public void setReadOnly() throws IOException { @@ -120,7 +120,7 @@ public class AllocateDirectWritableMapMemoryTest { final long bytes = 8; WritableMemory wmem = null; try (ResourceScope scope = ResourceScope.newConfinedScope()) { - wmem = WritableMemory.writableMap(file, 0L, bytes, scope, BaseState.NON_NATIVE_BYTE_ORDER); + wmem = WritableMemory.writableMap(file, 0L, bytes, scope, Resource.NON_NATIVE_BYTE_ORDER); wmem.putChar(0, (char) 1); assertEquals(wmem.getByte(1), (byte) 1); } diff --git a/src/test/java/org/apache/datasketches/memory/internal/BaseBufferTest.java b/src/test/java/org/apache/datasketches/memory/internal/BaseBufferTest.java index 14ba7c7..f7ca693 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/BaseBufferTest.java +++ b/src/test/java/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/src/test/java/org/apache/datasketches/memory/internal/Buffer2Test.java b/src/test/java/org/apache/datasketches/memory/internal/Buffer2Test.java index 8df8553..22b65a4 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/Buffer2Test.java +++ b/src/test/java/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/src/test/java/org/apache/datasketches/memory/internal/BufferInvariantsTest.java b/src/test/java/org/apache/datasketches/memory/internal/BufferInvariantsTest.java index addb7d9..5953cf2 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/BufferInvariantsTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/BufferInvariantsTest.java @@ -25,7 +25,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.MemoryRequestServer; import org.apache.datasketches.memory.WritableBuffer; @@ -38,7 +38,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/src/test/java/org/apache/datasketches/memory/internal/BufferTest.java b/src/test/java/org/apache/datasketches/memory/internal/BufferTest.java index 821c39a..554ec95 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/BufferTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/BufferTest.java @@ -25,7 +25,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.Buffer; import org.apache.datasketches.memory.Memory; import org.apache.datasketches.memory.MemoryRequestServer; @@ -37,7 +37,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 @@ -203,7 +203,7 @@ public class BufferTest { public void checkByteBufBigEndianOrder() { int n = 1024; //longs ByteBuffer bb = ByteBuffer.allocate(n * 8); - bb.order(BaseState.NON_NATIVE_BYTE_ORDER); + bb.order(Resource.NON_NATIVE_BYTE_ORDER); Buffer buf = Buffer.wrap(bb); assertEquals(buf.getTypeByteOrder(), ByteOrder.nativeOrder()); } diff --git a/src/test/java/org/apache/datasketches/memory/internal/CommonBufferTest.java b/src/test/java/org/apache/datasketches/memory/internal/CommonBufferTest.java index ecfa2a9..5c20f77 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/CommonBufferTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/CommonBufferTest.java @@ -23,7 +23,7 @@ import static org.testng.Assert.assertEquals; 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.WritableBuffer; import org.apache.datasketches.memory.WritableMemory; @@ -32,7 +32,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/src/test/java/org/apache/datasketches/memory/internal/CommonMemoryTest.java b/src/test/java/org/apache/datasketches/memory/internal/CommonMemoryTest.java index d48d486..8627021 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/CommonMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/CommonMemoryTest.java @@ -29,7 +29,7 @@ import static org.testng.Assert.assertTrue; 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; @@ -37,7 +37,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/src/test/java/org/apache/datasketches/memory/internal/CopyMemoryOverlapTest.java b/src/test/java/org/apache/datasketches/memory/internal/CopyMemoryOverlapTest.java index 13813ad..f1f6056 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/CopyMemoryOverlapTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/CopyMemoryOverlapTest.java @@ -23,7 +23,7 @@ import static org.testng.Assert.assertEquals; import java.nio.ByteOrder; -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 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/src/test/java/org/apache/datasketches/memory/internal/CopyMemoryTest.java b/src/test/java/org/apache/datasketches/memory/internal/CopyMemoryTest.java index 7ef0a84..8af0f9e 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/CopyMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/CopyMemoryTest.java @@ -24,7 +24,7 @@ import static org.testng.Assert.assertEquals; 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.MemoryRequestServer; import org.apache.datasketches.memory.WritableMemory; @@ -34,7 +34,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/src/test/java/org/apache/datasketches/memory/internal/DruidIssue11544Test.java b/src/test/java/org/apache/datasketches/memory/internal/DruidIssue11544Test.java index a9fce8a..9a03420 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/DruidIssue11544Test.java +++ b/src/test/java/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/src/test/java/org/apache/datasketches/memory/internal/IgnoredArrayOverflowTest.java b/src/test/java/org/apache/datasketches/memory/internal/IgnoredArrayOverflowTest.java index c9d3b4b..8751441 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/IgnoredArrayOverflowTest.java +++ b/src/test/java/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/src/test/java/org/apache/datasketches/memory/internal/LeafImplTest.java b/src/test/java/org/apache/datasketches/memory/internal/LeafImplTest.java index 4de6350..be44431 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/LeafImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/LeafImplTest.java @@ -28,7 +28,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.MemoryRequestServer; import org.apache.datasketches.memory.WritableBuffer; import org.apache.datasketches.memory.WritableMemory; @@ -41,7 +41,7 @@ import jdk.incubator.foreign.ResourceScope; */ public class LeafImplTest { private static final ByteOrder NBO = ByteOrder.nativeOrder(); - private static final ByteOrder NNBO = BaseState.NON_NATIVE_BYTE_ORDER; + private static final ByteOrder NNBO = Resource.NON_NATIVE_BYTE_ORDER; private static final MemoryRequestServer dummyMemReqSvr = new DummyMemoryRequestServer(); static class DummyMemoryRequestServer implements MemoryRequestServer { diff --git a/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java b/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java index 1467e08..175d07d 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java @@ -34,7 +34,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; @@ -47,7 +47,7 @@ import jdk.incubator.foreign.ResourceScope; public class MemoryTest { private static final String LS = System.getProperty("line.separator"); - private static final MemoryRequestServer memReqSvr = BaseState.defaultMemReqSvr; + private static final MemoryRequestServer memReqSvr = Resource.defaultMemReqSvr; @BeforeClass @@ -177,7 +177,7 @@ public class MemoryTest { int n = 10; //longs byte[] arr = new byte[n * 8]; ByteBuffer bb = ByteBuffer.wrap(arr); //non-native order - WritableMemory wmem = WritableMemory.writableWrap(bb, BaseState.NON_NATIVE_BYTE_ORDER, memReqSvr); + WritableMemory wmem = WritableMemory.writableWrap(bb, Resource.NON_NATIVE_BYTE_ORDER, memReqSvr); for (int i = 0; i < n; i++) { //write to wmem wmem.putLong(i * 8, i); } @@ -189,7 +189,7 @@ public class MemoryTest { long v = bb.getLong(i * 8); assertEquals(v, i); } - Memory mem1 = Memory.wrap(arr, BaseState.NON_NATIVE_BYTE_ORDER); + Memory mem1 = Memory.wrap(arr, Resource.NON_NATIVE_BYTE_ORDER); for (int i = 0; i < n; i++) { //read from wrapped arr long v = mem1.getLong(i * 8); assertEquals(v, i); @@ -241,7 +241,7 @@ public class MemoryTest { assertTrue(mem.getTypeByteOrder() == ByteOrder.nativeOrder()); assertEquals(mem.getTypeByteOrder(), ByteOrder.LITTLE_ENDIAN); //Now explicitly set it - mem = Memory.wrap(bb, BaseState.NON_NATIVE_BYTE_ORDER); + mem = Memory.wrap(bb, Resource.NON_NATIVE_BYTE_ORDER); assertFalse(mem.getTypeByteOrder() == ByteOrder.nativeOrder()); assertEquals(mem.getTypeByteOrder(), ByteOrder.BIG_ENDIAN); } @@ -298,7 +298,7 @@ public class MemoryTest { long[] arr = new long[n]; for (int i = 0; i < n; i++) { arr[i] = i; } Memory mem = Memory.wrap(arr); - Memory reg = mem.region(n2 * 8, n2 * 8, BaseState.NON_NATIVE_BYTE_ORDER); //top half + Memory reg = mem.region(n2 * 8, n2 * 8, Resource.NON_NATIVE_BYTE_ORDER); //top half for (int i = 0; i < n2; i++) { long v = Long.reverseBytes(reg.getLong(i * 8)); long e = i + n2; @@ -338,7 +338,7 @@ public class MemoryTest { //println("" + wmem.getLong(i * 8)); } //println(""); - WritableMemory reg = wmem.writableRegion(n2 * 8, n2 * 8, BaseState.NON_NATIVE_BYTE_ORDER); + WritableMemory reg = wmem.writableRegion(n2 * 8, n2 * 8, Resource.NON_NATIVE_BYTE_ORDER); for (int i = 0; i < n2; i++) { reg.putLong(i * 8, i); } for (int i = 0; i < n; i++) { long v = wmem.getLong(i * 8); @@ -401,7 +401,7 @@ public class MemoryTest { assertNull(wbuf.getMemoryRequestServer()); //ON HEAP - wmem = WritableMemory.writableWrap(new byte[16], 0, 16, BaseState.NATIVE_BYTE_ORDER, memReqSvr); + wmem = WritableMemory.writableWrap(new byte[16], 0, 16, Resource.NATIVE_BYTE_ORDER, memReqSvr); assertNotNull(wmem.getMemoryRequestServer()); wbuf = wmem.asWritableBuffer(); assertNotNull(wbuf.getMemoryRequestServer()); diff --git a/src/test/java/org/apache/datasketches/memory/internal/MemoryWriteToTest.java b/src/test/java/org/apache/datasketches/memory/internal/MemoryWriteToTest.java index 2160d1a..57fe8ed 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/MemoryWriteToTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/MemoryWriteToTest.java @@ -27,7 +27,7 @@ import java.io.IOException; 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.MemoryRequestServer; import org.apache.datasketches.memory.WritableMemory; @@ -36,7 +36,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/src/test/java/org/apache/datasketches/memory/internal/MurmurHash3v3Test.java b/src/test/java/org/apache/datasketches/memory/internal/MurmurHash3v3Test.java index 59fe167..d9a7833 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/MurmurHash3v3Test.java +++ b/src/test/java/org/apache/datasketches/memory/internal/MurmurHash3v3Test.java @@ -25,7 +25,7 @@ import static org.testng.Assert.fail; import java.nio.ByteOrder; -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; @@ -42,7 +42,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/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java b/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java index 2f7002c..76f4134 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/NativeWritableBufferImplTest.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.MemoryRequestServer; @@ -39,7 +39,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 @@ -540,7 +540,7 @@ public class NativeWritableBufferImplTest { public void checkDuplicateNonNative() { WritableMemory wmem = WritableMemory.allocate(64); wmem.putShort(0, (short) 1); - Buffer buf = wmem.asWritableBuffer().duplicate(BaseState.NON_NATIVE_BYTE_ORDER); + Buffer buf = wmem.asWritableBuffer().duplicate(Resource.NON_NATIVE_BYTE_ORDER); assertEquals(buf.getShort(0), 256); } 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 2ed8caa..706bda3 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/NativeWritableMemoryImplTest.java @@ -27,7 +27,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; @@ -38,7 +38,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 @@ -660,7 +660,7 @@ public class NativeWritableMemoryImplTest { public void checkAsBufferNonNative() { WritableMemory wmem = WritableMemory.allocate(64); wmem.putShort(0, (short) 1); - Buffer buf = wmem.asBuffer(BaseState.NON_NATIVE_BYTE_ORDER); + Buffer buf = wmem.asBuffer(Resource.NON_NATIVE_BYTE_ORDER); assertEquals(buf.getShort(0), 256); } 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 6d30f29..e6b8d70 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/SpecificLeafTest.java @@ -28,7 +28,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; @@ -41,7 +41,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() { @@ -57,11 +57,11 @@ public class SpecificLeafTest { assertFalse(mem.isMapped()); checkCrossLeafTypeIds(mem); Buffer buf = mem.asBuffer().region(0, bytes, ByteOrder.nativeOrder()); - assertEquals(buf.getTypeByteOrder(), BaseState.NATIVE_BYTE_ORDER); + assertEquals(buf.getTypeByteOrder(), Resource.NATIVE_BYTE_ORDER); - bb.order(BaseState.NON_NATIVE_BYTE_ORDER); - Memory mem2 = Memory.wrap(bb).region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER); - Buffer buf2 = mem2.asBuffer().region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER); + bb.order(Resource.NON_NATIVE_BYTE_ORDER); + Memory mem2 = Memory.wrap(bb).region(0, bytes, Resource.NON_NATIVE_BYTE_ORDER); + Buffer buf2 = mem2.asBuffer().region(0, bytes, Resource.NON_NATIVE_BYTE_ORDER); Buffer buf3 = buf2.duplicate(); assertTrue(mem.isRegion()); @@ -81,14 +81,14 @@ public class SpecificLeafTest { assertFalse(wmem.isHeap()); assertFalse(wmem.isReadOnly()); checkCrossLeafTypeIds(wmem); - WritableMemory nnwmem = wmem.writableRegion(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER); + WritableMemory nnwmem = wmem.writableRegion(0, bytes, Resource.NON_NATIVE_BYTE_ORDER); Memory mem = wmem.region(0, bytes, ByteOrder.nativeOrder()); Buffer buf = mem.asBuffer().region(0, bytes, ByteOrder.nativeOrder()); - Memory mem2 = nnwmem.region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER); - Buffer buf2 = mem2.asBuffer().region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER); + Memory mem2 = nnwmem.region(0, bytes, Resource.NON_NATIVE_BYTE_ORDER); + Buffer buf2 = mem2.asBuffer().region(0, bytes, Resource.NON_NATIVE_BYTE_ORDER); Buffer buf3 = buf2.duplicate(); assertTrue(mem.isRegion()); @@ -117,19 +117,19 @@ public class SpecificLeafTest { assertTrue(mem.isMapped()); assertFalse(mem.isReadOnly()); checkCrossLeafTypeIds(mem); - Memory nnreg = mem.region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER); + Memory nnreg = mem.region(0, bytes, Resource.NON_NATIVE_BYTE_ORDER); Memory reg = mem.region(0, bytes, ByteOrder.nativeOrder()); Buffer buf = reg.asBuffer().region(0, bytes, ByteOrder.nativeOrder()); Buffer buf4 = buf.duplicate(); - Memory reg2 = nnreg.region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER); - Buffer buf2 = reg2.asBuffer().region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER); + Memory reg2 = nnreg.region(0, bytes, Resource.NON_NATIVE_BYTE_ORDER); + Buffer buf2 = reg2.asBuffer().region(0, bytes, Resource.NON_NATIVE_BYTE_ORDER); Buffer buf3 = buf2.duplicate(); assertTrue(reg.isRegion()); assertTrue(reg2.isRegion()); - assertEquals(reg2.getTypeByteOrder(), BaseState.NON_NATIVE_BYTE_ORDER); + assertEquals(reg2.getTypeByteOrder(), Resource.NON_NATIVE_BYTE_ORDER); assertTrue(buf.isRegion()); assertFalse(buf.isMemory()); assertTrue(buf2.isRegion()); @@ -145,14 +145,14 @@ public class SpecificLeafTest { assertTrue(mem.isHeap()); assertTrue(((BaseStateImpl)mem).isReadOnly()); checkCrossLeafTypeIds(mem); - Memory nnreg = mem.region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER); + Memory nnreg = mem.region(0, bytes, Resource.NON_NATIVE_BYTE_ORDER); Memory reg = mem.region(0, bytes, ByteOrder.nativeOrder()); Buffer buf = reg.asBuffer().region(0, bytes, ByteOrder.nativeOrder()); Buffer buf4 = buf.duplicate(); - Memory reg2 = nnreg.region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER); - Buffer buf2 = reg2.asBuffer().region(0, bytes, BaseState.NON_NATIVE_BYTE_ORDER); + Memory reg2 = nnreg.region(0, bytes, Resource.NON_NATIVE_BYTE_ORDER); + Buffer buf2 = reg2.asBuffer().region(0, bytes, Resource.NON_NATIVE_BYTE_ORDER); Buffer buf3 = buf2.duplicate(); assertFalse(mem.isRegion()); @@ -184,18 +184,18 @@ public class SpecificLeafTest { assertFalse(mem2.isDuplicate()); assertTrue(mem2.isReadOnly()); - Buffer buf3 = buf1.duplicate(BaseState.NON_NATIVE_BYTE_ORDER); + Buffer buf3 = buf1.duplicate(Resource.NON_NATIVE_BYTE_ORDER); assertTrue(buf3.isRegion()); assertTrue(buf3.isBuffer()); assertTrue(buf3.isDuplicate()); - assertEquals(buf3.getTypeByteOrder(), BaseState.NON_NATIVE_BYTE_ORDER); + assertEquals(buf3.getTypeByteOrder(), Resource.NON_NATIVE_BYTE_ORDER); assertTrue(buf3.isReadOnly()); Memory mem3 = buf3.asMemory(); assertTrue(mem3.isRegion()); assertFalse(mem3.isBuffer()); assertTrue(mem3.isDuplicate()); - assertEquals(mem3.getTypeByteOrder(), BaseState.NON_NATIVE_BYTE_ORDER); + assertEquals(mem3.getTypeByteOrder(), Resource.NON_NATIVE_BYTE_ORDER); assertTrue(mem3.isReadOnly()); } diff --git a/src/test/java/org/apache/datasketches/memory/internal/WritableDirectCopyTest.java b/src/test/java/org/apache/datasketches/memory/internal/WritableDirectCopyTest.java index 1b024f5..679f563 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/WritableDirectCopyTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/WritableDirectCopyTest.java @@ -24,7 +24,7 @@ import static org.testng.Assert.fail; import java.nio.ByteOrder; -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 WritableDirectCopyTest { - private static final MemoryRequestServer memReqSvr = BaseState.defaultMemReqSvr; + private static final MemoryRequestServer memReqSvr = Resource.defaultMemReqSvr; //Copy Within tests diff --git a/src/test/java/org/apache/datasketches/memory/internal/WritableMemoryTest.java b/src/test/java/org/apache/datasketches/memory/internal/WritableMemoryTest.java index ebe9e97..49aa5c4 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/WritableMemoryTest.java +++ b/src/test/java/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.getTypeByteOrder(), ByteOrder.LITTLE_ENDIAN); //ignore BB endianness - wmem = WritableMemory.writableWrap(bb, ByteOrder.nativeOrder(), BaseState.defaultMemReqSvr); + wmem = WritableMemory.writableWrap(bb, ByteOrder.nativeOrder(), Resource.defaultMemReqSvr); assertEquals(wmem.getTypeByteOrder(), 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/src/test/java/org/apache/datasketches/memory/internal/XxHash64Test.java b/src/test/java/org/apache/datasketches/memory/internal/XxHash64Test.java index 81a682a..f3013b2 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/XxHash64Test.java +++ b/src/test/java/org/apache/datasketches/memory/internal/XxHash64Test.java @@ -26,7 +26,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; @@ -101,7 +101,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/src/test/java/org/apache/datasketches/memory/internal/ZeroCapacityTest.java b/src/test/java/org/apache/datasketches/memory/internal/ZeroCapacityTest.java index 3db859a..7c4df24 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/ZeroCapacityTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/ZeroCapacityTest.java @@ -24,7 +24,7 @@ import static org.testng.Assert.assertEquals; 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.Memory; import org.apache.datasketches.memory.MemoryRequestServer; import org.apache.datasketches.memory.WritableMemory; @@ -37,7 +37,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 diff --git a/tools/FindBugsExcludeFilter.xml b/tools/FindBugsExcludeFilter.xml index ae68389..c23547f 100644 --- a/tools/FindBugsExcludeFilter.xml +++ b/tools/FindBugsExcludeFilter.xml @@ -21,76 +21,9 @@ under the License. <FindBugsFilter> <!-- memory --> - <!-- Too many false positives to be useful. I could not make it happy :( --> - <Match> - <Bug pattern="SF_SWITCH_NO_DEFAULT" /> - </Match> - - <Match> <!-- Exclude for test classes; too many False Positives. --> - <Bug pattern="NP_NULL_PARAM_DEREF_NONVIRTUAL" /> - <Class name="~.*\.*Test" /> - </Match> - - <Match> <!-- Exclude for test classes; too many False Positives. --> - <Bug pattern="DLS_DEAD_LOCAL_STORE" /> - <Class name="~.*\.*Test" /> - </Match> - -</FindBugsFilter> - - - -<!-- Examples: --> - -<!-- Exclude java.* classes --> - <!-- - <Match> - <Package name="java\.*" /> - </Match> ---> - - <!-- Exclude test classes --> -<!-- + <!-- Ignore all test code --> <Match> <Class name="~.*\.*Test" /> </Match> ---> -<!-- - <Match> - <Class name="com.foobar.ClassNotToBeAnalyzed" /> - </Match> ---> -<!-- - <Match> - <Class name="com.foobar.ClassWithSomeBugsMatched" /> - <Bug code="DE,UrF,SIC" /> - </Match> ---> - <!-- Match all XYZ violations. --> -<!-- - <Match> - <Bug code="XYZ" /> - </Match> ---> - <!-- Match all doublecheck violations in these methods of "AnotherClass". --> -<!-- - <Match> - <Class name="com.foobar.AnotherClass" /> - <Or> - <Method name="nonOverloadedMethod" /> - <Method name="frob" params="int,java.lang.String" returns="void" /> - <Method name="blat" params="" returns="boolean" /> - </Or> - <Bug code="DC" /> - </Match> ---> - <!-- A method with a dead local store false positive (medium priority). --> -<!-- - <Match> - <Class name="com.foobar.MyClass" /> - <Method name="someMethod" /> - <Bug pattern="DLS_DEAD_LOCAL_STORE" /> - <Priority value="2" /> - </Match> ---> +</FindBugsFilter> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
