kvazar
/
kevacoin
mirror of https://github.com/kvazar-network/kevacoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #6873

0.13
Jeff Garzik 9 years ago
parent
c719cefc41 3795e8152b
commit
46f74379b8
Failed to extract signature
7 changed files with 85 additions and 89 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/Makefile.am
  2. 2
      src/Makefile.test.include
  3. 42
      src/dbwrapper.cpp
  4. 56
      src/dbwrapper.h
  5. 28
      src/test/dbwrapper_tests.cpp
  6. 12
      src/txdb.cpp
  7. 8
      src/txdb.h

4
src/Makefile.am
Unescape View File

@ -110,7 +110,7 @@ BITCOIN_CORE_H = \
init.h \ init.h \
key.h \ key.h \
keystore.h \ keystore.h \
leveldbwrapper.h \ dbwrapper.h \
limitedmap.h \ limitedmap.h \
main.h \ main.h \
memusage.h \ memusage.h \
@ -188,7 +188,7 @@ libbitcoin_server_a_SOURCES = \
httprpc.cpp \ httprpc.cpp \
httpserver.cpp \ httpserver.cpp \
init.cpp \ init.cpp \
leveldbwrapper.cpp \ dbwrapper.cpp \
main.cpp \ main.cpp \
merkleblock.cpp \ merkleblock.cpp \
miner.cpp \ miner.cpp \

2
src/Makefile.test.include
Unescape View File

@ -54,7 +54,7 @@ BITCOIN_TESTS =\
test/hash_tests.cpp \ test/hash_tests.cpp \
test/key_tests.cpp \ test/key_tests.cpp \
test/limitedmap_tests.cpp \ test/limitedmap_tests.cpp \
test/leveldbwrapper_tests.cpp \ test/dbwrapper_tests.cpp \
test/main_tests.cpp \ test/main_tests.cpp \
test/mempool_tests.cpp \ test/mempool_tests.cpp \
test/miner_tests.cpp \ test/miner_tests.cpp \

42
src/leveldbwrapper.cpp → src/dbwrapper.cpp
Unescape View File

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "leveldbwrapper.h" #include "dbwrapper.h"
#include "util.h" #include "util.h"
#include "random.h" #include "random.h"
@ -15,18 +15,18 @@
#include <memenv.h> #include <memenv.h>
#include <stdint.h> #include <stdint.h>
void HandleError(const leveldb::Status& status) throw(leveldb_error) void HandleError(const leveldb::Status& status) throw(dbwrapper_error)
{ {
if (status.ok()) if (status.ok())
return; return;
LogPrintf("%s\n", status.ToString()); LogPrintf("%s\n", status.ToString());
if (status.IsCorruption()) if (status.IsCorruption())
throw leveldb_error("Database corrupted"); throw dbwrapper_error("Database corrupted");
if (status.IsIOError()) if (status.IsIOError())
throw leveldb_error("Database I/O error"); throw dbwrapper_error("Database I/O error");
if (status.IsNotFound()) if (status.IsNotFound())
throw leveldb_error("Database entry missing"); throw dbwrapper_error("Database entry missing");
throw leveldb_error("Unknown database error"); throw dbwrapper_error("Unknown database error");
} }
static leveldb::Options GetOptions(size_t nCacheSize) static leveldb::Options GetOptions(size_t nCacheSize)
@ -45,7 +45,7 @@ static leveldb::Options GetOptions(size_t nCacheSize)
return options; return options;
} }
CLevelDBWrapper::CLevelDBWrapper(const boost::filesystem::path& path, size_t nCacheSize, bool fMemory, bool fWipe, bool obfuscate) CDBWrapper::CDBWrapper(const boost::filesystem::path& path, size_t nCacheSize, bool fMemory, bool fWipe, bool obfuscate)
{ {
penv = NULL; penv = NULL;
readoptions.verify_checksums = true; readoptions.verify_checksums = true;
@ -90,7 +90,7 @@ CLevelDBWrapper::CLevelDBWrapper(const boost::filesystem::path& path, size_t nCa
LogPrintf("Using obfuscation key for %s: %s\n", path.string(), GetObfuscateKeyHex()); LogPrintf("Using obfuscation key for %s: %s\n", path.string(), GetObfuscateKeyHex());
} }
CLevelDBWrapper::~CLevelDBWrapper() CDBWrapper::~CDBWrapper()
{ {
delete pdb; delete pdb;
pdb = NULL; pdb = NULL;
@ -102,7 +102,7 @@ CLevelDBWrapper::~CLevelDBWrapper()
options.env = NULL; options.env = NULL;
} }
bool CLevelDBWrapper::WriteBatch(CLevelDBBatch& batch, bool fSync) throw(leveldb_error) bool CDBWrapper::WriteBatch(CDBBatch& batch, bool fSync) throw(dbwrapper_error)
{ {
leveldb::Status status = pdb->Write(fSync ? syncoptions : writeoptions, &batch.batch); leveldb::Status status = pdb->Write(fSync ? syncoptions : writeoptions, &batch.batch);
HandleError(status); HandleError(status);
@ -113,15 +113,15 @@ bool CLevelDBWrapper::WriteBatch(CLevelDBBatch& batch, bool fSync) throw(leveldb
// //
// We must use a string constructor which specifies length so that we copy // We must use a string constructor which specifies length so that we copy
// past the null-terminator. // past the null-terminator.
const std::string CLevelDBWrapper::OBFUSCATE_KEY_KEY("\000obfuscate_key", 14); const std::string CDBWrapper::OBFUSCATE_KEY_KEY("\000obfuscate_key", 14);
const unsigned int CLevelDBWrapper::OBFUSCATE_KEY_NUM_BYTES = 8; const unsigned int CDBWrapper::OBFUSCATE_KEY_NUM_BYTES = 8;
/** /**
* Returns a string (consisting of 8 random bytes) suitable for use as an * Returns a string (consisting of 8 random bytes) suitable for use as an
* obfuscating XOR key. * obfuscating XOR key.
*/ */
std::vector<unsigned char> CLevelDBWrapper::CreateObfuscateKey() const std::vector<unsigned char> CDBWrapper::CreateObfuscateKey() const
{ {
unsigned char buff[OBFUSCATE_KEY_NUM_BYTES]; unsigned char buff[OBFUSCATE_KEY_NUM_BYTES];
GetRandBytes(buff, OBFUSCATE_KEY_NUM_BYTES); GetRandBytes(buff, OBFUSCATE_KEY_NUM_BYTES);
@ -129,26 +129,24 @@ std::vector<unsigned char> CLevelDBWrapper::CreateObfuscateKey() const
} }
bool CLevelDBWrapper::IsEmpty() bool CDBWrapper::IsEmpty()
{ {
boost::scoped_ptr<CLevelDBIterator> it(NewIterator()); boost::scoped_ptr<CDBIterator> it(NewIterator());
it->SeekToFirst(); it->SeekToFirst();
return !(it->Valid()); return !(it->Valid());
} }
const std::vector<unsigned char>& CLevelDBWrapper::GetObfuscateKey() const const std::vector<unsigned char>& CDBWrapper::GetObfuscateKey() const
{ {
return obfuscate_key; return obfuscate_key;
} }
std::string CLevelDBWrapper::GetObfuscateKeyHex() const std::string CDBWrapper::GetObfuscateKeyHex() const
{ {
return HexStr(obfuscate_key); return HexStr(obfuscate_key);
} }
CLevelDBIterator::~CLevelDBIterator() { delete piter; } CDBIterator::~CDBIterator() { delete piter; }
bool CLevelDBIterator::Valid() { return piter->Valid(); } bool CDBIterator::Valid() { return piter->Valid(); }
void CLevelDBIterator::SeekToFirst() { piter->SeekToFirst(); } void CDBIterator::SeekToFirst() { piter->SeekToFirst(); }
void CLevelDBIterator::SeekToLast() { piter->SeekToLast(); } void CDBIterator::Next() { piter->Next(); }
void CLevelDBIterator::Next() { piter->Next(); }
void CLevelDBIterator::Prev() { piter->Prev(); }

56
src/leveldbwrapper.h → src/dbwrapper.h
Unescape View File

@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_LEVELDBWRAPPER_H #ifndef BITCOIN_DBWRAPPER_H
#define BITCOIN_LEVELDBWRAPPER_H #define BITCOIN_DBWRAPPER_H
#include "clientversion.h" #include "clientversion.h"
#include "serialize.h" #include "serialize.h"
@ -17,18 +17,18 @@
#include <leveldb/db.h> #include <leveldb/db.h>
#include <leveldb/write_batch.h> #include <leveldb/write_batch.h>
class leveldb_error : public std::runtime_error class dbwrapper_error : public std::runtime_error
{ {
public: public:
leveldb_error(const std::string& msg) : std::runtime_error(msg) {} dbwrapper_error(const std::string& msg) : std::runtime_error(msg) {}
}; };
void HandleError(const leveldb::Status& status) throw(leveldb_error); void HandleError(const leveldb::Status& status) throw(dbwrapper_error);
/** Batch of changes queued to be written to a CLevelDBWrapper */ /** Batch of changes queued to be written to a CDBWrapper */
class CLevelDBBatch class CDBBatch
{ {
friend class CLevelDBWrapper; friend class CDBWrapper;
private: private:
leveldb::WriteBatch batch; leveldb::WriteBatch batch;
@ -38,7 +38,7 @@ public:
/** /**
* @param[in] obfuscate_key If passed, XOR data with this key. * @param[in] obfuscate_key If passed, XOR data with this key.
*/ */
CLevelDBBatch(const std::vector<unsigned char> *obfuscate_key) : obfuscate_key(obfuscate_key) { }; CDBBatch(const std::vector<unsigned char> *obfuscate_key) : obfuscate_key(obfuscate_key) { };
template <typename K, typename V> template <typename K, typename V>
void Write(const K& key, const V& value) void Write(const K& key, const V& value)
@ -69,7 +69,7 @@ public:
} }
}; };
class CLevelDBIterator class CDBIterator
{ {
private: private:
leveldb::Iterator *piter; leveldb::Iterator *piter;
@ -81,14 +81,13 @@ public:
* @param[in] piterIn The original leveldb iterator. * @param[in] piterIn The original leveldb iterator.
* @param[in] obfuscate_key If passed, XOR data with this key. * @param[in] obfuscate_key If passed, XOR data with this key.
*/ */
CLevelDBIterator(leveldb::Iterator *piterIn, const std::vector<unsigned char>* obfuscate_key) : CDBIterator(leveldb::Iterator *piterIn, const std::vector<unsigned char>* obfuscate_key) :
piter(piterIn), obfuscate_key(obfuscate_key) { }; piter(piterIn), obfuscate_key(obfuscate_key) { };
~CLevelDBIterator(); ~CDBIterator();
bool Valid(); bool Valid();
void SeekToFirst(); void SeekToFirst();
void SeekToLast();
template<typename K> void Seek(const K& key) { template<typename K> void Seek(const K& key) {
CDataStream ssKey(SER_DISK, CLIENT_VERSION); CDataStream ssKey(SER_DISK, CLIENT_VERSION);
@ -99,7 +98,6 @@ public:
} }
void Next(); void Next();
void Prev();
template<typename K> bool GetKey(K& key) { template<typename K> bool GetKey(K& key) {
leveldb::Slice slKey = piter->key(); leveldb::Slice slKey = piter->key();
@ -134,7 +132,7 @@ public:
}; };
class CLevelDBWrapper class CDBWrapper
{ {
private: private:
//! custom environment this database is using (may be NULL in case of default environment) //! custom environment this database is using (may be NULL in case of default environment)
@ -178,11 +176,11 @@ public:
* @param[in] obfuscate If true, store data obfuscated via simple XOR. If false, XOR * @param[in] obfuscate If true, store data obfuscated via simple XOR. If false, XOR
* with a zero'd byte array. * with a zero'd byte array.
*/ */
CLevelDBWrapper(const boost::filesystem::path& path, size_t nCacheSize, bool fMemory = false, bool fWipe = false, bool obfuscate = false); CDBWrapper(const boost::filesystem::path& path, size_t nCacheSize, bool fMemory = false, bool fWipe = false, bool obfuscate = false);
~CLevelDBWrapper(); ~CDBWrapper();
template <typename K, typename V> template <typename K, typename V>
bool Read(const K& key, V& value) const throw(leveldb_error) bool Read(const K& key, V& value) const throw(dbwrapper_error)
{ {
CDataStream ssKey(SER_DISK, CLIENT_VERSION); CDataStream ssKey(SER_DISK, CLIENT_VERSION);
ssKey.reserve(ssKey.GetSerializeSize(key)); ssKey.reserve(ssKey.GetSerializeSize(key));
@ -208,15 +206,15 @@ public:
} }
template <typename K, typename V> template <typename K, typename V>
bool Write(const K& key, const V& value, bool fSync = false) throw(leveldb_error) bool Write(const K& key, const V& value, bool fSync = false) throw(dbwrapper_error)
{ {
CLevelDBBatch batch(&obfuscate_key); CDBBatch batch(&obfuscate_key);
batch.Write(key, value); batch.Write(key, value);
return WriteBatch(batch, fSync); return WriteBatch(batch, fSync);
} }
template <typename K> template <typename K>
bool Exists(const K& key) const throw(leveldb_error) bool Exists(const K& key) const throw(dbwrapper_error)
{ {
CDataStream ssKey(SER_DISK, CLIENT_VERSION); CDataStream ssKey(SER_DISK, CLIENT_VERSION);
ssKey.reserve(ssKey.GetSerializeSize(key)); ssKey.reserve(ssKey.GetSerializeSize(key));
@ -235,14 +233,14 @@ public:
} }
template <typename K> template <typename K>
bool Erase(const K& key, bool fSync = false) throw(leveldb_error) bool Erase(const K& key, bool fSync = false) throw(dbwrapper_error)
{ {
CLevelDBBatch batch(&obfuscate_key); CDBBatch batch(&obfuscate_key);
batch.Erase(key); batch.Erase(key);
return WriteBatch(batch, fSync); return WriteBatch(batch, fSync);
} }
bool WriteBatch(CLevelDBBatch& batch, bool fSync = false) throw(leveldb_error); bool WriteBatch(CDBBatch& batch, bool fSync = false) throw(dbwrapper_error);
// not available for LevelDB; provide for compatibility with BDB // not available for LevelDB; provide for compatibility with BDB
bool Flush() bool Flush()
@ -250,15 +248,15 @@ public:
return true; return true;
} }
bool Sync() throw(leveldb_error) bool Sync() throw(dbwrapper_error)
{ {
CLevelDBBatch batch(&obfuscate_key); CDBBatch batch(&obfuscate_key);
return WriteBatch(batch, true); return WriteBatch(batch, true);
} }
CLevelDBIterator *NewIterator() CDBIterator *NewIterator()
{ {
return new CLevelDBIterator(pdb->NewIterator(iteroptions), &obfuscate_key); return new CDBIterator(pdb->NewIterator(iteroptions), &obfuscate_key);
} }
/** /**
@ -278,5 +276,5 @@ public:
}; };
#endif // BITCOIN_LEVELDBWRAPPER_H #endif // BITCOIN_DBWRAPPER_H

28
src/test/leveldbwrapper_tests.cpp → src/test/dbwrapper_tests.cpp
Unescape View File

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "leveldbwrapper.h" #include "dbwrapper.h"
#include "uint256.h" #include "uint256.h"
#include "random.h" #include "random.h"
#include "test/test_bitcoin.h" #include "test/test_bitcoin.h"
@ -25,15 +25,15 @@ bool is_null_key(const vector<unsigned char>& key) {
return isnull; return isnull;
} }
BOOST_FIXTURE_TEST_SUITE(leveldbwrapper_tests, BasicTestingSetup) BOOST_FIXTURE_TEST_SUITE(dbwrapper_tests, BasicTestingSetup)
BOOST_AUTO_TEST_CASE(leveldbwrapper) BOOST_AUTO_TEST_CASE(dbwrapper)
{ {
// Perform tests both obfuscated and non-obfuscated. // Perform tests both obfuscated and non-obfuscated.
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
bool obfuscate = (bool)i; bool obfuscate = (bool)i;
path ph = temp_directory_path() / unique_path(); path ph = temp_directory_path() / unique_path();
CLevelDBWrapper dbw(ph, (1 << 20), true, false, obfuscate); CDBWrapper dbw(ph, (1 << 20), true, false, obfuscate);
char key = 'k'; char key = 'k';
uint256 in = GetRandHash(); uint256 in = GetRandHash();
uint256 res; uint256 res;
@ -48,13 +48,13 @@ BOOST_AUTO_TEST_CASE(leveldbwrapper)
} }
// Test batch operations // Test batch operations
BOOST_AUTO_TEST_CASE(leveldbwrapper_batch) BOOST_AUTO_TEST_CASE(dbwrapper_batch)
{ {
// Perform tests both obfuscated and non-obfuscated. // Perform tests both obfuscated and non-obfuscated.
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
bool obfuscate = (bool)i; bool obfuscate = (bool)i;
path ph = temp_directory_path() / unique_path(); path ph = temp_directory_path() / unique_path();
CLevelDBWrapper dbw(ph, (1 << 20), true, false, obfuscate); CDBWrapper dbw(ph, (1 << 20), true, false, obfuscate);
char key = 'i'; char key = 'i';
uint256 in = GetRandHash(); uint256 in = GetRandHash();
@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(leveldbwrapper_batch)
uint256 in3 = GetRandHash(); uint256 in3 = GetRandHash();
uint256 res; uint256 res;
CLevelDBBatch batch(&dbw.GetObfuscateKey()); CDBBatch batch(&dbw.GetObfuscateKey());
batch.Write(key, in); batch.Write(key, in);
batch.Write(key2, in2); batch.Write(key2, in2);
@ -85,13 +85,13 @@ BOOST_AUTO_TEST_CASE(leveldbwrapper_batch)
} }
} }
BOOST_AUTO_TEST_CASE(leveldbwrapper_iterator) BOOST_AUTO_TEST_CASE(dbwrapper_iterator)
{ {
// Perform tests both obfuscated and non-obfuscated. // Perform tests both obfuscated and non-obfuscated.
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
bool obfuscate = (bool)i; bool obfuscate = (bool)i;
path ph = temp_directory_path() / unique_path(); path ph = temp_directory_path() / unique_path();
CLevelDBWrapper dbw(ph, (1 << 20), true, false, obfuscate); CDBWrapper dbw(ph, (1 << 20), true, false, obfuscate);
// The two keys are intentionally chosen for ordering // The two keys are intentionally chosen for ordering
char key = 'j'; char key = 'j';
@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE(leveldbwrapper_iterator)
uint256 in2 = GetRandHash(); uint256 in2 = GetRandHash();
BOOST_CHECK(dbw.Write(key2, in2)); BOOST_CHECK(dbw.Write(key2, in2));
boost::scoped_ptr<CLevelDBIterator> it(const_cast<CLevelDBWrapper*>(&dbw)->NewIterator()); boost::scoped_ptr<CDBIterator> it(const_cast<CDBWrapper*>(&dbw)->NewIterator());
// Be sure to seek past the obfuscation key (if it exists) // Be sure to seek past the obfuscation key (if it exists)
it->Seek(key); it->Seek(key);
@ -134,7 +134,7 @@ BOOST_AUTO_TEST_CASE(existing_data_no_obfuscate)
create_directories(ph); create_directories(ph);
// Set up a non-obfuscated wrapper to write some initial data. // Set up a non-obfuscated wrapper to write some initial data.
CLevelDBWrapper* dbw = new CLevelDBWrapper(ph, (1 << 10), false, false, false); CDBWrapper* dbw = new CDBWrapper(ph, (1 << 10), false, false, false);
char key = 'k'; char key = 'k';
uint256 in = GetRandHash(); uint256 in = GetRandHash();
uint256 res; uint256 res;
@ -147,7 +147,7 @@ BOOST_AUTO_TEST_CASE(existing_data_no_obfuscate)
delete dbw; delete dbw;
// Now, set up another wrapper that wants to obfuscate the same directory // Now, set up another wrapper that wants to obfuscate the same directory
CLevelDBWrapper odbw(ph, (1 << 10), false, false, true); CDBWrapper odbw(ph, (1 << 10), false, false, true);
// Check that the key/val we wrote with unobfuscated wrapper exists and // Check that the key/val we wrote with unobfuscated wrapper exists and
// is readable. // is readable.
@ -175,7 +175,7 @@ BOOST_AUTO_TEST_CASE(existing_data_reindex)
create_directories(ph); create_directories(ph);
// Set up a non-obfuscated wrapper to write some initial data. // Set up a non-obfuscated wrapper to write some initial data.
CLevelDBWrapper* dbw = new CLevelDBWrapper(ph, (1 << 10), false, false, false); CDBWrapper* dbw = new CDBWrapper(ph, (1 << 10), false, false, false);
char key = 'k'; char key = 'k';
uint256 in = GetRandHash(); uint256 in = GetRandHash();
uint256 res; uint256 res;
@ -188,7 +188,7 @@ BOOST_AUTO_TEST_CASE(existing_data_reindex)
delete dbw; delete dbw;
// Simulate a -reindex by wiping the existing data store // Simulate a -reindex by wiping the existing data store
CLevelDBWrapper odbw(ph, (1 << 10), false, true, true); CDBWrapper odbw(ph, (1 << 10), false, true, true);
// Check that the key/val we wrote with unobfuscated wrapper doesn't exist // Check that the key/val we wrote with unobfuscated wrapper doesn't exist
uint256 res2; uint256 res2;

12
src/txdb.cpp
Unescape View File

@ -49,7 +49,7 @@ uint256 CCoinsViewDB::GetBestBlock() const {
} }
bool CCoinsViewDB::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock) { bool CCoinsViewDB::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock) {
CLevelDBBatch batch(&db.GetObfuscateKey()); CDBBatch batch(&db.GetObfuscateKey());
size_t count = 0; size_t count = 0;
size_t changed = 0; size_t changed = 0;
for (CCoinsMap::iterator it = mapCoins.begin(); it != mapCoins.end();) { for (CCoinsMap::iterator it = mapCoins.begin(); it != mapCoins.end();) {
@ -71,7 +71,7 @@ bool CCoinsViewDB::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock) {
return db.WriteBatch(batch); return db.WriteBatch(batch);
} }
CBlockTreeDB::CBlockTreeDB(size_t nCacheSize, bool fMemory, bool fWipe) : CLevelDBWrapper(GetDataDir() / "blocks" / "index", nCacheSize, fMemory, fWipe) { CBlockTreeDB::CBlockTreeDB(size_t nCacheSize, bool fMemory, bool fWipe) : CDBWrapper(GetDataDir() / "blocks" / "index", nCacheSize, fMemory, fWipe) {
} }
bool CBlockTreeDB::ReadBlockFileInfo(int nFile, CBlockFileInfo &info) { bool CBlockTreeDB::ReadBlockFileInfo(int nFile, CBlockFileInfo &info) {
@ -98,7 +98,7 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) const {
/* It seems that there are no "const iterators" for LevelDB. Since we /* It seems that there are no "const iterators" for LevelDB. Since we
only need read operations on it, use a const-cast to get around only need read operations on it, use a const-cast to get around
that restriction. */ that restriction. */
boost::scoped_ptr<CLevelDBIterator> pcursor(const_cast<CLevelDBWrapper*>(&db)->NewIterator()); boost::scoped_ptr<CDBIterator> pcursor(const_cast<CDBWrapper*>(&db)->NewIterator());
pcursor->Seek(DB_COINS); pcursor->Seek(DB_COINS);
CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION); CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION);
@ -141,7 +141,7 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) const {
} }
bool CBlockTreeDB::WriteBatchSync(const std::vector<std::pair<int, const CBlockFileInfo*> >& fileInfo, int nLastFile, const std::vector<const CBlockIndex*>& blockinfo) { bool CBlockTreeDB::WriteBatchSync(const std::vector<std::pair<int, const CBlockFileInfo*> >& fileInfo, int nLastFile, const std::vector<const CBlockIndex*>& blockinfo) {
CLevelDBBatch batch(&GetObfuscateKey()); CDBBatch batch(&GetObfuscateKey());
for (std::vector<std::pair<int, const CBlockFileInfo*> >::const_iterator it=fileInfo.begin(); it != fileInfo.end(); it++) { for (std::vector<std::pair<int, const CBlockFileInfo*> >::const_iterator it=fileInfo.begin(); it != fileInfo.end(); it++) {
batch.Write(make_pair(DB_BLOCK_FILES, it->first), *it->second); batch.Write(make_pair(DB_BLOCK_FILES, it->first), *it->second);
} }
@ -157,7 +157,7 @@ bool CBlockTreeDB::ReadTxIndex(const uint256 &txid, CDiskTxPos &pos) {
} }
bool CBlockTreeDB::WriteTxIndex(const std::vector<std::pair<uint256, CDiskTxPos> >&vect) { bool CBlockTreeDB::WriteTxIndex(const std::vector<std::pair<uint256, CDiskTxPos> >&vect) {
CLevelDBBatch batch(&GetObfuscateKey()); CDBBatch batch(&GetObfuscateKey());
for (std::vector<std::pair<uint256,CDiskTxPos> >::const_iterator it=vect.begin(); it!=vect.end(); it++) for (std::vector<std::pair<uint256,CDiskTxPos> >::const_iterator it=vect.begin(); it!=vect.end(); it++)
batch.Write(make_pair(DB_TXINDEX, it->first), it->second); batch.Write(make_pair(DB_TXINDEX, it->first), it->second);
return WriteBatch(batch); return WriteBatch(batch);
@ -177,7 +177,7 @@ bool CBlockTreeDB::ReadFlag(const std::string &name, bool &fValue) {
bool CBlockTreeDB::LoadBlockIndexGuts() bool CBlockTreeDB::LoadBlockIndexGuts()
{ {
boost::scoped_ptr<CLevelDBIterator> pcursor(NewIterator()); boost::scoped_ptr<CDBIterator> pcursor(NewIterator());
pcursor->Seek(make_pair(DB_BLOCK_INDEX, uint256())); pcursor->Seek(make_pair(DB_BLOCK_INDEX, uint256()));

8
src/txdb.h
Unescape View File

@ -7,7 +7,7 @@
#define BITCOIN_TXDB_H #define BITCOIN_TXDB_H
#include "coins.h" #include "coins.h"
#include "leveldbwrapper.h" #include "dbwrapper.h"
#include <map> #include <map>
#include <string> #include <string>
@ -26,11 +26,11 @@ static const int64_t nMaxDbCache = sizeof(void*) > 4 ? 16384 : 1024;
//! min. -dbcache in (MiB) //! min. -dbcache in (MiB)
static const int64_t nMinDbCache = 4; static const int64_t nMinDbCache = 4;
/** CCoinsView backed by the LevelDB coin database (chainstate/) */ /** CCoinsView backed by the coin database (chainstate/) */
class CCoinsViewDB : public CCoinsView class CCoinsViewDB : public CCoinsView
{ {
protected: protected:
CLevelDBWrapper db; CDBWrapper db;
public: public:
CCoinsViewDB(size_t nCacheSize, bool fMemory = false, bool fWipe = false); CCoinsViewDB(size_t nCacheSize, bool fMemory = false, bool fWipe = false);
@ -42,7 +42,7 @@ public:
}; };
/** Access to the block database (blocks/index/) */ /** Access to the block database (blocks/index/) */
class CBlockTreeDB : public CLevelDBWrapper class CBlockTreeDB : public CDBWrapper
{ {
public: public:
CBlockTreeDB(size_t nCacheSize, bool fMemory = false, bool fWipe = false); CBlockTreeDB(size_t nCacheSize, bool fMemory = false, bool fWipe = false);

Write Preview
Loading…
Cancel
Save