summaryrefslogtreecommitdiff
path: root/db/db_test.cc
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@62dab493-f737-651d-591e-8d6aee1b9529>2011-03-22 23:24:02 +0000
committerjorlow@chromium.org <jorlow@chromium.org@62dab493-f737-651d-591e-8d6aee1b9529>2011-03-22 23:24:02 +0000
commit8303bb1b33a4db1d688d32f9be10976b0b54f209 (patch)
tree01802e7d30e43809b4a8c62a073c11c6037eb8f6 /db/db_test.cc
parent6d243ebf79640525a94fab280efeb5a46c994af6 (diff)
downloadleveldb-8303bb1b33a4db1d688d32f9be10976b0b54f209.tar.gz
Pull from upstream.
git-svn-id: https://leveldb.googlecode.com/svn/trunk@14 62dab493-f737-651d-591e-8d6aee1b9529
Diffstat (limited to 'db/db_test.cc')
-rw-r--r--db/db_test.cc17
1 files changed, 11 insertions, 6 deletions
diff --git a/db/db_test.cc b/db/db_test.cc
index f8accf6..888c560 100644
--- a/db/db_test.cc
+++ b/db/db_test.cc
@@ -674,6 +674,12 @@ TEST(DBTest, LargeValues1) {
ASSERT_TRUE(LargeValuesOK(this, expected));
}
+static bool SnappyCompressionSupported() {
+ std::string out;
+ Slice in = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+ return port::Snappy_Compress(in.data(), in.size(), &out);
+}
+
TEST(DBTest, LargeValues2) {
Options options;
options.large_value_threshold = 10000;
@@ -694,12 +700,11 @@ TEST(DBTest, LargeValues2) {
ASSERT_OK(Put("big2", big2));
ASSERT_EQ(big2, Get("big2"));
-#if defined(LEVELDB_PLATFORM_POSIX) || defined(LEVELDB_PLATFORM_CHROMIUM)
- // TODO(sanjay) Reenable after compression support is added
- expected.insert(LargeValueRef::Make(big2, kNoCompression));
-#else
- expected.insert(LargeValueRef::Make(big2, kLightweightCompression));
-#endif
+ if (SnappyCompressionSupported()) {
+ expected.insert(LargeValueRef::Make(big2, kSnappyCompression));
+ } else {
+ expected.insert(LargeValueRef::Make(big2, kNoCompression));
+ }
ASSERT_TRUE(LargeValuesOK(this, expected));
ASSERT_OK(dbfull()->TEST_CompactMemTable());