From a515468e37eb340100ca38d2595725da4be7c0b1 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 17 Dec 2025 10:59:11 -0500 Subject: [PATCH] refactor: Rename TableUpdate props to PascalCase Makes the sdk look more polished, professional --- .../DataStream/DataStreamExtensions.cs | 22 +-- .../DataStreamCore/BlueData/BlueRowAdapter.cs | 2 - .../BlueData/BlueTableImmutable.cs | 5 +- .../Business/MarketData/BBOStream.cs | 6 +- .../Business/MarketData/BookStream.cs | 8 +- .../Business/MarketData/InstrumentsStream.cs | 4 +- .../Business/MarketData/PriceStatsStream.cs | 4 +- .../src/Commands/TestServiceCommand.cs | 2 +- src/client/spark/Admin/AdminModel.cs | 4 +- .../spark/AlgoProvider/IAlgoProvider.cs | 28 +-- .../spark/Daemons/DeleteSyntheticDaemon.cs | 2 +- src/client/spark/Daemons/OrderTicketDaemon.cs | 2 +- src/client/spark/Daemons/ReportDaemon.cs | 4 +- .../Market/MarketView/MarketViewRow.cs | 4 +- .../Modules/Market/MarketView/MarketViewVM.cs | 4 +- .../VM/SyntheticManagementDialogVM.cs | 4 +- .../AlgoStudio/Utils/AlgoCollectionHelper.cs | 2 +- .../Trading/AlgoStudio/VM/AlgoStudioVM.cs | 2 +- .../spark/Modules/Trading/Fills/FillsVM.cs | 12 +- .../Modules/Trading/Ladder/VM/LadderVM.cs | 10 +- .../Trading/Ladder/View/LadderGridHost.cs | 2 +- .../Modules/Trading/OrderBook/OrderBookVM.cs | 18 +- .../Trading/OrderBook/OrderBookWindow.cs | 6 +- .../spark/Modules/Trading/PNL/VM/PNLVM.cs | 18 +- .../ReconcileReport/ReconcileReportVM.cs | 4 +- .../NMSheetAllTaskingDataSource.cs | 4 +- .../Notifications/INotificationService.cs | 2 +- .../INotificationServiceDataCache.cs | 12 +- .../spark/Orders/OrderActivitySummarizer.cs | 4 +- .../spark/Orders/OrderPropertiesEditorVM.cs | 6 +- src/client/spark/Orders/OrdersModel.cs | 32 ++-- .../Diagnostics/TestData/TestDataFactory.cs | 10 +- .../spark/core/Utility/TableUpdateBuffer.cs | 12 +- .../core/Utility/TableUpdateTransform.cs | 32 ++-- .../spark/view/Controls/DIYGrid/DIYGrid.cs | 2 +- .../Filters/VM/DiscreteValuesFilterVM.cs | 14 +- .../Shell/Settings/ShellSettingsDialogVM.cs | 6 +- .../spark/view/Spark/Core/SparkUtils.cs | 4 +- src/client/spark/view/Utility/RXCollection.cs | 32 ++-- src/client/spark_api_server/BookDumper.cs | 4 +- src/client/spark_api_server/SecurityDumper.cs | 4 +- .../spark_sdk/samples/MarketDataSample.cs | 4 +- src/client/spark_test/api/ApiTests.cs | 32 ++-- src/client/spark_test/api/ApiUpdateTests.cs | 58 +++--- .../spark_websocket/Core/WebsocketDataSync.cs | 2 +- .../Core/WebsocketJsonParsers.cs | 6 +- src/cs/Bts.Spark.Api/Admin/AdminClient.cs | 16 +- .../Bts.Spark.Api/Admin/EmptyAdminClient.cs | 4 +- src/cs/Bts.Spark.Api/Admin/IAdminClient.cs | 4 +- .../MarketData/MarketDataClient.cs | 24 +-- .../MarketData/MarketDataExtensions.cs | 16 +- .../MarketData/PassiveSecurityResolver.cs | 12 +- .../Bts.Spark.Api/Position/PositionModel.cs | 8 +- .../Position/PositionModelExtensions.cs | 2 +- .../Reactive/SecurityResolver.cs | 2 +- .../Operable/OperableCollection.cs | 12 +- .../Reactive/RootDependentSubscription.cs | 34 ++-- .../Reactive/TableUpdateBootstrapper.cs | 2 +- .../Reactive/TableUpdateDemuxer.cs | 14 +- .../Reflection/ReflectionHelper.cs | 2 +- src/cs/Bts.Spark.Core/Update/TableUpdate.cs | 177 +++++++++--------- .../Update/TableUpdateFullJoin.cs | 38 ++-- .../Update/TableUpdateGroupTable.cs | 30 +-- .../Update/TableUpdateLeftJoin.cs | 38 ++-- .../Bts.Spark.Core/Update/UpdateExtensions.cs | 148 +++++++-------- .../Bts.Spark.Core/utils/UpdateExtensions.cs | 64 +++---- 66 files changed, 554 insertions(+), 554 deletions(-) diff --git a/src/DataStreamSuite/DataStream/DataStreamExtensions.cs b/src/DataStreamSuite/DataStream/DataStreamExtensions.cs index 9b6bdfab2..14840d19b 100644 --- a/src/DataStreamSuite/DataStream/DataStreamExtensions.cs +++ b/src/DataStreamSuite/DataStream/DataStreamExtensions.cs @@ -59,16 +59,16 @@ public static class DataStreamExtensions { public static IObservable> AsTables( this IObservable source, Func valueSelector, Func keySelector, Func? rowKeySelector = null) where TKey : IEquatable { rowKeySelector ??= r => keySelector(valueSelector(r)); - return source.Scan(TableUpdate.mk_empty(keySelector), (res, dp) => { - var bd = res.to_builder(); + return source.Scan(TableUpdate.Empty(keySelector), (res, dp) => { + var bd = res.ToBuilder(); dp.get_new_added_deleted(out var newRows, out var addedRows, out var deletedRows); foreach (IBlueRow r in addedRows) { - bd.add_or_update(valueSelector(r)); + bd.AddOrUpdate(valueSelector(r)); } foreach (IBlueRow r in deletedRows) { - bd.remove(rowKeySelector(r)); + bd.Remove(rowKeySelector(r)); } - return bd.to_table(); + return bd.ToImmutable(); }); } @@ -78,16 +78,16 @@ public static class DataStreamExtensions { (res, table) => { var resTable = res.Table; if (resTable is null) { - if (table.state.Count == 0) { + if (table.Index.Count == 0) { return (null, null); } - resTable = new(table.state.Values.First().schema); + resTable = new(table.Index.Values.First().schema); } var bd = resTable.ToDataPacketBuilder(); - foreach (var r in table.removed) { + foreach (var r in table.RemovedItems) { bd.Remove(r.Id()); } - foreach (var r in table.added) { + foreach (var r in table.AddedItems) { bd.AddOrUpdate(r); } var resDp = bd.ToDataPacket(out var newRows); @@ -101,10 +101,10 @@ public static class DataStreamExtensions { (Table: new BlueTableImmutable(schema), Dp: (IDataPacket)new DataPacket(schema)), (res, table) => { var bd = res.Table.ToDataPacketBuilder(); - foreach (var r in table.removed) { + foreach (var r in table.RemovedItems) { bd.Remove(r.Id()); } - foreach (var r in table.added) { + foreach (var r in table.AddedItems) { bd.AddOrUpdate(r); } var resDp = bd.ToDataPacket(out var newRows); diff --git a/src/DataStreamSuite/DataStreamCore/BlueData/BlueRowAdapter.cs b/src/DataStreamSuite/DataStreamCore/BlueData/BlueRowAdapter.cs index f846b5bba..b5e39dbc3 100644 --- a/src/DataStreamSuite/DataStreamCore/BlueData/BlueRowAdapter.cs +++ b/src/DataStreamSuite/DataStreamCore/BlueData/BlueRowAdapter.cs @@ -3,8 +3,6 @@ namespace Bts.DataStreamCore; using BCG; -using Bts.DataStream; - public class BlueRowAdapter : IBlueRow { readonly BlueTableSchemaAdapter adapter; readonly T data; diff --git a/src/DataStreamSuite/DataStreamCore/BlueData/BlueTableImmutable.cs b/src/DataStreamSuite/DataStreamCore/BlueData/BlueTableImmutable.cs index 1ef16a3a9..7d9a828ec 100644 --- a/src/DataStreamSuite/DataStreamCore/BlueData/BlueTableImmutable.cs +++ b/src/DataStreamSuite/DataStreamCore/BlueData/BlueTableImmutable.cs @@ -5,7 +5,6 @@ using BCG; using bts.api.core; -using Bts.DataStream; using Bts.DataStreamCore; using System; @@ -316,10 +315,10 @@ public class BlueTableImmutableAdapter : IBlueRowCollection } public void Update(TableUpdate tableUpdate) where TKey : IEquatable { - foreach (var r in tableUpdate.removed.Concat(tableUpdate.changes.Old())) { + foreach (var r in tableUpdate.RemovedItems.Concat(tableUpdate.Changes.Old())) { Remove(new BlueRowAdapter(schemaAdapter, r).Id()); } - foreach (var r in tableUpdate.changed.Concat(tableUpdate.added)) { + foreach (var r in tableUpdate.ChangedItems.Concat(tableUpdate.AddedItems)) { AddOrUpdate(r); } } diff --git a/src/DataStreamSuite/SharedStreams/Business/MarketData/BBOStream.cs b/src/DataStreamSuite/SharedStreams/Business/MarketData/BBOStream.cs index 6b925884b..b68774620 100644 --- a/src/DataStreamSuite/SharedStreams/Business/MarketData/BBOStream.cs +++ b/src/DataStreamSuite/SharedStreams/Business/MarketData/BBOStream.cs @@ -135,10 +135,10 @@ namespace bts.BlueOrb { private void _log_updates(TableUpdate update) { int i = 0; - foreach (BookTuple bt in update.added) { + foreach (BookTuple bt in update.AddedItems) { bts.Log.Gen.info($"BBOStream added: idx: {i++} bid: {bt.book.bids[0].price} / {bt.book.bids[0].size} ask: {bt.book.asks[0].price} / {bt.book.asks[0].size}"); } - foreach (Change c in update.changes) { + foreach (Change c in update.Changes) { var bt = c.New; //bts.Log.Gen.info($"BBOStream changes: idx: {i} bid: {bt.book.bids[0].price} / {bt.book.bids[0].size} ask: {bt.book.asks[0].price} / {bt.book.asks[0].size}"); } @@ -148,7 +148,7 @@ namespace bts.BlueOrb { //_log_updates(update); // just cacching in here, will populate the rows in _poll_scan and fire the datapacket //bts.Log.Gen.info($"BBOStream._on_books state: {update.state.Count()} changes: {update.changes.Count()} added: {update.added.Count()}"); - _cached_state = update.state; + _cached_state = update.Index; } protected override void myOnLastSubscriber() { diff --git a/src/DataStreamSuite/SharedStreams/Business/MarketData/BookStream.cs b/src/DataStreamSuite/SharedStreams/Business/MarketData/BookStream.cs index ba32e4f7c..efc1edbd1 100644 --- a/src/DataStreamSuite/SharedStreams/Business/MarketData/BookStream.cs +++ b/src/DataStreamSuite/SharedStreams/Business/MarketData/BookStream.cs @@ -51,10 +51,10 @@ namespace bts.BlueOrb{ private void _log_updates(TableUpdate update) { int i = 0; - foreach (BookTuple bt in update.added) { + foreach (BookTuple bt in update.AddedItems) { bts.Log.Gen.info($"BookStream added: idx: {i++} bid: {bt.book.bids[0].price} / {bt.book.bids[0].size} ask: {bt.book.asks[0].price} / {bt.book.asks[0].size}"); } - foreach (Change c in update.changes) { + foreach (Change c in update.Changes) { var bt = c.New; bts.Log.Gen.info($"BookStream changes: idx: {i} bid: {bt.book.bids[0].price} / {bt.book.bids[0].size} ask: {bt.book.asks[0].price} / {bt.book.asks[0].size}"); } @@ -62,8 +62,8 @@ namespace bts.BlueOrb{ private void _on_books(TableUpdate update) { //_log_updates(update); - bts.Log.Gen.info($"BookStream._on_books state: {update.state.Count()} changes: {update.changes.Count()} added: {update.added.Count()}"); - _cached_state = update.state; + bts.Log.Gen.info($"BookStream._on_books state: {update.Index.Count()} changes: {update.Changes.Count()} added: {update.AddedItems.Count()}"); + _cached_state = update.Index; } protected override void myOnLastSubscriber() { diff --git a/src/DataStreamSuite/SharedStreams/Business/MarketData/InstrumentsStream.cs b/src/DataStreamSuite/SharedStreams/Business/MarketData/InstrumentsStream.cs index be31e30f5..d1503974d 100644 --- a/src/DataStreamSuite/SharedStreams/Business/MarketData/InstrumentsStream.cs +++ b/src/DataStreamSuite/SharedStreams/Business/MarketData/InstrumentsStream.cs @@ -63,8 +63,8 @@ namespace bts.BlueOrb { _dirty = true; //_log_updates(state); // just cacching in here, will populate the rows in _poll_scan and fire the datapacket - bts.Log.Gen.info($"InstrumentsStream._on_instruments state: {table.state.Count}"); - _cached_state = table.state; + bts.Log.Gen.info($"InstrumentsStream._on_instruments state: {table.Index.Count}"); + _cached_state = table.Index; } protected override void myOnLastSubscriber() { diff --git a/src/DataStreamSuite/SharedStreams/Business/MarketData/PriceStatsStream.cs b/src/DataStreamSuite/SharedStreams/Business/MarketData/PriceStatsStream.cs index 8c7b3d87c..8c9bbf9a0 100644 --- a/src/DataStreamSuite/SharedStreams/Business/MarketData/PriceStatsStream.cs +++ b/src/DataStreamSuite/SharedStreams/Business/MarketData/PriceStatsStream.cs @@ -61,8 +61,8 @@ namespace BCG { private void _on_price_stats(TableUpdate update) { _log_updates(update); // just cacching in here, will populate the rows in _poll_scan and fire the datapacket - bts.Log.Gen.info($"PriceStatsStream._on_price_stats state: {update.state.Count()} changes: {update.changes.Count()} added: {update.added.Count()}"); - _cached_state = update.state; + bts.Log.Gen.info($"PriceStatsStream._on_price_stats state: {update.Index.Count()} changes: {update.Changes.Count()} added: {update.AddedItems.Count()}"); + _cached_state = update.Index; _dirty = true; } diff --git a/src/client/Spark.Console/src/Commands/TestServiceCommand.cs b/src/client/Spark.Console/src/Commands/TestServiceCommand.cs index 26e94da5c..f62902f7b 100644 --- a/src/client/Spark.Console/src/Commands/TestServiceCommand.cs +++ b/src/client/Spark.Console/src/Commands/TestServiceCommand.cs @@ -33,7 +33,7 @@ namespace Spark.Console { using var ctx = new ServiceContext(); var md = ctx.locate(); md.subscribe_securities().Table().Subscribe(update => { - Console.WriteLine($"got {update.state.Count} securities"); + Console.WriteLine($"got {update.Index.Count} securities"); }); while (true) { Thread.Sleep(1000); diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index c00b62e8c..6b6714799 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -57,10 +57,10 @@ namespace mbts.spark { .ToObservable()); } else { all_user_tuples = Observable.Return( - TableUpdate.mk_empty(UserTuple.key_fn).with_added(new[] { user })); + TableUpdate.Empty(UserTuple.key_fn).with_added(new[] { user })); } _dispose = Disposable.Create( - all_user_tuples.Subscribe(t => bus.post(SparkTags.Users, t.state)), + all_user_tuples.Subscribe(t => bus.post(SparkTags.Users, t.Index)), on_accounts.Subscribe(map => { _account_map = map; var account_tuple_map = MappedDictionary.create(map, (id, name) => new AccountTuple(id, name)); diff --git a/src/client/spark/AlgoProvider/IAlgoProvider.cs b/src/client/spark/AlgoProvider/IAlgoProvider.cs index 8d21857a1..212a9aa27 100644 --- a/src/client/spark/AlgoProvider/IAlgoProvider.cs +++ b/src/client/spark/AlgoProvider/IAlgoProvider.cs @@ -84,7 +84,7 @@ namespace mbts.spark { public IObservable> subscribe_algos() => _studio_algos_source - .StartWith(TableUpdate.mk_empty(AlgoData.key_fn)) + .StartWith(TableUpdate.Empty(AlgoData.key_fn)) .AppendTable(_security_algo_types .Select(s => s.algo_type_set) .Aggregate(AlgoTypeSetImmutable.empty, (a, b) => a.union_with(b)) @@ -101,7 +101,7 @@ namespace mbts.spark { a => (algo: a, fitted_def: _fit_to_type(a.value, security_clause, _security_algo_types)), tup => tup.algo.key) .Select(tup => AlgoData.create(tup.fitted_def, tup.algo.name, tup.algo.key), a => a.key) - .StartWith(TableUpdate.mk_empty(AlgoData.key_fn)) + .StartWith(TableUpdate.Empty(AlgoData.key_fn)) .AppendTable(system_algos.Values); } @@ -117,7 +117,7 @@ namespace mbts.spark { _sec_meta_store.get_qty_display_divisor(security)); var filtered_studio_algos = _studio_algos_source - .StartWith(TableUpdate.mk_empty(AlgoData.key_fn)) + .StartWith(TableUpdate.Empty(AlgoData.key_fn)) .Select( a => (algo: a, fitted_def: _fit_to_type(a.value, security, _security_algo_types)), tup => tup.algo.key) @@ -126,7 +126,7 @@ namespace mbts.spark { .Filter(tup => tup.fitted_def.actual().CustomCase == tup.algo.value.actual().CustomCase, tup => tup.algo.key) .Select(tup => AlgoData.create(tup.fitted_def, tup.algo.name, tup.algo.key), AlgoData.key_fn); return filtered_studio_algos - .StartWith(TableUpdate.mk_empty(AlgoData.key_fn)) + .StartWith(TableUpdate.Empty(AlgoData.key_fn)) .AppendTable(system_algos.Values); } @@ -227,24 +227,24 @@ namespace mbts.spark { public static IObservable> subscribe_complete_algos(IObservable> source, bool allow_undefined_child = false) => Observable.Create>(o => { - var last_out = TableUpdate.mk_empty(AlgoData.key_fn); + var last_out = TableUpdate.Empty(AlgoData.key_fn); var incomplete_composites = ImmutableHashSet.Empty; return source.Subscribe(table => { - var bd = last_out.to_builder(); - foreach (var algo in incomplete_composites.Where(a => _validate_algo_structure(a.value, table.state, allow_undefined_child))) { + var bd = last_out.ToBuilder(); + foreach (var algo in incomplete_composites.Where(a => _validate_algo_structure(a.value, table.Index, allow_undefined_child))) { incomplete_composites = incomplete_composites.Remove(algo); - bd.add_or_update(algo); + bd.AddOrUpdate(algo); } - foreach (var a in table.removed.Concat(table.changes.Old())) - bd.remove(a.key); - foreach (var a in table.added.Concat(table.changed)) { - if (_validate_algo_structure(a.value, table.state, allow_undefined_child)) { - bd.add_or_update(a); + foreach (var a in table.RemovedItems.Concat(table.Changes.Old())) + bd.Remove(a.key); + foreach (var a in table.AddedItems.Concat(table.ChangedItems)) { + if (_validate_algo_structure(a.value, table.Index, allow_undefined_child)) { + bd.AddOrUpdate(a); } else { incomplete_composites = incomplete_composites.Add(a); } } - o.OnNext(last_out = bd.to_table()); + o.OnNext(last_out = bd.ToImmutable()); }); }); diff --git a/src/client/spark/Daemons/DeleteSyntheticDaemon.cs b/src/client/spark/Daemons/DeleteSyntheticDaemon.cs index 1f9f36f20..e634543d4 100644 --- a/src/client/spark/Daemons/DeleteSyntheticDaemon.cs +++ b/src/client/spark/Daemons/DeleteSyntheticDaemon.cs @@ -61,7 +61,7 @@ namespace bts { var items = new List<(uint key, ExecutionStrategyImmutable strategy)>(); var temp_strats = _strategy_map; foreach (var k in keys) { - if (orders.state.TryGetValue(k, out var sec_group) && sec_group.table.state.Values.Any(tup => tup.order.is_active())) { + if (orders.Index.TryGetValue(k, out var sec_group) && sec_group.table.Index.Values.Any(tup => tup.order.is_active())) { working_orders.Add(k); } else if (!temp_strats.TryGetValue(k, out var strat)) { missing_strategies.Add(k); diff --git a/src/client/spark/Daemons/OrderTicketDaemon.cs b/src/client/spark/Daemons/OrderTicketDaemon.cs index 51120dcb0..1c2f40351 100644 --- a/src/client/spark/Daemons/OrderTicketDaemon.cs +++ b/src/client/spark/Daemons/OrderTicketDaemon.cs @@ -104,7 +104,7 @@ namespace bts.shell { } void _show_modify_order(uint order_key) { - if (!_orders.state.TryGetValue(order_key, out var ori) || !ori.security.HasValue) { + if (!_orders.Index.TryGetValue(order_key, out var ori) || !ori.security.HasValue) { return; } switch (ori.order.order_type()) { diff --git a/src/client/spark/Daemons/ReportDaemon.cs b/src/client/spark/Daemons/ReportDaemon.cs index f3ee247c9..1067fb8d4 100644 --- a/src/client/spark/Daemons/ReportDaemon.cs +++ b/src/client/spark/Daemons/ReportDaemon.cs @@ -95,9 +95,9 @@ namespace bts.daemons { Disposable.dispose(ref _dispose); void _on_reports(TableUpdate reports) { - _report_parameters_map = reports.state; + _report_parameters_map = reports.Index; // recreate calculators with new/changed parameters - foreach (var r in reports.added.Concat(reports.changes.New())) { + foreach (var r in reports.AddedItems.Concat(reports.Changes.New())) { if (_report_calculators.Remove(r.Id)) { _report_calculators.get_or_add(r.Id); } diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs index fbeab5e50..9053884e1 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs @@ -188,13 +188,13 @@ namespace mbts.spark { } void on_security_positions(TableUpdate<(SecurityImmutable? sec, PositionUnitImmutable pos), int> table) { - var new_day_pos = table.state.Values.Sum(p => p.pos.day_pos()); + var new_day_pos = table.Index.Values.Sum(p => p.pos.day_pos()); bool day_pos_dirty = _day_position.on_next_distinct(new_day_pos); if (day_pos_dirty && !new_day_pos.is_nan() && !day_position.is_nan()) { _animation.animate_position(new_day_pos > _day_position.value); } bool raw_day_pos_dirty = _raw_day_position.on_next_distinct( - table.state.Values.Sum(p => p.pos.raw_day_pos())); + table.Index.Values.Sum(p => p.pos.raw_day_pos())); if (day_pos_dirty || raw_day_pos_dirty) { raise_invalidated(); } diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs index 93862b00c..943accc16 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs @@ -703,12 +703,12 @@ namespace mbts.spark { void _on_securities(TableUpdate table) { var sw = new Stopwatch(); sw.Start(); - foreach (var smd in table.removed) { + foreach (var smd in table.RemovedItems) { int i = CollectionHelper.binary_search(_wrapped_rows, smd, _sec_md_key_comparer); Log.assert(i >= 0); _wrapped_rows.RemoveAt(i); } - foreach (var smd in table.added) { + foreach (var smd in table.AddedItems) { int i = CollectionHelper.binary_search(_wrapped_rows, smd, _sec_md_key_comparer); Log.assert(i < 0); _wrapped_rows.Insert(~i, smd); diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs index 3a844c7b9..d843049b3 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs @@ -97,7 +97,7 @@ namespace mbts.spark { _dispose = Disposable.Create( orders_model.admin_model.all_user_tuples.OnDispatcher().Subscribe(user_filter_items_observer), orders_model.spreader.synthetic_tuples - .Select(t => t.state.Values) + .Select(t => t.Index.Values) .OnDispatcher() .Subscribe(synth_tups => _rows.WrapSelector( r => r.synthetic_tuple, @@ -158,7 +158,7 @@ namespace mbts.spark { this.synthetic_tuple = synthetic_tuple; _n_working_orders = backing(nameof(n_working_orders), orders_model.on_security_orders(security_key) - .Select(t => (uint)(t.state + .Select(t => (uint)(t.Index .Where(kv => kv.Value.is_active()) .Count()) ).OnDispatcher()); diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Utils/AlgoCollectionHelper.cs b/src/client/spark/Modules/Trading/AlgoStudio/Utils/AlgoCollectionHelper.cs index ef8345ffd..12dad7c81 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Utils/AlgoCollectionHelper.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Utils/AlgoCollectionHelper.cs @@ -41,7 +41,7 @@ namespace mbts.spark { }).to_comparer().to_safe(); public static void update_persisted_definitions(ObservableKeyedCollection target, TableUpdate update, Func factory) => - update_persisted_definitions(target, update.added, update.changed, update.removed.Select(AlgoData.key_fn), factory); + update_persisted_definitions(target, update.AddedItems, update.ChangedItems, update.RemovedItems.Select(AlgoData.key_fn), factory); public static void update_persisted_definitions(ObservableKeyedCollection target, IEnumerable added, IEnumerable changed, IEnumerable removed, Func factory) { foreach (var k in removed) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoStudioVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoStudioVM.cs index 0cf75ee5e..ea085fe53 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoStudioVM.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoStudioVM.cs @@ -96,7 +96,7 @@ namespace mbts.spark { // Synthetic securities in our system are defined by a set of contract legs, and a [single]strategy. // Note: synthetic strategy templates, however, could be introduced at a later date (no reason why 1 synthetic security couldn't have several ExecutionStrategies). var algo_building_blocks = new FilteredDictionary( - u.state, + u.Index, a => a.key.mode == AlgoKey.Mode.Dynamic || (a.key.mode == AlgoKey.Mode.Factory && a.key.factory != CustomOrderDefinition.CustomOneofCase.Spreader)); return ObservableAutoWrapper.connect_item_actions(_definitions.AsCollection(), d => ((IAlgoSelector)d).load_algo_data(algo_building_blocks, null)); diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 3eb58d83b..47f8e39e6 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -84,8 +84,8 @@ namespace mbts.spark { r => r.security?.ToString() ?? string.Empty, DiscreteValuesFilterVM.Create( row_securities.Select(t => ( - t.added.Concat(t.changed), - t.removed.Concat(t.changes.Select(ch => ch.Old)))) + t.AddedItems.Concat(t.ChangedItems), + t.RemovedItems.Concat(t.Changes.Select(ch => ch.Old)))) .OnDispatcher(), r => r.security ?? throw new InvalidOperationException(), SecurityCriteria.from_securities, @@ -130,7 +130,7 @@ namespace mbts.spark { order_type_items_view.CustomSort = algo_items_comp; order_type_items_view.GroupDescriptions.Add(algo_items_group_desc); - order_type_observer.OnNext(TableUpdate.mk_empty(AlgoDataVM.id_fn) + order_type_observer.OnNext(TableUpdate.Empty(AlgoDataVM.id_fn) .with_added(OrderDataHelper.all_order_types .Select(OrderDataHelper.Defaults.CustomOrderDefinitionImmutable) .Select(AlgoData.from_custom_def) @@ -355,11 +355,11 @@ namespace mbts.spark { grid_settings_manager.load_from(_settings_manager.current_settings()); - var last_unfiltered_fills = TableUpdate.mk_empty(FillTuple.key_fn); + var last_unfiltered_fills = TableUpdate.Empty(FillTuple.key_fn); var fills_buffer = Observable.Create>(o => { // this is what .Cache() does, but is a little cheaper, since we know subscriptions and // callbacks occur on the same thread (i.e., on this Dispatcher). - o.OnNext(last_unfiltered_fills.as_snapshot()); + o.OnNext(last_unfiltered_fills.AsSnapshot()); _unfiltered_fills_changed += o.OnNext; return Disposable.Create(() => _unfiltered_fills_changed -= o.OnNext); }); @@ -400,7 +400,7 @@ namespace mbts.spark { }), fills_source.OnDispatcher().Subscribe(t => { last_unfiltered_fills = t; - Set(ref _total_row_count, t.state.Count, nameof(total_row_count)); + Set(ref _total_row_count, t.Index.Count, nameof(total_row_count)); _unfiltered_fills_changed?.Invoke(t); }), bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().Subscribe(secs => { diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs index af6f63921..a00a344f9 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs @@ -354,7 +354,7 @@ namespace mbts.spark { var position_src = order_properties_vm.observe_account(true) .Select(a => a?.name ?? string.Empty) .SelectSeries(a => _model.position_model.on_security_positions(security.Id) - .Select(table => table.state.Values.FirstOrDefault( + .Select(table => table.Index.Values.FirstOrDefault( pos => pos.Item2.Account == a, tup => tup.Item2, (bts.api.position.PositionUnitImmutable?)null))); @@ -830,7 +830,7 @@ namespace mbts.spark { var bd = state.ToBuilder(); // removes - var removes = table.removed.Concat(table.changes.Where(price_changed).Old()); + var removes = table.RemovedItems.Concat(table.Changes.Where(price_changed).Old()); foreach (var old_order in removes) { var price = get_price(old_order); if (bd.TryGetValue(price, out var index)) { @@ -844,14 +844,14 @@ namespace mbts.spark { } // changes - var changes = table.changes.Where(ch => !price_changed(ch)).New(); + var changes = table.Changes.Where(ch => !price_changed(ch)).New(); foreach (var changed_order in changes) { var price = get_price(changed_order); bd[price] = bd[price].SetItem(changed_order.order.Key, changed_order); } // adds - var adds = table.added.Concat(table.changes.Where(price_changed).New()); + var adds = table.AddedItems.Concat(table.Changes.Where(price_changed).New()); foreach (var new_order in adds) { var price = get_price(new_order); if (bd.TryGetValue(price, out var index)) { @@ -862,7 +862,7 @@ namespace mbts.spark { }); } } - o.OnNext((state = bd.ToImmutable(), table.state)); + o.OnNext((state = bd.ToImmutable(), table.Index)); }); return sub; }); diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs index bccaf9135..310b7ccf4 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs @@ -958,7 +958,7 @@ namespace mbts.spark { local_vm.request_recenter += on_request_recenter; local_vm.request_go_to_price += on_request_go_to_price; _settings_sub = _vm.settings.OnDispatcher().Subscribe(_settings_updated); - _volume_sub = _vm.model.order_gateway.md_auxiliary_model.security_volume_at_price(security.Id).Subscribe(t => _volume_container.write_value(t.state.Values)); + _volume_sub = _vm.model.order_gateway.md_auxiliary_model.security_volume_at_price(security.Id).Subscribe(t => _volume_container.write_value(t.Index.Values)); // **unhook from local_vm.request_recenter. // todo: organize these subs into a single entity, prob _vm_subs. // This hasn't already been done bc the ladder a bit fragile, so changes must be carefully implemented, diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 3ebc03c04..f848a9e38 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -259,15 +259,15 @@ namespace mbts.spark { _current_row.Subscribe(_ => _custom_state_sync.sync()), orders_source.OnDispatcher().Subscribe(t => { if (_selected_rows.Count == 0) { - _cached_orders = t.state; + _cached_orders = t.Index; _row_collection.update( - t.added, t.changed, t.removed.Select(o => o.order.order.Key)); + t.AddedItems, t.ChangedItems, t.RemovedItems.Select(o => o.order.order.Key)); } else { using (_selected_params_mon.defer_updates()) using (_selected_security_mon.defer_updates()) { - _cached_orders = t.state; + _cached_orders = t.Index; _row_collection.update( - t.added, t.changed, t.removed.Select(o => o.order.order.Key)); + t.AddedItems, t.ChangedItems, t.RemovedItems.Select(o => o.order.order.Key)); // Remove, then re-add, all selected roots from _selected_params_mon // to capture algo param changes at any level (this keeps the update panel in sync). _selected_params_mon.Clear(); @@ -286,8 +286,8 @@ namespace mbts.spark { refresh_quantity_display(); }), model.on_orders_can_attach.OnDispatcher().Subscribe(table => { - _cached_attachable = new MappedDictionary, bool>(table.state, kv => kv.Value); - foreach (var kv in table.added.Concat(table.changed)) { + _cached_attachable = new MappedDictionary, bool>(table.Index, kv => kv.Value); + foreach (var kv in table.AddedItems.Concat(table.ChangedItems)) { if (_row_collection.TryGetRow(kv.Key, out var row)) { row.is_attachable = kv.Value; if (row.is_selected) { @@ -300,8 +300,8 @@ namespace mbts.spark { _can_attach_selected_orders.refresh(); }), model.on_orders_can_detach.OnDispatcher().Subscribe(table => { - _cached_detachable = new MappedDictionary, bool>(table.state, kv => kv.Value); - foreach (var kv in table.added.Concat(table.changed)) { + _cached_detachable = new MappedDictionary, bool>(table.Index, kv => kv.Value); + foreach (var kv in table.AddedItems.Concat(table.ChangedItems)) { if (_row_collection.TryGetRow(kv.Key, out var row)) { row.is_detachable = kv.Value; if (row.is_selected) { @@ -453,7 +453,7 @@ namespace mbts.spark { if (newval.HasValue) { return _model.subscribe_algos(newval.Value.security, true) .OnDispatcher() - .Subscribe(t => ((IAlgoSelector)attach_vm.algo_vm).load_algo_data(t.state, null)); + .Subscribe(t => ((IAlgoSelector)attach_vm.algo_vm).load_algo_data(t.Index, null)); } return null; }), diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs index 0a1c50ad7..b2c235928 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs @@ -129,7 +129,7 @@ namespace mbts.spark { var cancel_buy_orders_command = SparkCommands.CancelBuyOrders.complete( _model.working_orders.Select(os => - os.state.Values.Where(o => o.order.side() == Side.Buy).Select(o => o.order.Key)), + os.Index.Values.Where(o => o.order.side() == Side.Buy).Select(o => o.order.Key)), wbids => wbids.Any(), () => { var resp = BTSMessageBox.Show( @@ -144,7 +144,7 @@ namespace mbts.spark { var cancel_sell_orders_command = SparkCommands.CancelSellOrders.complete( _model.working_orders.Select(os => - os.state.Values.Where(o => o.order.side() == Side.Sell).Select(o => o.order.Key)), + os.Index.Values.Where(o => o.order.side() == Side.Sell).Select(o => o.order.Key)), wasks => wasks.Any(), () => { var resp = BTSMessageBox.Show( @@ -158,7 +158,7 @@ namespace mbts.spark { cancel_sell_orders_command.group = CommandGroups.Cancel; var cancel_all_orders_command = SparkCommands.CancelOrders.complete( - _model.working_orders.Select(os => os.state.Select(o => o.Key)), + _model.working_orders.Select(os => os.Index.Select(o => o.Key)), worders => worders.Any(), () => { var resp = BTSMessageBox.Show( diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs index da4660455..68f1449c8 100644 --- a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs +++ b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs @@ -85,7 +85,7 @@ namespace bts.shell.pnl { _header_triggers = Array.Empty>(); // pause/resume (TableUpdate filtered, TableUpdate raw)? _resume; - TableUpdate _last_table = TableUpdate.mk_empty(PNLRowData.key_fn); + TableUpdate _last_table = TableUpdate.Empty(PNLRowData.key_fn); AlternationConverter _group_background_converter = new AlternationConverter(); public PNLVM( @@ -207,7 +207,7 @@ namespace bts.shell.pnl { Enumerable.Empty>(), Enumerable.Empty(), PNLRowData.key_fn), - _resume.Value.filtered.state, + _resume.Value.filtered.Index, EqualityComparer.Default); _update((reset, _resume.Value.raw)); _resume = null; @@ -669,7 +669,7 @@ namespace bts.shell.pnl { static IObservable> _expirations_source( IObservable> pnl_source) => pnl_source - .StartWith(TableUpdate.mk_empty(PNLRowData.key_fn)) + .StartWith(TableUpdate.Empty(PNLRowData.key_fn)) .distinct_on( PNLRowData.key_fn, r => r.expiration, e => e, EqualityComparer.Default) .Filter(e => e != ExpirationDate.None); @@ -679,7 +679,7 @@ namespace bts.shell.pnl { pnl_source // ensure this fires once immediatey, because the known symbols are appended to the first update // (observers shouldn't have to wait for the pnl source to tick to see them). - .StartWith(TableUpdate.mk_empty(PNLRowData.key_fn)) + .StartWith(TableUpdate.Empty(PNLRowData.key_fn)) .distinct_on(PNLRowData.key_fn, r => r.symbol, s => s, EqualityComparer.Default) .Filter(sym => !string.IsNullOrEmpty(sym)) .AppendTable(mbts.co2.UserSymbol.get_all().Select(u => u.symbol).Distinct().ToList()); @@ -879,7 +879,7 @@ namespace bts.shell.pnl { // Note: this is a necessary behavior if the predicate is used in a TableUpdate filter stream (it must always return the same value for the same item). Func _visible_items_filter_snapshot(Func key_selector) { var t = _last_table; - return o => t.state.ContainsKey(key_selector(o)); + return o => t.Index.ContainsKey(key_selector(o)); } void _update((TableUpdate filtered, TableUpdate raw) tup) { @@ -893,7 +893,7 @@ namespace bts.shell.pnl { int old_filtered_row_count = filtered_row_count; var total_pnl = total_aggregate.data; // don't adjust selected_pnl incrementally - it may be possible for the selection to change throughout the update, making incremental calculations tricky - foreach (var v in filtered.removed) { + foreach (var v in filtered.RemovedItems) { int i = CollectionHelper.binary_search(_rows_data_wrapper, v, PNLRowData.key_comparer); Log.assert(i >= 0, $"{typeof(PNLVM)} received an update with a removed item that was not found via binary search."); if (i >= 0) { @@ -901,7 +901,7 @@ namespace bts.shell.pnl { rows.RemoveAt(i); } } - foreach (var v in filtered.added) { + foreach (var v in filtered.AddedItems) { var r = new PNLRowVM( v.with(calc_type: calculation_type), _sec_meta_store, @@ -912,7 +912,7 @@ namespace bts.shell.pnl { rows.InsertSorted(r, PNLRowVM.key_comparer); total_pnl += r.normalized_data; } - foreach (var d in filtered.changed) { + foreach (var d in filtered.ChangedItems) { int i = CollectionHelper.binary_search(_rows_data_wrapper, d, PNLRowData.key_comparer); if (i >= 0) { var r = rows[i]; @@ -927,7 +927,7 @@ namespace bts.shell.pnl { } // total_aggregate.data = total_pnl; - total_row_count = tup.raw.state.Count; + total_row_count = tup.raw.Index.Count; if (total_row_count != old_total_row_count) RaisePropertyChanged(nameof(total_row_count)); if (filtered_row_count != old_filtered_row_count) diff --git a/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportVM.cs b/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportVM.cs index 40901763f..aafd49e3a 100644 --- a/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportVM.cs +++ b/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportVM.cs @@ -108,7 +108,7 @@ namespace Spark.Trading { // cmds _sync_with_exchange_cmd = new AsyncCommand( sync_with_exchange, - () => _last_update.raw is not null && _last_update.raw.state.Values.Any(r => !r.is_match())); + () => _last_update.raw is not null && _last_update.raw.Index.Values.Any(r => !r.is_match())); var row_observers = RXCollection.observers( rows, create_row_vm, r => r.data, update_row_vm, false); @@ -173,7 +173,7 @@ namespace Spark.Trading { return; } - await model.sync_with_exchange(_last_update.raw.state.Values); + await model.sync_with_exchange(_last_update.raw.Index.Values); } } diff --git a/src/client/spark/NMSheets/DataProviders/NMSheetAllTaskingDataSource.cs b/src/client/spark/NMSheets/DataProviders/NMSheetAllTaskingDataSource.cs index 4813e3315..cf8244ba3 100644 --- a/src/client/spark/NMSheets/DataProviders/NMSheetAllTaskingDataSource.cs +++ b/src/client/spark/NMSheets/DataProviders/NMSheetAllTaskingDataSource.cs @@ -68,8 +68,8 @@ namespace mbts.ui { orders_model.on_orders.Subscribe(ords => { var timer = Stopwatch.StartNew(); NMSheetAllTaskingData t_data = new NMSheetAllTaskingData(); - bts.Log.Gen.info($"NMSheetAllTaskingDataSource on_orders n_orders: {ords.state.Values.Count()}"); - foreach (var k in ords.state.Values) { + bts.Log.Gen.info($"NMSheetAllTaskingDataSource on_orders n_orders: {ords.Index.Values.Count()}"); + foreach (var k in ords.Index.Values) { OrderRecordImmutable order = k.order; if (!is_working(order.State.Status)) continue; diff --git a/src/client/spark/Notifications/INotificationService.cs b/src/client/spark/Notifications/INotificationService.cs index 78dad7e3e..285cad994 100644 --- a/src/client/spark/Notifications/INotificationService.cs +++ b/src/client/spark/Notifications/INotificationService.cs @@ -134,7 +134,7 @@ namespace bts.shell { void _on_orders(TableUpdate update) { // must update notification_service_data_cache first, some of the predicate/triggers (esp. ToastNotifications) will use the notification_service_data_cache to lookup order-history _data_cache.update(update); - foreach (var o in update.added.Concat(update.changed)) + foreach (var o in update.AddedItems.Concat(update.ChangedItems)) _order_notifications.process_item(o); } diff --git a/src/client/spark/Notifications/INotificationServiceDataCache.cs b/src/client/spark/Notifications/INotificationServiceDataCache.cs index 745456ac3..61a6639fe 100644 --- a/src/client/spark/Notifications/INotificationServiceDataCache.cs +++ b/src/client/spark/Notifications/INotificationServiceDataCache.cs @@ -79,21 +79,21 @@ namespace bts.shell { } void impl() { - if (table.state.Count == 0) { + if (table.Index.Count == 0) { _order_cache.Clear(); } - is_first_order_update = _order_cache.Count == 0 && table.state.Count > 0; - foreach (var order in table.removed) { + is_first_order_update = _order_cache.Count == 0 && table.Index.Count > 0; + foreach (var order in table.RemovedItems) { var k = table.key(order); _order_cache.Remove(k); _order_history.Remove(k); } - foreach (var ch in table.changes) { + foreach (var ch in table.Changes) { var k = table.key(ch.New); _order_cache[k] = ch.New; _order_history[k].Add(new(ch.New, now)); } - foreach (var order in table.added) { + foreach (var order in table.AddedItems) { var k = table.key(order); _order_cache[k] = order; var hist = _order_history.GetOrAdd(k, _ => new()); @@ -105,7 +105,7 @@ namespace bts.shell { _order_cache.Clear(); _order_history.Clear(); _table_history.Clear(); - foreach (var (k, order) in table.state) { + foreach (var (k, order) in table.Index) { _order_cache[k] = order; _order_history.GetOrAdd(k, _ => new()).Add(new(order, now)); } diff --git a/src/client/spark/Orders/OrderActivitySummarizer.cs b/src/client/spark/Orders/OrderActivitySummarizer.cs index 195661894..9169e7393 100644 --- a/src/client/spark/Orders/OrderActivitySummarizer.cs +++ b/src/client/spark/Orders/OrderActivitySummarizer.cs @@ -145,7 +145,7 @@ namespace bts.spark { void orders_updated(TableUpdate update) { - foreach (var o in update.added) { + foreach (var o in update.AddedItems) { if (!string.IsNullOrEmpty(o.order.State.LastMsg) && o.order.State.Created.ToDateTime().Date == DateTime.Today) { if (o.security.HasValue) { log_status(ActivityLogCategory.warn, o.security.Value, o.order.State.LastMsg); @@ -153,7 +153,7 @@ namespace bts.spark { } } - foreach (var order in update.changes) { + foreach (var order in update.Changes) { var neworder = order.New.order; var oldorder = order.Old.order; var security = order.New.security ?? order.Old.security; diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index eec5ae9ee..291889796 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -189,14 +189,14 @@ namespace mbts.spark { .OnDispatcher() .Subscribe(table => { using (_selected_algo_definition.begin_update()) { - foreach (var (algo, meta) in table.removed) + foreach (var (algo, meta) in table.RemovedItems) _algo_definitions.Remove(algo.key); - foreach (var (algo, meta) in table.changed) { + foreach (var (algo, meta) in table.ChangedItems) { var vm = _algo_definitions[algo.key]; vm.load(algo); vm.favorite_index = _get_favorite_algo_index(vm.key); } - foreach (var (algo, meta) in table.added) { + foreach (var (algo, meta) in table.AddedItems) { var vm = AlgoDefinitionVM.create(_model, algo, AlgoEditingPermissions.AllowEditValues); vm.favorite_index = _get_favorite_algo_index(vm.key); _algo_definitions.Add(vm); diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 94e0a8bd0..3955509ed 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -278,7 +278,7 @@ namespace mbts.spark { _bus.subscribe(SparkTags.UpdateOrder).Subscribe(x => this.update_order(x.key, x.price, x.size).ignore()), bootstraps); algo_model.definitions.Subscribe(defs => { - IEnumerable algos = new List(defs.state.Values); + IEnumerable algos = new List(defs.Index.Values); bts.Log.Ui.info($"OrdersModel publishing algos count: {algos.Count()}"); bus.post(SparkTags.Algos, algos); }); @@ -511,12 +511,12 @@ namespace mbts.spark { static ImmutableDictionary _update_working_orders( ImmutableDictionary target, OrderUpdate table) { var clone = target.ToBuilder(); - foreach (var o in table.removed) { + foreach (var o in table.RemovedItems) { if (o.order.is_active()) { clone.Remove(o.order.Key); } } - foreach (var o in table.changes) { + foreach (var o in table.Changes) { if (o.Old.order.is_active()) { clone.Remove(o.Old.order.Key); } @@ -524,7 +524,7 @@ namespace mbts.spark { clone.Add(o.New.order.Key, o.New); } } - foreach (var o in table.added) { + foreach (var o in table.AddedItems) { if (o.order.is_active()) { clone.Add(o.order.Key, o); } @@ -539,7 +539,7 @@ namespace mbts.spark { #region Cancel Orders public static async Task cancel_order(this OrdersModel orders_model, uint order_id) { var tu = await orders_model.on_orders.FirstAsync(); - if (tu.state.TryGetValue(order_id, out var o)) { + if (tu.Index.TryGetValue(order_id, out var o)) { return await orders_model.cancel_order(o.order); } return false; @@ -548,7 +548,7 @@ namespace mbts.spark { public static async Task<(OrderRecordImmutable, bool)[]> cancel_orders_where(this OrdersModel model, Predicate pred) { var tu = await model.on_orders.FirstAsync(); var orders = - tu.state.Values + tu.Index.Values .Where(o => o.order.is_non_terminal() && pred(o.order)) .Select(async o => { return (o.order, await model.cancel_order(o.order)); }); return await Task.WhenAll(orders); @@ -567,7 +567,7 @@ namespace mbts.spark { public static IObservable security_has_working_orders(this OrdersModel orders_model, uint security_key) => orders_model .on_security_orders(security_key) - .Select(t => t.state.Any(kv => kv.Value.is_active())) + .Select(t => t.Index.Any(kv => kv.Value.is_active())) .StartWith(false); public static IObservable> on_security_root_orders(this OrdersModel orders_model, uint security_key) => @@ -578,13 +578,13 @@ namespace mbts.spark { var added_roots = new List(); var removed_root_keys = new HashSet(); var removed_roots = new List(); - foreach (var o in table.removed.Concat(table.changes.Old())) { + foreach (var o in table.RemovedItems.Concat(table.Changes.Old())) { if (rod.last_update.state.ContainsKey(o.Key)) { // order was a root, needs to be removed removed_roots.Add(o); - if (table.state.TryGetValue(o.Key, out OrderRecordImmutable newval)) { + if (table.Index.TryGetValue(o.Key, out OrderRecordImmutable newval)) { // order was changed, if its an actual root, or its parent isn't present, the newval needs to be added - if (!o.has_parent() || !table.state.ContainsKey(o.ParentKey)) { + if (!o.has_parent() || !table.Index.ContainsKey(o.ParentKey)) { added_roots.Add(newval); added_root_keys.Add(o.Key); } @@ -596,19 +596,19 @@ namespace mbts.spark { if (rod.parent_to_children.try_lookup(o.Key, out ISet children)) { // order has left some orphans behind, any children that haven't been removed (i.e. still exist in table.state) are now roots foreach (uint ck in children) { - if (table.state.TryGetValue(ck, out OrderRecordImmutable child)) { + if (table.Index.TryGetValue(ck, out OrderRecordImmutable child)) { added_roots.Add(child); added_root_keys.Add(ck); } } } } - } else if (!table.state.ContainsKey(o.Key)) { + } else if (!table.Index.ContainsKey(o.Key)) { // order was indeed removed, not just changed - if it has a parent, remove its corresponding child-entry rod.parent_to_children.remove(o.ParentKey, o.Key); } } - foreach (var o in table.added.Concat(table.changes.New())) { + foreach (var o in table.AddedItems.Concat(table.Changes.New())) { if (added_root_keys.Contains(o.Key)) continue; if (rod.parent_to_children.try_lookup(o.Key, out ISet children)) { @@ -620,7 +620,7 @@ namespace mbts.spark { } if (o.has_parent()) { rod.parent_to_children.add(o.ParentKey, o.Key); - if (table.state.ContainsKey(o.ParentKey)) { + if (table.Index.ContainsKey(o.ParentKey)) { // not a root order continue; } @@ -640,8 +640,8 @@ namespace mbts.spark { _subscribe_algo_meta_tuples(orders_model, orders_model.subscribe_algos(security)); public static async Task order_from_key(this OrdersModel orders_model, uint order_key) { - (var tu, var success) = await orders_model.on_orders.FirstAsyncTask(t => t.state.ContainsKey(order_key), TimeSpan.FromSeconds(3)); - if (success && tu.state.TryGetValue(order_key, out var rec)) { + (var tu, var success) = await orders_model.on_orders.FirstAsyncTask(t => t.Index.ContainsKey(order_key), TimeSpan.FromSeconds(3)); + if (success && tu.Index.TryGetValue(order_key, out var rec)) { return rec.order; } return null; diff --git a/src/client/spark/core/Diagnostics/TestData/TestDataFactory.cs b/src/client/spark/core/Diagnostics/TestData/TestDataFactory.cs index bb91576b6..3998c278e 100644 --- a/src/client/spark/core/Diagnostics/TestData/TestDataFactory.cs +++ b/src/client/spark/core/Diagnostics/TestData/TestDataFactory.cs @@ -18,7 +18,7 @@ namespace bts.utils.diagnostics { IObservable> orders, TimeSpan throttle) => Observable.Create>(o => { TableUpdate last_orders = null; - var output = TableUpdate.mk_empty(p => p.order.Key); + var output = TableUpdate.Empty(p => p.order.Key); var piq_offsets = Enumerable.Range(1, 10).Select(i => (uint)i).ToArray(); var rand = new Random(); return Disposable.Create( @@ -28,15 +28,15 @@ namespace bts.utils.diagnostics { }), Observable.Interval(throttle).Subscribe(_ => notify())); void notify() { - var bd = last_orders.to_builder(); - foreach (var os in last_orders.state.Values) { + var bd = last_orders.ToBuilder(); + foreach (var os in last_orders.Index.Values) { if (os.order.is_active()) { var rpiq = os.piq ?? 0; rpiq += piq_offsets[rand.Next(piq_offsets.Length)]; - bd.add_or_update(os.order.Key, new OrderSecurity(os.security, os.order, rpiq, os.algo, os.meta)); + bd.AddOrUpdate(os.order.Key, new OrderSecurity(os.security, os.order, rpiq, os.algo, os.meta)); } } - last_orders = bd.to_table(); + last_orders = bd.ToImmutable(); if (last_orders.has_changes()) o.OnNext(last_orders); diff --git a/src/client/spark/core/Utility/TableUpdateBuffer.cs b/src/client/spark/core/Utility/TableUpdateBuffer.cs index 84ae400d4..92748bfab 100644 --- a/src/client/spark/core/Utility/TableUpdateBuffer.cs +++ b/src/client/spark/core/Utility/TableUpdateBuffer.cs @@ -21,7 +21,7 @@ namespace mbts.utils { public TableUpdateBuffer(Func key) { _key = key; - _last_update = TableUpdate.mk_empty(key); + _last_update = TableUpdate.Empty(key); _buffer_req = new BufferRequest(this); _suspension_req = new SuspensionRequest(this); } @@ -38,7 +38,7 @@ namespace mbts.utils { public IDisposable Subscribe(IObserver> observer) { using (buffer_updates()) { - observer.OnNext(_last_update.as_snapshot()); + observer.OnNext(_last_update.AsSnapshot()); return _subject.Subscribe(observer); } } @@ -48,7 +48,7 @@ namespace mbts.utils { public void OnNext(TableUpdate table) { lock (this) { if (_aggregator != null) { - _aggregator.merge_table(table, _key); + _aggregator.Merge(table, _key); if (_num_buffer_reqs == 0) _aggregator = null; } else { @@ -60,7 +60,7 @@ namespace mbts.utils { void _on_buffer_request() { lock (this) { if (++_num_buffer_reqs == 1) - _aggregator = _last_update.to_builder(); + _aggregator = _last_update.ToBuilder(); } } @@ -73,9 +73,9 @@ namespace mbts.utils { public void Dispose() { lock (_owner) { if (--_owner._num_buffer_reqs == 0) { - var t = _owner._aggregator.to_table(); + var t = _owner._aggregator.ToImmutable(); _owner._aggregator = null; - if (t.changed.Any() || t.added.Any() || t.removed.Any()) + if (t.ChangedItems.Any() || t.AddedItems.Any() || t.RemovedItems.Any()) _owner._subject.OnNext(t); } } diff --git a/src/client/spark/core/Utility/TableUpdateTransform.cs b/src/client/spark/core/Utility/TableUpdateTransform.cs index 56b9eedab..821af928c 100644 --- a/src/client/spark/core/Utility/TableUpdateTransform.cs +++ b/src/client/spark/core/Utility/TableUpdateTransform.cs @@ -59,7 +59,7 @@ namespace mbts.utils { this.update(update.removed, update.added, update.key); public TableUpdateTransform update(TableUpdate update, Func key) => - this.update(update.removed, update.added, key); + this.update(update.RemovedItems, update.AddedItems, key); public TableUpdateTransform update(IEnumerable removed, IEnumerable added, Func key) { var table = new TableUpdateTransform(new Dictionary(_state), added, removed); @@ -79,7 +79,7 @@ namespace mbts.utils { return table; } - internal TableUpdateTransform as_snapshot() => + internal TableUpdateTransform AsSnapshot() => new TableUpdateTransform(_state, _state.Values.ToList(), new T[0]); } @@ -160,18 +160,18 @@ namespace mbts.utils { // Observable.Create>(o => { var key_map = new SetMap(); - var last = TableUpdate.mk_empty(result_key); + var last = TableUpdate.Empty(result_key); return source.Subscribe(table => { lock (key_map) { - var builder = last.to_builder(); - foreach (var v in table.removed.Concat(table.changes.Select(ch => ch.Old))) { + var builder = last.ToBuilder(); + foreach (var v in table.RemovedItems.Concat(table.Changes.Select(ch => ch.Old))) { var k = source_key(v); var result = selector(v); var rkey = result_key(result); if (key_map.removes_key(rkey, source_key(v))) - builder.remove(rkey); + builder.Remove(rkey); } - foreach (var ch in table.changes) { + foreach (var ch in table.Changes) { TResult old_result = selector(ch.Old), new_result = selector(ch.New); @@ -183,19 +183,19 @@ namespace mbts.utils { var old_k = source_key(ch.Old); var new_k = source_key(ch.New); if (key_map.removes_key(old_rk, old_k)) - builder.remove(old_rk); + builder.Remove(old_rk); if (key_map.adds_key(new_rk, new_k)) - builder.add_or_update(new_rk, new_result); + builder.AddOrUpdate(new_rk, new_result); } - foreach (var v in table.added.Concat(table.changed)) { + foreach (var v in table.AddedItems.Concat(table.ChangedItems)) { var k = source_key(v); var result = selector(v); var rkey = result_key(result); if (key_map.adds_key(rkey, k)) - builder.add_or_update(rkey, result); + builder.AddOrUpdate(rkey, result); } last = result_comparer is null ? - builder.to_table() : builder.to_table_checked(result_comparer); + builder.ToImmutable() : builder.ToImmutableChecked(result_comparer); if (last.has_changes()) { o.OnNext(last); } @@ -366,10 +366,10 @@ namespace mbts.utils { } public static IIncrementalUpdate as_iincremental(this TableUpdate update) where TKey : IEquatable { - var key = update.key_extractor; - var added = update.added.ToDictionary(key); - var removed = update.removed.ToDictionary(key); - foreach (var ch in update.changes) { + var key = update.KeySelector; + var added = update.AddedItems.ToDictionary(key); + var removed = update.RemovedItems.ToDictionary(key); + foreach (var ch in update.Changes) { added[key(ch.New)] = ch.New; removed[key(ch.Old)] = ch.Old; } diff --git a/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs b/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs index 44214cd3b..dfca7f834 100644 --- a/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs +++ b/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs @@ -979,7 +979,7 @@ namespace mbts.ui.controls { ObservableAutoWrapper.connect_item_hooks(cols, cols_notifier, c => ReflectionHelper.property_table((INotifyPropertyChanged)c, ccp_array) .Subscribe((bts.api.core.TableUpdate table) => { - foreach (var (name, current, original) in table.added.Concat(table.changed)) + foreach (var (name, current, original) in table.AddedItems.Concat(table.ChangedItems)) params_container.Resources[ColumnResourceHelper.col_prop_resource_id(c.id, name)] = current; }) )); diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs index 5e4643308..f0d0b357a 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs @@ -347,13 +347,13 @@ namespace mbts.spark.filters { void IObserver>.OnError(Exception error) { } void IObserver>.OnNext(TableUpdate table) { - foreach (var v in table.removed) { + foreach (var v in table.RemovedItems) { _items.Remove(_key(v)); } - foreach (var ch in table.changes) { + foreach (var ch in table.Changes) { _items.Replace(_key(ch.Old), ch.New); } - foreach (var v in table.added) { + foreach (var v in table.AddedItems) { _items.Add(v); } var newly_selected_keys = _desired_keys.Where(k => _selection_model.try_select(k, false)).ToList(); @@ -438,12 +438,12 @@ namespace mbts.spark.filters { Func get_row_account, string? prop_name = null) => Create( - source.Select(t => t.state.Values), + source.Select(t => t.Index.Values), get_row_account, vals => vals.Select(v => v.id).ToArray(), vals => { var id_set = new HashSet(vals.empty_if_null()); - return source.Filter(acc => id_set.Contains(acc.id)).Select(t => t.state.Values); + return source.Filter(acc => id_set.Contains(acc.id)).Select(t => t.Index.Values); }, prop_name); @@ -470,12 +470,12 @@ namespace mbts.spark.filters { Func get_row_user, string? prop_name = null) => Create( - source.Select(t => t.state.Values), + source.Select(t => t.Index.Values), get_row_user, vals => vals.Select(v => v.id).ToArray(), vals => { var id_set = new HashSet(vals.empty_if_null()); - return source.Filter(acc => id_set.Contains(acc.id)).Select(t => t.state.Values); + return source.Filter(acc => id_set.Contains(acc.id)).Select(t => t.Index.Values); }, prop_name); diff --git a/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs b/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs index dc320a362..f63840dbf 100644 --- a/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs +++ b/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs @@ -180,13 +180,13 @@ namespace mbts.spark { }), profile_service.subscribe_all().OnDispatcher().Subscribe(table => { var prev_selected_name = selected_profile?.name; - skip_local_wrapper.RemoveSorted(table.removed, _key_comp); - foreach (var ns in table.changed) { + skip_local_wrapper.RemoveSorted(table.RemovedItems, _key_comp); + foreach (var ns in table.ChangedItems) { int i = CollectionHelper.binary_search(skip_local_wrapper, ns, _key_comp); if (i >= 0) skip_local[i].commit(ns.with(value: normalize(ns.value))); } - foreach (var ns in table.added) { + foreach (var ns in table.AddedItems) { int i = CollectionHelper.binary_search(skip_local_wrapper, ns, _key_comp); if (i >= 0) continue; diff --git a/src/client/spark/view/Spark/Core/SparkUtils.cs b/src/client/spark/view/Spark/Core/SparkUtils.cs index ca576fd96..48329c068 100644 --- a/src/client/spark/view/Spark/Core/SparkUtils.cs +++ b/src/client/spark/view/Spark/Core/SparkUtils.cs @@ -111,10 +111,10 @@ namespace mbts.spark { security_key.CombineLatest(bus.subscribe(SparkTags.SecuritiesTag), (sk, map) => map.GetValueOrDefault(sk).security); public static T get(this TableUpdate table, TKey key) where TKey : IEquatable => - table.state[key]; + table.Index[key]; public static bool try_get(this TableUpdate table, TKey key, out T result) where TKey : IEquatable => - table.state.TryGetValue(key, out result); + table.Index.TryGetValue(key, out result); #endregion diff --git a/src/client/spark/view/Utility/RXCollection.cs b/src/client/spark/view/Utility/RXCollection.cs index 5d5ac1acf..a91e871b0 100644 --- a/src/client/spark/view/Utility/RXCollection.cs +++ b/src/client/spark/view/Utility/RXCollection.cs @@ -73,11 +73,11 @@ namespace mbts.ui.utility { var model_list = target.WrapSelector(get_model, view_factory); // removed - model_list.RemoveSorted(table.removed, comp, out var n_rem, out var n_rem_expected); + model_list.RemoveSorted(table.RemovedItems, comp, out var n_rem, out var n_rem_expected); Log.assert(n_rem == n_rem_expected); // changes - foreach (var ch in table.changes) { + foreach (var ch in table.Changes) { var old_idx = model_list.BinarySearch(ch.Old, comp); Log.assert(old_idx >= 0 && old_idx < target.Count); var new_idx = model_list.BinarySearch(ch.New, comp); @@ -107,7 +107,7 @@ namespace mbts.ui.utility { // added model_list.InsertSortedDistinct( - table.added, comp, out var n_ins, out var n_ins_expected); + table.AddedItems, comp, out var n_ins, out var n_ins_expected); Log.assert(n_ins == n_ins_expected); } @@ -118,7 +118,7 @@ namespace mbts.ui.utility { target.Clear(); target.InsertSorted( - table.state.Values.Select(view_factory), comp.wrap(get_model)); + table.Index.Values.Select(view_factory), comp.wrap(get_model)); } } @@ -151,15 +151,15 @@ namespace mbts.ui.utility { comp = new_comp; if (table != null) { target.Clear(); - target.InsertSorted(table.state.Values, new_comp); + target.InsertSorted(table.Index.Values, new_comp); } } // on table update void on_table(TableUpdate new_table) { - table = table == null ? new_table.as_snapshot() : new_table; + table = table == null ? new_table.AsSnapshot() : new_table; if (comp != null) { - target.RemoveSorted(table.removed.Concat(table.changes.Old()), comp); - target.InsertSorted(table.added.Concat(table.changed), comp); + target.RemoveSorted(table.RemovedItems.Concat(table.Changes.Old()), comp); + target.InsertSorted(table.AddedItems.Concat(table.ChangedItems), comp); } } } @@ -221,15 +221,15 @@ namespace mbts.ui.utility { comp = new_comp; if (table != null) { target.Clear(); - wrapped_models.InsertSorted(table.state.Values, comp); + wrapped_models.InsertSorted(table.Index.Values, comp); } } // on table update void on_table(TableUpdate new_table) { - table = table == null ? new_table.as_snapshot() : new_table; + table = table == null ? new_table.AsSnapshot() : new_table; if (comp != null) { - wrapped_models.RemoveSorted(table.removed, comp); - foreach (var ch in table.changes) { + wrapped_models.RemoveSorted(table.RemovedItems, comp); + foreach (var ch in table.Changes) { int pos = CollectionHelper.binary_search(wrapped_models, ch.Old, comp); if (pos < 0) { // Something fishy is going on, but best to avoid crashing if possible. @@ -237,7 +237,7 @@ namespace mbts.ui.utility { Log.Ui.error($"Binary search failed to find the old value of a changed item observed in a TableUpdate ({TableUpdateConnectMessages.TypeDesc}); " + $"will reset the target collection and continue (this could cause slowness in the ui if the collection is sufficiently large)."); target.Clear(); - wrapped_models.InsertSorted(table.state.Values, comp); + wrapped_models.InsertSorted(table.Index.Values, comp); return; } else { int new_pos = CollectionHelper.binary_search(wrapped_models, ch.New, comp); @@ -257,7 +257,7 @@ namespace mbts.ui.utility { } } } - wrapped_models.InsertSorted(table.added, comp); + wrapped_models.InsertSorted(table.AddedItems, comp); } } } @@ -269,8 +269,8 @@ namespace mbts.ui.utility { // Note: comparer must be 100% deterministic (i.e., if a comprison returns 0, items must be equal) public static IDisposable connect(IList target, IObservable> source, IComparer comparer) where TKey : IEquatable => source.Subscribe(table => { - target.RemoveSorted(table.removed.Concat(table.changes.Old()), comparer); - target.InsertSorted(table.added.Concat(table.changed), comparer); + target.RemoveSorted(table.RemovedItems.Concat(table.Changes.Old()), comparer); + target.InsertSorted(table.AddedItems.Concat(table.ChangedItems), comparer); }); public static IObservableCollection from_enumerable(IEnumerable source) => diff --git a/src/client/spark_api_server/BookDumper.cs b/src/client/spark_api_server/BookDumper.cs index 703623860..74ae9f993 100644 --- a/src/client/spark_api_server/BookDumper.cs +++ b/src/client/spark_api_server/BookDumper.cs @@ -118,8 +118,8 @@ class BookDumperService : IHostedService { return Task.CompletedTask; void OnBooks(TableUpdate books) { - logger.LogDebug("BookDumper OnBooks. NumAdded={numAdded}, NumTotal={numTotal}", books.added.Count(), books.state.Count); - var updated_books = books.added.Concat(books.changed); + logger.LogDebug("BookDumper OnBooks. NumAdded={numAdded}, NumTotal={numTotal}", books.AddedItems.Count(), books.Index.Count); + var updated_books = books.AddedItems.Concat(books.ChangedItems); var desc = "\n".join(updated_books.Select(FmtBook)); Console.WriteLine(desc); diff --git a/src/client/spark_api_server/SecurityDumper.cs b/src/client/spark_api_server/SecurityDumper.cs index 477cc6604..f2d01d62b 100644 --- a/src/client/spark_api_server/SecurityDumper.cs +++ b/src/client/spark_api_server/SecurityDumper.cs @@ -111,8 +111,8 @@ class SecurityDumperService : IHostedService { return Task.CompletedTask; void OnSecurities(TableUpdate securities) { - logger.LogDebug("SecurityDumper OnSecurities. NumAdded={numAdded}, NumTotal={numTotal}", securities.added.Count(), securities.state.Count); - foreach (var sec in securities.added) { + logger.LogDebug("SecurityDumper OnSecurities. NumAdded={numAdded}, NumTotal={numTotal}", securities.AddedItems.Count(), securities.Index.Count); + foreach (var sec in securities.AddedItems) { Console.WriteLine(Fmt(sec)); } diff --git a/src/client/spark_sdk/samples/MarketDataSample.cs b/src/client/spark_sdk/samples/MarketDataSample.cs index d805e5ee4..17b960e1b 100644 --- a/src/client/spark_sdk/samples/MarketDataSample.cs +++ b/src/client/spark_sdk/samples/MarketDataSample.cs @@ -59,7 +59,7 @@ namespace bts.sdk _disps.Add(_md.Books(criteria).Subscribe(x => { - print_update(x.added.Concat(x.changed)); + print_update(x.AddedItems.Concat(x.ChangedItems)); })); } @@ -77,7 +77,7 @@ namespace bts.sdk .Filter(b => b.security.security_desc() == security_desc); _disps.Add(md_source.Subscribe(x => { - print_update(x.added.Concat(x.changed)); + print_update(x.AddedItems.Concat(x.ChangedItems)); })); } diff --git a/src/client/spark_test/api/ApiTests.cs b/src/client/spark_test/api/ApiTests.cs index c1ac91349..eb07742f8 100644 --- a/src/client/spark_test/api/ApiTests.cs +++ b/src/client/spark_test/api/ApiTests.cs @@ -59,18 +59,18 @@ namespace mbts.api.Test { var response = h.say_hello(new HelloRequest() { Name = "UnitTest 1" }); Assert.AreEqual("Hello UnitTest 1", response.Message); Assert.IsNotNull(last_update); - Assert.IsTrue(last_update.added.Count() == 1); - Assert.IsTrue(last_update.removed.Count() == 0); - Assert.IsTrue(last_update.state.Count == 1); - Assert.IsTrue(last_update.state.Single().Value.Message == "Hello UnitTest 1"); + Assert.IsTrue(last_update.AddedItems.Count() == 1); + Assert.IsTrue(last_update.RemovedItems.Count() == 0); + Assert.IsTrue(last_update.Index.Count == 1); + Assert.IsTrue(last_update.Index.Single().Value.Message == "Hello UnitTest 1"); last_update = null; response = h.yell_hello(new HelloRequest() { Name = "UnitTest 2" }); Assert.AreEqual("HELLO UNITTEST 2", response.Message); Assert.IsNotNull(last_update); - Assert.IsTrue(last_update.added.Count() == 1); - Assert.IsTrue(last_update.removed.Count() == 1); - Assert.IsTrue(last_update.state.Count == 1); - Assert.IsTrue(last_update.state.Single().Value.Message == "HELLO UNITTEST 2"); + Assert.IsTrue(last_update.AddedItems.Count() == 1); + Assert.IsTrue(last_update.RemovedItems.Count() == 1); + Assert.IsTrue(last_update.Index.Count == 1); + Assert.IsTrue(last_update.Index.Single().Value.Message == "HELLO UNITTEST 2"); last_update = null; // Managed shout, Native hello @@ -79,10 +79,10 @@ namespace mbts.api.Test { response = h.yell_hello(new HelloRequest() { Name = "UnitTest 3" }); Assert.AreEqual("HELLO UNITTEST 3", response.Message); Assert.IsNotNull(last_update); - Assert.IsTrue(last_update.added.Count() == 1); - Assert.IsTrue(last_update.removed.Count() == 1); - Assert.IsTrue(last_update.state.Count == 1); - Assert.IsTrue(last_update.state.Single().Value.Message == "HELLO UNITTEST 3"); + Assert.IsTrue(last_update.AddedItems.Count() == 1); + Assert.IsTrue(last_update.RemovedItems.Count() == 1); + Assert.IsTrue(last_update.Index.Count == 1); + Assert.IsTrue(last_update.Index.Single().Value.Message == "HELLO UNITTEST 3"); last_update = null; // Native+native @@ -90,10 +90,10 @@ namespace mbts.api.Test { _ntest.run_shout_service(null); response = h.yell_hello(new HelloRequest() { Name = "UnitTest 4" }); Assert.AreEqual("HELLO UNITTEST 4", response.Message); - Assert.IsTrue(last_update.added.Count() == 1); - Assert.IsTrue(last_update.removed.Count() == 1); - Assert.IsTrue(last_update.state.Count == 1); - Assert.IsTrue(last_update.state.Single().Value.Message == "HELLO UNITTEST 4"); + Assert.IsTrue(last_update.AddedItems.Count() == 1); + Assert.IsTrue(last_update.RemovedItems.Count() == 1); + Assert.IsTrue(last_update.Index.Count == 1); + Assert.IsTrue(last_update.Index.Single().Value.Message == "HELLO UNITTEST 4"); last_update = null; } _ntest.stop_hello_service(null); diff --git a/src/client/spark_test/api/ApiUpdateTests.cs b/src/client/spark_test/api/ApiUpdateTests.cs index db291957d..255eb88e2 100644 --- a/src/client/spark_test/api/ApiUpdateTests.cs +++ b/src/client/spark_test/api/ApiUpdateTests.cs @@ -98,7 +98,7 @@ namespace mbts.api.Test { .Naggle(TimeSpan.FromMilliseconds(1), CurrentThreadScheduler.Instance)) .Table() .LastAsync(); - Assert.SequenceEqual(orig.state.Values.OrderBy(id), nag.state.Values.OrderBy(id)); + Assert.SequenceEqual(orig.Index.Values.OrderBy(id), nag.Index.Values.OrderBy(id)); } // collapse rolling window @@ -421,16 +421,16 @@ namespace mbts.api.Test { .ToList(); //REMOVE THIS WHEN SPARK-1988 is fixed. var expected = Enumerable.Range(1, 10).Select(square); - Assert.SequenceEqual(expected, output.SelectMany(u => u.added)); + Assert.SequenceEqual(expected, output.SelectMany(u => u.AddedItems)); var expected_all = Enumerable.Range(1, 10).Select(i => Enumerable.Range(1, i).Select(square)).SelectMany(id); - var accumulated = output.SelectMany(u => u.state.Values).ToList(); + var accumulated = output.SelectMany(u => u.Index.Values).ToList(); Assert.SequenceEqual(expected_all, accumulated); } TableUpdate _empty_table => - TableUpdate.mk_empty(i => i.id); + TableUpdate.Empty(i => i.id); struct LeftJoinUpdateItem { public readonly Item add_or_update; @@ -465,48 +465,48 @@ namespace mbts.api.Test { public LeftJoinTest(IEnumerable update_items) { - var left_table = TableUpdate.mk_empty(i => i.id); - var right_table = TableUpdate.mk_empty(i => i.id); - var curr_table = TableUpdate<(Item left, Item right), int>.mk_empty(i => i.left.id); + var left_table = TableUpdate.Empty(i => i.id); + var right_table = TableUpdate.Empty(i => i.id); + var curr_table = TableUpdate<(Item left, Item right), int>.Empty(i => i.left.id); foreach (var ui in update_items) { - var builder = curr_table.to_builder(); + var builder = curr_table.ToBuilder(); if (ui.is_left) { - var lbuilder = left_table.to_builder(); + var lbuilder = left_table.ToBuilder(); if (ui.remove.HasValue) { - lbuilder.remove(ui.remove.Value); - builder.remove(ui.remove.Value); + lbuilder.Remove(ui.remove.Value); + builder.Remove(ui.remove.Value); } else { var l = new Item(ui.add_or_update.id, ui.add_or_update.name); - var r = right_table.state.TryGetValue(ui.add_or_update.id, out Item _r) ? _r : null; - lbuilder.add_or_update(l); - builder.add_or_update((l, r)); + var r = right_table.Index.TryGetValue(ui.add_or_update.id, out Item _r) ? _r : null; + lbuilder.AddOrUpdate(l); + builder.AddOrUpdate((l, r)); } - left_table = lbuilder.to_table(); + left_table = lbuilder.ToImmutable(); _update_sequence.Add((left_table, null)); } else { - var rbuilder = right_table.to_builder(); + var rbuilder = right_table.ToBuilder(); if (ui.remove.HasValue) { - rbuilder.remove(ui.remove.Value); - if (curr_table.state.TryGetValue(ui.remove.Value, out (Item l, Item r) lr)) { - builder.add_or_update((lr.l, null)); + rbuilder.Remove(ui.remove.Value); + if (curr_table.Index.TryGetValue(ui.remove.Value, out (Item l, Item r) lr)) { + builder.AddOrUpdate((lr.l, null)); } } else { var r = new Item(ui.add_or_update.id, ui.add_or_update.name); - rbuilder.add_or_update(r); - if (curr_table.state.TryGetValue(ui.add_or_update.id, out (Item l, Item r) lr)) { - builder.add_or_update((lr.l, r)); + rbuilder.AddOrUpdate(r); + if (curr_table.Index.TryGetValue(ui.add_or_update.id, out (Item l, Item r) lr)) { + builder.AddOrUpdate((lr.l, r)); } } - right_table = rbuilder.to_table(); + right_table = rbuilder.ToImmutable(); _update_sequence.Add((null, right_table)); } - _result_sequence.Add(curr_table = builder.to_table()); + _result_sequence.Add(curr_table = builder.ToImmutable()); } } public IReadOnlyList<(TableUpdate left, TableUpdate right)> update_sequence => _update_sequence; public IReadOnlyList> result_sequence => _result_sequence; - public IReadOnlyDictionary expected_state => _result_sequence.Last().state; + public IReadOnlyDictionary expected_state => _result_sequence.Last().Index; } [Test] @@ -570,13 +570,13 @@ namespace mbts.api.Test { // verify void on_completed() { Assert.AreEqual(update_list.Count, test.result_sequence.Count); - var actual_state = update_list.Last().state; + var actual_state = update_list.Last().Index; for (int i = 0; i < update_list.Count; i++) { var actual = update_list[i]; var expected = test.result_sequence[i]; - Assert.IsTrue(new HashSet<(Item, Item)>(actual.removed).SetEquals(expected.changed)); - Assert.IsTrue(new HashSet<(Item, Item)>(actual.changed).SetEquals(expected.removed)); - Assert.IsTrue(new HashSet<(Item, Item)>(actual.added).SetEquals(expected.added)); + Assert.IsTrue(new HashSet<(Item, Item)>(actual.RemovedItems).SetEquals(expected.ChangedItems)); + Assert.IsTrue(new HashSet<(Item, Item)>(actual.ChangedItems).SetEquals(expected.RemovedItems)); + Assert.IsTrue(new HashSet<(Item, Item)>(actual.AddedItems).SetEquals(expected.AddedItems)); } } } diff --git a/src/client/spark_websocket/Core/WebsocketDataSync.cs b/src/client/spark_websocket/Core/WebsocketDataSync.cs index 39ab58f1d..a41918f1b 100644 --- a/src/client/spark_websocket/Core/WebsocketDataSync.cs +++ b/src/client/spark_websocket/Core/WebsocketDataSync.cs @@ -197,7 +197,7 @@ namespace bts.websocket_core { Gateway = gtwy; clients = new ClientsStore(); var sec_table_src = Md_Client.Securities().Cache().ToObservable(); - _securities_sub = sec_table_src.Subscribe(secTable => _securities = secTable.state); + _securities_sub = sec_table_src.Subscribe(secTable => _securities = secTable.Index); var order_service = _service_ctx.GetService(); var position_service = _service_ctx.GetService(); var admin_service = _service_ctx.GetService(); diff --git a/src/client/spark_websocket/Core/WebsocketJsonParsers.cs b/src/client/spark_websocket/Core/WebsocketJsonParsers.cs index 5c0279433..0bbc9c18d 100644 --- a/src/client/spark_websocket/Core/WebsocketJsonParsers.cs +++ b/src/client/spark_websocket/Core/WebsocketJsonParsers.cs @@ -12,9 +12,9 @@ namespace bts.websocket_core { public class WebsocketJsonParsers { public static Object to_json(TableUpdate upd, Func conv) where TKey : IEquatable { return new { - added = upd.added.Select(conv), - removed = upd.removed.Select(conv), - changed = upd.changed.Select(conv) + added = upd.AddedItems.Select(conv), + removed = upd.RemovedItems.Select(conv), + changed = upd.ChangedItems.Select(conv) }; } public static Object to_json(IList upd, Func conv) diff --git a/src/cs/Bts.Spark.Api/Admin/AdminClient.cs b/src/cs/Bts.Spark.Api/Admin/AdminClient.cs index a5e6dd9be..30070b480 100644 --- a/src/cs/Bts.Spark.Api/Admin/AdminClient.cs +++ b/src/cs/Bts.Spark.Api/Admin/AdminClient.cs @@ -60,13 +60,13 @@ namespace Spark.Api.Admin { rv : null; Dictionary get_user_map(TableUpdate up) => - up.state.Values.FirstOrNull() + up.Index.Values.FirstOrNull() ?.Users ?.ToDictionary(u => u.Id, u => new UserTuple(u.Id, u.Name)) ?? new(0); Dictionary get_account_map(TableUpdate update) { - if (!update.state.Values.TryGetFirst(out var admin_data)) { + if (!update.Index.Values.TryGetFirst(out var admin_data)) { return new(0); } var user_in = find_user(userName, admin_data); @@ -98,20 +98,20 @@ namespace Spark.Api.Admin { return Observable.Create>(Subscribe); IDisposable Subscribe(IObserver> observer) { - var lastOut = TableUpdate.mk_empty(keySelector); + var lastOut = TableUpdate.Empty(keySelector); var sub = adminDataUpdates.Subscribe(OnAdminData); return sub; void OnAdminData(TableUpdate update) { - var bd = lastOut.to_builder(); - bd.clear(); - if (update.state.Values.TryGetFirst(out var data)) { + var bd = lastOut.ToBuilder(); + bd.Clear(); + if (update.Index.Values.TryGetFirst(out var data)) { var items = getItems(data); foreach (var item in items) { - bd.add_or_update(item); + bd.AddOrUpdate(item); } } - var nextOut = bd.to_table(); + var nextOut = bd.ToImmutable(); if (nextOut.has_changes()) { observer.OnNext(nextOut); lastOut = nextOut; diff --git a/src/cs/Bts.Spark.Api/Admin/EmptyAdminClient.cs b/src/cs/Bts.Spark.Api/Admin/EmptyAdminClient.cs index d3d5437f7..2d0816438 100644 --- a/src/cs/Bts.Spark.Api/Admin/EmptyAdminClient.cs +++ b/src/cs/Bts.Spark.Api/Admin/EmptyAdminClient.cs @@ -9,8 +9,8 @@ using System.Reactive.Linq; public class EmptyAdminClient : IAdminClient { public IObservable> Users => - Observable.Return(TableUpdate.mk_empty(u => u.Id)); + Observable.Return(TableUpdate.Empty(u => u.Id)); public IObservable> Accounts => - Observable.Return(TableUpdate.mk_empty(a => a.Id)); + Observable.Return(TableUpdate.Empty(a => a.Id)); } diff --git a/src/cs/Bts.Spark.Api/Admin/IAdminClient.cs b/src/cs/Bts.Spark.Api/Admin/IAdminClient.cs index 8f3bd29c9..3d6b87c03 100644 --- a/src/cs/Bts.Spark.Api/Admin/IAdminClient.cs +++ b/src/cs/Bts.Spark.Api/Admin/IAdminClient.cs @@ -19,13 +19,13 @@ public static class AdminClientExtensions { IObservable> positions, Func get_account_id) where TKey : IEquatable => positions.Filter(adminClient.Accounts.Select( - t => new Func(p => t.state.ContainsKey(get_account_id(p))))); + t => new Func(p => t.Index.ContainsKey(get_account_id(p))))); public static IObservable> permission_filter( this IAdminClient adminClient, IObservable> positions, Func get_account_name) where TKey : IEquatable => positions.Filter(adminClient.Accounts.Select(t => { - var hash = t.state.Values.Select(a => a.Name).ToHashSet(); + var hash = t.Index.Values.Select(a => a.Name).ToHashSet(); return new Func(v => hash.Contains(get_account_name(v))); })); } diff --git a/src/cs/Bts.Spark.Api/MarketData/MarketDataClient.cs b/src/cs/Bts.Spark.Api/MarketData/MarketDataClient.cs index 704320583..aa37d4142 100644 --- a/src/cs/Bts.Spark.Api/MarketData/MarketDataClient.cs +++ b/src/cs/Bts.Spark.Api/MarketData/MarketDataClient.cs @@ -127,20 +127,20 @@ public class MarketDataClient : IMarketDataClient { .ToList(); return Observable.Interval(config.HotPollInterval).Scan( - TableUpdate.mk_empty(GetSecId), + TableUpdate.Empty(GetSecId), PollBooks); uint GetSecId(BookTuple book) => book.security.Id; TableUpdate PollBooks(TableUpdate table, long _) { - var bd = table.to_builder(); + var bd = table.ToBuilder(); foreach (var cbook in cached_books) { if (cbook.poll_changes()) { - bd.add_or_update(cbook.to_book_tuple()); + bd.AddOrUpdate(cbook.to_book_tuple()); } } - return bd.to_table(); + return bd.ToImmutable(); } } } @@ -191,20 +191,20 @@ public class MarketDataClient : IMarketDataClient { .ToList(); return Observable.Interval(config.ColdPollInterval).Scan( - TableUpdate.mk_empty(GetSecId), + TableUpdate.Empty(GetSecId), PollStats); uint GetSecId(PriceStats stats) => stats.security.Id; TableUpdate PollStats(TableUpdate table, long _) { - var bd = table.to_builder(); + var bd = table.ToBuilder(); foreach (var cstats in cachedStats) { if (cstats.PollChanges()) { - bd.add_or_update(cstats.ToStats()); + bd.AddOrUpdate(cstats.ToStats()); } } - return bd.to_table(); + return bd.ToImmutable(); } } } @@ -225,20 +225,20 @@ public class MarketDataClient : IMarketDataClient { .ToList(); return Observable.Interval(config.ColdPollInterval).Scan( - TableUpdate.mk_empty(GetSecId), + TableUpdate.Empty(GetSecId), PollTickers); uint GetSecId(PriceTicker ticker) => ticker.security.Id; TableUpdate PollTickers(TableUpdate table, long _) { - var bd = table.to_builder(); + var bd = table.ToBuilder(); foreach (var cticker in cachedTickers) { if (cticker.PollChanges()) { - bd.add_or_update(cticker.ToTicker()); + bd.AddOrUpdate(cticker.ToTicker()); } } - return bd.to_table(); + return bd.ToImmutable(); } } } diff --git a/src/cs/Bts.Spark.Api/MarketData/MarketDataExtensions.cs b/src/cs/Bts.Spark.Api/MarketData/MarketDataExtensions.cs index 4e6331393..7da263340 100644 --- a/src/cs/Bts.Spark.Api/MarketData/MarketDataExtensions.cs +++ b/src/cs/Bts.Spark.Api/MarketData/MarketDataExtensions.cs @@ -45,7 +45,7 @@ public static class MarketDataExtensions { s => { if (!isKeyInitialized) { isKeyInitialized = true; - Interlocked.Exchange(ref keyFn, Log.notnull(s.key_extractor)); + Interlocked.Exchange(ref keyFn, Log.notnull(s.KeySelector)); } return s; }) @@ -68,18 +68,18 @@ public static class MarketDataExtensions { numDepthLevels ??= 5; return source.CombineLatest(securities.Select(smds => new BookStore(smds))) .Sample(pollInterval.Value) - .Scan(TableUpdate.mk_empty(getResultKey), Accumulate); + .Scan(TableUpdate.Empty(getResultKey), Accumulate); TableUpdate Accumulate(TableUpdate lastOut, (TableUpdate, BookStore) lastIn) { var (table, bookStore) = lastIn; if (table is null || bookStore is null) { return lastOut; } - var bd = lastOut.to_builder(); - var getKey = Log.notnull(table.key_extractor); - var dirtyKeys = table.added.Concat(table.changes.New()).ToHashSet(getKey); + var bd = lastOut.ToBuilder(); + var getKey = Log.notnull(table.KeySelector); + var dirtyKeys = table.AddedItems.Concat(table.Changes.New()).ToHashSet(getKey); lock (bookStore) { - foreach (var secGroup in table.state.Values.GroupBy(getSecId)) { + foreach (var secGroup in table.Index.Values.GroupBy(getSecId)) { var pbook = bookStore.GetPollableBook(secGroup.Key); if (pbook is null) { continue; @@ -92,10 +92,10 @@ public static class MarketDataExtensions { } foreach (var v in dirtyVals) { var result = getResult(v, book); - bd.add_or_update(result); + bd.AddOrUpdate(result); } } - return bd.to_table(); + return bd.ToImmutable(); } } } diff --git a/src/cs/Bts.Spark.Api/MarketData/PassiveSecurityResolver.cs b/src/cs/Bts.Spark.Api/MarketData/PassiveSecurityResolver.cs index c4a5845ea..dec9b444b 100644 --- a/src/cs/Bts.Spark.Api/MarketData/PassiveSecurityResolver.cs +++ b/src/cs/Bts.Spark.Api/MarketData/PassiveSecurityResolver.cs @@ -40,7 +40,7 @@ public class PassiveSecurityResolver : ISecurityResolver { void OnSecurities(TableUpdate table) { lock (syncRoot) { - secMap = table.state; + secMap = table.Index; if (keySelector is null) { return; } @@ -125,7 +125,7 @@ public class PassiveSecurityResolver : ISecurityResolver { void OnSecurities(TableUpdate table) { lock (syncRoot) { - secMap = table.state; + secMap = table.Index; if (keySelector is null) { return; } @@ -155,7 +155,7 @@ public class PassiveSecurityResolver : ISecurityResolver { } void OnData(TableUpdate update) { - keySelector ??= update.key_extractor; + keySelector ??= update.KeySelector; if (keySelector is null) { throw new InvalidOperationException("TableUpdate key_extractor is null"); } @@ -165,18 +165,18 @@ public class PassiveSecurityResolver : ISecurityResolver { List<(SecurityImmutable? Security, T Value)> adds = new(0); List<(SecurityImmutable? Security, T Value)> removes = new(0); lock (syncRoot) { - foreach (var v in update.removed) { + foreach (var v in update.RemovedItems) { var k = keySelector(v); removes.Add(state[k]); stateBd.Remove(k); } - foreach (var (_, newVal) in update.changes) { + foreach (var (_, newVal) in update.Changes) { var k = keySelector(newVal); var sec = GetSecurity(newVal); changes.Add(new(state[k], (sec, newVal))); stateBd[k] = (sec, newVal); } - foreach (var v in update.added) { + foreach (var v in update.AddedItems) { var k = keySelector(v); var sec = GetSecurity(v); stateBd.Add(k, (sec, v)); diff --git a/src/cs/Bts.Spark.Api/Position/PositionModel.cs b/src/cs/Bts.Spark.Api/Position/PositionModel.cs index 15bff541d..3fe0b361b 100644 --- a/src/cs/Bts.Spark.Api/Position/PositionModel.cs +++ b/src/cs/Bts.Spark.Api/Position/PositionModel.cs @@ -70,7 +70,7 @@ namespace Spark.Trading { .Cache() .ToObservable()); var users = admin_model.users - .Select(t => t.state.ToDictionary(kv => kv.Key, kv => new UserTuple(kv.Key, kv.Value.name))); + .Select(t => t.Index.ToDictionary(kv => kv.Key, kv => new UserTuple(kv.Key, kv.Value.name))); day_fills = bootstraps.emplace( DayFillsDataSource.create(users, pnlDataSource, sec_resolver).Cache().ToObservable()); @@ -87,11 +87,11 @@ namespace Spark.Trading { PNLRowData.key_fn, acc_orders => acc_orders.group_key, (row, acc_orders, pnl_key) => row.with(working: WorkingOrderData.Create( - acc_orders.table.state.Values.Select(t => t.order), row.qty_conversion)), + acc_orders.table.Index.Values.Select(t => t.order), row.qty_conversion)), (row, pnl_id) => row, (acc_orders, pnl_id) => { var (security, account_id, account) = - acc_orders.table.state.Values.TryGetFirst(out var tup) ? + acc_orders.table.Index.Values.TryGetFirst(out var tup) ? (tup.security, tup.order.account_id(), tup.order.account()) : (null, 0, null); return new PNLRowData(pnl_id, @@ -99,7 +99,7 @@ namespace Spark.Trading { account_id: account_id, account_name: account, working: WorkingOrderData.Create( - acc_orders.table.state.Values.Select(t => t.order), + acc_orders.table.Index.Values.Select(t => t.order), new( sec_meta_store.get_qty_display_divisor(security), QuantityConversionOpType.DivideActual))); diff --git a/src/cs/Bts.Spark.Api/Position/PositionModelExtensions.cs b/src/cs/Bts.Spark.Api/Position/PositionModelExtensions.cs index e530c6c0a..961637268 100644 --- a/src/cs/Bts.Spark.Api/Position/PositionModelExtensions.cs +++ b/src/cs/Bts.Spark.Api/Position/PositionModelExtensions.cs @@ -19,7 +19,7 @@ namespace Spark.Trading { public static IObservable security_total_position( this IPositionModel orders_model, uint security_key, string account) => orders_model.on_security_positions(security_key) - .Select((t, k) => t.state.Values.TryGetFirst(v => v.Item2.Account == account, out var v) ? + .Select((t, k) => t.Index.Values.TryGetFirst(v => v.Item2.Account == account, out var v) ? v.Item2.total_pos() : double.NaN) .DistinctUntilChanged() .StartWith(double.NaN); diff --git a/src/cs/Bts.Spark.Api/Reactive/SecurityResolver.cs b/src/cs/Bts.Spark.Api/Reactive/SecurityResolver.cs index 8386a80d4..0cb435fed 100644 --- a/src/cs/Bts.Spark.Api/Reactive/SecurityResolver.cs +++ b/src/cs/Bts.Spark.Api/Reactive/SecurityResolver.cs @@ -283,7 +283,7 @@ namespace Spark.Api.Reactive { join( source, get_sec_key, - t => (t.state.Values, t.added, t.changes, t.removed, t.key_extractor), + t => (t.Index.Values, t.AddedItems, t.Changes, t.RemovedItems, t.KeySelector), (state, added, changes, removed, key) => new TableUpdate<(SecurityImmutable?, T), TKey>( state, added, changes, removed, key)); diff --git a/src/cs/Bts.Spark.Core/Collections/Operable/OperableCollection.cs b/src/cs/Bts.Spark.Core/Collections/Operable/OperableCollection.cs index badb05afd..fb6b248e4 100644 --- a/src/cs/Bts.Spark.Core/Collections/Operable/OperableCollection.cs +++ b/src/cs/Bts.Spark.Core/Collections/Operable/OperableCollection.cs @@ -34,14 +34,14 @@ namespace bts.collections { } public void update(TableUpdate table) { - _map = table.state; + _map = table.Index; IEnumerable added, removed; if (filter == null) { - added = table.added.Concat(table.changed); - removed = table.removed.Concat(table.changes.Select(ch => ch.Old)); + added = table.AddedItems.Concat(table.ChangedItems); + removed = table.RemovedItems.Concat(table.Changes.Select(ch => ch.Old)); } else { - added = table.added.Where(filter).Concat(table.changed.Where(filter)); - removed = table.removed.Where(filter).Concat(table.changes.Select(ch => ch.Old).Where(filter)); + added = table.AddedItems.Where(filter).Concat(table.ChangedItems.Where(filter)); + removed = table.RemovedItems.Where(filter).Concat(table.Changes.Select(ch => ch.Old).Where(filter)); } foreach (var v in removed) { _sorted_items.Remove(v, out int? old_pos); @@ -70,4 +70,4 @@ namespace bts.collections { Diff.apply_diff(this, _sorted_items, changes, m => _factory(m, _key(m))); } } -} \ No newline at end of file +} diff --git a/src/cs/Bts.Spark.Core/Reactive/RootDependentSubscription.cs b/src/cs/Bts.Spark.Core/Reactive/RootDependentSubscription.cs index df23e2984..2f6c4995a 100644 --- a/src/cs/Bts.Spark.Core/Reactive/RootDependentSubscription.cs +++ b/src/cs/Bts.Spark.Core/Reactive/RootDependentSubscription.cs @@ -40,7 +40,7 @@ namespace Spark.Core.Reactive { _get_result_no_parent = get_result_no_parent; _result_key = result_key; _no_parent_key = no_parent_key; - _output = TableUpdate.mk_empty(_result_key); + _output = TableUpdate.Empty(_result_key); _dispose = source.Subscribe(_on_next); } @@ -48,15 +48,15 @@ namespace Spark.Core.Reactive { Disposable.dispose_thread_safe(ref _dispose); void _on_next(TableUpdate input) { - _state = input.state; - var builder = _output.to_builder(); + _state = input.Index; + var builder = _output.ToBuilder(); // Execute parent_to_children changes first, so descendent-propagation will be // efficient (otherwise propagation might be needlessly performed on values that are yet // to be removed, or performed with the wrong root, if the real root is yet to be added). - foreach (var v in input.removed.Concat(input.changes.Select(ch => ch.Old))) { + foreach (var v in input.RemovedItems.Concat(input.Changes.Select(ch => ch.Old))) { _parent_to_children.remove(_parent_key(v), v); } - foreach (var v in input.added.Concat(input.changed)) { + foreach (var v in input.AddedItems.Concat(input.ChangedItems)) { var pk = _parent_key(v); if (!pk.Equals(_no_parent_key)) { _parent_to_children.add(pk, v); @@ -64,45 +64,45 @@ namespace Spark.Core.Reactive { } // removed - foreach (var v in input.removed) { + foreach (var v in input.RemovedItems) { var k = _key(v); - builder.remove(k); + builder.Remove(k); if (_parent_to_children.try_lookup(k, out var children)) { foreach (var child in children) { var ck = _key(child); - builder.add_or_update(ck, _get_result_no_parent(child)); + builder.AddOrUpdate(ck, _get_result_no_parent(child)); foreach (var d in _descendents(ck)) { - builder.add_or_update(_key(d), _get_result(d, child)); + builder.AddOrUpdate(_key(d), _get_result(d, child)); } } } } // changed - foreach (var v in input.changed) { + foreach (var v in input.ChangedItems) { var k = _key(v); var root = _get_root(v); TResult result; if (_key(root).Equals(k)) { result = _get_result_no_parent(v); foreach (var d in _descendents(k)) { - builder.add_or_update(_key(d), _get_result(d, v)); + builder.AddOrUpdate(_key(d), _get_result(d, v)); } } else { result = _get_result(v, root); } - builder.add_or_update(k, result); + builder.AddOrUpdate(k, result); } // added - foreach (var v in input.added) { + foreach (var v in input.AddedItems) { var k = _key(v); var pk = _parent_key(v); TResult result; if (pk.Equals(_no_parent_key)) { result = _get_result_no_parent(v); foreach (var d in _descendents(k)) { - builder.add_or_update(_key(d), _get_result(d, v)); + builder.AddOrUpdate(_key(d), _get_result(d, v)); } } else { _parent_to_children.add(pk, v); @@ -110,14 +110,14 @@ namespace Spark.Core.Reactive { if (_key(root).Equals(k)) { result = _get_result_no_parent(v); foreach (var d in _descendents(k)) - builder.add_or_update(_key(d), _get_result(d, v)); + builder.AddOrUpdate(_key(d), _get_result(d, v)); } else { result = _get_result(v, root); } } - builder.add_or_update(k, result); + builder.AddOrUpdate(k, result); } - _observer.OnNext(_output = builder.to_table()); + _observer.OnNext(_output = builder.ToImmutable()); } T _get_root(T value) { diff --git a/src/cs/Bts.Spark.Core/Reactive/TableUpdateBootstrapper.cs b/src/cs/Bts.Spark.Core/Reactive/TableUpdateBootstrapper.cs index 9718362cb..1b3a0cedd 100644 --- a/src/cs/Bts.Spark.Core/Reactive/TableUpdateBootstrapper.cs +++ b/src/cs/Bts.Spark.Core/Reactive/TableUpdateBootstrapper.cs @@ -16,6 +16,6 @@ namespace Spark.Core.Reactive { _source.Connect(); public IDisposable Subscribe(IObserver> observer) => - _source.Bootstrap(t => t.as_snapshot()).Subscribe(observer); + _source.Bootstrap(t => t.AsSnapshot()).Subscribe(observer); } } diff --git a/src/cs/Bts.Spark.Core/Reactive/TableUpdateDemuxer.cs b/src/cs/Bts.Spark.Core/Reactive/TableUpdateDemuxer.cs index de997f73a..be1681311 100644 --- a/src/cs/Bts.Spark.Core/Reactive/TableUpdateDemuxer.cs +++ b/src/cs/Bts.Spark.Core/Reactive/TableUpdateDemuxer.cs @@ -54,11 +54,11 @@ namespace Spark.Core.Reactive { return; } if (_publish_default_on_remove) { - foreach (var v in tu.removed) { + foreach (var v in tu.RemovedItems) { subject(v).OnNext(_default_value); } } - foreach (var v in tu.changed.Concat(tu.added)) { + foreach (var v in tu.ChangedItems.Concat(tu.AddedItems)) { subject(v).OnNext(v); } } @@ -140,7 +140,7 @@ namespace Spark.Core.Reactive { } public IObservable> subscribe(TGroupKey group_key) => - _subject(group_key).Bootstrap(tu => tu.as_snapshot()); + _subject(group_key).Bootstrap(tu => tu.AsSnapshot()); public void Dispose() { GC.SuppressFinalize(this); @@ -156,13 +156,13 @@ namespace Spark.Core.Reactive { Dictionary _demux_update(TableUpdate update) { var group_updates = new Dictionary(); - foreach (var v in update.added) { + foreach (var v in update.AddedItems) { get_group_update(_group_key(v)).added.Add(v); } - foreach (var v in update.removed) { + foreach (var v in update.RemovedItems) { get_group_update(_group_key(v)).removed.Add(v); } - foreach (var c in update.changes) { + foreach (var c in update.Changes) { var old_gk = _group_key(c.Old); var new_gk = _group_key(c.New); if (old_gk.Equals(new_gk)) { @@ -207,7 +207,7 @@ namespace Spark.Core.Reactive { TableUpdate _last_update; public Data(Func key) => - _last_update = TableUpdate.mk_empty(key); + _last_update = TableUpdate.Empty(key); public void OnCompleted() { } diff --git a/src/cs/Bts.Spark.Core/Reflection/ReflectionHelper.cs b/src/cs/Bts.Spark.Core/Reflection/ReflectionHelper.cs index 093a2a9a8..999e3c7c4 100644 --- a/src/cs/Bts.Spark.Core/Reflection/ReflectionHelper.cs +++ b/src/cs/Bts.Spark.Core/Reflection/ReflectionHelper.cs @@ -276,7 +276,7 @@ var cache = props.ToDictionary( p => p.Name, p => new PropRecord(p, p.GetValue(instance))); - var table = TableUpdate.mk_empty(t => t.name).with_added( + var table = TableUpdate.Empty(t => t.name).with_added( cache.Values.Select(pn => new MemberChange(pn.prop.Name, pn.current, pn.original))); o.OnNext(table); instance.PropertyChanged += on_prop_changed; diff --git a/src/cs/Bts.Spark.Core/Update/TableUpdate.cs b/src/cs/Bts.Spark.Core/Update/TableUpdate.cs index 055158a8d..f5b07632f 100644 --- a/src/cs/Bts.Spark.Core/Update/TableUpdate.cs +++ b/src/cs/Bts.Spark.Core/Update/TableUpdate.cs @@ -6,43 +6,43 @@ namespace bts.api.core { using System.Linq; public class TableUpdate where TKey : IEquatable { - // warning: this does not have a key_extractor - public static readonly TableUpdate empty = new( + // warning: this does not have a KeySelector + internal static readonly TableUpdate empty = new( ImmutableDictionary.Empty, Array.Empty(), Array.Empty>(), Array.Empty(), null); - readonly ImmutableDictionary _state; + readonly ImmutableDictionary index; public TableUpdate( - ImmutableDictionary init, - IEnumerable? added, + ImmutableDictionary index, + IEnumerable? addedItems, IEnumerable>? changes, - IEnumerable? removed, - Func? key_extractor) { - _state = init; - this.added = added ?? Array.Empty(); - this.changes = changes ?? Array.Empty>(); - this.removed = removed ?? Array.Empty(); - this.key_extractor = key_extractor; + IEnumerable? removedItems, + Func? keySelector) { + this.index = index; + AddedItems = addedItems ?? Array.Empty(); + Changes = changes ?? Array.Empty>(); + RemovedItems = removedItems ?? Array.Empty(); + KeySelector = keySelector; } - public IReadOnlyDictionary state => _state; - public IEnumerable added { get; } - public IEnumerable> changes { get; } - public IEnumerable changed => changes.Select(c => c.New); - public IEnumerable removed { get; } + public IReadOnlyDictionary Index => index; + public IEnumerable AddedItems { get; } + public IEnumerable> Changes { get; } + public IEnumerable ChangedItems => Changes.Select(c => c.New); + public IEnumerable RemovedItems { get; } - public Func? key_extractor { get; private set; } + public Func? KeySelector { get; private set; } - public static TableUpdate mk_empty(Func key_extractor) => new( + public static TableUpdate Empty(Func keySelector) => new( ImmutableDictionary.Empty, Array.Empty(), Array.Empty>(), Array.Empty(), - key_extractor); + keySelector); internal static TableUpdate update( TableUpdate table, Update upd) => @@ -50,7 +50,7 @@ namespace bts.api.core { internal static TableUpdate update( TableUpdate table, TableUpdate upd) => - update(table, upd.added, upd.changes, upd.removed, upd.key_extractor); + update(table, upd.AddedItems, upd.Changes, upd.RemovedItems, upd.KeySelector); internal static TableUpdate update( TableUpdate table, @@ -59,9 +59,9 @@ namespace bts.api.core { IEnumerable removed, Func? key = null ) { - key ??= table.key_extractor ?? throw new ArgumentNullException( - nameof(key), $"{nameof(table)}.{nameof(table.key_extractor)} is also null"); - var builder = table._state.ToBuilder(); + key ??= table.KeySelector ?? throw new ArgumentNullException( + nameof(key), $"{nameof(table)}.{nameof(table.KeySelector)} is also null"); + var builder = table.index.ToBuilder(); builder.RemoveRange(removed.Select(i => key(i))); builder.AddRange(added.Select(i => new KeyValuePair(key(i), i))); foreach (var i in changes) { @@ -75,11 +75,11 @@ namespace bts.api.core { IReadOnlyDictionary new_state, IEqualityComparer value_comparer ) { - var builder = table._state.ToBuilder(); + var builder = table.index.ToBuilder(); // removed/changes var removed = new List(); var changes = new List>(); - foreach (var kv in table._state) { + foreach (var kv in table.index) { if (new_state.TryGetValue(kv.Key, out var new_val)) { if (!value_comparer.Equals(kv.Value, new_val)) { changes.Add(new(kv.Value, new_val)); @@ -94,29 +94,29 @@ namespace bts.api.core { // added var added = new List(); foreach (var kv in new_state) { - if (!table._state.ContainsKey(kv.Key)) { + if (!table.index.ContainsKey(kv.Key)) { added.Add(kv.Value); builder.Add(kv); } } - return new(builder.ToImmutable(), added, changes, removed, table.key_extractor); + return new(builder.ToImmutable(), added, changes, removed, table.KeySelector); } - internal TableUpdate as_snapshot() => new( - _state, - _state.Values.ToList(), + internal TableUpdate AsSnapshot() => new( + index, + index.Values.ToList(), Enumerable.Empty>(), Enumerable.Empty(), - key_extractor); + KeySelector); - public TableUpdate clear_changes() => new( - _state, + public TableUpdate ClearChanges() => new( + index, Enumerable.Empty(), Enumerable.Empty>(), Enumerable.Empty(), - key_extractor); + KeySelector); - public Builder to_builder() => + public Builder ToBuilder() => new(this); public static class FilterHelper { @@ -127,7 +127,7 @@ namespace bts.api.core { IEnumerable raw_removed, Func predicate ) { - var builder = filtered_target._state.ToBuilder(); + var builder = filtered_target.index.ToBuilder(); List added; List removed; List> changes; @@ -152,7 +152,7 @@ namespace bts.api.core { } } - var key = filtered_target.key_extractor; + var key = filtered_target.KeySelector; if (removed.Count > 0 || changes.Count > 0 || added.Count > 0) { if (key is null) { throw new InvalidOperationException(); @@ -180,17 +180,17 @@ namespace bts.api.core { // wrench into the gears by throwing a literal exception. Return the table as is. if (filtered_target.has_changes()) { filtered_target = new( - filtered_target._state, + filtered_target.index, Enumerable.Empty(), Enumerable.Empty>(), Enumerable.Empty(), - filtered_target.key_extractor); + filtered_target.KeySelector); } return filtered_target; } if (old_predicate is null) { - removed.AddRange(filtered_target.state.Values.Where(v => !new_predicate(v))); + removed.AddRange(filtered_target.Index.Values.Where(v => !new_predicate(v))); } else if (new_predicate is null) { added.AddRange(unfiltered_state.Values.Where(v => !old_predicate(v))); } else { @@ -210,8 +210,8 @@ namespace bts.api.core { } } - var builder = filtered_target._state.ToBuilder(); - var key = filtered_target.key_extractor; + var builder = filtered_target.index.ToBuilder(); + var key = filtered_target.KeySelector; if (removed.Count > 0 || added.Count > 0) { if (key is null) { throw new InvalidOperationException(); @@ -228,79 +228,82 @@ namespace bts.api.core { /// This class is used to aggregate a series of changes into a single update. /// public class Builder { - readonly TableUpdate _state; - readonly Dictionary _added = new(); - readonly Dictionary _removed = new(); - readonly Dictionary> _changes = new(); + readonly TableUpdate table; + readonly Dictionary addedItems = new(); + readonly Dictionary removedItems = new(); + readonly Dictionary> changes = new(); public Builder(TableUpdate state) => - _state = state; + table = state; - Func _key => _state.key_extractor ?? - throw new InvalidOperationException("TableUpdate.key_extractor is null"); + Func keySelector => table.KeySelector ?? + throw new InvalidOperationException("TableUpdate.KeySelector is null"); - public void add_or_update(T value) => - add_or_update(_key(value), value); + public void AddOrUpdate(T value) => + AddOrUpdate(keySelector(value), value); - public void add_or_update(TKey key, T value) { - if (_state.state.TryGetValue(key, out var curr)) { - _removed.Remove(key); - _changes[key] = new Change(curr, value); + public void AddOrUpdate(TKey key, T value) { + if (table.Index.TryGetValue(key, out var curr)) { + removedItems.Remove(key); + changes[key] = new Change(curr, value); } else { - _added[key] = value; + addedItems[key] = value; } } - public void remove(TKey key) { - if (_state.state.TryGetValue(key, out var orig)) { - _removed[key] = orig; - _changes.Remove(key); + public void Remove(TKey key) { + if (table.Index.TryGetValue(key, out var orig)) { + removedItems[key] = orig; + changes.Remove(key); } else { - _added.Remove(key); + addedItems.Remove(key); } } - public void remove(T value) => - remove(_key(value)); + public void Remove(T value) => + Remove(keySelector(value)); - public void merge_table(TableUpdate table, Func _key) { - foreach (T v in table.removed) - remove(_key(v)); - foreach (T v in table.added.Concat(table.changed)) - add_or_update(_key(v), v); + public void Merge(TableUpdate table, Func keySelector) { + foreach (T v in table.RemovedItems) { + Remove(keySelector(v)); + } + foreach (T v in table.AddedItems.Concat(table.ChangedItems)) { + AddOrUpdate(keySelector(v), v); + } } - public void clear() { - _added.Clear(); - _changes.Clear(); - foreach (var kv in _state.state) - _removed[kv.Key] = kv.Value; + public void Clear() { + addedItems.Clear(); + changes.Clear(); + foreach (var kv in table.Index) { + removedItems[kv.Key] = kv.Value; + } } /// /// Creates a TableUpdate instance from the current state /// - public TableUpdate to_table() { - var builder = _state._state.ToBuilder(); - builder.RemoveRange(_removed.Keys); - foreach (var kv in _changes) { + public TableUpdate ToImmutable() { + var builder = table.index.ToBuilder(); + builder.RemoveRange(removedItems.Keys); + foreach (var kv in changes) { builder[kv.Key] = kv.Value.New; } - builder.AddRange(_added); + builder.AddRange(addedItems); var new_state = builder.ToImmutable(); return new( - new_state, _added.Values, _changes.Values, _removed.Values, _state.key_extractor); + new_state, addedItems.Values, changes.Values, removedItems.Values, table.KeySelector); } /// /// Creates a TableUpdate instance from the current state (uses /// to filter out 'changes' whose value didn't actually change) /// - public TableUpdate to_table_checked(IEqualityComparer comparer) { - var builder = _state._state.ToBuilder(); - builder.RemoveRange(_removed.Keys); + public TableUpdate ToImmutableChecked(IEqualityComparer comparer) { + var builder = table.index.ToBuilder(); + builder.RemoveRange(removedItems.Keys); var false_change_keys = new List(0); - foreach (var kv in _changes) { + foreach (var kv in changes) { if (comparer.Equals(kv.Value.Old, kv.Value.New)) { false_change_keys.Add(kv.Key); continue; @@ -308,12 +311,12 @@ namespace bts.api.core { builder[kv.Key] = kv.Value.New; } foreach (var k in false_change_keys) { - _changes.Remove(k); + changes.Remove(k); } - builder.AddRange(_added); + builder.AddRange(addedItems); var new_state = builder.ToImmutable(); return new( - new_state, _added.Values, _changes.Values, _removed.Values, _state.key_extractor); + new_state, addedItems.Values, changes.Values, removedItems.Values, table.KeySelector); } } } diff --git a/src/cs/Bts.Spark.Core/Update/TableUpdateFullJoin.cs b/src/cs/Bts.Spark.Core/Update/TableUpdateFullJoin.cs index 5669f8dd6..e5e6f427c 100644 --- a/src/cs/Bts.Spark.Core/Update/TableUpdateFullJoin.cs +++ b/src/cs/Bts.Spark.Core/Update/TableUpdateFullJoin.cs @@ -18,57 +18,57 @@ namespace bts.api.core { return left_source.AggregateLatest, TableUpdate, (TableUpdate result, IReadOnlyDictionary left_state, IReadOnlyDictionary right_state), TableUpdate>(right_source, process_left, process_right, - () => (TableUpdate.mk_empty(result_key), new Dictionary(0), new Dictionary(0)), + () => (TableUpdate.Empty(result_key), new Dictionary(0), new Dictionary(0)), t => t.result, - TableUpdate.mk_empty(left_key), TableUpdate.mk_empty(right_key)); + TableUpdate.Empty(left_key), TableUpdate.Empty(right_key)); // left (TableUpdate result, IReadOnlyDictionary left_state, IReadOnlyDictionary right_state) process_left( (TableUpdate result, IReadOnlyDictionary left_state, IReadOnlyDictionary right_state) state, Change> change, TableUpdate right) { - var builder = state.result.to_builder(); - foreach (var v in change.New.removed.Concat(change.New.changes.Old())) { + var builder = state.result.ToBuilder(); + foreach (var v in change.New.RemovedItems.Concat(change.New.Changes.Old())) { var k = left_key(v); if (state.right_state.TryGetValue(k, out var rval)) { - builder.add_or_update(absent_left_result_selector(rval, k)); + builder.AddOrUpdate(absent_left_result_selector(rval, k)); } else { - builder.remove(k); + builder.Remove(k); } } - foreach (var v in change.New.added.Concat(change.New.changes.New())) { + foreach (var v in change.New.AddedItems.Concat(change.New.Changes.New())) { var k = left_key(v); if (state.right_state.TryGetValue(k, out var rval)) { - builder.add_or_update(result_selector(v, rval, k)); + builder.AddOrUpdate(result_selector(v, rval, k)); } else { - builder.add_or_update(absent_right_result_selector(v, k)); + builder.AddOrUpdate(absent_right_result_selector(v, k)); } } - return (builder.to_table(), change.New.state, state.right_state); + return (builder.ToImmutable(), change.New.Index, state.right_state); } // right (TableUpdate result, IReadOnlyDictionary left_state, IReadOnlyDictionary right_state) process_right( (TableUpdate result, IReadOnlyDictionary left_state, IReadOnlyDictionary right_state) state, TableUpdate left, Change> change) { - var builder = state.result.to_builder(); - foreach (var v in change.New.removed) { + var builder = state.result.ToBuilder(); + foreach (var v in change.New.RemovedItems) { var k = right_key(v); if (state.left_state.TryGetValue(k, out var lval)) { - builder.add_or_update(absent_right_result_selector(lval, k)); + builder.AddOrUpdate(absent_right_result_selector(lval, k)); } else { - builder.remove(k); + builder.Remove(k); } } - foreach (var v in change.New.added.Concat(change.New.changed)) { + foreach (var v in change.New.AddedItems.Concat(change.New.ChangedItems)) { var k = right_key(v); if (state.left_state.TryGetValue(k, out var lval)) { - builder.add_or_update(result_selector(lval, v, k)); + builder.AddOrUpdate(result_selector(lval, v, k)); } else { - builder.add_or_update(absent_left_result_selector(v, k)); + builder.AddOrUpdate(absent_left_result_selector(v, k)); } } - return (builder.to_table(), state.left_state, change.New.state); + return (builder.ToImmutable(), state.left_state, change.New.Index); } } } -} \ No newline at end of file +} diff --git a/src/cs/Bts.Spark.Core/Update/TableUpdateGroupTable.cs b/src/cs/Bts.Spark.Core/Update/TableUpdateGroupTable.cs index 986a6332b..2af127490 100644 --- a/src/cs/Bts.Spark.Core/Update/TableUpdateGroupTable.cs +++ b/src/cs/Bts.Spark.Core/Update/TableUpdateGroupTable.cs @@ -22,37 +22,37 @@ namespace bts.api.core { where TGroupKey : IEquatable { // return Observable.Create, TGroupKey>>(o => { - var output = TableUpdate, TGroupKey>.mk_empty(t => t.group_key); + var output = TableUpdate, TGroupKey>.Empty(t => t.group_key); return source.Subscribe(table => { - var state = output.state; - var builder = output.to_builder(); + var state = output.Index; + var builder = output.ToBuilder(); var changing_groups = new Dictionary>(); - foreach (var v in table.removed.Concat(table.changes.Old())) { + foreach (var v in table.RemovedItems.Concat(table.Changes.Old())) { var gk = group_key(v); var b = get_builder(gk); - b.remove(key(v)); + b.Remove(key(v)); } - foreach (var v in table.added.Concat(table.changes.New())) { + foreach (var v in table.AddedItems.Concat(table.Changes.New())) { var gk = group_key(v); var b = get_builder(gk); - b.add_or_update(v); + b.AddOrUpdate(v); } foreach (var it in changing_groups.Values) { it.flush(); - if (!it.table.state.Any()) { - builder.remove(it.group_key); + if (!it.table.Index.Any()) { + builder.Remove(it.group_key); } else { - builder.add_or_update(it.to_immutable()); + builder.AddOrUpdate(it.to_immutable()); } } - var new_output = builder.to_table(); + var new_output = builder.ToImmutable(); if (new_output.has_changes()) { output = new_output; o.OnNext(new_output); } TableUpdate.Builder get_builder(TGroupKey gk) { if (!changing_groups.TryGetValue(gk, out var b)) { - var mtable = new MutableTableUpdateGrouping(gk, state.TryGetValue(gk, out var tn) ? tn.table : TableUpdate.mk_empty(key)); + var mtable = new MutableTableUpdateGrouping(gk, state.TryGetValue(gk, out var tn) ? tn.table : TableUpdate.Empty(key)); changing_groups[gk] = mtable; return mtable.builder; } else { @@ -70,7 +70,7 @@ namespace bts.api.core { public TableUpdate table { get; private set; } - public TableUpdate.Builder builder => _builder ?? (_builder = table.to_builder()); + public TableUpdate.Builder builder => _builder ?? (_builder = table.ToBuilder()); public MutableTableUpdateGrouping(TGroupKey group_key, TableUpdate table) { this.group_key = group_key; @@ -79,7 +79,7 @@ namespace bts.api.core { public void flush() { if (_builder != null) { - table = _builder.to_table(); + table = _builder.ToImmutable(); _builder = null; } } @@ -88,4 +88,4 @@ namespace bts.api.core { new TableUpdateGrouping(group_key, table); } } -} \ No newline at end of file +} diff --git a/src/cs/Bts.Spark.Core/Update/TableUpdateLeftJoin.cs b/src/cs/Bts.Spark.Core/Update/TableUpdateLeftJoin.cs index 80c3c1b4a..079230a01 100644 --- a/src/cs/Bts.Spark.Core/Update/TableUpdateLeftJoin.cs +++ b/src/cs/Bts.Spark.Core/Update/TableUpdateLeftJoin.cs @@ -20,10 +20,10 @@ namespace bts.api.core { right_source, process_left, process_right, - () => (TableUpdate.mk_empty(result_key), new Dictionary>()), + () => (TableUpdate.Empty(result_key), new Dictionary>()), state => state.result, - TableUpdate.mk_empty(left_key), - TableUpdate.mk_empty(right_key)); + TableUpdate.Empty(left_key), + TableUpdate.Empty(right_key)); // process left (TableUpdate result, Dictionary> join_index) process_left( (TableUpdate result, Dictionary> join_index) state, @@ -31,25 +31,25 @@ namespace bts.api.core { TableUpdate right) { var left_update = change.New; var join_index = state.join_index; - var builder = state.result.to_builder(); - foreach (var v in left_update.removed) { + var builder = state.result.ToBuilder(); + foreach (var v in left_update.RemovedItems) { var lk = left_key(v); - builder.remove(lk); + builder.Remove(lk); var rk = join_key(v); var joined = join_index[rk]; if (joined.Remove(lk) && joined.Count == 0) join_index.Remove(rk); } - foreach (var v in left_update.added.Concat(left_update.changed)) { + foreach (var v in left_update.AddedItems.Concat(left_update.ChangedItems)) { var lk = left_key(v); var rk = join_key(v); - var result = right.state.TryGetValue(rk, out TRight r) ? result_selector(v, lk, r, rk) : absent_right_result_selector(v, lk, rk); - builder.add_or_update(lk, result); + var result = right.Index.TryGetValue(rk, out TRight r) ? result_selector(v, lk, r, rk) : absent_right_result_selector(v, lk, rk); + builder.AddOrUpdate(lk, result); if (!join_index.TryGetValue(rk, out HashSet joined)) join_index.Add(rk, joined = new HashSet()); joined.Add(lk); } - return (builder.to_table(), join_index); + return (builder.ToImmutable(), join_index); } // process right (TableUpdate result, Dictionary> join_index) process_right( @@ -58,33 +58,33 @@ namespace bts.api.core { Change> change) { var right_update = change.New; var join_index = state.join_index; - var builder = state.result.to_builder(); - foreach (var v in right_update.removed) { + var builder = state.result.ToBuilder(); + foreach (var v in right_update.RemovedItems) { var rkey = right_key(v); if (join_index.TryGetValue(rkey, out HashSet lkeys)) { foreach (var k in lkeys) { - var lval = left.state[k]; + var lval = left.Index[k]; var result = absent_right_result_selector(lval, k, rkey); - builder.add_or_update(k, result); + builder.AddOrUpdate(k, result); } if (lkeys.Count == 0) join_index.Remove(rkey); } } - foreach (var v in right_update.added.Concat(right_update.changed)) { + foreach (var v in right_update.AddedItems.Concat(right_update.ChangedItems)) { var rkey = right_key(v); if (join_index.TryGetValue(rkey, out HashSet lkeys)) { foreach (var k in lkeys) { - var lval = left.state[k]; + var lval = left.Index[k]; var result = result_selector(lval, k, v, rkey); - builder.add_or_update(k, result); + builder.AddOrUpdate(k, result); } } else { join_index.Add(rkey, new HashSet()); } } - return (builder.to_table(), join_index); + return (builder.ToImmutable(), join_index); } } } -} \ No newline at end of file +} diff --git a/src/cs/Bts.Spark.Core/Update/UpdateExtensions.cs b/src/cs/Bts.Spark.Core/Update/UpdateExtensions.cs index 1a9ad6b29..b7ed31250 100644 --- a/src/cs/Bts.Spark.Core/Update/UpdateExtensions.cs +++ b/src/cs/Bts.Spark.Core/Update/UpdateExtensions.cs @@ -17,7 +17,7 @@ namespace bts.api.core { public static class UpdateExtensions { public static Func assert_key_fn(this TableUpdate table) where TKey : IEquatable => - table.key_extractor ?? throw new InvalidOperationException(); + table.KeySelector ?? throw new InvalidOperationException(); public static TKey key(this TableUpdate table, T value) where TKey : IEquatable => assert_key_fn(table)(value); @@ -47,7 +47,7 @@ namespace bts.api.core { } public static bool has_changes(this TableUpdate table) where TKey : IEquatable => - table.added.Any() || table.changes.Any() || table.removed.Any(); + table.AddedItems.Any() || table.Changes.Any() || table.RemovedItems.Any(); public static IObservable> reconstitute( this IObservable> source, Func key_extractor) where TKey : IEquatable { @@ -101,17 +101,17 @@ namespace bts.api.core { static TableUpdate bridge( TableUpdate curr_table, TableUpdate next_table) { - curr_table ??= TableUpdate.mk_empty(next_table.key_extractor); - var bd = curr_table.to_builder(); - var removed = curr_table.state.Keys - .Where(k => !next_table.state.ContainsKey(k)); + curr_table ??= TableUpdate.Empty(next_table.KeySelector); + var bd = curr_table.ToBuilder(); + var removed = curr_table.Index.Keys + .Where(k => !next_table.Index.ContainsKey(k)); foreach (var k in removed) { - bd.remove(k); + bd.Remove(k); } - foreach (var (key, value) in next_table.state) { - bd.add_or_update(key, value); + foreach (var (key, value) in next_table.Index) { + bd.AddOrUpdate(key, value); } - return bd.to_table_checked(EqualityComparer.Default); + return bd.ToImmutableChecked(EqualityComparer.Default); } } public static Update Select( @@ -148,7 +148,7 @@ namespace bts.api.core { Func key, IEqualityComparer value_comparer) where TKey : IEquatable => source.Scan( - TableUpdate.mk_empty(key), + TableUpdate.Empty(key), (table, new_state) => TableUpdate.update(table, new_state, value_comparer)); public static IObservable> TableChecked( @@ -157,13 +157,13 @@ namespace bts.api.core { TableUpdate.empty, (table, update) => { Log.assert( - !update.added.Select(update.key).Any(table.state.ContainsKey), + !update.added.Select(update.key).Any(table.Index.ContainsKey), "Update - duplicate keys added."); Log.assert( - update.removed.Select(update.key).All(table.state.ContainsKey), + update.removed.Select(update.key).All(table.Index.ContainsKey), "Update - unknown key removed."); Log.assert( - update.all.Count() + update.removed.Count() - update.added.Count() == table.state.Count, + update.all.Count() + update.removed.Count() - update.added.Count() == table.Index.Count, "Table is out of sync with Update"); var changes = value_comparer is null ? @@ -179,17 +179,17 @@ namespace bts.api.core { (table, update) => { bool has_errors = false; var sb = new StringBuilder(); - if (update.added.Select(update.key).Any(table.state.ContainsKey)) { + if (update.added.Select(update.key).Any(table.Index.ContainsKey)) { sb.Append("\tUpdate - duplicate keys added."); has_errors = true; } - if (!update.removed.Select(update.key).All(table.state.ContainsKey)) { + if (!update.removed.Select(update.key).All(table.Index.ContainsKey)) { if (has_errors) sb.AppendLine(); sb.Append("\tUpdate - unknown key removed."); has_errors = true; } - if (update.all.Count() + update.removed.Count() - update.added.Count() != table.state.Count) { + if (update.all.Count() + update.removed.Count() - update.added.Count() != table.Index.Count) { if (has_errors) sb.AppendLine(); sb.Append("\tTable is out of sync with Update."); @@ -219,13 +219,13 @@ namespace bts.api.core { var last = TableUpdate.empty; return source.Subscribe(update => { Log.assert( - !update.added.Select(update.key_extractor).Any(last.state.ContainsKey), + !update.AddedItems.Select(update.KeySelector).Any(last.Index.ContainsKey), "TableUpdate - duplicate keys added."); Log.assert( - update.removed.Select(update.key_extractor).All(last.state.ContainsKey), + update.RemovedItems.Select(update.KeySelector).All(last.Index.ContainsKey), "TableUpdate - unknown key removed."); Log.assert( - update.state.Count + update.removed.Count() - update.added.Count() == last.state.Count, + update.Index.Count + update.RemovedItems.Count() - update.AddedItems.Count() == last.Index.Count, "TableUpdate - table is out of sync with Update"); last = update; o.OnNext(update); @@ -238,17 +238,17 @@ namespace bts.api.core { return Observable.Create>(o => { var last = TableUpdate.empty; return source.Subscribe(update => { - Log.assert(!update.added.Select(update.key_extractor).Any(last.state.ContainsKey), "TableUpdate - duplicate keys added."); - Log.assert(update.removed.Select(update.key_extractor).All(last.state.ContainsKey), "TableUpdate - unknown key removed."); - int total_count = update.state.Count; - int removed_count = update.removed.Count(); - int added_count = update.added.Count(); - int last_count = last.state.Count; + Log.assert(!update.AddedItems.Select(update.KeySelector).Any(last.Index.ContainsKey), "TableUpdate - duplicate keys added."); + Log.assert(update.RemovedItems.Select(update.KeySelector).All(last.Index.ContainsKey), "TableUpdate - unknown key removed."); + int total_count = update.Index.Count; + int removed_count = update.RemovedItems.Count(); + int added_count = update.AddedItems.Count(); + int last_count = last.Index.Count; Log.assert(total_count + removed_count - added_count == last_count, "TableUpdate - table is out of sync with Update"); - Log.assert(update.added.Select(convert_key).Distinct().Count() == added_count, "TableUpdate - duplicate converted keys added."); - Log.assert(update.removed.Select(convert_key).Distinct().Count() == removed_count, "TableUpdate - unknown converted key removed."); - Log.assert(update.state.Values.Select(convert_key).Distinct().Count() == update.state.Count, "TableUpdate - table (converted keys) is out of sync with Update"); + Log.assert(update.AddedItems.Select(convert_key).Distinct().Count() == added_count, "TableUpdate - duplicate converted keys added."); + Log.assert(update.RemovedItems.Select(convert_key).Distinct().Count() == removed_count, "TableUpdate - unknown converted key removed."); + Log.assert(update.Index.Values.Select(convert_key).Distinct().Count() == update.Index.Count, "TableUpdate - table (converted keys) is out of sync with Update"); last = update; o.OnNext(update); @@ -358,10 +358,10 @@ namespace bts.api.core { Func predicate, Func key = null) where TKey : IEquatable => Observable.Create>(o => { - var filtered_table = TableUpdate.mk_empty(key); + var filtered_table = TableUpdate.Empty(key); return source.Subscribe(table => { filtered_table = _apply_predicate( - filtered_table, table, predicate, key ?? table.key_extractor); + filtered_table, table, predicate, key ?? table.KeySelector); if (filtered_table.has_changes()) { o.OnNext(filtered_table); } @@ -378,11 +378,11 @@ namespace bts.api.core { return table_source.AggregateLatest( predicate_source, (tout, tin, pred) => TableUpdate.FilterHelper.on_source_changed( - tout, tin.New.added, tin.New.changes, tin.New.removed, pred), + tout, tin.New.AddedItems, tin.New.Changes, tin.New.RemovedItems, pred), (tout, tin, pred) => TableUpdate.FilterHelper.on_predicate_changed( - tout, tin.state, pred.Old, pred.New), - () => TableUpdate.mk_empty(key), - TableUpdate.mk_empty(key), + tout, tin.Index, pred.Old, pred.New), + () => TableUpdate.Empty(key), + TableUpdate.Empty(key), init_predicate) .Where(t => t.has_changes()); } @@ -391,19 +391,19 @@ namespace bts.api.core { predicate_source, (tout, tin, pred) => { if (tout is null) { - Log.assert(!tin.New.removed.Any() && !tin.New.changes.Any()); - Log.notnull(tin.New.key_extractor); - tout = TableUpdate.mk_empty(tin.New.key_extractor); + Log.assert(!tin.New.RemovedItems.Any() && !tin.New.Changes.Any()); + Log.notnull(tin.New.KeySelector); + tout = TableUpdate.Empty(tin.New.KeySelector); } return TableUpdate.FilterHelper.on_source_changed( - tout, tin.New.added, tin.New.changes, tin.New.removed, pred); + tout, tin.New.AddedItems, tin.New.Changes, tin.New.RemovedItems, pred); }, (tout, tin, pred) => { if (tout is null) { return null; } tout = TableUpdate.FilterHelper.on_predicate_changed( - tout, tin.state, pred.Old, pred.New); + tout, tin.Index, pred.Old, pred.New); return tout; }, () => (TableUpdate)null, @@ -418,18 +418,18 @@ namespace bts.api.core { Func key = null, Func init_predicate = null ) where TKey : IEquatable { - var empty = TableUpdate.mk_empty(key); + var empty = TableUpdate.Empty(key); if (key is not null) { return table_source.AggregateLatest, Func, (TableUpdate filtered, TableUpdate raw)>( predicate_source, (tout, tin, pred) => { var filtered = TableUpdate.FilterHelper.on_source_changed( - tout.filtered, tin.New.added, tin.New.changes, tin.New.removed, pred); + tout.filtered, tin.New.AddedItems, tin.New.Changes, tin.New.RemovedItems, pred); return (filtered, tin.New); }, (tout, tin, pred) => { var filtered = TableUpdate.FilterHelper.on_predicate_changed( - tout.filtered, tin.state, pred.Old, pred.New); + tout.filtered, tin.Index, pred.Old, pred.New); return (filtered, tin); }, () => (empty, empty), @@ -442,12 +442,12 @@ namespace bts.api.core { (tup_out, tin, pred) => { var (ftout, _) = tup_out; if (ftout is null) { - Log.assert(!tin.New.removed.Any() && !tin.New.changes.Any()); - Log.notnull(tin.New.key_extractor); - ftout = TableUpdate.mk_empty(tin.New.key_extractor); + Log.assert(!tin.New.RemovedItems.Any() && !tin.New.Changes.Any()); + Log.notnull(tin.New.KeySelector); + ftout = TableUpdate.Empty(tin.New.KeySelector); } ftout = TableUpdate.FilterHelper.on_source_changed( - ftout, tin.New.added, tin.New.changes, tin.New.removed, pred); + ftout, tin.New.AddedItems, tin.New.Changes, tin.New.RemovedItems, pred); return (ftout, tin.New); }, (tup_out, tin, pred) => { @@ -456,8 +456,8 @@ namespace bts.api.core { return (null, null); } ftout = TableUpdate.FilterHelper.on_predicate_changed( - ftout, tin.state, pred.Old, pred.New); - return (ftout, tin.clear_changes()); + ftout, tin.Index, pred.Old, pred.New); + return (ftout, tin.ClearChanges()); }, () => (null, null), null, @@ -517,18 +517,18 @@ namespace bts.api.core { param_source, on_left, on_right, - () => TableUpdate.mk_empty(key_fn), - TableUpdate.mk_empty(key_fn), + () => TableUpdate.Empty(key_fn), + TableUpdate.Empty(key_fn), init_param); TableUpdate on_left( TableUpdate last_out, Change> change, TParam last_param) { return TableUpdate.update( last_out, - change.New.added.Select(get_value), - change.New.changes.Select(get_change), - change.New.removed.Select(get_value), - change.New.key_extractor); + change.New.AddedItems.Select(get_value), + change.New.Changes.Select(get_change), + change.New.RemovedItems.Select(get_value), + change.New.KeySelector); T get_value(T v) => operate(v, last_param); @@ -543,9 +543,9 @@ namespace bts.api.core { return TableUpdate.update( last_out, Enumerable.Empty(), - last_out.state.Values.Select(convert_value), + last_out.Index.Values.Select(convert_value), Enumerable.Empty(), - last_out.key_extractor); + last_out.KeySelector); Change convert_value(T v) => new(v, operate(v, param)); @@ -558,10 +558,10 @@ namespace bts.api.core { Func predicate, Func key ) where TKey : IEquatable { - var added = src_table.added.Where(predicate).ToList(); - var removed = src_table.removed.Where(predicate).ToList(); + var added = src_table.AddedItems.Where(predicate).ToList(); + var removed = src_table.RemovedItems.Where(predicate).ToList(); var changes = new List>(); - foreach (var ch in src_table.changes) { + foreach (var ch in src_table.Changes) { if (predicate(ch.Old)) { if (predicate(ch.New)) { changes.Add(ch); @@ -619,9 +619,9 @@ namespace bts.api.core { Observable.Create>(observer => { var cache = ImmutableDictionary.Empty; return src.Subscribe(update => { - var added = update.added.Select(map); - var removed = update.removed.Select(map); - var changes = update.changes.Select(ch => new Change(map(ch.Old), map(ch.New))); + var added = update.AddedItems.Select(map); + var removed = update.RemovedItems.Select(map); + var changes = update.Changes.Select(ch => new Change(map(ch.Old), map(ch.New))); var builder = cache.ToBuilder(); builder.RemoveRange(removed.Select(key)); builder.AddRange(added.Select(t => new KeyValuePair(key(t), t))); @@ -643,9 +643,9 @@ namespace bts.api.core { Observable.Create>(observer => { var cache = ImmutableDictionary.Empty; return src.Subscribe(update => { - var added = update.added.Select(map); - var removed = update.removed.Select(map); - var changes = update.changes.Select(ch => new Change(map(ch.Old), map(ch.New))); + var added = update.AddedItems.Select(map); + var removed = update.RemovedItems.Select(map); + var changes = update.Changes.Select(ch => new Change(map(ch.Old), map(ch.New))); var builder = cache.ToBuilder(); builder.RemoveRange(removed.Select(key)); builder.AddRange(added.Select(t => new KeyValuePair(key(t), t))); @@ -756,18 +756,18 @@ namespace bts.api.core { var sb = new StringBuilder(); // added - var n_added = table.added.Count(); + var n_added = table.AddedItems.Count(); sb.Append($"added ({n_added})"); if (n_added > 0) { sb.Append(section_header_suffix); - sb.AppendJoin(separator, table.added.Take(max_item_display_count).Select(fmt)); + sb.AppendJoin(separator, table.AddedItems.Take(max_item_display_count).Select(fmt)); } sb.Append(section_separator); // changes - var n_changes = table.changes.Count(); + var n_changes = table.Changes.Count(); sb.Append($"changes ({n_changes})"); - var changes_list = table.changes.Select(ch => (Old: fmt(ch.Old), New: fmt(ch.New))) + var changes_list = table.Changes.Select(ch => (Old: fmt(ch.Old), New: fmt(ch.New))) .Take(max_item_display_count) .ToList(); var from_col_width = changes_list.Count == 0 ? 0 : changes_list.Max(ch => ch.Old.Length); @@ -780,20 +780,20 @@ namespace bts.api.core { sb.Append(section_separator); // removed - var n_removed = table.removed.Count(); + var n_removed = table.RemovedItems.Count(); sb.Append($"removed ({n_removed})"); if (n_removed > 0) { sb.Append(section_header_suffix); - sb.AppendJoin(separator, table.removed.Take(max_item_display_count).Select(fmt)); + sb.AppendJoin(separator, table.RemovedItems.Take(max_item_display_count).Select(fmt)); } sb.Append(section_separator); // all - var n_total = table.state.Count; + var n_total = table.Index.Count; sb.Append($"total ({n_total})"); if (n_total > 0) { sb.Append(section_header_suffix); - sb.AppendJoin(separator, table.state.Values.Take(max_item_display_count).Select(fmt)); + sb.AppendJoin(separator, table.Index.Values.Take(max_item_display_count).Select(fmt)); } sb.Append(section_separator); return sb.ToString(); diff --git a/src/cs/Bts.Spark.Core/utils/UpdateExtensions.cs b/src/cs/Bts.Spark.Core/utils/UpdateExtensions.cs index 96525e36b..24335b49f 100644 --- a/src/cs/Bts.Spark.Core/utils/UpdateExtensions.cs +++ b/src/cs/Bts.Spark.Core/utils/UpdateExtensions.cs @@ -26,17 +26,17 @@ namespace bts.utils { // once initialized, the append_keys/filter will not change. output = table; if (append_keys == null) { - append_keys = new HashSet(append_items.Select(table.key_extractor)); - append_key_filter = v => !append_keys.Contains(table.key_extractor(v)); + append_keys = new HashSet(append_items.Select(table.KeySelector)); + append_key_filter = v => !append_keys.Contains(table.KeySelector(v)); } // filter append_items out of the normal source (ensures that they will be immune to removes/changes). - output = TableUpdate.FilterHelper.on_predicate_changed(output, table.state, null, append_key_filter); + output = TableUpdate.FilterHelper.on_predicate_changed(output, table.Index, null, append_key_filter); // add the append_items to the output table (only need to do this once) - output = TableUpdate.update(output, append_items, Enumerable.Empty>(), Enumerable.Empty(), table.key_extractor); - output = output.as_snapshot(); + output = TableUpdate.update(output, append_items, Enumerable.Empty>(), Enumerable.Empty(), table.KeySelector); + output = output.AsSnapshot(); } else { output = TableUpdate.FilterHelper.on_source_changed( - output, table.added, table.changes, table.removed, append_key_filter); + output, table.AddedItems, table.Changes, table.RemovedItems, append_key_filter); } o.OnNext(output); }); @@ -45,26 +45,26 @@ namespace bts.utils { public static void FilterIncremental(this TableUpdate table, Func predicate, out IEnumerable added, out IEnumerable> changes, out IEnumerable removed) where TKey : IEquatable { // added - added = table.added.Where(predicate).Concat( - table.changes.Where(ch => predicate(ch.New) && !predicate(ch.Old)).Select(ch => ch.New)); + added = table.AddedItems.Where(predicate).Concat( + table.Changes.Where(ch => predicate(ch.New) && !predicate(ch.Old)).Select(ch => ch.New)); // changes - changes = table.changes.Where(ch => predicate(ch.New) && predicate(ch.Old)); + changes = table.Changes.Where(ch => predicate(ch.New) && predicate(ch.Old)); // removed - removed = table.removed.Where(predicate).Concat( - table.changes.Where(ch => !predicate(ch.New) && predicate(ch.Old)).Select(ch => ch.Old)); + removed = table.RemovedItems.Where(predicate).Concat( + table.Changes.Where(ch => !predicate(ch.New) && predicate(ch.Old)).Select(ch => ch.Old)); } public static TableUpdate with_added(this TableUpdate table, IEnumerable added) where TKey : IEquatable => - TableUpdate.update(table, added, Enumerable.Empty>(), Enumerable.Empty(), table.key_extractor); + TableUpdate.update(table, added, Enumerable.Empty>(), Enumerable.Empty(), table.KeySelector); public static TableUpdate with_removed(this TableUpdate table, IEnumerable removed) where TKey : IEquatable => - TableUpdate.update(table, Enumerable.Empty(), Enumerable.Empty>(), removed, table.key_extractor); + TableUpdate.update(table, Enumerable.Empty(), Enumerable.Empty>(), removed, table.KeySelector); public static TableUpdate with_changed(this TableUpdate table, IEnumerable changed) where TKey : IEquatable => - TableUpdate.update(table, Enumerable.Empty(), changed.Select(v => new Change(table.state[table.key_extractor(v)], v)), Enumerable.Empty(), table.key_extractor); + TableUpdate.update(table, Enumerable.Empty(), changed.Select(v => new Change(table.Index[table.KeySelector(v)], v)), Enumerable.Empty(), table.KeySelector); public static TableUpdate with_changes(this TableUpdate table, IEnumerable> changes) where TKey : IEquatable => - TableUpdate.update(table, Enumerable.Empty(), changes, Enumerable.Empty(), table.key_extractor); + TableUpdate.update(table, Enumerable.Empty(), changes, Enumerable.Empty(), table.KeySelector); public static IObservable> RootDependent( this IObservable> source, @@ -122,41 +122,41 @@ namespace bts.utils { Observable.Create, TKey>>(observer => { var value_comparer = EqualityComparer.Create, TResult>(kv => kv.Value, result_comparer); var state = DictionaryHelper.empty(); - var output = TableUpdate, TKey>.mk_empty(kv => kv.Key); + var output = TableUpdate, TKey>.Empty(kv => kv.Key); var parent_to_children = new SetMap(); return source.Subscribe(update); // void update(TableUpdate input) { - state = input.state; - var builder = output.to_builder(); - foreach (var v in input.removed) { - var k = input.key_extractor(v); - builder.remove(k); + state = input.Index; + var builder = output.ToBuilder(); + foreach (var v in input.RemovedItems) { + var k = input.KeySelector(v); + builder.Remove(k); parent_to_children.remove(parent_key(v), v); if (parent_to_children.try_lookup(k, out ISet children)) { foreach (var child in children) - builder.add_or_update(new KeyValuePair(key(child), get_result_no_parent(child))); + builder.AddOrUpdate(new KeyValuePair(key(child), get_result_no_parent(child))); } } - foreach (var v in input.changed) { + foreach (var v in input.ChangedItems) { var k = key(v); - builder.add_or_update(new KeyValuePair(k, lookup_result(v))); + builder.AddOrUpdate(new KeyValuePair(k, lookup_result(v))); parent_to_children.set(parent_key(v), v); if (parent_to_children.try_lookup(k, out ISet children)) { foreach (var child in children) - builder.add_or_update(new KeyValuePair(key(child), get_result(child, v))); + builder.AddOrUpdate(new KeyValuePair(key(child), get_result(child, v))); } } - foreach (var v in input.added) { + foreach (var v in input.AddedItems) { var k = key(v); - builder.add_or_update(new KeyValuePair(k, lookup_result(v))); + builder.AddOrUpdate(new KeyValuePair(k, lookup_result(v))); parent_to_children.add(parent_key(v), v); if (parent_to_children.try_lookup(k, out ISet children)) { foreach (var child in children) - builder.add_or_update(new KeyValuePair(key(child), get_result(child, v))); + builder.AddOrUpdate(new KeyValuePair(key(child), get_result(child, v))); } } - var result = builder.to_table_checked(value_comparer); + var result = builder.ToImmutableChecked(value_comparer); if (result.has_changes()) observer.OnNext(output = result); } @@ -171,10 +171,10 @@ namespace bts.utils { public static readonly Func, TableUpdate, Change>, TableUpdate> other_change_del = _other_changed_impl; static TableUpdate _source_changed_impl(TableUpdate target, Change> source_change, TableUpdate other_table) => - TableUpdate.update(target, source_change.New.added, source_change.New.changes, source_change.New.removed, source_change.New.key_extractor); + TableUpdate.update(target, source_change.New.AddedItems, source_change.New.Changes, source_change.New.RemovedItems, source_change.New.KeySelector); static TableUpdate _other_changed_impl(TableUpdate target, TableUpdate source_table, Change> other_change) => - TableUpdate.update(target, other_change.New.added, other_change.New.changes, other_change.New.removed, other_change.New.key_extractor); + TableUpdate.update(target, other_change.New.AddedItems, other_change.New.Changes, other_change.New.RemovedItems, other_change.New.KeySelector); } } } @@ -200,7 +200,7 @@ namespace bts.utils.diagnostics { // write the state on dispose, and/or on error IReadOnlyDictionary state = DictionaryHelper.empty(); var sub = source.Subscribe(table => { - state = table.state; + state = table.Index; o.OnNext(table); }, ex => { save(true);