diff --git a/utilities/blob_db/blob_db_impl.cc b/utilities/blob_db/blob_db_impl.cc index 98ab40376..c65ff679d 100644 --- a/utilities/blob_db/blob_db_impl.cc +++ b/utilities/blob_db/blob_db_impl.cc @@ -330,6 +330,7 @@ Status BlobDBImpl::OpenAllFiles() { continue; } bfptr->SetHasTTL(bfptr->header_.has_ttl); + bfptr->SetCompression(bfptr->header_.compression); bfptr->header_valid_ = true; std::shared_ptr ra_reader = @@ -567,6 +568,7 @@ std::shared_ptr BlobDBImpl::SelectBlobFile() { reinterpret_cast(DefaultColumnFamily())->GetID(); bfile->header_valid_ = true; bfile->SetHasTTL(false); + bfile->SetCompression(bdb_options_.compression); Status s = writer->WriteHeader(bfile->header_); if (!s.ok()) { @@ -627,6 +629,7 @@ std::shared_ptr BlobDBImpl::SelectBlobFileTTL(uint64_t expiration) { ; bfile->header_valid_ = true; bfile->SetHasTTL(true); + bfile->SetCompression(bdb_options_.compression); bfile->file_size_ = BlobLogHeader::kSize; // set the first value of the range, since that is @@ -882,6 +885,7 @@ Status BlobDBImpl::PutBlobValue(const WriteOptions& options, const Slice& key, return Status::NotFound("Blob file not found"); } + assert(bfile->compression() == bdb_options_.compression); std::string compression_output; Slice value_compressed = GetCompressedSlice(value, &compression_output); @@ -1196,12 +1200,12 @@ Status BlobDBImpl::GetBlobValue(const Slice& key, const Slice& index_entry, // TODO(yiwu): Should use compression flag in the blob file instead of // current compression option. - if (bdb_options_.compression != kNoCompression) { + if (bfile->compression() != kNoCompression) { BlockContents contents; auto cfh = reinterpret_cast(DefaultColumnFamily()); s = UncompressBlockContentsForCompressionType( blob_value.data(), blob_value.size(), &contents, - kBlockBasedTableVersionFormat, Slice(), bdb_options_.compression, + kBlockBasedTableVersionFormat, Slice(), bfile->compression(), *(cfh->cfd()->ioptions())); *(value->GetSelf()) = contents.data.ToString(); } diff --git a/utilities/blob_db/blob_db_test.cc b/utilities/blob_db/blob_db_test.cc index 708cec5c7..9f627061a 100644 --- a/utilities/blob_db/blob_db_test.cc +++ b/utilities/blob_db/blob_db_test.cc @@ -58,6 +58,14 @@ class BlobDBTest : public testing::Test { ASSERT_OK(TryOpen(bdb_options, options)); } + void Reopen(BlobDBOptions bdb_options = BlobDBOptions(), + Options options = Options()) { + assert(blob_db_ != nullptr); + delete blob_db_; + blob_db_ = nullptr; + Open(bdb_options, options); + } + void Destroy() { if (blob_db_) { Options options = blob_db_->GetOptions(); @@ -573,6 +581,24 @@ TEST_F(BlobDBTest, Compression) { } VerifyDB(data); } + +TEST_F(BlobDBTest, DecompressAfterReopen) { + Random rnd(301); + BlobDBOptions bdb_options; + bdb_options.min_blob_size = 0; + bdb_options.disable_background_tasks = true; + bdb_options.compression = CompressionType::kSnappyCompression; + Open(bdb_options); + std::map data; + for (size_t i = 0; i < 100; i++) { + PutRandom("put-key" + ToString(i), &rnd, &data); + } + VerifyDB(data); + bdb_options.compression = CompressionType::kNoCompression; + Reopen(bdb_options); + VerifyDB(data); +} + #endif TEST_F(BlobDBTest, MultipleWriters) { diff --git a/utilities/blob_db/blob_file.cc b/utilities/blob_db/blob_file.cc index bbd885725..162f364a2 100644 --- a/utilities/blob_db/blob_file.cc +++ b/utilities/blob_db/blob_file.cc @@ -30,6 +30,7 @@ BlobFile::BlobFile() : parent_(nullptr), file_number_(0), has_ttl_(false), + compression_(kNoCompression), blob_count_(0), gc_epoch_(-1), file_size_(0), @@ -49,6 +50,7 @@ BlobFile::BlobFile(const BlobDBImpl* p, const std::string& bdir, uint64_t fn) path_to_dir_(bdir), file_number_(fn), has_ttl_(false), + compression_(kNoCompression), blob_count_(0), gc_epoch_(-1), file_size_(0), diff --git a/utilities/blob_db/blob_file.h b/utilities/blob_db/blob_file.h index 239e8e1c5..ad738170e 100644 --- a/utilities/blob_db/blob_file.h +++ b/utilities/blob_db/blob_file.h @@ -41,6 +41,9 @@ class BlobFile { // have TTL. bool has_ttl_; + // Compression type of blobs in the file + CompressionType compression_; + // number of blobs in the file std::atomic blob_count_; @@ -173,6 +176,12 @@ class BlobFile { void SetHasTTL(bool has_ttl) { has_ttl_ = has_ttl; } + CompressionType compression() const { return compression_; } + + void SetCompression(CompressionType compression) { + compression_ = compression; + } + std::shared_ptr GetWriter() const { return log_writer_; } private: