From 5d3186c4592e4fdc75cd9e8428e702a99f5ea93b Mon Sep 17 00:00:00 2001 From: Levi Tamasi Date: Wed, 11 Mar 2020 09:55:40 -0700 Subject: [PATCH] Disambiguate CustomFieldTags to fix the unity build Test Plan: `make unity_test` --- db/blob_file_addition.cc | 6 +----- db/blob_file_addition.h | 2 ++ db/blob_file_garbage.cc | 6 +----- db/blob_file_garbage.h | 2 ++ 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/db/blob_file_addition.cc b/db/blob_file_addition.cc index 994b23b1ed2..a346cf66b4d 100644 --- a/db/blob_file_addition.cc +++ b/db/blob_file_addition.cc @@ -16,11 +16,9 @@ namespace ROCKSDB_NAMESPACE { -namespace { - // Tags for custom fields. Note that these get persisted in the manifest, // so existing tags should not be modified. -enum CustomFieldTags : uint32_t { +enum BlobFileAddition::CustomFieldTags : uint32_t { kEndMarker, // Add forward compatible fields here @@ -32,8 +30,6 @@ enum CustomFieldTags : uint32_t { // Add forward incompatible fields here }; -} // anonymous namespace - void BlobFileAddition::EncodeTo(std::string* output) const { PutVarint64(output, blob_file_number_); PutVarint64(output, total_blob_count_); diff --git a/db/blob_file_addition.h b/db/blob_file_addition.h index 8241038b2db..fab50160da9 100644 --- a/db/blob_file_addition.h +++ b/db/blob_file_addition.h @@ -47,6 +47,8 @@ class BlobFileAddition { std::string DebugJSON() const; private: + enum CustomFieldTags : uint32_t; + uint64_t blob_file_number_ = kInvalidBlobFileNumber; uint64_t total_blob_count_ = 0; uint64_t total_blob_bytes_ = 0; diff --git a/db/blob_file_garbage.cc b/db/blob_file_garbage.cc index 2d399bf4434..e4dde6c09c8 100644 --- a/db/blob_file_garbage.cc +++ b/db/blob_file_garbage.cc @@ -16,11 +16,9 @@ namespace ROCKSDB_NAMESPACE { -namespace { - // Tags for custom fields. Note that these get persisted in the manifest, // so existing tags should not be modified. -enum CustomFieldTags : uint32_t { +enum BlobFileGarbage::CustomFieldTags : uint32_t { kEndMarker, // Add forward compatible fields here @@ -32,8 +30,6 @@ enum CustomFieldTags : uint32_t { // Add forward incompatible fields here }; -} // anonymous namespace - void BlobFileGarbage::EncodeTo(std::string* output) const { PutVarint64(output, blob_file_number_); PutVarint64(output, garbage_blob_count_); diff --git a/db/blob_file_garbage.h b/db/blob_file_garbage.h index ae6c23231cd..4b61fb9c08a 100644 --- a/db/blob_file_garbage.h +++ b/db/blob_file_garbage.h @@ -39,6 +39,8 @@ class BlobFileGarbage { std::string DebugJSON() const; private: + enum CustomFieldTags : uint32_t; + uint64_t blob_file_number_ = kInvalidBlobFileNumber; uint64_t garbage_blob_count_ = 0; uint64_t garbage_blob_bytes_ = 0;