From ab0281c51b83b3931acc0559b8a84a253833de32 Mon Sep 17 00:00:00 2001 From: Sandip Patel Date: Mon, 11 Nov 2019 16:22:29 +0530 Subject: [PATCH 1/2] Fixed betting tests --- libraries/chain/db_init.cpp | 5 ++++- libraries/db/include/graphene/db/index.hpp | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 7dc986a4b..538808dd4 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -263,7 +263,10 @@ void database::initialize_indexes() acnt_index->add_secondary_index(); add_index< primary_index >(); // 256 members per chunk - add_index< primary_index >(); // 256 sons per chunk + + // Note: Do not create secondary_index if you will need to create an + // operation to remove associated object. + add_index< primary_index >(); add_index< primary_index >(); // 1024 witnesses per chunk add_index< primary_index >(); add_index< primary_index >(); diff --git a/libraries/db/include/graphene/db/index.hpp b/libraries/db/include/graphene/db/index.hpp index e8d4fa110..7554955ef 100644 --- a/libraries/db/include/graphene/db/index.hpp +++ b/libraries/db/include/graphene/db/index.hpp @@ -402,14 +402,17 @@ namespace graphene { namespace db { DerivedIndex::remove(obj); } - virtual const object& insert( object&& obj )override - { - const auto& res = DerivedIndex::insert(std::move(obj)); - for( const auto& item : _sindex ) - item->object_inserted( res ); - on_add(res); - return res; - } + // Note: Implementing insert function here will break the + // bookie_plugin functionality as it was implemented assuming no undo required. + // virtual const object& insert( object&& obj )override + // { + // const auto& res = DerivedIndex::insert(std::move(obj)); + // if (object_type_id() != graphene::) + // for( const auto& item : _sindex ) + // item->object_inserted( res ); + // on_add(res); + // return res; + // } virtual void modify( const object& obj, const std::function& m )override { From 53283728d1525c0d74563705464c30f0242c54f2 Mon Sep 17 00:00:00 2001 From: Sandip Patel Date: Mon, 11 Nov 2019 18:06:28 +0530 Subject: [PATCH 2/2] Removed comments --- libraries/chain/db_init.cpp | 3 --- libraries/db/include/graphene/db/index.hpp | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/libraries/chain/db_init.cpp b/libraries/chain/db_init.cpp index 538808dd4..72841afe0 100644 --- a/libraries/chain/db_init.cpp +++ b/libraries/chain/db_init.cpp @@ -263,9 +263,6 @@ void database::initialize_indexes() acnt_index->add_secondary_index(); add_index< primary_index >(); // 256 members per chunk - - // Note: Do not create secondary_index if you will need to create an - // operation to remove associated object. add_index< primary_index >(); add_index< primary_index >(); // 1024 witnesses per chunk add_index< primary_index >(); diff --git a/libraries/db/include/graphene/db/index.hpp b/libraries/db/include/graphene/db/index.hpp index 7554955ef..1bc593f42 100644 --- a/libraries/db/include/graphene/db/index.hpp +++ b/libraries/db/include/graphene/db/index.hpp @@ -402,18 +402,6 @@ namespace graphene { namespace db { DerivedIndex::remove(obj); } - // Note: Implementing insert function here will break the - // bookie_plugin functionality as it was implemented assuming no undo required. - // virtual const object& insert( object&& obj )override - // { - // const auto& res = DerivedIndex::insert(std::move(obj)); - // if (object_type_id() != graphene::) - // for( const auto& item : _sindex ) - // item->object_inserted( res ); - // on_add(res); - // return res; - // } - virtual void modify( const object& obj, const std::function& m )override { save_undo( obj );