Skip to content

LZ4 decompression forward compatibility #4824

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
drcrallen merged 2 commits into from
Sep 19, 2017
Merged

LZ4 decompression forward compatibility #4824

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04cbd5c
LZ4 decompression forward compatibility
leventov Sep 15, 2017
e40062c
Merge remote-tracking branch 'upstream/master' into lz4compression-fo…
leventov Sep 19, 2017
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
15 changes: 11 additions & 4 deletions processing/src/main/java/io/druid/segment/data/CompressedObjectStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import io.druid.java.util.common.logger.Logger;
import io.druid.segment.CompressedPools;
import net.jpountz.lz4.LZ4Factory;
import net.jpountz.lz4.LZ4FastDecompressor;
import net.jpountz.lz4.LZ4SafeDecompressor;
import org.apache.commons.lang.ArrayUtils;

Expand Down Expand Up @@ -264,7 +263,6 @@ public byte[] compress(byte[] bytes)
public static class LZ4Decompressor implements Decompressor
{
private static final LZ4SafeDecompressor lz4Safe = LZ4Factory.fastestInstance().safeDecompressor();
private static final LZ4FastDecompressor lz4Fast = LZ4Factory.fastestInstance().fastDecompressor();
private static final LZ4Decompressor defaultDecompressor = new LZ4Decompressor();

@Override
Expand All @@ -286,8 +284,17 @@ public void decompress(ByteBuffer in, int numBytes, ByteBuffer out)
@Override
public void decompress(ByteBuffer in, int numBytes, ByteBuffer out, int decompressedSize)
{
// lz4Fast.decompress does not modify buffer positions
lz4Fast.decompress(in, in.position(), out, out.position(), decompressedSize);
// lz4Safe.decompress does not modify buffer positions.
// Using lz4Safe API for forward-compatibility with https://github.com/druid-io/druid/pull/4762, which doesn't
// always compressed blocks of the same size.
lz4Safe.decompress(
in,
in.position(),
numBytes,
out,
out.position(),
decompressedSize
);
out.limit(out.position() + decompressedSize);
}
}
Expand Down