You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2022/06/12 21:50:20 UTC
[datasketches-java] 01/05: Interim 1
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch checkMemoryWith17
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git
commit 23aff8d9cccd86311eb8074d9596ccb83f217625
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Thu Jun 9 09:48:05 2022 -0700
Interim 1
---
pom.xml | 2 +-
src/main/java/org/apache/datasketches/cpc/CpcSketch.java | 7 ++++---
src/main/java/org/apache/datasketches/hash/MurmurHash3.java | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 607475ef..b8657b40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@ under the License.
<!-- System-wide properties -->
<maven.version>3.5.0</maven.version>
- <java.version>1.8</java.version>
+ <java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<argLine>-Xmx4g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8</argLine>
diff --git a/src/main/java/org/apache/datasketches/cpc/CpcSketch.java b/src/main/java/org/apache/datasketches/cpc/CpcSketch.java
index 162a9c45..585d2b91 100644
--- a/src/main/java/org/apache/datasketches/cpc/CpcSketch.java
+++ b/src/main/java/org/apache/datasketches/cpc/CpcSketch.java
@@ -298,10 +298,11 @@ public final class CpcSketch {
*/
public byte[] toByteArray() {
final CompressedState state = CompressedState.compress(this);
- final long cap = state.getRequiredSerializedBytes();
- final WritableMemory wmem = WritableMemory.allocate((int) cap);
+ final int cap = (int) state.getRequiredSerializedBytes();
+ final byte[] byteArr = new byte[cap];
+ final WritableMemory wmem = WritableMemory.writableWrap(byteArr);
state.exportToMemory(wmem);
- return (byte[]) wmem.getArray();
+ return byteArr;
}
/**
diff --git a/src/main/java/org/apache/datasketches/hash/MurmurHash3.java b/src/main/java/org/apache/datasketches/hash/MurmurHash3.java
index eb9756e5..dff4d515 100644
--- a/src/main/java/org/apache/datasketches/hash/MurmurHash3.java
+++ b/src/main/java/org/apache/datasketches/hash/MurmurHash3.java
@@ -341,7 +341,7 @@ public final class MurmurHash3 implements Serializable {
final long lengthBytes = mem.getCapacity();
checkPositive(lengthBytes);
- final Memory memLE = mem.getTypeByteOrder() == ByteOrder.LITTLE_ENDIAN
+ final Memory memLE = mem.getByteOrder() == ByteOrder.LITTLE_ENDIAN
? mem : mem.region(0, lengthBytes, ByteOrder.LITTLE_ENDIAN);
final HashState hashState = new HashState(seed, seed);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org