Merge pull request #14456 from tchaikov/wip-rocksdb-freebsd-build

rocksdb: sync with upstream

Reviewed-by: Nathan Cutler <ncutler@suse.com>
This commit is contained in:
Kefu Chai 2017-04-18 23:17:03 +08:00 committed by GitHub
commit c1ba579a7c
2 changed files with 3 additions and 5 deletions

@ -1 +1 @@
Subproject commit 3b4ac8076bff9fd6a8b4ccbc37a1995d08981840
Subproject commit 9f2cc59ec5065c828dabbab483506bde681c955c

View File

@ -25,8 +25,7 @@ TEST(RocksDBOption, simple) {
"max_bytes_for_level_base = 104857600;"
"target_file_size_base = 10485760;"
"num_levels = 3;"
"compression = kNoCompression;"
"disable_data_sync = false;";
"compression = kNoCompression;";
int r = db->ParseOptionsFromString(options_string, options);
ASSERT_EQ(0, r);
ASSERT_EQ(536870912u, options.write_buffer_size);
@ -38,8 +37,7 @@ TEST(RocksDBOption, simple) {
ASSERT_EQ(104857600u, options.max_bytes_for_level_base);
ASSERT_EQ(10485760u, options.target_file_size_base);
ASSERT_EQ(3, options.num_levels);
ASSERT_FALSE(options.disableDataSync);
// ASSERT_EQ("none", options.compression);
ASSERT_EQ(rocksdb::kNoCompression, options.compression);
}
TEST(RocksDBOption, interpret) {
rocksdb::Options options;