Skip to content

Fix the mistaken argument in LZ4Uncompressor #57

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
JackieTien97 merged 1 commit into from
Mar 28, 2024
Merged

Fix the mistaken argument in LZ4Uncompressor #57

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
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<argLine />
<argLine/>
<spotless.skip>false</spotless.skip>
</properties>
<dependencyManagement>
Expand Down Expand Up @@ -202,7 +202,7 @@
<importOrder>
<order>org.apache.tsfile,,javax,java,\#</order>
</importOrder>
<removeUnusedImports />
<removeUnusedImports/>
</java>
<lineEndings>UNIX</lineEndings>
</configuration>
Expand Down Expand Up @@ -301,7 +301,7 @@
<phase>validate</phase>
<configuration>
<rules>
<dependencyConvergence />
<dependencyConvergence/>
</rules>
</configuration>
</execution>
Expand Down
2 changes: 1 addition & 1 deletion tsfile/src/main/java/org/apache/tsfile/compress/IUnCompressor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ public byte[] uncompress(byte[] bytes) throws IOException {
public int uncompress(byte[] byteArray, int offset, int length, byte[] output, int outOffset)
throws IOException {
try {
return decompressor.decompress(byteArray, offset, length, output, offset);
return decompressor.decompress(byteArray, offset, length, output, outOffset);
} catch (RuntimeException e) {
logger.error(UNCOMPRESS_INPUT_ERROR, e);
throw new IOException(e);
Expand Down
21 changes: 21 additions & 0 deletions tsfile/src/test/java/org/apache/tsfile/compress/LZ4Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,25 @@ public void testBytes2() throws IOException {
byte[] uncompressed = unCompressor.uncompress(compressed);
Assert.assertArrayEquals(uncom, uncompressed);
}

@Test
public void testBytes3() throws IOException {
LZ4Compressor compressor = new LZ4Compressor();
IUnCompressor.LZ4UnCompressor unCompressor = new IUnCompressor.LZ4UnCompressor();

int n = 500000;
int offset = 100;
String input = randomString(n);
byte[] origin = input.getBytes(StandardCharsets.UTF_8);
byte[] compressed = new byte[origin.length * 2];
int compressedLength = compressor.compress(origin, 0, origin.length, compressed);
System.arraycopy(compressed, 0, compressed, offset, compressedLength);
for (int i = 0; i < offset; i++) {
compressed[i] = 0;
}

byte[] uncompressed = new byte[origin.length];
unCompressor.uncompress(compressed, offset, compressedLength, uncompressed, 0);
Assert.assertArrayEquals(origin, uncompressed);
}
}