dolysis
/
rocksdb
mirror of https://github.com/facebook/rocksdb.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changes to get Snappy working 

git-svn-id: https://leveldb.googlecode.com/svn/trunk@8 62dab493-f737-651d-591e-8d6aee1b9529
This commit is contained in:
jorlow@chromium.org 2011-03-21 19:09:55 +00:00
parent 795dd1d550
commit 24ba614869
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
leveldb.gyp
View File

@ -4,7 +4,7 @@
{ {
'variables': { 'variables': {
'use_snappy%': 0, 'use_snappy%': 1,
}, },
'target_defaults': { 'target_defaults': {
'defines': [ 'defines': [
@ -38,7 +38,7 @@
'conditions': [ 'conditions': [
['use_snappy', { ['use_snappy', {
'dependencies': [ 'dependencies': [
'../../../../third_party/snappy/snappy.gyp:snappy', '../../third_party/snappy/snappy.gyp:snappy',
], ],
}], }],
], ],

10
port/port_chromium.cc
View File

@ -8,7 +8,7 @@
#if defined(USE_SNAPPY) #if defined(USE_SNAPPY)
# include "third_party/snappy/src/snappy.h" # include "third_party/snappy/src/snappy.h"
# include "third_party/snappy/src/snappy-stubs.h" # include "snappy-stubs-public.h"
#endif #endif
namespace leveldb { namespace leveldb {
@ -55,8 +55,7 @@ void Lightweight_Compress(const char* input, size_t input_length,
#if defined(USE_SNAPPY) #if defined(USE_SNAPPY)
output->resize(snappy::MaxCompressedLength(input_length)); output->resize(snappy::MaxCompressedLength(input_length));
size_t outlen; size_t outlen;
snappy::RawCompress(snappy::StringPiece(input, input_length), snappy::RawCompress(input, input_length, &(*output)[0], &outlen);
&(*output)[0], &outlen);
output->resize(outlen); output->resize(outlen);
#else #else
output->assign(input, input_length); output->assign(input, input_length);
@ -66,13 +65,12 @@ void Lightweight_Compress(const char* input, size_t input_length,
bool Lightweight_Uncompress(const char* input_data, size_t input_length, bool Lightweight_Uncompress(const char* input_data, size_t input_length,
std::string* output) { std::string* output) {
#if defined(USE_SNAPPY) #if defined(USE_SNAPPY)
snappy::StringPiece input(input_data, input_length);
size_t ulength; size_t ulength;
if (!snappy::GetUncompressedLength(input, &ulength)) { if (!snappy::GetUncompressedLength(input_data, input_length, &ulength)) {
return false; return false;
} }
output->resize(ulength); output->resize(ulength);
return snappy::RawUncompress(input, &(*output)[0]); return snappy::RawUncompress(input_data, input_length, &(*output)[0]);
#else #else
output->assign(input_data, input_length); output->assign(input_data, input_length);
return true; return true;