Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

DB: removed cache size for lmdb, added basic_key_value_accessor::deinit(), removed ugly code for 0.9.18->0.9.24 migration

Browse source
This commit is contained in:
sowle 2019-08-17 07:08:00 +03:00
parent d12959aac7
commit f98fb2b492
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
4 changed files with 35 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/common/db_abstract_accessor.h
View file

@ -241,9 +241,9 @@ namespace tools
m_is_open = false;
return m_backend->close();
}
bool open(const std::string& path, uint64_t cache_sz = CACHE_SIZE)
bool open(const std::string& path, uint64_t flags = 0)
{
bool r = m_backend->open(path, cache_sz);
bool r = m_backend->open(path, flags);
if(r)
m_is_open = true;
@ -558,15 +558,30 @@ namespace tools
bool init(const std::string& container_name)
{
#ifdef ENABLE_PROFILING
m_get_profiler.m_name = container_name +":get";
m_set_profiler.m_name = container_name + ":set";
m_explicit_get_profiler.m_name = container_name + ":explicit_get";
m_explicit_set_profiler.m_name = container_name + ":explicit_set";
m_commit_profiler.m_name = container_name + ":commit";;
m_get_profiler.m_name = container_name +":get";
m_set_profiler.m_name = container_name + ":set";
m_explicit_get_profiler.m_name = container_name + ":explicit_get";
m_explicit_set_profiler.m_name = container_name + ":explicit_set";
m_commit_profiler.m_name = container_name + ":commit";
#endif
return bdb.get_backend()->open_container(container_name, m_h);
}
bool deinit()
{
#ifdef ENABLE_PROFILING
m_get_profiler.m_name = "";
m_set_profiler.m_name = "";
m_explicit_get_profiler.m_name = "";
m_explicit_set_profiler.m_name = "";
m_commit_profiler.m_name = "";
#endif
m_h = AUTO_VAL_INIT(m_h);
size_cache = 0;
size_cache_valid = false;
return true;
}
template<class t_cb>
void enumerate_keys(t_cb cb) const
{

25
src/common/db_backend_base.h
View file

@ -1,17 +1,10 @@
// Copyright (c) 2014-2018 Zano Project
// Copyright (c) 2014-2019 Zano Project
// Copyright (c) 2014-2018 The Louisdor Project
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#pragma once
#ifndef ENV32BIT
#define CACHE_SIZE uint64_t(uint64_t(1UL * 128UL) * 1024UL * 1024UL * 1024UL)
#else
#define CACHE_SIZE (1 * 1024UL * 1024UL * 1024UL)
#endif
namespace tools
{
namespace db
@ -32,20 +25,20 @@ namespace tools
struct i_db_backend
{
virtual bool close()=0;
virtual bool close() = 0;
virtual bool begin_transaction(bool read_only = false) = 0;
virtual bool commit_transaction()=0;
virtual void abort_transaction()=0;
virtual bool open(const std::string& path, uint64_t cache_sz = CACHE_SIZE) = 0;
virtual bool open_container(const std::string& name, container_handle& h)=0;
virtual bool commit_transaction() = 0;
virtual void abort_transaction() = 0;
virtual bool open(const std::string& path, uint64_t flags = 0) = 0;
virtual bool open_container(const std::string& name, container_handle& h) = 0;
virtual bool erase(container_handle h, const char* k, size_t s) = 0;
virtual uint64_t size(container_handle h) = 0;
virtual bool get(container_handle h, const char* k, size_t s, std::string& res_buff) = 0;
virtual bool set(container_handle h, const char* k, size_t s, const char* v, size_t vs) = 0;
virtual bool clear(container_handle h) = 0;
virtual bool enumerate(container_handle h, i_db_callback* pcb)=0;
virtual bool enumerate(container_handle h, i_db_callback* pcb) = 0;
virtual bool get_stat_info(stat_info& si) = 0;
virtual ~i_db_backend(){};
virtual ~i_db_backend() {};
};
}
}
}

17
src/common/db_backend_lmdb.cpp
View file

@ -43,7 +43,7 @@ namespace tools
NESTED_CATCH_ENTRY(__func__);
}
bool lmdb_db_backend::open(const std::string& path_, uint64_t cache_sz)
bool lmdb_db_backend::open(const std::string& path_, uint64_t /* flags -- unused atm */)
{
int res = 0;
res = mdb_env_create(&m_penv);
@ -60,23 +60,12 @@ namespace tools
CHECK_AND_ASSERT_MES(tools::create_directories_if_necessary(m_path), false, "create_directories_if_necessary failed: " << m_path);
// TODO: convert flags to lmdb_flags (implement fast lmdb modes)
unsigned int lmdb_flags = MDB_NORDAHEAD /*| MDB_NOSYNC | MDB_WRITEMAP | MDB_MAPASYNC*/;
mdb_mode_t lmdb_mode = 0644;
res = mdb_env_open(m_penv, m_path.c_str(), lmdb_flags, lmdb_mode);
if (res != MDB_SUCCESS)
{
// DB created with prev LMDB 0.9.18 cannot be opened due to huge map size set in env
// try to remove DB folder completely and re-open
boost::filesystem::remove_all(m_path);
CHECK_AND_ASSERT_MES(tools::create_directories_if_necessary(m_path), false, "create_directories_if_necessary failed: " << m_path);
res = mdb_env_create(&m_penv);
CHECK_AND_ASSERT_MESS_LMDB_DB(res, false, "Unable to mdb_env_create");
res = mdb_env_set_maxdbs(m_penv, max_dbs);
CHECK_AND_ASSERT_MESS_LMDB_DB(res, false, "Unable to mdb_env_set_maxdbs");
res = mdb_env_open(m_penv, m_path.c_str(), lmdb_flags, lmdb_mode);
CHECK_AND_ASSERT_MESS_LMDB_DB(res, false, "Unable to mdb_env_open, m_path=" << m_path);
}
CHECK_AND_ASSERT_MESS_LMDB_DB(res, false, "Unable to mdb_env_open, m_path=" << m_path);
resize_if_needed();

2
src/common/db_backend_lmdb.h
View file

@ -52,7 +52,7 @@ namespace tools
bool begin_transaction(bool read_only = false);
bool commit_transaction();
void abort_transaction();
bool open(const std::string& path, uint64_t cache_sz = CACHE_SIZE);
bool open(const std::string& path, uint64_t flags = 0);
bool open_container(const std::string& name, container_handle& h);
bool erase(container_handle h, const char* k, size_t s);
bool get(container_handle h, const char* k, size_t s, std::string& res_buff);