Browse Source

Add LevelDB MemEnv support

Support LevelDB memory-backed environments, and use them in unit tests.
pull/1/head
Pieter Wuille 10 years ago
parent
commit
e1bfbab802
  1. 2
      src/init.cpp
  2. 12
      src/leveldb.cpp
  3. 2
      src/leveldb.h
  4. 8
      src/test/test_bitcoin.cpp
  5. 2
      src/txdb-bdb.cpp
  6. 4
      src/txdb-bdb.h
  7. 5
      src/txdb-leveldb.cpp
  8. 4
      src/txdb-leveldb.h

2
src/init.cpp

@ -652,7 +652,7 @@ bool AppInit2() @@ -652,7 +652,7 @@ bool AppInit2()
uiInterface.InitMessage(_("Loading block index..."));
printf("Loading block index...\n");
nStart = GetTimeMillis();
pblocktree = new CBlockTreeDB("cr+");
pblocktree = new CBlockTreeDB();
pcoinsdbview = new CCoinsViewDB();
pcoinsTip = new CCoinsViewCache(*pcoinsdbview);

12
src/leveldb.cpp

@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
#include <leveldb/env.h>
#include <leveldb/cache.h>
#include <leveldb/filter_policy.h>
#include <memenv/memenv.h>
#include <boost/filesystem.hpp>
@ -20,7 +21,7 @@ static leveldb::Options GetOptions() { @@ -20,7 +21,7 @@ static leveldb::Options GetOptions() {
return options;
}
CLevelDB::CLevelDB(const boost::filesystem::path &path) {
CLevelDB::CLevelDB(const boost::filesystem::path &path, bool fMemory) {
penv = NULL;
readoptions.verify_checksums = true;
iteroptions.verify_checksums = true;
@ -28,8 +29,13 @@ CLevelDB::CLevelDB(const boost::filesystem::path &path) { @@ -28,8 +29,13 @@ CLevelDB::CLevelDB(const boost::filesystem::path &path) {
syncoptions.sync = true;
options = GetOptions();
options.create_if_missing = true;
boost::filesystem::create_directory(path);
printf("Opening LevelDB in %s\n", path.string().c_str());
if (fMemory) {
penv = leveldb::NewMemEnv(leveldb::Env::Default());
options.env = penv;
} else {
boost::filesystem::create_directory(path);
printf("Opening LevelDB in %s\n", path.string().c_str());
}
leveldb::Status status = leveldb::DB::Open(options, path.string(), &pdb);
if (!status.ok())
throw std::runtime_error(strprintf("CLevelDB(): error opening database environment %s", status.ToString().c_str()));

2
src/leveldb.h

@ -69,7 +69,7 @@ private: @@ -69,7 +69,7 @@ private:
leveldb::DB *pdb;
public:
CLevelDB(const boost::filesystem::path &path);
CLevelDB(const boost::filesystem::path &path, bool fMemory = false);
~CLevelDB();
template<typename K, typename V> bool Read(const K& key, V& value) {

8
src/test/test_bitcoin.cpp

@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
#include <boost/test/unit_test.hpp>
#include "db.h"
#include "txdb.h"
#include "main.h"
#include "wallet.h"
@ -18,8 +19,13 @@ struct TestingSetup { @@ -18,8 +19,13 @@ struct TestingSetup {
fPrintToDebugger = true; // don't want to write to debug.log file
noui_connect();
bitdb.MakeMock();
pblocktree = new CBlockTreeDB("cr+");
#ifdef USE_LEVELDB
pblocktree = new CBlockTreeDB(true);
pcoinsdbview = new CCoinsViewDB(true);
#else
pblocktree = new CBlockTreeDB();
pcoinsdbview = new CCoinsViewDB();
#endif
pcoinsTip = new CCoinsViewCache(*pcoinsdbview);
LoadBlockIndex(true);
bool fFirstRun;

2
src/txdb-bdb.cpp

@ -64,7 +64,7 @@ bool CBlockTreeDB::ReadLastBlockFile(int &nFile) { @@ -64,7 +64,7 @@ bool CBlockTreeDB::ReadLastBlockFile(int &nFile) {
return Read('l', nFile);
}
CCoinsViewDB::CCoinsViewDB() : db("cr+") {}
CCoinsViewDB::CCoinsViewDB() : db() {}
bool CCoinsViewDB::GetCoins(uint256 txid, CCoins &coins) { return db.ReadCoins(txid, coins); }
bool CCoinsViewDB::SetCoins(uint256 txid, const CCoins &coins) { return db.WriteCoins(txid, coins); }
bool CCoinsViewDB::HaveCoins(uint256 txid) { return db.HaveCoins(txid); }

4
src/txdb-bdb.h

@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
class CCoinsDB : public CDB
{
public:
CCoinsDB(const char* pszMode="r+") : CDB("coins.dat", pszMode) { }
CCoinsDB() : CDB("coins.dat", "cr+") { }
private:
CCoinsDB(const CCoinsDB&);
void operator=(const CCoinsDB&);
@ -43,7 +43,7 @@ public: @@ -43,7 +43,7 @@ public:
class CBlockTreeDB : public CDB
{
public:
CBlockTreeDB(const char* pszMode="r+") : CDB("blktree.dat", pszMode) { }
CBlockTreeDB() : CDB("blktree.dat", "cr+") { }
private:
CBlockTreeDB(const CBlockTreeDB&);
void operator=(const CBlockTreeDB&);

5
src/txdb-leveldb.cpp

@ -19,7 +19,7 @@ void static BatchWriteHashBestChain(CLevelDBBatch &batch, const uint256 &hash) { @@ -19,7 +19,7 @@ void static BatchWriteHashBestChain(CLevelDBBatch &batch, const uint256 &hash) {
batch.Write('B', hash);
}
CCoinsViewDB::CCoinsViewDB() : db(GetDataDir() / "coins") {
CCoinsViewDB::CCoinsViewDB(bool fMemory) : db(GetDataDir() / "coins", fMemory) {
}
bool CCoinsViewDB::GetCoins(uint256 txid, CCoins &coins) {
@ -63,6 +63,9 @@ bool CCoinsViewDB::BatchWrite(const std::map<uint256, CCoins> &mapCoins, CBlockI @@ -63,6 +63,9 @@ bool CCoinsViewDB::BatchWrite(const std::map<uint256, CCoins> &mapCoins, CBlockI
return db.WriteBatch(batch);
}
CBlockTreeDB::CBlockTreeDB(bool fMemory) : CLevelDB(GetDataDir() / "blktree", fMemory) {
}
bool CBlockTreeDB::WriteBlockIndex(const CDiskBlockIndex& blockindex)
{
return Write(make_pair('b', blockindex.GetBlockHash()), blockindex);

4
src/txdb-leveldb.h

@ -14,7 +14,7 @@ class CCoinsViewDB : public CCoinsView @@ -14,7 +14,7 @@ class CCoinsViewDB : public CCoinsView
protected:
CLevelDB db;
public:
CCoinsViewDB();
CCoinsViewDB(bool fMemory = false);
bool GetCoins(uint256 txid, CCoins &coins);
bool SetCoins(uint256 txid, const CCoins &coins);
@ -28,7 +28,7 @@ public: @@ -28,7 +28,7 @@ public:
class CBlockTreeDB : public CLevelDB
{
public:
CBlockTreeDB(const char* pszMode="r+") : CLevelDB(GetDataDir() / "blktree") { }
CBlockTreeDB(bool fMemory = false);
private:
CBlockTreeDB(const CBlockTreeDB&);
void operator=(const CBlockTreeDB&);

Loading…
Cancel
Save