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

Merge pull request #28 from peerplays-network/beatrice

Browse source 
Merge beatrice indexing changes into master
This commit is contained in:
pbattu123 2019-04-12 10:19:17 -03:00 committed by GitHub
commit f0f140e1e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
libraries/chain/include/graphene/chain/betting_market_object.hpp
View file

@ -247,20 +247,12 @@ typedef multi_index_container<
betting_market_group_object,
indexed_by<
ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
ordered_unique< tag<by_event_id>,
composite_key<
betting_market_group_object,
member<betting_market_group_object, event_id_type, &betting_market_group_object::event_id>,
member< object, object_id_type, &object::id >
>
>,
ordered_unique< tag<by_settling_time>,
composite_key<
betting_market_group_object,
member<betting_market_group_object, fc::optional<fc::time_point_sec>, &betting_market_group_object::settling_time>,
member< object, object_id_type, &object::id >
>
>
ordered_unique< tag<by_event_id>, composite_key<betting_market_group_object,
member<betting_market_group_object, event_id_type, &betting_market_group_object::event_id>,
member<object, object_id_type, &object::id> > >,
ordered_unique< tag<by_settling_time>, composite_key<betting_market_group_object,
member<betting_market_group_object, fc::optional<fc::time_point_sec>, &betting_market_group_object::settling_time>,
member<object, object_id_type, &object::id> > >
> > betting_market_group_object_multi_index_type;
typedef generic_index<betting_market_group_object, betting_market_group_object_multi_index_type> betting_market_group_object_index;
@ -268,13 +260,9 @@ typedef multi_index_container<
betting_market_object,
indexed_by<
ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
ordered_unique< tag<by_betting_market_group_id>,
composite_key<
betting_market_object,
member<betting_market_object, betting_market_group_id_type, &betting_market_object::group_id>,
member< object, object_id_type, &object::id >
>
>
ordered_unique< tag<by_betting_market_group_id>, composite_key<betting_market_object,
member<betting_market_object, betting_market_group_id_type, &betting_market_object::group_id>,
member<object, object_id_type, &object::id> > >
> > betting_market_object_multi_index_type;
typedef generic_index<betting_market_object, betting_market_object_multi_index_type> betting_market_object_index;
@ -611,13 +599,9 @@ typedef multi_index_container<
indexed_by<
ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
ordered_unique< tag<by_odds>, identity<bet_object>, compare_bet_by_odds >,
ordered_unique< tag<by_betting_market_id>,
composite_key<
bet_object,
member<bet_object, betting_market_id_type, &bet_object::betting_market_id>,
member< object, object_id_type, &object::id >
>
>,
ordered_unique< tag<by_betting_market_id>, composite_key<bet_object,
member<bet_object, betting_market_id_type, &bet_object::betting_market_id>,
member<object, object_id_type, &object::id> > >,
ordered_unique< tag<by_bettor_and_odds>, identity<bet_object>, compare_bet_by_bettor_then_odds > > > bet_object_multi_index_type;
typedef generic_index<bet_object, bet_object_multi_index_type> bet_object_index;

15
libraries/chain/include/graphene/chain/event_group_object.hpp
View file

@ -28,6 +28,8 @@
#include <graphene/db/generic_index.hpp>
#include <boost/multi_index/composite_key.hpp>
#include <boost/multi_index/composite_key.hpp>
namespace graphene { namespace chain {
class database;
@ -50,15 +52,10 @@ typedef multi_index_container<
event_group_object,
indexed_by<
ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
ordered_unique< tag<by_sport_id>,
composite_key<
event_group_object,
member< event_group_object, sport_id_type, &event_group_object::sport_id >,
member< object, object_id_type, &object::id >
>
>
>
> event_group_object_multi_index_type;
ordered_unique< tag<by_sport_id>, composite_key<event_group_object,
member< event_group_object, sport_id_type, &event_group_object::sport_id >,
member<object, object_id_type, &object::id> > > >
> event_group_object_multi_index_type;
typedef generic_index<event_group_object, event_group_object_multi_index_type> event_group_object_index;
} } // graphene::chain

24
libraries/chain/include/graphene/chain/event_object.hpp
View file

@ -29,6 +29,8 @@
#include <graphene/chain/protocol/event.hpp>
#include <boost/multi_index/composite_key.hpp>
#include <boost/multi_index/composite_key.hpp>
namespace graphene { namespace chain {
class event_object;
} }
@ -101,22 +103,12 @@ typedef multi_index_container<
event_object,
indexed_by<
ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
ordered_unique< tag<by_event_group_id>,
composite_key<
event_object,
member< event_object, event_group_id_type, &event_object::event_group_id >,
member< object, object_id_type, &object::id >
>
>,
ordered_unique< tag<by_event_status>,
composite_key<
event_object,
const_mem_fun< event_object, event_status, &event_object::get_status >,
member< object, object_id_type, &object::id >
>
>
>
> event_object_multi_index_type;
ordered_unique< tag<by_event_group_id>, composite_key<event_object,
member< event_object, event_group_id_type, &event_object::event_group_id >,
member<object, object_id_type, &object::id> > >,
ordered_unique< tag<by_event_status>, composite_key<event_object,
const_mem_fun< event_object, event_status, &event_object::get_status >,
member<object, object_id_type, &object::id> > > > > event_object_multi_index_type;
typedef generic_index<event_object, event_object_multi_index_type> event_object_index;

10
libraries/chain/include/graphene/chain/tournament_object.hpp
View file

@ -133,14 +133,16 @@ namespace graphene { namespace chain {
tournament_object,
indexed_by<
ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
ordered_non_unique< tag<by_registration_deadline>,
ordered_unique< tag<by_registration_deadline>,
composite_key<tournament_object,
const_mem_fun<tournament_object, tournament_state, &tournament_object::get_state>,
const_mem_fun<tournament_object, time_point_sec, &tournament_object::get_registration_deadline> > >,
ordered_non_unique< tag<by_start_time>,
const_mem_fun<tournament_object, time_point_sec, &tournament_object::get_registration_deadline>,
member< object, object_id_type, &object::id > > >,
ordered_unique< tag<by_start_time>,
composite_key<tournament_object,
const_mem_fun<tournament_object, tournament_state, &tournament_object::get_state>,
member<tournament_object, optional<time_point_sec>, &tournament_object::start_time> > >
member<tournament_object, optional<time_point_sec>, &tournament_object::start_time>,
member< object, object_id_type, &object::id > > >
>
> tournament_object_multi_index_type;
typedef generic_index<tournament_object, tournament_object_multi_index_type> tournament_index;