Renamed "namespace zippy" to "namespace snappy" to reduce
the differences from the opensource code. Will make it easier in the future to mix-and-match third-party code that uses snappy with google code. Currently, csearch shows that the only external user of "namespace zippy" is some bigtable code that accesses a TEST variable, which is temporarily kept in the zippy namespace. R=sesse DELTA=123 (18 added, 3 deleted, 102 changed) Revision created by MOE tool push_codebase. MOE_MIGRATION=1150 git-svn-id: https://snappy.googlecode.com/svn/trunk@23 03e5f5b5-db94-4691-08a0-1a8bf15f6143
This commit is contained in:
@@ -220,8 +220,8 @@ static bool Compress(const char* input, size_t input_size, CompressorType comp,
|
|||||||
case SNAPPY: {
|
case SNAPPY: {
|
||||||
size_t destlen;
|
size_t destlen;
|
||||||
snappy::RawCompress(input, input_size,
|
snappy::RawCompress(input, input_size,
|
||||||
string_as_array(compressed),
|
string_as_array(compressed),
|
||||||
&destlen);
|
&destlen);
|
||||||
CHECK_LE(destlen, snappy::MaxCompressedLength(input_size));
|
CHECK_LE(destlen, snappy::MaxCompressedLength(input_size));
|
||||||
compressed->resize(destlen);
|
compressed->resize(destlen);
|
||||||
break;
|
break;
|
||||||
@@ -315,7 +315,7 @@ static bool Uncompress(const string& compressed, CompressorType comp,
|
|||||||
|
|
||||||
case SNAPPY: {
|
case SNAPPY: {
|
||||||
snappy::RawUncompress(compressed.data(), compressed.size(),
|
snappy::RawUncompress(compressed.data(), compressed.size(),
|
||||||
string_as_array(output));
|
string_as_array(output));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -713,8 +713,8 @@ TEST(Snappy, FourByteOffset) {
|
|||||||
static bool CheckUncompressedLength(const string& compressed,
|
static bool CheckUncompressedLength(const string& compressed,
|
||||||
size_t* ulength) {
|
size_t* ulength) {
|
||||||
const bool result1 = snappy::GetUncompressedLength(compressed.data(),
|
const bool result1 = snappy::GetUncompressedLength(compressed.data(),
|
||||||
compressed.size(),
|
compressed.size(),
|
||||||
ulength);
|
ulength);
|
||||||
|
|
||||||
snappy::ByteArraySource source(compressed.data(), compressed.size());
|
snappy::ByteArraySource source(compressed.data(), compressed.size());
|
||||||
uint32 length;
|
uint32 length;
|
||||||
@@ -730,7 +730,7 @@ TEST(SnappyCorruption, TruncatedVarint) {
|
|||||||
CHECK(!CheckUncompressedLength(compressed, &ulength));
|
CHECK(!CheckUncompressedLength(compressed, &ulength));
|
||||||
CHECK(!snappy::IsValidCompressedBuffer(compressed.data(), compressed.size()));
|
CHECK(!snappy::IsValidCompressedBuffer(compressed.data(), compressed.size()));
|
||||||
CHECK(!snappy::Uncompress(compressed.data(), compressed.size(),
|
CHECK(!snappy::Uncompress(compressed.data(), compressed.size(),
|
||||||
&uncompressed));
|
&uncompressed));
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(SnappyCorruption, UnterminatedVarint) {
|
TEST(SnappyCorruption, UnterminatedVarint) {
|
||||||
@@ -745,7 +745,7 @@ TEST(SnappyCorruption, UnterminatedVarint) {
|
|||||||
CHECK(!CheckUncompressedLength(compressed, &ulength));
|
CHECK(!CheckUncompressedLength(compressed, &ulength));
|
||||||
CHECK(!snappy::IsValidCompressedBuffer(compressed.data(), compressed.size()));
|
CHECK(!snappy::IsValidCompressedBuffer(compressed.data(), compressed.size()));
|
||||||
CHECK(!snappy::Uncompress(compressed.data(), compressed.size(),
|
CHECK(!snappy::Uncompress(compressed.data(), compressed.size(),
|
||||||
&uncompressed));
|
&uncompressed));
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(Snappy, ReadPastEndOfBuffer) {
|
TEST(Snappy, ReadPastEndOfBuffer) {
|
||||||
|
|||||||
Reference in New Issue
Block a user