Skip to content

Backport "HBASE-28485 Re-use ZstdDecompressCtx/ZstdCompressCtx for performance (#5797)" to branch-3 #5803

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

Merged
merged 1 commit into from
Apr 9, 2024
Merged

Backport "HBASE-28485 Re-use ZstdDecompressCtx/ZstdCompressCtx for performance (#5797)" to branch-3 #5803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions ...mpression-zstd/src/main/java/org/apache/hadoop/hbase/io/compress/zstd/ZstdCompressor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.hadoop.hbase.io.compress.zstd;

import com.github.luben.zstd.Zstd;
import com.github.luben.zstd.ZstdCompressCtx;
import com.github.luben.zstd.ZstdDictCompress;
import java.io.IOException;
import java.nio.ByteBuffer;
Expand All @@ -39,16 +40,20 @@ public class ZstdCompressor implements CanReinit, Compressor {
protected long bytesRead, bytesWritten;
protected int dictId;
protected ZstdDictCompress dict;
protected ZstdCompressCtx ctx;

ZstdCompressor(final int level, final int bufferSize, final byte[] dictionary) {
this.level = level;
this.bufferSize = bufferSize;
this.inBuf = ByteBuffer.allocateDirect(bufferSize);
this.outBuf = ByteBuffer.allocateDirect(bufferSize);
this.outBuf.position(bufferSize);
this.ctx = new ZstdCompressCtx();
this.ctx.setLevel(level);
if (dictionary != null) {
this.dictId = ZstdCodec.getDictionaryId(dictionary);
this.dict = new ZstdDictCompress(dictionary, level);
this.ctx.loadDict(this.dict);
}
}

Expand Down Expand Up @@ -79,12 +84,7 @@ public int compress(final byte[] b, final int off, final int len) throws IOExcep
} else {
outBuf.clear();
}
int written;
if (dict != null) {
written = Zstd.compress(outBuf, inBuf, dict);
} else {
written = Zstd.compress(outBuf, inBuf, level);
}
int written = ctx.compress(outBuf, inBuf);
bytesWritten += written;
inBuf.clear();
finished = true;
Expand Down Expand Up @@ -170,6 +170,14 @@ public void reset() {
bytesWritten = 0;
finish = false;
finished = false;
ctx.reset();
ctx.setLevel(level);
if (dict != null) {
ctx.loadDict(dict);
} else {
// loadDict((byte[]) accepts null to clear the dictionary
ctx.loadDict((byte[]) null);
}
}

@Override
Expand Down
19 changes: 12 additions & 7 deletions ...ression-zstd/src/main/java/org/apache/hadoop/hbase/io/compress/zstd/ZstdDecompressor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hbase.io.compress.zstd;

import com.github.luben.zstd.Zstd;
import com.github.luben.zstd.ZstdDecompressCtx;
import com.github.luben.zstd.ZstdDictDecompress;
import java.io.IOException;
import java.nio.ByteBuffer;
Expand All @@ -39,15 +39,18 @@ public class ZstdDecompressor implements CanReinit, Decompressor {
protected boolean finished;
protected int dictId;
protected ZstdDictDecompress dict;
protected ZstdDecompressCtx ctx;

ZstdDecompressor(final int bufferSize, final byte[] dictionary) {
this.bufferSize = bufferSize;
this.inBuf = ByteBuffer.allocateDirect(bufferSize);
this.outBuf = ByteBuffer.allocateDirect(bufferSize);
this.outBuf.position(bufferSize);
this.ctx = new ZstdDecompressCtx();
if (dictionary != null) {
this.dictId = ZstdCodec.getDictionaryId(dictionary);
this.dict = new ZstdDictDecompress(dictionary);
this.ctx.loadDict(this.dict);
}
}

Expand All @@ -67,12 +70,7 @@ public int decompress(final byte[] b, final int off, final int len) throws IOExc
int remaining = inBuf.remaining();
inLen -= remaining;
outBuf.clear();
int written;
if (dict != null) {
written = Zstd.decompress(outBuf, inBuf, dict);
} else {
written = Zstd.decompress(outBuf, inBuf);
}
int written = ctx.decompress(outBuf, inBuf);
inBuf.clear();
outBuf.flip();
int n = Math.min(written, len);
Expand Down Expand Up @@ -109,6 +107,13 @@ public void reset() {
outBuf.clear();
outBuf.position(outBuf.capacity());
finished = false;
ctx.reset();
if (dict != null) {
ctx.loadDict(dict);
} else {
// loadDict((byte[]) accepts null to clear the dictionary
ctx.loadDict((byte[]) null);
}
}

@Override
Expand Down