diff options
| author | Stefan Boberg <[email protected]> | 2021-05-24 22:24:28 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-05-24 22:24:28 +0200 |
| commit | da806396c4a2b8d1bf097f31d28b03e4e8a29336 (patch) | |
| tree | 2f33bb2449168bcd7ec212356c23ec3681468fd9 /zenserver/projectstore.cpp | |
| parent | Added TODO to CasLogFile::Append (diff) | |
| download | zen-da806396c4a2b8d1bf097f31d28b03e4e8a29336.tar.xz zen-da806396c4a2b8d1bf097f31d28b03e4e8a29336.zip | |
Eliminated exploratory LMDB/RocksDB code from default path
Diffstat (limited to 'zenserver/projectstore.cpp')
| -rw-r--r-- | zenserver/projectstore.cpp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp index b353a6eac..f99bfdcac 100644 --- a/zenserver/projectstore.cpp +++ b/zenserver/projectstore.cpp @@ -31,6 +31,8 @@ namespace zen { namespace rocksdb = ROCKSDB_NAMESPACE; using namespace fmt::literals; +bool UseRocksDb = false; + ////////////////////////////////////////////////////////////////////////// struct ProjectStore::OplogStorage : public RefCounted @@ -44,12 +46,6 @@ struct ProjectStore::OplogStorage : public RefCounted Log().info("closing oplog storage at {}", m_OplogStoragePath); Flush(); - if (m_LmdbEnv) - { - mdb_env_close(m_LmdbEnv); - m_LmdbEnv = nullptr; - } - if (m_RocksDb) { // Column families must be torn down before database is closed @@ -94,15 +90,7 @@ struct ProjectStore::OplogStorage : public RefCounted ZEN_ASSERT(IsPow2(m_OpsAlign)); ZEN_ASSERT(!(m_NextOpsOffset & (m_OpsAlign - 1))); - { - std::string LmdbPath = WideToUtf8((m_OplogStoragePath / "ops.zdb").native().c_str()); - - int rc = mdb_env_create(&m_LmdbEnv); - rc = mdb_env_set_mapsize(m_LmdbEnv, 8 * 1024 * 1024); - rc = mdb_env_set_maxreaders(m_LmdbEnv, 256); - rc = mdb_env_open(m_LmdbEnv, LmdbPath.c_str(), MDB_NOSUBDIR | MDB_WRITEMAP | MDB_NOMETASYNC | MDB_NOSYNC, 0666); - } - + if (UseRocksDb) { std::string RocksdbPath = WideToUtf8((m_OplogStoragePath / "ops.rdb").native().c_str()); @@ -233,7 +221,6 @@ private: std::atomic<uint64_t> m_NextOpsOffset{0}; uint64_t m_OpsAlign = 32; std::atomic<uint32_t> m_MaxLsn{0}; - MDB_env* m_LmdbEnv = nullptr; std::unique_ptr<rocksdb::DB> m_RocksDb; std::vector<rocksdb::ColumnFamilyHandle*> m_RocksDbColumnHandles; }; |