Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Merge pull request #60 from peerplays-network/GRPH-48-Object-Database-18.04

Browse source 
Grph 48 object database 18.04
This commit is contained in:
Bobinson K B 2019-09-07 00:53:04 +05:30 committed by GitHub
commit f9a3d087ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/app/database_api.cpp
View file

@ -554,7 +554,7 @@ vector<vector<account_id_type>> database_api_impl::get_key_references( vector<pu
auto itr = refs.account_to_address_memberships.find(a); auto itr = refs.account_to_address_memberships.find(a);
if( itr != refs.account_to_address_memberships.end() ) if( itr != refs.account_to_address_memberships.end() )
{ {
result.reserve( itr->second.size() ); result.reserve( result.size() + itr->second.size() );
for( auto item : itr->second ) for( auto item : itr->second )
{ {
wdump((a)(item)(item(_db).name)); wdump((a)(item)(item(_db).name));
@ -565,7 +565,7 @@ vector<vector<account_id_type>> database_api_impl::get_key_references( vector<pu
if( itr != refs.account_to_key_memberships.end() ) if( itr != refs.account_to_key_memberships.end() )
{ {
result.reserve( itr->second.size() ); result.reserve( result.size() + itr->second.size() );
for( auto item : itr->second ) result.push_back(item); for( auto item : itr->second ) result.push_back(item);
} }
final_result.emplace_back( std::move(result) ); final_result.emplace_back( std::move(result) );

14
libraries/db/include/graphene/db/index.hpp
View file

@ -234,14 +234,12 @@ namespace graphene { namespace db {
fc::raw::unpack(ds, _next_id); fc::raw::unpack(ds, _next_id);
fc::raw::unpack(ds, open_ver); fc::raw::unpack(ds, open_ver);
FC_ASSERT( open_ver == get_object_version(), "Incompatible Version, the serialization of objects in this index has changed" ); FC_ASSERT( open_ver == get_object_version(), "Incompatible Version, the serialization of objects in this index has changed" );
try { vector<char> tmp;
vector<char> tmp; while( ds.remaining() > 0 )
while( true ) {
{ fc::raw::unpack( ds, tmp );
fc::raw::unpack( ds, tmp ); load( tmp );
load( tmp ); }
}
} catch ( const fc::exception& ){}
} }
virtual void save( const path& db ) override virtual void save( const path& db ) override