This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch frank_grimes_java-21-ffm
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
The following commit(s) were added to refs/heads/frank_grimes_java-21-ffm by
this push:
new b874e6b Update frank_grimes_java-21-ffm
b874e6b is described below
commit b874e6b5963926e5b0e953e7053221977a58c595
Author: Lee Rhodes <[email protected]>
AuthorDate: Wed Nov 20 16:23:37 2024 -0800
Update frank_grimes_java-21-ffm
Mostly Checkstyle issues
---
src/main/java/org/apache/datasketches/memory/Buffer.java | 1 -
src/main/java/org/apache/datasketches/memory/Memory.java | 3 ---
.../java/org/apache/datasketches/memory/MurmurHash3.java | 2 +-
src/main/java/org/apache/datasketches/memory/Resource.java | 8 ++++----
.../datasketches/memory/internal/NonNativeValueLayouts.java | 9 +++++----
.../memory/internal/NonNativeWritableBufferImpl.java | 13 +++++++------
.../memory/internal/NonNativeWritableMemoryImpl.java | 12 ++++++------
.../apache/datasketches/memory/internal/PositionalImpl.java | 1 -
.../apache/datasketches/memory/internal/ResourceImpl.java | 2 +-
.../datasketches/memory/internal/WritableMemoryImpl.java | 7 ++++---
.../org/apache/datasketches/memory/internal/XxHash64.java | 4 ++--
11 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/src/main/java/org/apache/datasketches/memory/Buffer.java
b/src/main/java/org/apache/datasketches/memory/Buffer.java
index acd44cb..c388efd 100644
--- a/src/main/java/org/apache/datasketches/memory/Buffer.java
+++ b/src/main/java/org/apache/datasketches/memory/Buffer.java
@@ -19,7 +19,6 @@
package org.apache.datasketches.memory;
-import java.lang.foreign.Arena;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
diff --git a/src/main/java/org/apache/datasketches/memory/Memory.java
b/src/main/java/org/apache/datasketches/memory/Memory.java
index cbbc4b3..6c7d5c8 100644
--- a/src/main/java/org/apache/datasketches/memory/Memory.java
+++ b/src/main/java/org/apache/datasketches/memory/Memory.java
@@ -24,14 +24,11 @@ import java.io.File;
import java.io.IOException;
import java.lang.foreign.Arena;
import java.lang.foreign.MemorySegment;
-import java.lang.foreign.MemorySegment.Scope;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import java.util.Objects;
import org.apache.datasketches.memory.internal.WritableMemoryImpl;
-
/**
* Defines the read-only API for offset access to a resource.
*
diff --git a/src/main/java/org/apache/datasketches/memory/MurmurHash3.java
b/src/main/java/org/apache/datasketches/memory/MurmurHash3.java
index 2b32999..161bf58 100644
--- a/src/main/java/org/apache/datasketches/memory/MurmurHash3.java
+++ b/src/main/java/org/apache/datasketches/memory/MurmurHash3.java
@@ -20,8 +20,8 @@
package org.apache.datasketches.memory;
import java.lang.foreign.MemorySegment;
-import org.apache.datasketches.memory.internal.MurmurHash3v4;
+import org.apache.datasketches.memory.internal.MurmurHash3v4;
/**
* <p>The MurmurHash3 is a fast, non-cryptographic, 128-bit hash function that
has
diff --git a/src/main/java/org/apache/datasketches/memory/Resource.java
b/src/main/java/org/apache/datasketches/memory/Resource.java
index e2d2299..529a8bc 100644
--- a/src/main/java/org/apache/datasketches/memory/Resource.java
+++ b/src/main/java/org/apache/datasketches/memory/Resource.java
@@ -95,13 +95,13 @@ public interface Resource extends AutoCloseable {
* and all the memory segments associated with it can no longer be accessed.
Furthermore, any off-heap region of memory backing the
* segments obtained from this arena are also released.
*
- * This operation is not idempotent; that is, closing an already closed
arena <em>always</em> results in an
+ * <p>This operation is not idempotent; that is, closing an already closed
arena <em>always</em> results in an
* exception being thrown. This reflects a deliberate design choice: failure
to close an arena might reveal a bug
- * in the underlying application logic.
+ * in the underlying application logic.</p>
*
- * If this method completes normally, then {@code
java.lang.foreign.Arena.scope().isAlive() == false}.
+ * <p>If this method completes normally, then {@code
java.lang.foreign.Arena.scope().isAlive() == false}.
* Implementations are allowed to throw {@link
UnsupportedOperationException} if an explicit close operation is
- * not supported.
+ * not supported.</p>
*
* @see java.lang.foreign.MemorySegment.Scope#isAlive()
*
diff --git
a/src/main/java/org/apache/datasketches/memory/internal/NonNativeValueLayouts.java
b/src/main/java/org/apache/datasketches/memory/internal/NonNativeValueLayouts.java
index b3355f3..a9d754e 100644
---
a/src/main/java/org/apache/datasketches/memory/internal/NonNativeValueLayouts.java
+++
b/src/main/java/org/apache/datasketches/memory/internal/NonNativeValueLayouts.java
@@ -19,10 +19,11 @@
package org.apache.datasketches.memory.internal;
-import java.lang.foreign.ValueLayout;
import static
org.apache.datasketches.memory.internal.ResourceImpl.NON_NATIVE_BYTE_ORDER;
-public class NonNativeValueLayouts {
+import java.lang.foreign.ValueLayout;
+
+public final class NonNativeValueLayouts {
private NonNativeValueLayouts() { }
@@ -38,5 +39,5 @@ public class NonNativeValueLayouts {
.withOrder(NON_NATIVE_BYTE_ORDER);
static final ValueLayout.OfShort JAVA_SHORT_UNALIGNED_NON_NATIVE =
ValueLayout.JAVA_SHORT_UNALIGNED
.withOrder(NON_NATIVE_BYTE_ORDER);
-
-}
\ No newline at end of file
+
+}
diff --git
a/src/main/java/org/apache/datasketches/memory/internal/NonNativeWritableBufferImpl.java
b/src/main/java/org/apache/datasketches/memory/internal/NonNativeWritableBufferImpl.java
index 862ac03..93409ed 100644
---
a/src/main/java/org/apache/datasketches/memory/internal/NonNativeWritableBufferImpl.java
+++
b/src/main/java/org/apache/datasketches/memory/internal/NonNativeWritableBufferImpl.java
@@ -19,12 +19,6 @@
package org.apache.datasketches.memory.internal;
-import java.lang.foreign.Arena;
-import java.lang.foreign.MemorySegment;
-import java.lang.foreign.ValueLayout;
-
-import org.apache.datasketches.memory.MemoryRequestServer;
-import org.apache.datasketches.memory.WritableBuffer;
import static
org.apache.datasketches.memory.internal.NonNativeValueLayouts.JAVA_CHAR_UNALIGNED_NON_NATIVE;
import static
org.apache.datasketches.memory.internal.NonNativeValueLayouts.JAVA_DOUBLE_UNALIGNED_NON_NATIVE;
import static
org.apache.datasketches.memory.internal.NonNativeValueLayouts.JAVA_FLOAT_UNALIGNED_NON_NATIVE;
@@ -32,6 +26,13 @@ import static
org.apache.datasketches.memory.internal.NonNativeValueLayouts.JAVA
import static
org.apache.datasketches.memory.internal.NonNativeValueLayouts.JAVA_LONG_UNALIGNED_NON_NATIVE;
import static
org.apache.datasketches.memory.internal.NonNativeValueLayouts.JAVA_SHORT_UNALIGNED_NON_NATIVE;
+import java.lang.foreign.Arena;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+
+import org.apache.datasketches.memory.MemoryRequestServer;
+import org.apache.datasketches.memory.WritableBuffer;
+
/*
* Developer notes: The heavier methods, such as put/get arrays, duplicate,
region, clear, fill,
* compareTo, etc., use hard checks (check*() and incrementAndCheck*()
methods), which execute at
diff --git
a/src/main/java/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImpl.java
b/src/main/java/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImpl.java
index 3cdf71f..eb8b8cf 100644
---
a/src/main/java/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImpl.java
+++
b/src/main/java/org/apache/datasketches/memory/internal/NonNativeWritableMemoryImpl.java
@@ -19,12 +19,6 @@
package org.apache.datasketches.memory.internal;
-import java.lang.foreign.Arena;
-import java.lang.foreign.MemorySegment;
-import java.lang.foreign.ValueLayout;
-
-import org.apache.datasketches.memory.MemoryRequestServer;
-import org.apache.datasketches.memory.WritableMemory;
import static
org.apache.datasketches.memory.internal.NonNativeValueLayouts.JAVA_CHAR_UNALIGNED_NON_NATIVE;
import static
org.apache.datasketches.memory.internal.NonNativeValueLayouts.JAVA_DOUBLE_UNALIGNED_NON_NATIVE;
import static
org.apache.datasketches.memory.internal.NonNativeValueLayouts.JAVA_FLOAT_UNALIGNED_NON_NATIVE;
@@ -32,6 +26,12 @@ import static
org.apache.datasketches.memory.internal.NonNativeValueLayouts.JAVA
import static
org.apache.datasketches.memory.internal.NonNativeValueLayouts.JAVA_LONG_UNALIGNED_NON_NATIVE;
import static
org.apache.datasketches.memory.internal.NonNativeValueLayouts.JAVA_SHORT_UNALIGNED_NON_NATIVE;
+import java.lang.foreign.Arena;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+
+import org.apache.datasketches.memory.MemoryRequestServer;
+import org.apache.datasketches.memory.WritableMemory;
/**
* Implementation of {@link WritableMemory} for non-native endian byte order.
diff --git
a/src/main/java/org/apache/datasketches/memory/internal/PositionalImpl.java
b/src/main/java/org/apache/datasketches/memory/internal/PositionalImpl.java
index b0ebe39..94ddcde 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/PositionalImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/PositionalImpl.java
@@ -26,7 +26,6 @@ import
org.apache.datasketches.memory.BufferPositionInvariantsException;
import org.apache.datasketches.memory.MemoryRequestServer;
import org.apache.datasketches.memory.Positional;
-
/**
* This implements the positional API.
* This is different from and simpler than Java BufferImpl positional approach.
diff --git
a/src/main/java/org/apache/datasketches/memory/internal/ResourceImpl.java
b/src/main/java/org/apache/datasketches/memory/internal/ResourceImpl.java
index a1ab49a..2da6253 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/ResourceImpl.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/ResourceImpl.java
@@ -339,7 +339,7 @@ abstract class ResourceImpl implements Resource {
try {
arena.close();
}
- catch (UnsupportedOperationException uoe) {
+ catch (final UnsupportedOperationException uoe) {
// ignored as it seems there's no way to determine if the Arena is
closeable or not
}
} //not idempotent
diff --git
a/src/main/java/org/apache/datasketches/memory/internal/WritableMemoryImpl.java
b/src/main/java/org/apache/datasketches/memory/internal/WritableMemoryImpl.java
index cbbd33a..764acef 100644
---
a/src/main/java/org/apache/datasketches/memory/internal/WritableMemoryImpl.java
+++
b/src/main/java/org/apache/datasketches/memory/internal/WritableMemoryImpl.java
@@ -46,6 +46,7 @@ import org.apache.datasketches.memory.WritableMemory;
* Common base of native-ordered and non-native-ordered {@link WritableMemory}
implementations.
* Contains methods which are agnostic to the byte order.
*/
+@SuppressWarnings("preview")
public abstract class WritableMemoryImpl extends ResourceImpl implements
WritableMemory {
//Pass-through constructor
@@ -171,9 +172,9 @@ public abstract class WritableMemoryImpl extends
ResourceImpl implements Writabl
}
}
- final Set<OpenOption> openOptions = READ_WRITE.equals(mapMode) ?
- Set.of(StandardOpenOption.READ, StandardOpenOption.WRITE) :
- Set.of(StandardOpenOption.READ);
+ final Set<OpenOption> openOptions = READ_WRITE.equals(mapMode)
+ ? Set.of(StandardOpenOption.READ, StandardOpenOption.WRITE)
+ : Set.of(StandardOpenOption.READ);
final boolean nativeBOType = byteOrder == ByteOrder.nativeOrder();
final int type = MEMORY | MAP | DIRECT
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 b37fcb8..0b24481 100644
--- a/src/main/java/org/apache/datasketches/memory/internal/XxHash64.java
+++ b/src/main/java/org/apache/datasketches/memory/internal/XxHash64.java
@@ -47,7 +47,7 @@ import java.lang.foreign.ValueLayout;
*
* @author Lee Rhodes
*/
-public class XxHash64 {
+public final class XxHash64 {
// Unsigned, 64-bit primes
private static final long P1 = -7046029288634856825L;
private static final long P2 = -4417276706812531889L;
@@ -79,7 +79,7 @@ public class XxHash64 {
v1 = Long.rotateLeft(v1, 31);
v1 *= P1;
- v2 += seg.get(ValueLayout.JAVA_LONG_UNALIGNED, offsetBytes+ 8L) * P2;
+ v2 += seg.get(ValueLayout.JAVA_LONG_UNALIGNED, offsetBytes + 8L) * P2;
v2 = Long.rotateLeft(v2, 31);
v2 *= P1;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
