From a61ec9ae3b9a0380a746233ca278ccdd3152d933 Mon Sep 17 00:00:00 2001
From: Adam Retter <adam.retter@googlemail.com>
Date: Wed, 27 Nov 2019 13:07:28 -0800
Subject: [PATCH] Fix BlobDB compilation on older GCC versions

Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/6094

Differential Revision: D18731951

Pulled By: ltamasi

fbshipit-source-id: 5b73c6009c748f6a2a48d4d880b1259980d801d4
---
 utilities/blob_db/blob_db_impl.cc | 4 ++--
 utilities/blob_db/blob_file.cc    | 2 +-
 utilities/blob_db/blob_file.h     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/utilities/blob_db/blob_db_impl.cc b/utilities/blob_db/blob_db_impl.cc
index 9c4a8a4c5..7f04ea85e 100644
--- a/utilities/blob_db/blob_db_impl.cc
+++ b/utilities/blob_db/blob_db_impl.cc
@@ -975,7 +975,7 @@ Status BlobDBImpl::PutBlobValue(const WriteOptions& /*options*/,
     }
     if (s.ok()) {
       assert(blob_file != nullptr);
-      assert(blob_file->compression() == bdb_options_.compression);
+      assert(blob_file->GetCompressionType() == bdb_options_.compression);
       s = AppendBlob(blob_file, headerbuf, key, value_compressed, expiration,
                      &index_entry);
     }
@@ -1364,7 +1364,7 @@ Status BlobDBImpl::GetRawBlobFromFile(const Slice& key, uint64_t file_number,
     blob_file = it->second;
   }
 
-  *compression_type = blob_file->compression();
+  *compression_type = blob_file->GetCompressionType();
 
   // takes locks when called
   std::shared_ptr<RandomAccessFileReader> reader;
diff --git a/utilities/blob_db/blob_file.cc b/utilities/blob_db/blob_file.cc
index f7a0e7de8..2aa0922dc 100644
--- a/utilities/blob_db/blob_file.cc
+++ b/utilities/blob_db/blob_file.cc
@@ -54,7 +54,7 @@ BlobFile::~BlobFile() {
   }
 }
 
-uint32_t BlobFile::column_family_id() const { return column_family_id_; }
+uint32_t BlobFile::GetColumnFamilyId() const { return column_family_id_; }
 
 std::string BlobFile::PathName() const {
   return BlobFileName(path_to_dir_, file_number_);
diff --git a/utilities/blob_db/blob_file.h b/utilities/blob_db/blob_file.h
index 485b2e985..41e86431f 100644
--- a/utilities/blob_db/blob_file.h
+++ b/utilities/blob_db/blob_file.h
@@ -116,7 +116,7 @@ class BlobFile {
 
   ~BlobFile();
 
-  uint32_t column_family_id() const;
+  uint32_t GetColumnFamilyId() const;
 
   // Returns log file's absolute pathname.
   std::string PathName() const;
@@ -204,7 +204,7 @@ class BlobFile {
 
   void SetHasTTL(bool has_ttl) { has_ttl_ = has_ttl; }
 
-  CompressionType compression() const { return compression_; }
+  CompressionType GetCompressionType() const { return compression_; }
 
   std::shared_ptr<Writer> GetWriter() const { return log_writer_; }
 
-- 
GitLab