forked from continuwuation/rocksdb
befa6b8050
Summary: ... caused by public headers depending on build parameters (macro definitions). This change also adds a check under 'make check-headers' (already in CI) looking for potential future violations. I've audited the uses of '#if' in public headers and either * Eliminated them * Systematically excluded them because they are intentional or similar (details in comments in check-public-header.sh * Manually excluded them as being ODR-SAFE In the case of ROCKSDB_USING_THREAD_STATUS, there was no good reason for this to appear in public headers so I've replaced it with a static bool ThreadStatus::kEnabled. I considered getting rid of the ability to disable this code but some relatively recent PRs have been submitted for fixing that case. I've added a release note and updated one of the CI jobs to use this build configuration. (I didn't want to combine with some jobs like no_compression and status_checked because the interaction might limit what is checked. Pull Request resolved: https://github.com/facebook/rocksdb/pull/14096 Test Plan: manual 'make check-headers' + manual cmake as in new CI config + CI Reviewed By: jaykorean Differential Revision: D86241864 Pulled By: pdillinger fbshipit-source-id: d16addc9e3480706b174a006720a4def0740bf2e
43 lines
1.3 KiB
C++
43 lines
1.3 KiB
C++
// Copyright (c) 2011-present, Facebook, Inc. All rights reserved.
|
|
// This source code is licensed under both the GPLv2 (found in the
|
|
// COPYING file in the root directory) and Apache 2.0 License
|
|
// (found in the LICENSE.Apache file in the root directory).
|
|
|
|
#include <mutex>
|
|
|
|
#include "db/column_family.h"
|
|
#include "monitoring/thread_status_updater.h"
|
|
#include "util/cast_util.h"
|
|
|
|
namespace ROCKSDB_NAMESPACE {
|
|
|
|
#ifndef NDEBUG
|
|
#ifndef NROCKSDB_THREAD_STATUS
|
|
void ThreadStatusUpdater::TEST_VerifyColumnFamilyInfoMap(
|
|
const std::vector<ColumnFamilyHandle*>& handles, bool check_exist) {
|
|
std::unique_lock<std::mutex> lock(thread_list_mutex_);
|
|
if (check_exist) {
|
|
assert(cf_info_map_.size() == handles.size());
|
|
}
|
|
for (auto* handle : handles) {
|
|
auto* cfd = static_cast_with_check<ColumnFamilyHandleImpl>(handle)->cfd();
|
|
auto iter __attribute__((__unused__)) = cf_info_map_.find(cfd);
|
|
if (check_exist) {
|
|
assert(iter != cf_info_map_.end());
|
|
assert(iter->second.cf_name == cfd->GetName());
|
|
} else {
|
|
assert(iter == cf_info_map_.end());
|
|
}
|
|
}
|
|
}
|
|
|
|
#else
|
|
|
|
void ThreadStatusUpdater::TEST_VerifyColumnFamilyInfoMap(
|
|
const std::vector<ColumnFamilyHandle*>& /*handles*/, bool /*check_exist*/) {
|
|
}
|
|
|
|
#endif // !NROCKSDB_THREAD_STATUS
|
|
#endif // !NDEBUG
|
|
|
|
} // namespace ROCKSDB_NAMESPACE
|