TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup certificate manager path management.

Browse Source 
PiperOrigin-RevId: 768146823
This commit is contained in:
Francis Tsui
2025-06-06 11:15:29 -07:00
committed by Copybara-Service
parent 56d7ca1c2e
commit 2d8b71703e
12 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/data/leveldb_data_set.h
+11 -12
View File
@@ -28,6 +28,7 @@
#include "third_party/leveldb/include/options.h"
#include "third_party/leveldb/include/slice.h"
#include "third_party/leveldb/include/status.h"
#include "internal/base/file_path.h"
#include "internal/data/data_set.h"
#if defined(_WIN32)
#include "location/nearby/apps/better_together/windows/common/leveldb_env_windows.h"
@@ -46,7 +47,13 @@ class LeveldbDataSet : public DataSet<T> {
public:
using KeyEntryVector = std::vector<std::pair<std::string, T>>;
explicit LeveldbDataSet(absl::string_view path) : path_(path) {}
explicit LeveldbDataSet(const FilePath& db_dir) : path_(db_dir.ToString()) {
#if defined(_WIN32)
// In Windows use the Unicode compatible environment.
db_options_.env = nearby::windows::WindowsEnv::Default();
#endif // defined(_WIN32)
db_options_.create_if_missing = true;
}
~LeveldbDataSet() override = default;
void Initialize(absl::AnyInvocable<void(InitStatus) &&> callback) override;
@@ -72,6 +79,7 @@ class LeveldbDataSet : public DataSet<T> {
private:
std::string path_;
leveldb::Options db_options_;
std::unique_ptr<leveldb::DB> db_ = nullptr;
InitStatus status_ = InitStatus::kNotInitialized;
};
@@ -81,13 +89,8 @@ template <typename T,
isMessageLite>
void LeveldbDataSet<T, isMessageLite>::Initialize(
absl::AnyInvocable<void(InitStatus) &&> callback) {
leveldb::Options options;
options.create_if_missing = true;
#if defined(_WIN32)
options.env = nearby::windows::WindowsEnv::Default();
#endif // defined(_WIN32)
leveldb::DB* db;
leveldb::Status status = leveldb::DB::Open(options, path_, &db);
leveldb::Status status = leveldb::DB::Open(db_options_, path_, &db);
db_ = std::unique_ptr<leveldb::DB>(db);
if (status.ok()) {
@@ -226,11 +229,7 @@ void LeveldbDataSet<T, isMessageLite>::Destroy(
absl::AnyInvocable<void(bool) &&> callback) {
LOG(INFO) << "Destroy is called.";
db_.reset();
leveldb::Options options;
#if defined(_WIN32)
options.env = nearby::windows::WindowsEnv::Default();
#endif // defined(_WIN32)
leveldb::DestroyDB(path_, options);
leveldb::DestroyDB(path_, db_options_);
std::move(callback)(true);
}