Skip to content

Fix for the bug described in issue #8 #9

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

Open
srosenberg wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for the bug described in issue #8 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
016366c
fix for issue #8
Feb 23, 2013
ecda072
consider all combinations; e.g., null,crc32 exposes the bug described…
Feb 23, 2013
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
3 changes: 2 additions & 1 deletion java/core/src/main/java/org/apache/trevni/ColumnOutputBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public void endRow() throws IOException {
private void flushBuffer() throws IOException {
if (rowCount == 0) return;
ByteBuffer raw = buffer.asByteBuffer();
ByteBuffer checksumBuf = checksum.compute(raw);
ByteBuffer c = codec.compress(raw);

blockDescriptors.add(new BlockDescriptor(rowCount,
Expand All @@ -81,7 +82,7 @@ private void flushBuffer() throws IOException {

ByteBuffer data = ByteBuffer.allocate(c.remaining() + checksum.size());
data.put(c);
data.put(checksum.compute(raw));
data.put(checksumBuf);
blockData.add(data.array());

int sizeIncrement =
Expand Down
5 changes: 4 additions & 1 deletion java/core/src/test/java/org/apache/trevni/TestColumnFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,11 @@ public TestColumnFile(String codec, String checksum) {

@Parameters public static Collection<Object[]> codecs() {
Object[][] data = new Object[][] {{"null", "null"},
{"null", "crc32"},
{"snappy", "crc32"},
{"deflate", "crc32"}};
{"snappy", "null"},
{"deflate", "crc32"},
{"deflate", "null"}};
return Arrays.asList(data);
}

Expand Down