From deb8f8e440afb66b3fa2cd4f34d3e29ba55e55d6 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 19 Dec 2017 16:20:17 +0000 Subject: [PATCH] Orderman2 --- src/server/sparkd/cmds/Run.cpp | 2 +- src/server/sparkd/orderman2/actors/MDSource.h | 4 +- .../sparkd/orderman2/actors/OrderStore.cpp | 59 ++++++++++--------- .../sparkd/orderman2/actors/OrderStore.h | 6 +- .../orderman2/events/OrderStateUpdateEvent.h | 5 +- .../orderman2/events/StoredOrderEvent.h | 2 + 6 files changed, 43 insertions(+), 35 deletions(-) diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 2c5565b3c..ae09f354c 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -39,7 +39,7 @@ int Run::execute(std::vector 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([]() { diff --git a/src/server/sparkd/orderman2/actors/MDSource.h b/src/server/sparkd/orderman2/actors/MDSource.h index 826c8c9e0..fb5861f39 100644 --- a/src/server/sparkd/orderman2/actors/MDSource.h +++ b/src/server/sparkd/orderman2/actors/MDSource.h @@ -35,7 +35,7 @@ public: }}); subscribe (broker_id(), [this] (auto const&) { - auto out_stream = make_stream(); + auto out_stream = this->make_stream(); 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); } } }); diff --git a/src/server/sparkd/orderman2/actors/OrderStore.cpp b/src/server/sparkd/orderman2/actors/OrderStore.cpp index 82a10403c..0a2124002 100644 --- a/src/server/sparkd/orderman2/actors/OrderStore.cpp +++ b/src/server/sparkd/orderman2/actors/OrderStore.cpp @@ -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 @@ -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> known_orders; std::unique_ptr store; mercury::Stream 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 (kvp.second,&rec)) { auto ok = OrderKey(std::stoi(kvp.first)); auto order_record = std::make_unique (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 (); + me->order_stream = make_stream (me->gw_name); publish_batch(me->order_stream,stored_batch); + subscribe ([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 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 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 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()); + } +} }} diff --git a/src/server/sparkd/orderman2/actors/OrderStore.h b/src/server/sparkd/orderman2/actors/OrderStore.h index 6b69ed7f1..50c9cfd82 100644 --- a/src/server/sparkd/orderman2/actors/OrderStore.h +++ b/src/server/sparkd/orderman2/actors/OrderStore.h @@ -2,20 +2,24 @@ #include #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 me; + + void on_order_state_update(mercury::Update const&ev); }; }} diff --git a/src/server/sparkd/orderman2/events/OrderStateUpdateEvent.h b/src/server/sparkd/orderman2/events/OrderStateUpdateEvent.h index 411ce8df2..7e7065b80 100644 --- a/src/server/sparkd/orderman2/events/OrderStateUpdateEvent.h +++ b/src/server/sparkd/orderman2/events/OrderStateUpdateEvent.h @@ -3,7 +3,7 @@ #include #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; }; }} diff --git a/src/server/sparkd/orderman2/events/StoredOrderEvent.h b/src/server/sparkd/orderman2/events/StoredOrderEvent.h index 42c5c397c..2394d62cc 100644 --- a/src/server/sparkd/orderman2/events/StoredOrderEvent.h +++ b/src/server/sparkd/orderman2/events/StoredOrderEvent.h @@ -15,6 +15,8 @@ public: using Tag = GatewayName; using SynopsisPolicy = mercury::MergeByKey; + StoredOrderEvent(api::orderman2::OrderRecord &record) : order_record(&record) {} + auto key() {return order_record->key();} api::orderman2::OrderRecord *order_record; };