Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix calculate checkSum when using Java9IntHash #4140

Merged
merged 8 commits into from
Dec 7, 2023
Merged

fix calculate checkSum when using Java9IntHash #4140

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d90c7d5
fix calculate checkSum when using Java9IntHash
poorbarcode Dec 1, 2023
8a4c558
-
poorbarcode Dec 1, 2023
e197574
improve performence
poorbarcode Dec 1, 2023
5440cd1
add test
poorbarcode Dec 1, 2023
3f45369
edit test
poorbarcode Dec 1, 2023
c184a1b
rename test
poorbarcode Dec 2, 2023
d2ca22c
fix license
poorbarcode Dec 2, 2023
53cb6a6
address comments
poorbarcode Dec 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion circe-checksum/src/main/java/com/scurrilous/circe/checksum/Java9IntHash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,13 @@ public int resume(int current, ByteBuf buffer, int offset, int len) {
} 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;
}
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, I want you to move the return to every branch, that wouldn't leave any trap in the future. :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving return to every logic branch would make ~ everywhere(just like below). So I think current implementation is better to read:

public int resume(int current, ByteBuf buffer, int offset, int len) {
    if (buffer.hasMemoryAddress()) {
        return ~resume(~current, buffer.memoryAddress(), offset, len);
    }
    if (buffer.hasArray()) {
        int arrayOffset = buffer.arrayOffset() + offset;
        return ~resume(~current, buffer.array(), arrayOffset, len);
    }
    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;
    }
    int negCrc = ~current;
    byte[] b = TL_BUFFER.get();
    int toRead = len;
    int loopOffset = offset;
    while (toRead > 0) {
        int length = Math.min(toRead, b.length);
        buffer.slice(loopOffset, length).readBytes(b, 0, length);
        negCrc = resume(negCrc, b, 0, length);
        toRead -= length;
        loopOffset += length;
    }
    return ~negCrc;
}

Expand Down
Loading