andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sst_dump: Error message should include the case that compression algorithms are not supported.

Browse Source 
Summary: It took me almost a day to debug this. :(  Although I got to learn the file format as a by-product, this time could be saved if we have better error messages.

Test Plan: gmake clean all; sst_dump --hex --file=000005.sst

Reviewers: dhruba

Reviewed By: dhruba

CC: leveldb

Differential Revision: https://reviews.facebook.net/D7551
This commit is contained in:
Zheng Shao 2012-12-20 14:25:06 -08:00
parent 551f01fb23
commit 7521a225d1
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
table/format.cc
View File

@ -120,15 +120,17 @@ Status ReadBlock(RandomAccessFile* file,
break; break;
case kSnappyCompression: { case kSnappyCompression: {
size_t ulength = 0; size_t ulength = 0;
static char snappy_corrupt_msg[] =
"Snappy not supported or corrupted Snappy compressed block contents";
if (!port::Snappy_GetUncompressedLength(data, n, &ulength)) { if (!port::Snappy_GetUncompressedLength(data, n, &ulength)) {
delete[] buf; delete[] buf;
return Status::Corruption("corrupted compressed block contents"); return Status::Corruption(snappy_corrupt_msg);
} }
ubuf = new char[ulength]; ubuf = new char[ulength];
if (!port::Snappy_Uncompress(data, n, ubuf)) { if (!port::Snappy_Uncompress(data, n, ubuf)) {
delete[] buf; delete[] buf;
delete[] ubuf; delete[] ubuf;
return Status::Corruption("corrupted compressed block contents"); return Status::Corruption(snappy_corrupt_msg);
} }
delete[] buf; delete[] buf;
result->data = Slice(ubuf, ulength); result->data = Slice(ubuf, ulength);
@ -138,9 +140,11 @@ Status ReadBlock(RandomAccessFile* file,
} }
case kZlibCompression: case kZlibCompression:
ubuf = port::Zlib_Uncompress(data, n, &decompress_size); ubuf = port::Zlib_Uncompress(data, n, &decompress_size);
static char zlib_corrupt_msg[] =
"Zlib not supported or corrupted Zlib compressed block contents";
if (!ubuf) { if (!ubuf) {
delete[] buf; delete[] buf;
return Status::Corruption("corrupted compressed block contents"); return Status::Corruption(zlib_corrupt_msg);
} }
delete[] buf; delete[] buf;
result->data = Slice(ubuf, decompress_size); result->data = Slice(ubuf, decompress_size);
@ -149,9 +153,11 @@ Status ReadBlock(RandomAccessFile* file,
break; break;
case kBZip2Compression: case kBZip2Compression:
ubuf = port::BZip2_Uncompress(data, n, &decompress_size); ubuf = port::BZip2_Uncompress(data, n, &decompress_size);
static char bzip2_corrupt_msg[] =
"Bzip2 not supported or corrupted Bzip2 compressed block contents";
if (!ubuf) { if (!ubuf) {
delete[] buf; delete[] buf;
return Status::Corruption("corrupted compressed block contents"); return Status::Corruption(bzip2_corrupt_msg);
} }
delete[] buf; delete[] buf;
result->data = Slice(ubuf, decompress_size); result->data = Slice(ubuf, decompress_size);