Skip to content

Commit

Permalink
Merge #9353: Add data() method to CDataStream (and use it)
Browse files Browse the repository at this point in the history 
5113474 wallet: Use CDataStream.data() (Wladimir J. van der Laan)
e2300ff bench: Use CDataStream.data() (Wladimir J. van der Laan)
adff950 dbwrapper: Use new .data() method of CDataStream (Wladimir J. van der Laan)
a2141e4 streams: Remove special cases for ancient MSVC (Wladimir J. van der Laan)
af4c44c streams: Add data() method to CDataStream (Wladimir J. van der Laan)
  • Loading branch information
@sipa
sipa committed Jan 9, 2017
2 parents 12e3112 + 5113474 commit 07fd147
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 21 deletions.
2 changes: 1 addition & 1 deletion src/bench/verify_script.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static void VerifyScriptBench(benchmark::State& state)
txCredit.vout[0].scriptPubKey.data(),
txCredit.vout[0].scriptPubKey.size(),
txCredit.vout[0].nValue,
(const unsigned char*)&stream[0], stream.size(), 0, flags, nullptr);
(const unsigned char*)stream.data(), stream.size(), 0, flags, nullptr);
assert(csuccess == 1);
#endif
}
Expand Down
12 changes: 6 additions & 6 deletions src/dbwrapper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ class CDBBatch
{
ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
ssKey << key;
leveldb::Slice slKey(&ssKey[0], ssKey.size());
leveldb::Slice slKey(ssKey.data(), ssKey.size());

ssValue.reserve(DBWRAPPER_PREALLOC_VALUE_SIZE);
ssValue << value;
ssValue.Xor(dbwrapper_private::GetObfuscateKey(parent));
leveldb::Slice slValue(&ssValue[0], ssValue.size());
leveldb::Slice slValue(ssValue.data(), ssValue.size());

batch.Put(slKey, slValue);
ssKey.clear();
Expand All @@ -84,7 +84,7 @@ class CDBBatch
{
ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
ssKey << key;
leveldb::Slice slKey(&ssKey[0], ssKey.size());
leveldb::Slice slKey(ssKey.data(), ssKey.size());

batch.Delete(slKey);
ssKey.clear();
Expand Down Expand Up @@ -115,7 +115,7 @@ class CDBIterator
CDataStream ssKey(SER_DISK, CLIENT_VERSION);
ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
ssKey << key;
leveldb::Slice slKey(&ssKey[0], ssKey.size());
leveldb::Slice slKey(ssKey.data(), ssKey.size());
piter->Seek(slKey);
}

Expand Down Expand Up @@ -208,7 +208,7 @@ class CDBWrapper
CDataStream ssKey(SER_DISK, CLIENT_VERSION);
ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
ssKey << key;
leveldb::Slice slKey(&ssKey[0], ssKey.size());
leveldb::Slice slKey(ssKey.data(), ssKey.size());

std::string strValue;
leveldb::Status status = pdb->Get(readoptions, slKey, &strValue);
Expand Down Expand Up @@ -242,7 +242,7 @@ class CDBWrapper
CDataStream ssKey(SER_DISK, CLIENT_VERSION);
ssKey.reserve(DBWRAPPER_PREALLOC_KEY_SIZE);
ssKey << key;
leveldb::Slice slKey(&ssKey[0], ssKey.size());
leveldb::Slice slKey(ssKey.data(), ssKey.size());

std::string strValue;
leveldb::Status status = pdb->Get(readoptions, slKey, &strValue);
Expand Down
6 changes: 2 additions & 4 deletions src/streams.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,10 @@ class CDataStream
Init(nTypeIn, nVersionIn);
}

#if !defined(_MSC_VER) || _MSC_VER >= 1300
CDataStream(const char* pbegin, const char* pend, int nTypeIn, int nVersionIn) : vch(pbegin, pend)
{
Init(nTypeIn, nVersionIn);
}
#endif

CDataStream(const vector_type& vchIn, int nTypeIn, int nVersionIn) : vch(vchIn.begin(), vchIn.end())
{
Expand Down Expand Up @@ -245,6 +243,8 @@ class CDataStream
void clear() { vch.clear(); nReadPos = 0; }
iterator insert(iterator it, const char& x=char()) { return vch.insert(it, x); }
void insert(iterator it, size_type n, const char& x) { vch.insert(it, n, x); }
value_type* data() { return vch.data() + nReadPos; }
const value_type* data() const { return vch.data() + nReadPos; }

void insert(iterator it, std::vector<char>::const_iterator first, std::vector<char>::const_iterator last)
{
Expand All @@ -259,7 +259,6 @@ class CDataStream
vch.insert(it, first, last);
}

#if !defined(_MSC_VER) || _MSC_VER >= 1300
void insert(iterator it, const char* first, const char* last)
{
assert(last - first >= 0);
Expand All @@ -272,7 +271,6 @@ class CDataStream
else
vch.insert(it, first, last);
}
#endif

iterator erase(iterator it)
{
Expand Down
8 changes: 4 additions & 4 deletions src/wallet/db.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,15 +397,15 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
break;
}
if (pszSkip &&
strncmp(&ssKey[0], pszSkip, std::min(ssKey.size(), strlen(pszSkip))) == 0)
strncmp(ssKey.data(), pszSkip, std::min(ssKey.size(), strlen(pszSkip))) == 0)
continue;
if (strncmp(&ssKey[0], "\x07version", 8) == 0) {
if (strncmp(ssKey.data(), "\x07version", 8) == 0) {
// Update version:
ssValue.clear();
ssValue << CLIENT_VERSION;
}
Dbt datKey(&ssKey[0], ssKey.size());
Dbt datValue(&ssValue[0], ssValue.size());
Dbt datKey(ssKey.data(), ssKey.size());
Dbt datValue(ssValue.data(), ssValue.size());
int ret2 = pdbCopy->put(NULL, &datKey, &datValue, DB_NOOVERWRITE);
if (ret2 > 0)
fSuccess = false;
Expand Down
12 changes: 6 additions & 6 deletions src/wallet/db.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class CDB
CDataStream ssKey(SER_DISK, CLIENT_VERSION);
ssKey.reserve(1000);
ssKey << key;
Dbt datKey(&ssKey[0], ssKey.size());
Dbt datKey(ssKey.data(), ssKey.size());

// Read
Dbt datValue;
Expand Down Expand Up @@ -158,13 +158,13 @@ class CDB
CDataStream ssKey(SER_DISK, CLIENT_VERSION);
ssKey.reserve(1000);
ssKey << key;
Dbt datKey(&ssKey[0], ssKey.size());
Dbt datKey(ssKey.data(), ssKey.size());

// Value
CDataStream ssValue(SER_DISK, CLIENT_VERSION);
ssValue.reserve(10000);
ssValue << value;
Dbt datValue(&ssValue[0], ssValue.size());
Dbt datValue(ssValue.data(), ssValue.size());

// Write
int ret = pdb->put(activeTxn, &datKey, &datValue, (fOverwrite ? 0 : DB_NOOVERWRITE));
Expand All @@ -187,7 +187,7 @@ class CDB
CDataStream ssKey(SER_DISK, CLIENT_VERSION);
ssKey.reserve(1000);
ssKey << key;
Dbt datKey(&ssKey[0], ssKey.size());
Dbt datKey(ssKey.data(), ssKey.size());

// Erase
int ret = pdb->del(activeTxn, &datKey, 0);
Expand All @@ -207,7 +207,7 @@ class CDB
CDataStream ssKey(SER_DISK, CLIENT_VERSION);
ssKey.reserve(1000);
ssKey << key;
Dbt datKey(&ssKey[0], ssKey.size());
Dbt datKey(ssKey.data(), ssKey.size());

// Exists
int ret = pdb->exists(activeTxn, &datKey, 0);
Expand All @@ -234,7 +234,7 @@ class CDB
Dbt datKey;
unsigned int fFlags = DB_NEXT;
if (setRange) {
datKey.set_data(&ssKey[0]);
datKey.set_data(ssKey.data());
datKey.set_size(ssKey.size());
fFlags = DB_SET_RANGE;
}
Expand Down

0 comments on commit 07fd147

Please sign in to comment.