Orderman2

This commit is contained in:
Pedro Pinto committed 2017-12-19 11:30:00 -05:00
1 parent dba051e374
commit deb8f8e440
6 files changed
+43 -35

No files matched your search

+1 -1
View File
@@ -39,7 +39,7 @@ int Run::execute(std::vector<std::string> const &)
account::AccountServiceServer account_server(sc);
md::run_market_datapublishers();
md::QueryServerPtr md_query_server(md::run_query_server(sc));
orderman2::OrderServiceServer2 order_service_server(sc);
//orderman2::OrderServiceServer2 order_service_server(sc);
orderman::OrderServiceServer order_server(sc);
std::thread([]() {
@@ -35,7 +35,7 @@ public:
}});
subscribe<mercury::PollEvent> (broker_id(), [this] (auto const&) {
auto out_stream = make_stream<BookUpdateEvent>();
auto out_stream = this->make_stream<BookUpdateEvent>();
Book book;
TickToTradeCorID corid;
@@ -48,7 +48,7 @@ public:
book._security_key = SecurityKey(handle->key());
corid = handle->sequence();
LOG(Latency,Info,"MDSource {} {}", corid,utils::TimeStamp::now().to_uint64());
publish(out_stream, book, corid);
this->publish(out_stream, book, corid);
}
}
});
@@ -4,6 +4,7 @@
#include "server/sparkd/persistence/SqliteStore.h"
#include "lib/api/services/OrderService2.pb.h"
#include "server/sparkd/orderman2/events/StoredOrderEvent.h"
#include "server/sparkd/orderman2/events/OrderStateUpdateEvent.h"
#include <unordered_set>
@@ -14,18 +15,20 @@ static auto const orders_ns = "orders";
struct OrderStore::PImpl
{
PImpl() :
PImpl(GatewayName const&gw) :
gw_name(gw),
known_orders(),
store(new persistence::SqliteStore("orders2")),
order_stream()
{}
const GatewayName gw_name;
std::unordered_map<OrderKey,std::unique_ptr<api::orderman2::OrderRecord>> known_orders;
std::unique_ptr<persistence::IStore> store;
mercury::Stream<StoredOrderEvent> order_stream;
};
OrderStore::OrderStore () : me (new PImpl()) {}
OrderStore::OrderStore (const GatewayName &gw_name) : me (new PImpl(gw_name)) {}
OrderStore::~OrderStore () {}
void OrderStore::init()
@@ -38,7 +41,7 @@ void OrderStore::init()
if (utils::pb::from_string<api::orderman2::OrderRecord> (kvp.second,&rec)) {
auto ok = OrderKey(std::stoi(kvp.first));
auto order_record = std::make_unique<api::orderman2::OrderRecord> (rec);
stored_batch.emplace_back(order_record.get());
stored_batch.emplace_back(*order_record.get());
me->known_orders[ok] = std::move(order_record);
}
else
@@ -46,35 +49,33 @@ void OrderStore::init()
"Could not recover order {} from storage. "
"This should be investigated", kvp.first);
me->order_stream = make_stream<StoredOrderEvent> ();
me->order_stream = make_stream<StoredOrderEvent> (me->gw_name);
publish_batch(me->order_stream,stored_batch);
subscribe<OrderStateUpdateEvent> ([this] (auto const&ev) {this->on_order_state_update(ev);});
}
// void OrderStore::on(event::NativeOrderStateChange const&ch)
// {
// auto pb = event::to_pb(*ch.header,ch.current_state);
// LOG(OrderMan,Info,"Storing native order: {} ",utils::pb::to_string(pb));
// me->store.store(pb);
void OrderStore::on_order_state_update(mercury::Update<OrderStateUpdateEvent> const&u)
{
if (u.events)
for (auto const &ev : *u.events) {
auto &ptr = me->known_orders[ev.key];
auto new_order = !ptr;
if (new_order) {
ptr.reset (new api::orderman2::OrderRecord());
*ptr->mutable_def() = *ev.definition;
ptr->set_key(ev.key.value());
ptr->set_parent_key(ev.parent_key.value());
}
*ptr->mutable_state() = ev.state;
// std::vector<api::orderman::OrderState> v {pb};
// order_state_change_signal(event::OrderStateChange {v});
// }
// void OrderStore::on(event::SpreaderOrderStateChange const&sc)
// {
// auto pb = event::to_pb(*sc.header,sc.current_state);
// LOG(OrderMan,Info,"Storing spreader order: {} ",utils::pb::to_string(pb));
// me->store.store(pb);
// std::vector<api::orderman::OrderState> v {pb};
// order_state_change_signal(event::OrderStateChange {v});
// }
// void OrderStore::on(event_grid::event::Init const&)
// {
// auto existing_orders = me->store.retrieve_all();
// LOG(OrderMan,Info,"Publishing initial {} orders recovered from store.", existing_orders.size());
// order_state_change_signal(event::OrderStateChange {existing_orders});
// }
auto k = std::to_string(ptr->key());
auto v = utils::pb::to_string(*ptr);
if (new_order)
me->store->insert(orders_ns,k,v);
else
me->store->update(orders_ns,k,v);
publish(me->order_stream,*ptr.get());
}
}
}}
@@ -2,20 +2,24 @@
#include <memory>
#include "server/sparkd/mercury/actors/Actor.h"
#include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h"
namespace bts {
namespace orderman2 {
class OrderStateUpdateEvent;
class OrderStore : public mercury::Actor
{
public:
OrderStore();
OrderStore(GatewayName const&gw);
~OrderStore();
void init() override;
private:
struct PImpl;
std::unique_ptr<PImpl> me;
void on_order_state_update(mercury::Update<OrderStateUpdateEvent> const&ev);
};
}}
@@ -3,7 +3,7 @@
#include <memory>
#include "server/sparkd/mercury/events/Event.h"
#include "lib/api/services/OrderService.pb.h"
#include "lib/api/services/OrderService2.pb.h"
namespace bts {
namespace orderman2 {
@@ -14,7 +14,8 @@ public:
using SynopsisPolicy = mercury::NoSynopsis;
OrderKey key;
OrderKey parent_key;
api::orderman::OrderState state;
api::orderman2::OrderDefinition const *definition;
api::orderman2::OrderState state;
};
}}
@@ -15,6 +15,8 @@ public:
using Tag = GatewayName;
using SynopsisPolicy = mercury::MergeByKey<StoredOrderEvent>;
StoredOrderEvent(api::orderman2::OrderRecord &record) : order_record(&record) {}
auto key() {return order_record->key();}
api::orderman2::OrderRecord *order_record;
};