This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new be1749c3db fix calculate checkSum when using Java9IntHash (#4140)
be1749c3db is described below
commit be1749c3db4374b5a222b6f8312813da8433dc40
Author: fengyubiao <yubiao.f...@streamnative.io>
AuthorDate: Thu Dec 7 13:49:32 2023 +0800
fix calculate checkSum when using Java9IntHash (#4140)
* fix calculate checkSum when using Java9IntHash
* -
* improve performence
* add test
* edit test
* rename test
* fix license
* address comments
---
.../scurrilous/circe/checksum/Java9IntHash.java | 12 +-
.../circe/checksum/Java9IntHashTest.java | 121 +++++++++++++++++++++
2 files changed, 132 insertions(+), 1 deletion(-)
diff --git
a/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java9IntHash.java
b/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java9IntHash.java
index 622c66d9ee..31af153666 100644
---
a/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java9IntHash.java
+++
b/circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java9IntHash.java
@@ -19,6 +19,7 @@
package com.scurrilous.circe.checksum;
import io.netty.buffer.ByteBuf;
+import io.netty.buffer.CompositeByteBuf;
import io.netty.util.concurrent.FastThreadLocal;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -106,14 +107,23 @@ public class Java9IntHash implements IntHash {
} else if (buffer.hasArray()) {
int arrayOffset = buffer.arrayOffset() + offset;
negCrc = resume(negCrc, buffer.array(), arrayOffset, len);
+ } else if (buffer instanceof CompositeByteBuf) {
+ CompositeByteBuf compositeByteBuf = (CompositeByteBuf) buffer;
+ int loopedCurrent = current;
+ for (int i = 0; i < compositeByteBuf.numComponents(); i ++) {
+ loopedCurrent = resume(loopedCurrent,
compositeByteBuf.component(i));
+ }
+ return loopedCurrent;
} else {
byte[] b = TL_BUFFER.get();
int toRead = len;
+ int loopOffset = offset;
while (toRead > 0) {
int length = Math.min(toRead, b.length);
- buffer.slice(offset, len).readBytes(b, 0, length);
+ buffer.slice(loopOffset, length).readBytes(b, 0, length);
negCrc = resume(negCrc, b, 0, length);
toRead -= length;
+ loopOffset += length;
}
}
diff --git
a/circe-checksum/src/test/java/com/scurrilous/circe/checksum/Java9IntHashTest.java
b/circe-checksum/src/test/java/com/scurrilous/circe/checksum/Java9IntHashTest.java
new file mode 100644
index 0000000000..3fb57b4a1a
--- /dev/null
+++
b/circe-checksum/src/test/java/com/scurrilous/circe/checksum/Java9IntHashTest.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.scurrilous.circe.checksum;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.CompositeByteBuf;
+import io.netty.buffer.DuplicatedByteBuf;
+import java.util.Random;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Assert;
+import org.junit.Test;
+
+@Slf4j
+public class Java9IntHashTest {
+
+ private ByteBuf[] generateByteBuffers() {
+ Random random = new Random();
+ int hugeDataLen = 4096 * 3;
+ byte[] hugeData = new byte[hugeDataLen];
+ for (int i = 0; i < hugeDataLen; i ++) {
+ hugeData[i] = (byte) (random.nextInt() % 127);
+ }
+
+ // b_total = b1 + b2 + b3;
+ ByteBuf bTotal = ByteBufAllocator.DEFAULT.heapBuffer(6 + hugeDataLen);
+ bTotal.writeBytes(new byte[]{1,2,3,4,5,6});
+ bTotal.writeBytes(hugeData);
+ ByteBuf b1 = ByteBufAllocator.DEFAULT.heapBuffer(3);
+ b1.writeBytes(new byte[]{1,2,3});
+ ByteBuf b2 = ByteBufAllocator.DEFAULT.heapBuffer(3);
+ b2.writeBytes(new byte[]{4,5,6});
+ ByteBuf b3 = ByteBufAllocator.DEFAULT.heapBuffer(hugeDataLen);
+ b3.writeBytes(hugeData);
+
+ return new ByteBuf[]{bTotal, b1, new
CompositeByteBuf(ByteBufAllocator.DEFAULT, false, 2, b2, b3)};
+ }
+
+ @Test
+ public void calculateCheckSumUsingCompositeByteBuf() {
+ // byteBuffers[0] = byteBuffers[1] + byteBuffers[2].
+ // byteBuffers[2] is a composite ByteBuf.
+ ByteBuf[] byteBuffers = generateByteBuffers();
+ ByteBuf bTotal = byteBuffers[0];
+ ByteBuf b1 = byteBuffers[1];
+ ByteBuf b2 = byteBuffers[2];
+
+ // Calculate: case-1.
+ int checksumRes1 = Crc32cIntChecksum.computeChecksum(bTotal);
+
+ // Calculate: case-2.
+ int b1CheckSum = Crc32cIntChecksum.computeChecksum(b1);
+ int checksumRes2 = Crc32cIntChecksum.resumeChecksum(b1CheckSum, b2);
+
+ // Verify: the results of both ways to calculate the checksum are same.
+ Assert.assertEquals(checksumRes1, checksumRes2);
+
+ // cleanup.
+ bTotal.release();
+ b1.release();
+ b2.release();
+ }
+
+ @Test
+ public void calculateCheckSumUsingNoArrayNoMemoryAddrByteBuf() {
+ // byteBuffers[0] = byteBuffers[1] + byteBuffers[2].
+ // byteBuffers[2] is a composite ByteBuf.
+ ByteBuf[] byteBuffers = generateByteBuffers();
+ ByteBuf bTotal = byteBuffers[0];
+ ByteBuf b1 = byteBuffers[1];
+ ByteBuf b2 = new NoArrayNoMemoryAddrByteBuff(byteBuffers[2]);
+
+ // Calculate: case-1.
+ int checksumRes1 = Crc32cIntChecksum.computeChecksum(bTotal);
+
+ // Calculate: case-2.
+ int b1CheckSum = Crc32cIntChecksum.computeChecksum(b1);
+ int checksumRes2 = Crc32cIntChecksum.resumeChecksum(b1CheckSum, b2);
+
+ // Verify: the results of both ways to calculate the checksum are same.
+ Assert.assertEquals(checksumRes1, checksumRes2);
+
+ // cleanup.
+ bTotal.release();
+ b1.release();
+ b2.release();
+ }
+
+ public static class NoArrayNoMemoryAddrByteBuff extends DuplicatedByteBuf {
+
+ public NoArrayNoMemoryAddrByteBuff(ByteBuf buffer) {
+ super(buffer);
+ }
+
+ @Override
+ public boolean hasArray(){
+ return false;
+ }
+
+ @Override
+ public boolean hasMemoryAddress(){
+ return false;
+ }
+ }
+}
\ No newline at end of file
