From b515e45b231d4bd2d9363a7ac397a55b6b080bb9 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 8 Jun 2018 13:49:22 -0400 Subject: [PATCH] SPARK-1123 on_orders.Replay().RefCount() does not handle late join correctly --- src/client/spark/Orders/OrdersModel.cs | 4 ++-- src/client/spark_api/api/Update.cs | 31 +++++++++++++++++++++----- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 5f755a5a1..5706ce854 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -31,11 +31,11 @@ namespace mbts.spark { _service = service; _spreader = spreader; _error = error; - on_orders = _service.subscribei_orders().Table().Replay(1).RefCount(); + on_orders = _service.subscribei_orders().Table().Cache(); IReadOnlyDictionary empty_orders = new Dictionary(); working_orders = on_orders.Scan(empty_orders, (worders, table) => _update_working_orders(worders, table)).Replay(1).RefCount(); - on_fills = _service.subscribei_fills().Table().Replay(1).RefCount(); + on_fills = _service.subscribei_fills().Table().Cache(); _activity = new OrderActivitySummarizer(bus, on_orders); on_fill_tuples = FillTupleSource.create_observable(bus.subscribe(SparkTags.SecuritiesTag), on_orders, on_fills); _security_orders_demuxer = new TableUpdateDemuxer(o => o.Key, o => o.security_key()); diff --git a/src/client/spark_api/api/Update.cs b/src/client/spark_api/api/Update.cs index a4734f127..f02d96bf1 100644 --- a/src/client/spark_api/api/Update.cs +++ b/src/client/spark_api/api/Update.cs @@ -44,18 +44,16 @@ namespace bts.api.core { public class TableUpdate where TKey : IEquatable { readonly Dictionary _state; - readonly IReadOnlyList _added; - readonly IReadOnlyList _removed; internal TableUpdate(Dictionary init, IReadOnlyList added, IReadOnlyList removed) { _state = init; - _added = added; - _removed = removed; + this.added = added; + this.removed = removed; } public IReadOnlyDictionary state { get { return _state; } } - public IReadOnlyList added { get { return _added; } } - public IReadOnlyList removed { get { return _removed; } } + public IReadOnlyList added { get; } + public IReadOnlyList removed { get; } internal TableUpdate update(Update update) => this.update(update.removed, update.added, update.key); @@ -70,6 +68,10 @@ namespace bts.api.core { } return table; } + + internal TableUpdate as_snapshot() { + return new TableUpdate(_state, _state.Values.ToList(), new T[0]); + } } public static class ObservableUpdateExtensions { @@ -102,5 +104,22 @@ namespace bts.api.core { source.Scan( new TableUpdate(new Dictionary(), new List(), new List()), (table, update) => table.update(update)); + + public static IObservable> Cache(this IObservable> source) where TKey : IEquatable { + var inner = source.Replay(1).RefCount(); + return Observable.Create>(o => { + bool first = true; + return inner.Subscribe(upd => { + if (first) { + o.OnNext(upd.as_snapshot()); + first = false; + } + else { + o.OnNext(upd); + } + }); + }); + } + } } \ No newline at end of file