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.

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

Revert "Add workaround for an empty zstd message" #1180

Merged
merged 1 commit into from
Oct 2, 2018

Conversation

bobrik
Copy link
Contributor

@bobrik bobrik commented Oct 1, 2018

This reverts commit 0f30d97.

The issue was fixed in DataDog/zstd#42

cc @Viq111 @jmoiron

@@ -60,7 +60,7 @@ var (
0xFF, 0xFF, 0xFF, 0xFF, // key
0x00, 0x00, 0x00, 0x0d, // len
// ZSTD data
0x28, 0xb5, 0x2f, 0xfd, 0x24, 0x00, 0x01, 0x00, 0x00, 0x99, 0xe9, 0xd8, 0x51,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

4 missing bytes are an optional checksum. zstd cli adds it, but DataDog's package does not and I don't see an option to enable it.

There's a message level checksum and checksum, so I think it's fine to leave it out.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Opened an issue, but it should not be a blocker here:

@bobrik bobrik force-pushed the zstd-revert-empty-message-hack branch from 22ff4e4 to 1703c3b Compare October 1, 2018 20:15
message_test.go Outdated
@@ -53,14 +53,14 @@ var (
}

emptyZSTDMessage = []byte{
252, 62, 137, 23, // CRC
180, 172, 84, 179, // CRC
0x01, // version byte
0x04, // attribute flags: lz4
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: attribute flags: zstd

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops, fixed.

@bobrik bobrik force-pushed the zstd-revert-empty-message-hack branch from 1703c3b to 7d77064 Compare October 2, 2018 06:09
@bai bai merged commit 1a7ecd8 into IBM:master Oct 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants