diff --git a/HISTORY.md b/HISTORY.md index ece785e24..980cd3db1 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -19,6 +19,7 @@ * DB::CompactRange() now accept CompactRangeOptions instead of multiple paramters. CompactRangeOptions is defined in include/rocksdb/options.h. * Add force_bottommost_level_compaction option to CompactRangeOptions, which prevent compaction from skipping compacting bottommost level. * Add Cache.GetPinnedUsage() to get the size of memory occupied by entries that are in use by the system. +* DB:Open() will fail if the compression specified in Options is not linked with the binary. If you see this failure, recompile RocksDB with compression libraries present on your system. Also, previously our default compression was snappy. This behavior is now changed. Now, the default compression is snappy only if it's available on the system. If it isn't we change the default to kNoCompression. ## 3.11.0 (5/19/2015) ### New Features diff --git a/db/column_family.cc b/db/column_family.cc index ec583f67f..4a600f611 100644 --- a/db/column_family.cc +++ b/db/column_family.cc @@ -29,6 +29,7 @@ #include "db/version_set.h" #include "db/write_controller.h" #include "util/autovector.h" +#include "util/compression.h" #include "util/hash_skiplist_rep.h" #include "util/options_helper.h" #include "util/thread_status_util.h" @@ -87,6 +88,28 @@ void GetIntTblPropCollectorFactory( new InternalKeyPropertiesCollectorFactory); } +Status CheckCompressionSupported(const ColumnFamilyOptions& cf_options) { + if (!cf_options.compression_per_level.empty()) { + for (size_t level = 0; level < cf_options.compression_per_level.size(); + ++level) { + if (!CompressionTypeSupported(cf_options.compression_per_level[level])) { + return Status::InvalidArgument( + "Compression type " + + CompressionTypeToString(cf_options.compression_per_level[level]) + + " is not linked with the binary."); + } + } + } else { + if (!CompressionTypeSupported(cf_options.compression)) { + return Status::InvalidArgument( + "Compression type " + + CompressionTypeToString(cf_options.compression) + + " is not linked with the binary."); + } + } + return Status::OK(); +} + ColumnFamilyOptions SanitizeOptions(const DBOptions& db_options, const InternalKeyComparator* icmp, const ColumnFamilyOptions& src) { @@ -141,24 +164,6 @@ ColumnFamilyOptions SanitizeOptions(const DBOptions& db_options, } } - if (!src.compression_per_level.empty()) { - for (size_t level = 0; level < src.compression_per_level.size(); ++level) { - if (!CompressionTypeSupported(src.compression_per_level[level])) { - Log(InfoLogLevel::WARN_LEVEL, db_options.info_log, - "Compression type chosen for level %zu is not supported: %s. " - "RocksDB " - "will not compress data on level %zu.", - level, CompressionTypeToString(src.compression_per_level[level]), - level); - } - } - } else if (!CompressionTypeSupported(src.compression)) { - Log(InfoLogLevel::WARN_LEVEL, db_options.info_log, - "Compression type chosen is not supported: %s. RocksDB will not " - "compress data.", - CompressionTypeToString(src.compression)); - } - if (result.compaction_style == kCompactionStyleFIFO) { result.num_levels = 1; // since we delete level0 files in FIFO compaction when there are too many diff --git a/db/column_family.h b/db/column_family.h index 6c37d92fa..6136b2566 100644 --- a/db/column_family.h +++ b/db/column_family.h @@ -130,6 +130,8 @@ struct SuperVersion { autovector to_delete; }; +extern Status CheckCompressionSupported(const ColumnFamilyOptions& cf_options); + extern ColumnFamilyOptions SanitizeOptions(const DBOptions& db_options, const InternalKeyComparator* icmp, const ColumnFamilyOptions& src); diff --git a/db/db_impl.cc b/db/db_impl.cc index 168891293..a7dd7ab88 100644 --- a/db/db_impl.cc +++ b/db/db_impl.cc @@ -2918,6 +2918,12 @@ Status DBImpl::CreateColumnFamily(const ColumnFamilyOptions& cf_options, ColumnFamilyHandle** handle) { Status s; *handle = nullptr; + + s = CheckCompressionSupported(cf_options); + if (!s.ok()) { + return s; + } + { InstrumentedMutexLock l(&mutex_); @@ -4154,8 +4160,12 @@ Status DB::Open(const DBOptions& db_options, const std::string& dbname, return s; } - if (db_options.db_paths.size() > 1) { - for (auto& cfd : column_families) { + for (auto& cfd : column_families) { + s = CheckCompressionSupported(cfd.options); + if (!s.ok()) { + return s; + } + if (db_options.db_paths.size() > 1) { if ((cfd.options.compaction_style != kCompactionStyleUniversal) && (cfd.options.compaction_style != kCompactionStyleLevel)) { return Status::NotSupported( @@ -4163,11 +4173,11 @@ Status DB::Open(const DBOptions& db_options, const std::string& dbname, "universal and level compaction styles. "); } } + } - if (db_options.db_paths.size() > 4) { - return Status::NotSupported( - "More than four DB paths are not supported yet. "); - } + if (db_options.db_paths.size() > 4) { + return Status::NotSupported( + "More than four DB paths are not supported yet. "); } *dbptr = nullptr; diff --git a/db/db_test.cc b/db/db_test.cc index f81b438a6..fc3bb2cf4 100644 --- a/db/db_test.cc +++ b/db/db_test.cc @@ -11354,6 +11354,9 @@ TEST_F(DBTest, FlushOnDestroy) { } TEST_F(DBTest, DynamicLevelMaxBytesBase) { + if (!Snappy_Supported() || !LZ4_Supported()) { + return; + } // Use InMemoryEnv, or it would be too slow. unique_ptr env(new MockEnv(env_)); @@ -11925,6 +11928,9 @@ TEST_F(DBTest, DynamicLevelCompressionPerLevel) { } TEST_F(DBTest, DynamicLevelCompressionPerLevel2) { + if (!Snappy_Supported() || !LZ4_Supported() || !Zlib_Supported()) { + return; + } const int kNKeys = 500; int keys[kNKeys]; for (int i = 0; i < kNKeys; i++) { @@ -12707,6 +12713,9 @@ TEST_F(DBTest, EncodeDecompressedBlockSizeTest) { CompressionType compressions[] = {kZlibCompression, kBZip2Compression, kLZ4Compression, kLZ4HCCompression}; for (int iter = 0; iter < 4; ++iter) { + if (!CompressionTypeSupported(compressions[iter])) { + continue; + } // first_table_version 1 -- generate with table_version == 1, read with // table_version == 2 // first_table_version 2 -- generate with table_version == 2, read with @@ -13859,6 +13868,26 @@ TEST_F(DBTest, ForceBottommostLevelCompaction) { rocksdb::SyncPoint::GetInstance()->DisableProcessing(); } +TEST_F(DBTest, FailWhenCompressionNotSupportedTest) { + CompressionType compressions[] = {kZlibCompression, kBZip2Compression, + kLZ4Compression, kLZ4HCCompression}; + for (int iter = 0; iter < 4; ++iter) { + if (!CompressionTypeSupported(compressions[iter])) { + // not supported, we should fail the Open() + Options options = CurrentOptions(); + options.compression = compressions[iter]; + ASSERT_TRUE(!TryReopen(options).ok()); + // Try if CreateColumnFamily also fails + options.compression = kNoCompression; + ASSERT_OK(TryReopen(options)); + ColumnFamilyOptions cf_options(options); + cf_options.compression = compressions[iter]; + ColumnFamilyHandle* handle; + ASSERT_TRUE(!db_->CreateColumnFamily(cf_options, "name", &handle).ok()); + } + } +} + } // namespace rocksdb int main(int argc, char** argv) { diff --git a/include/rocksdb/options.h b/include/rocksdb/options.h index f36892d80..dd02795c6 100644 --- a/include/rocksdb/options.h +++ b/include/rocksdb/options.h @@ -55,12 +55,6 @@ enum CompressionType : char { kBZip2Compression = 0x3, kLZ4Compression = 0x4, kLZ4HCCompression = 0x5 }; -// returns true if RocksDB was correctly linked with compression library and -// supports the compression type -extern bool CompressionTypeSupported(CompressionType compression_type); -// Returns a human-readable name of the compression type -extern const char* CompressionTypeToString(CompressionType compression_type); - enum CompactionStyle : char { // level based compaction style kCompactionStyleLevel = 0x0, @@ -260,8 +254,8 @@ struct ColumnFamilyOptions { // Compress blocks using the specified compression algorithm. This // parameter can be changed dynamically. // - // Default: kSnappyCompression, which gives lightweight but fast - // compression. + // Default: kSnappyCompression, if it's supported. If snappy is not linked + // with the library, the default is kNoCompression. // // Typical speeds of kSnappyCompression on an Intel(R) Core(TM)2 2.4GHz: // ~200-500MB/s compression diff --git a/util/compression.h b/util/compression.h index 36e36d50a..0c992fd50 100644 --- a/util/compression.h +++ b/util/compression.h @@ -62,6 +62,46 @@ inline bool LZ4_Supported() { return false; } +inline bool CompressionTypeSupported(CompressionType compression_type) { + switch (compression_type) { + case kNoCompression: + return true; + case kSnappyCompression: + return Snappy_Supported(); + case kZlibCompression: + return Zlib_Supported(); + case kBZip2Compression: + return BZip2_Supported(); + case kLZ4Compression: + return LZ4_Supported(); + case kLZ4HCCompression: + return LZ4_Supported(); + default: + assert(false); + return false; + } +} + +inline std::string CompressionTypeToString(CompressionType compression_type) { + switch (compression_type) { + case kNoCompression: + return "NoCompression"; + case kSnappyCompression: + return "Snappy"; + case kZlibCompression: + return "Zlib"; + case kBZip2Compression: + return "BZip2"; + case kLZ4Compression: + return "LZ4"; + case kLZ4HCCompression: + return "LZ4HC"; + default: + assert(false); + return ""; + } +} + // compress_format_version can have two values: // 1 -- decompressed sizes for BZip2 and Zlib are not included in the compressed // block. Also, decompressed sizes for LZ4 are encoded in platform-dependent diff --git a/util/options.cc b/util/options.cc index 3ffa6e9d4..c9de11949 100644 --- a/util/options.cc +++ b/util/options.cc @@ -84,7 +84,7 @@ ColumnFamilyOptions::ColumnFamilyOptions() max_write_buffer_number(2), min_write_buffer_number_to_merge(1), max_write_buffer_number_to_maintain(0), - compression(kSnappyCompression), + compression(Snappy_Supported() ? kSnappyCompression : kNoCompression), prefix_extractor(nullptr), num_levels(7), level0_file_num_compaction_trigger(4), @@ -380,11 +380,11 @@ void ColumnFamilyOptions::Dump(Logger* log) const { if (!compression_per_level.empty()) { for (unsigned int i = 0; i < compression_per_level.size(); i++) { Warn(log, " Options.compression[%d]: %s", i, - CompressionTypeToString(compression_per_level[i])); + CompressionTypeToString(compression_per_level[i]).c_str()); } } else { Warn(log, " Options.compression: %s", - CompressionTypeToString(compression)); + CompressionTypeToString(compression).c_str()); } Warn(log, " Options.prefix_extractor: %s", prefix_extractor == nullptr ? "nullptr" : prefix_extractor->Name()); @@ -546,46 +546,6 @@ Options::PrepareForBulkLoad() return this; } -const char* CompressionTypeToString(CompressionType compression_type) { - switch (compression_type) { - case kNoCompression: - return "NoCompression"; - case kSnappyCompression: - return "Snappy"; - case kZlibCompression: - return "Zlib"; - case kBZip2Compression: - return "BZip2"; - case kLZ4Compression: - return "LZ4"; - case kLZ4HCCompression: - return "LZ4HC"; - default: - assert(false); - return ""; - } -} - -bool CompressionTypeSupported(CompressionType compression_type) { - switch (compression_type) { - case kNoCompression: - return true; - case kSnappyCompression: - return Snappy_Supported(); - case kZlibCompression: - return Zlib_Supported(); - case kBZip2Compression: - return BZip2_Supported(); - case kLZ4Compression: - return LZ4_Supported(); - case kLZ4HCCompression: - return LZ4_Supported(); - default: - assert(false); - return false; - } -} - #ifndef ROCKSDB_LITE // Optimization functions ColumnFamilyOptions* ColumnFamilyOptions::OptimizeForPointLookup( diff --git a/utilities/spatialdb/spatial_db_test.cc b/utilities/spatialdb/spatial_db_test.cc index b304664d3..7b42995ba 100644 --- a/utilities/spatialdb/spatial_db_test.cc +++ b/utilities/spatialdb/spatial_db_test.cc @@ -8,6 +8,7 @@ #include #include "rocksdb/utilities/spatial_db.h" +#include "util/compression.h" #include "util/testharness.h" #include "util/testutil.h" #include "util/random.h" @@ -47,6 +48,9 @@ class SpatialDBTest : public testing::Test { }; TEST_F(SpatialDBTest, FeatureSetSerializeTest) { + if (!LZ4_Supported()) { + return; + } FeatureSet fs; fs.Set("a", std::string("b")); @@ -94,6 +98,9 @@ TEST_F(SpatialDBTest, FeatureSetSerializeTest) { } TEST_F(SpatialDBTest, TestNextID) { + if (!LZ4_Supported()) { + return; + } ASSERT_OK(SpatialDB::Create( SpatialDBOptions(), dbname_, {SpatialIndexOptions("simple", BoundingBox(0, 0, 100, 100), 2)})); @@ -117,6 +124,9 @@ TEST_F(SpatialDBTest, TestNextID) { } TEST_F(SpatialDBTest, FeatureSetTest) { + if (!LZ4_Supported()) { + return; + } ASSERT_OK(SpatialDB::Create( SpatialDBOptions(), dbname_, {SpatialIndexOptions("simple", BoundingBox(0, 0, 100, 100), 2)})); @@ -151,6 +161,9 @@ TEST_F(SpatialDBTest, FeatureSetTest) { } TEST_F(SpatialDBTest, SimpleTest) { + if (!LZ4_Supported()) { + return; + } // iter 0 -- not read only // iter 1 -- read only for (int iter = 0; iter < 2; ++iter) { @@ -227,6 +240,9 @@ BoundingBox ScaleBB(BoundingBox b, double step) { } // namespace TEST_F(SpatialDBTest, RandomizedTest) { + if (!LZ4_Supported()) { + return; + } Random rnd(301); std::vector>> elements;