From 03a8f4e9c01cb7e81e08d81f972e2b87f65885ea Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 8 Jan 2026 13:35:03 -0500 Subject: [PATCH] refactor: Replace DataPacket w/ IDataPacket in many places --- .../DataStream/BlueOrb/CountStream.cs | 5 ++--- .../DataStream/BlueOrb/FilterStream.cs | 6 +++--- .../DataStream/BlueOrb/GroupByStream.cs | 7 +++++-- .../BlueOrb/Join/SimpleJoinStream.cs | 18 ++++++++---------- .../BlueOrb/MultiRowRollingMathStream.cs | 2 +- .../AxisTransposition/YXTranspositionStream.cs | 2 +- .../Primitives/Derivative/DerivativeStream.cs | 10 +++++----- .../Primitives/File/FileViewStream.cs | 2 +- .../Primitives/Filter/FilterStream.cs | 17 +++++++++-------- .../NonIncremental/NonIncGroupByStream.cs | 10 +++++++--- .../Primitives/Join/InternalJoinStream.cs | 3 +-- .../DataStream/Primitives/Join/JoinOperand.cs | 14 ++++++-------- .../NonIncremental/NonIncJoinBookkeeper.cs | 12 ++++++------ .../Primitives/Join/SuperJoinStream.cs | 14 ++++++-------- .../KeyValue/KeyValueToRelationalStream.cs | 6 ++---- .../LeftJoin/LeftInternalJoinStream.cs | 7 +++---- .../Primitives/Map/SuperMapStream.cs | 6 +++--- .../Misc/DataPacketRecorderStream.cs | 2 +- .../DataStream/Primitives/Misc/DebugStream.cs | 10 +++------- .../Primitives/Project/ProjectStream.cs | 6 +++--- .../Primitives/SQL/SQLite/SqliteStream.cs | 2 +- .../SideEffectStreams/CSVSaverStream.cs | 9 ++++++--- .../SideEffectStreams/SchemaGuesserStream.cs | 6 +++--- .../DataStream/Primitives/Sort/SortStream.cs | 4 ++-- .../StaticCollectionStream/BlueTableStream.cs | 10 ++++++---- .../StaticCollectionStream/MutableStream.cs | 15 +++++++-------- .../Primitives/ThreadSafe/ThreadSafeStream.cs | 8 +++----- .../ThreadSafe/VSDBMarshallerStream.cs | 4 ++-- .../DataStream/Primitives/Time/DayStream.cs | 9 +++------ .../Primitives/Time/MillisecondStream.cs | 2 +- .../DataStream/Primitives/Time/SecondStream.cs | 4 ++-- .../TimeAverage/TimeAverageStream.cs | 12 ++++++------ .../Timeseries/ColumnEvolutionStream.cs | 8 ++++---- .../Union/AlphabetizeColumnsStream.cs | 4 ++-- .../Primitives/Union/AppendCollection.cs | 4 ++-- .../Primitives/Union/AppendStreamModified.cs | 7 +++---- .../DataStream/Primitives/Union/IUnionTable.cs | 4 ++-- .../Primitives/Union/MutableAppendStream.cs | 6 +++--- .../Primitives/Union/RenameStream.cs | 2 +- .../Primitives/Union/RowBasedAppendStream.cs | 4 ++-- .../DataStream/Publish/ViewPublisher.cs | 2 +- .../DataStreamCore/BlueData/BlueDataUtility.cs | 13 ++++++++----- .../BlueData/DataPacketEqualityComparer.cs | 10 +++++----- .../DataStreamCore/DataPacket.cs | 8 ++++---- .../DataStreamCore/ViewStream.cs | 6 ++---- .../DataStreamTests/FilterStreamTests.cs | 12 ++++++------ .../Live/ReplayFutureLiveBBOStream.cs | 2 +- .../Live/ReplayFutureLiveTradeStream.cs | 2 +- .../Analytics/SpatialArbStatsStream.cs | 2 +- .../Analytics/SpatialFuturePairsStream.cs | 2 +- .../Analytics/SpreadPerformanceStream.cs | 4 ++-- ...readStatArbsWeightLinearRegressionStream.cs | 4 ++-- .../MarketData/Analytics/SpreadStatsStream.cs | 4 ++-- .../Business/MarketData/BBOStream.cs | 8 ++++---- .../Business/MarketData/BookStream.cs | 2 +- .../Business/MarketData/InstrumentsStream.cs | 2 +- .../Business/MarketData/PriceStatsStream.cs | 2 +- .../Business/MarketData/TimeSalesStream.cs | 2 +- .../SharedStreams/NL/BlueOrbNLStream.cs | 6 +++--- .../SharedStreams/NL/OpenAIPromptStream.cs | 2 +- .../PS3/Stats/PubSubServerTagStatsStream.cs | 2 +- .../Subscription/PubSubServerStateStream.cs | 2 +- .../PS3/Subscription/PubsubHeartbeatStream.cs | 2 +- .../System/PS3/TableMetaDataStream.cs | 7 +++---- 64 files changed, 191 insertions(+), 200 deletions(-) diff --git a/src/DataStreamSuite/DataStream/BlueOrb/CountStream.cs b/src/DataStreamSuite/DataStream/BlueOrb/CountStream.cs index 0555ed628..39a2f164b 100644 --- a/src/DataStreamSuite/DataStream/BlueOrb/CountStream.cs +++ b/src/DataStreamSuite/DataStream/BlueOrb/CountStream.cs @@ -3,7 +3,7 @@ using System; namespace BCG { [DataStreamUserRespresentation("CountStream")] public class CountStream : ViewStream { - private DataPacket myLastFiredDataPacket; + IDataPacket? myLastFiredDataPacket; private IBlueTableSchema mySchema = new BlueTableSchema("count", new ColumnInfo("id", 0, typeof(int)), new ColumnInfo("count", 1, typeof(int))); @@ -39,8 +39,7 @@ namespace BCG { private IBlueRowCollection myGetRows(object dp, int id) { BlueTable retVal = new BlueTable(mySchema); - retVal.addRow - (new BlueRow(mySchema, id, (dp as DataPacket).newRows.Count)); + retVal.addRow(new BlueRow(mySchema, id, ((IDataPacket)dp).newRows.Count)); return retVal; } diff --git a/src/DataStreamSuite/DataStream/BlueOrb/FilterStream.cs b/src/DataStreamSuite/DataStream/BlueOrb/FilterStream.cs index 5e7f5702e..a10bc8236 100644 --- a/src/DataStreamSuite/DataStream/BlueOrb/FilterStream.cs +++ b/src/DataStreamSuite/DataStream/BlueOrb/FilterStream.cs @@ -86,7 +86,7 @@ namespace bts.BlueOrb { } protected override void myFireEvent(object o) { - DataPacket dp = o as DataPacket; + var dp = (IDataPacket)o; if (myLastValue == null || dp.addedRows.Count + dp.deletedRows.Count > 0) base.myFireEvent(o); } @@ -94,7 +94,7 @@ namespace bts.BlueOrb { private void myHandleCallbacks(object newValue) { DataPacket retVal; - DataPacket arrivedPacket = newValue as DataPacket; + IDataPacket arrivedPacket = (IDataPacket)newValue; myLastReceivedRows = arrivedPacket.newRows; if (myLastFiredRows != null) { retVal = new DataPacket(myLastFiredRows, new BlueTable(myLastFiredRows.schema), @@ -110,7 +110,7 @@ namespace bts.BlueOrb { (retVal.addedRows as BlueTable).addRow(r); } } else { - myLastFiredRows = new BlueTable(arrivedPacket.schema); + myLastFiredRows = new BlueTable(arrivedPacket.Schema); retVal = new DataPacket(myLastFiredRows, myLastFiredRows, new BlueTable(myLastFiredRows.schema)); foreach (IBlueRow r in arrivedPacket.newRows) if (myFilter.filter(r)) diff --git a/src/DataStreamSuite/DataStream/BlueOrb/GroupByStream.cs b/src/DataStreamSuite/DataStream/BlueOrb/GroupByStream.cs index 81916fee5..bbc4de7fd 100644 --- a/src/DataStreamSuite/DataStream/BlueOrb/GroupByStream.cs +++ b/src/DataStreamSuite/DataStream/BlueOrb/GroupByStream.cs @@ -95,7 +95,7 @@ namespace bts.BlueOrb { protected override void myOnLastSubscriber() { _main_stream.onChange -= _main_stream_onchange; } private void _main_stream_onchange(object nv) { - DataPacket dp = nv as DataPacket; + var dp = (IDataPacket)nv; ///grouping together _timer.Restart(); IDictionary> grouped_rows = (_groupby_cols == null || _groupby_cols.Length == 0) ? @@ -121,7 +121,10 @@ namespace bts.BlueOrb { Log.DataFlow.info( $"Time to evaluate {grouped_rows.Count} groups {_timer.ElapsedMilliseconds}ms, ratio {_n_expensive_fires}/{_n_total_fires}"); } - myFireEvent(new DataPacket(total_state, total_state, myLastValue == null ? new BlueTable(total_state.schema) : (myLastValue as DataPacket).newRows)); + var deletedRows = myLastValue is null + ? new BlueTable(total_state.schema) + : ((IDataPacket)myLastValue).newRows; + myFireEvent(new DataPacket(total_state, total_state, deletedRows)); } } } diff --git a/src/DataStreamSuite/DataStream/BlueOrb/Join/SimpleJoinStream.cs b/src/DataStreamSuite/DataStream/BlueOrb/Join/SimpleJoinStream.cs index 14ae2444a..ed485af97 100644 --- a/src/DataStreamSuite/DataStream/BlueOrb/Join/SimpleJoinStream.cs +++ b/src/DataStreamSuite/DataStream/BlueOrb/Join/SimpleJoinStream.cs @@ -1,13 +1,11 @@ namespace bts.BlueOrb { using BCG; - using RowHash = System.Int32; + using System; using System.Collections.Generic; using System.Linq; - using System.Text; - using System.Threading.Tasks; - using System.Collections; - using System.Data.Entity.Core.Mapping; + + using RowHash = System.Int32; [DataStreamUserRespresentation("JoinStream")] public class SimpleJoinStream : ViewStream { @@ -44,10 +42,10 @@ return _hasher.get_hash(r, _join_cols); } - public void update_data(DataPacket dp) { + public void update_data(IDataPacket dp) { if (!ready) { _schema = dp.newRows.schema; - _join_cols = _join_col_names.Count == 0 ? new int[] { } : _join_col_names.Select(n => dp.schema[n].colNo).ToArray(); + _join_cols = _join_col_names.Count == 0 ? new int[] { } : _join_col_names.Select(n => _schema[n].colNo).ToArray(); } _hash_row_map.Clear(); foreach (IBlueRow r in dp.newRows) { @@ -95,13 +93,13 @@ } private void _ls_onchange(object dp_obj) { - DataPacket dp = dp_obj as DataPacket; + var dp = (IDataPacket)dp_obj; _ldata.update_data(dp); _form_and_fire(); } private void _rs_onchange(object dp_obj) { - DataPacket dp = dp_obj as DataPacket; + var dp = (IDataPacket)dp_obj; _rdata.update_data(dp); _form_and_fire(); } @@ -179,7 +177,7 @@ foreach (object[] rval in res_rows) { rv.addRow(new BlueRow(_schema, rval)); } - var dp = BlueDataUtility.build_dp(rv, myLastValue as DataPacket); + var dp = BlueDataUtility.build_dp(rv, myLastValue as IDataPacket); myFireEvent(dp); } } diff --git a/src/DataStreamSuite/DataStream/BlueOrb/MultiRowRollingMathStream.cs b/src/DataStreamSuite/DataStream/BlueOrb/MultiRowRollingMathStream.cs index 5d12cbe68..378a7b155 100644 --- a/src/DataStreamSuite/DataStream/BlueOrb/MultiRowRollingMathStream.cs +++ b/src/DataStreamSuite/DataStream/BlueOrb/MultiRowRollingMathStream.cs @@ -24,7 +24,7 @@ } private void _parent_str_onchange(object dp_obj) { - DataPacket dp = dp_obj as DataPacket; + var dp = (IDataPacket)dp_obj; var rows = dp.newRows.to_list(); BlueTable out_table = null; for (int i = 0; i < rows.Count; i++) { diff --git a/src/DataStreamSuite/DataStream/Primitives/AxisTransposition/YXTranspositionStream.cs b/src/DataStreamSuite/DataStream/Primitives/AxisTransposition/YXTranspositionStream.cs index 9ef52fdfe..b62281538 100644 --- a/src/DataStreamSuite/DataStream/Primitives/AxisTransposition/YXTranspositionStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/AxisTransposition/YXTranspositionStream.cs @@ -33,7 +33,7 @@ namespace BCG private void _stream_onChange(object newValue) { - DataPacket dp = newValue as DataPacket; + var dp = (IDataPacket)newValue; if (dp != null && dp.newRows.Count > 0) { _stream.onChange -= _stream_onChange; diff --git a/src/DataStreamSuite/DataStream/Primitives/Derivative/DerivativeStream.cs b/src/DataStreamSuite/DataStream/Primitives/Derivative/DerivativeStream.cs index 23877d527..1bcaedc48 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Derivative/DerivativeStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Derivative/DerivativeStream.cs @@ -39,9 +39,9 @@ namespace BCG void myDataSource_onChange(object newValue) { - DataPacket dp = (DataPacket)newValue; + var dp = (IDataPacket)newValue; if (myLastPacketArrival == DateTime.MinValue) - mySchema = myBuildOutputSchema(dp.schema); + mySchema = myBuildOutputSchema(dp.Schema); else { DateTime now = DateTime.Now; @@ -55,7 +55,7 @@ namespace BCG else { IBlueRowCollection deleted, added; - BlueDataUtility.computeDifferences(thisVersion, ((DataPacket)myLastValue).newRows, out deleted, out added); + BlueDataUtility.computeDifferences(thisVersion, ((IDataPacket)myLastValue).newRows, out deleted, out added); myFireEvent(new DataPacket(thisVersion, added, deleted)); } } @@ -84,8 +84,8 @@ namespace BCG cols[cols.Length - 1] = new ColumnInfo(myOutputColumn, cols.Length - 1, typeof(double)); return new BlueTableSchema("derviative of " + inSchema.tableName, cols); } - protected void myStoreNewPacketInfo(DataPacket dp) - { + + protected void myStoreNewPacketInfo(IDataPacket dp) { myPreviousValues = new Dictionary(); myLastPacketArrival = DateTime.Now; foreach (IBlueRow row in dp.newRows) diff --git a/src/DataStreamSuite/DataStream/Primitives/File/FileViewStream.cs b/src/DataStreamSuite/DataStream/Primitives/File/FileViewStream.cs index ca7ba0707..96bd75fa3 100644 --- a/src/DataStreamSuite/DataStream/Primitives/File/FileViewStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/File/FileViewStream.cs @@ -5,7 +5,7 @@ namespace BCG { public class FileViewStream : ViewStream { - private DataPacket myDp; + DataPacket? myDp; public FileViewStream (string dataFileName, string schemaFileName) : this (dataFileName, schemaFileName, Int32.MaxValue) diff --git a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs index 9de8ed84c..d46a0a8a6 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs @@ -52,14 +52,15 @@ namespace BCG.StreamWorld.Addition { private void myHandleChanges(object newValue) { try { - DataPacket dp = newValue as DataPacket; + var dp = (IDataPacket)newValue; + var schema = dp.Schema; if (myStateTable == null) { bts.Log.assert(myBaseTable == null); - myStateTable = new BlueTable(dp.schema); - myBaseTable = new BlueTable(dp.schema); + myStateTable = new BlueTable(schema); + myBaseTable = new BlueTable(schema); } - BlueTable dels = new BlueTable(dp.schema), - adds = new BlueTable(dp.schema); + var dels = new BlueTable(schema); + var adds = new BlueTable(schema); foreach (IBlueRow r in dp.deletedRows) { myBaseTable.deleteRow(r); if (myStateTable.containsID((int)r["id"])) { @@ -224,7 +225,7 @@ namespace BCG protected override void myFireEvent(object o) { - DataPacket dp = o as DataPacket; + var dp = (IDataPacket)o; if (myLastValue == null || dp.addedRows.Count + dp.deletedRows.Count > 0) base.myFireEvent(o); } @@ -233,7 +234,7 @@ namespace BCG private void myHandleCallbacks(object newValue) { DataPacket retVal; - DataPacket arrivedPacket = newValue as DataPacket; + var arrivedPacket = (IDataPacket)newValue; myLastReceivedRows = arrivedPacket.newRows; try { if (myLastFiredRows != null) @@ -255,7 +256,7 @@ namespace BCG } else { - myLastFiredRows = new BlueTable(arrivedPacket.schema); + myLastFiredRows = new BlueTable(arrivedPacket.Schema); retVal = new DataPacket(myLastFiredRows, myLastFiredRows, new BlueTable(myLastFiredRows.schema)); foreach (IBlueRow r in arrivedPacket.newRows) if (filterRow(r)) diff --git a/src/DataStreamSuite/DataStream/Primitives/GroupBy/NonIncremental/NonIncGroupByStream.cs b/src/DataStreamSuite/DataStream/Primitives/GroupBy/NonIncremental/NonIncGroupByStream.cs index fbc8ef6e4..047c9e3f6 100644 --- a/src/DataStreamSuite/DataStream/Primitives/GroupBy/NonIncremental/NonIncGroupByStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/GroupBy/NonIncremental/NonIncGroupByStream.cs @@ -80,7 +80,7 @@ namespace BCG { protected override void myOnLastSubscriber() { _main_stream.onChange -= _main_stream_onchange; } private void _main_stream_onchange(object nv) { - DataPacket dp = nv as DataPacket; + var dp = (IDataPacket)nv; ///grouping together _timer.Restart(); IDictionary> grouped_rows = (_groupby_cols == null || _groupby_cols.Length == 0) ? @@ -108,8 +108,12 @@ namespace BCG { $"Time to evaluate {grouped_rows.Count} groups {_timer.ElapsedMilliseconds}ms, ratio {_n_expensive_fires}/{_n_total_fires}"); } // TODO, - if (total_state != null) - myFireEvent(new DataPacket(total_state, total_state, myLastValue == null ? new BlueTable(total_state.schema) : (myLastValue as DataPacket).newRows)); + if (total_state != null) { + var deletedRows = myLastValue is null + ? new BlueTable(total_state.schema) + : ((IDataPacket)myLastValue).newRows; + myFireEvent(new DataPacket(total_state, total_state, deletedRows)); + } } } } diff --git a/src/DataStreamSuite/DataStream/Primitives/Join/InternalJoinStream.cs b/src/DataStreamSuite/DataStream/Primitives/Join/InternalJoinStream.cs index 0f9f9c16c..0a88b7e5f 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Join/InternalJoinStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Join/InternalJoinStream.cs @@ -173,8 +173,7 @@ namespace BCG /// /// /// - public void test (DataPacket dp, bool isLeft) - { + public void test(IDataPacket dp, bool isLeft) { JoinOperand jo = isLeft ? myLeftOperand : myRightOperand; jo.changeHandler (dp); } diff --git a/src/DataStreamSuite/DataStream/Primitives/Join/JoinOperand.cs b/src/DataStreamSuite/DataStream/Primitives/Join/JoinOperand.cs index 235a3f343..961f203bf 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Join/JoinOperand.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Join/JoinOperand.cs @@ -11,7 +11,7 @@ namespace BCG public class JoinOperand { private string myJoinCol; - private DataPacket myLastArrivedPacket; + IDataPacket? myLastArrivedPacket; private JoinOperand myOtherOperand; private bool myIsLeft; private JoinOperandRowIndex myRowIndex; @@ -26,15 +26,14 @@ namespace BCG internal void changeHandler (object o) { - DataPacket temp = (DataPacket)o; + var dp = (IDataPacket)o; if (myLastArrivedPacket != null) - mySubsequentChangeHandler ((DataPacket)o); + mySubsequentChangeHandler (dp); else - myFirstChangeHandler ((DataPacket)o); + myFirstChangeHandler(dp); } - private void myFirstChangeHandler (DataPacket arrivedDp) - { + void myFirstChangeHandler(IDataPacket arrivedDp) { myLastArrivedPacket = arrivedDp; myOpSchema = myLastArrivedPacket.newRows.schema; myOtherOperand = myMaster.getOtherOperand (this); @@ -55,8 +54,7 @@ namespace BCG myOpSchema["id"].colNo); } - private void mySubsequentChangeHandler (DataPacket arrivedDp) - { + void mySubsequentChangeHandler (IDataPacket arrivedDp) { myLastArrivedPacket = arrivedDp; if (!myOtherOperand.hasReceivedData) { diff --git a/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinBookkeeper.cs b/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinBookkeeper.cs index 03305d575..c579d4616 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinBookkeeper.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Join/NonIncremental/NonIncJoinBookkeeper.cs @@ -38,7 +38,7 @@ namespace BCG { } private bool _filled_missing_data = false; - private void _fill_missing_data(DataPacket dp) { + void _fill_missing_data(IDataPacket dp) { if (_filled_missing_data) return; Func null_or_empty = (str_arr) => { @@ -52,17 +52,17 @@ namespace BCG { return true; }; Func remove_bad_cols = (col_names) => { - HashSet schema_col_map = new HashSet(dp.schema.columnNames); + HashSet schema_col_map = new HashSet(dp.Schema.columnNames); List cols_list = new List(col_names); cols_list.RemoveWhere(c => !schema_col_map.Contains(c)); return cols_list.ToArray(); }; if (null_or_empty(_join_spec.data_col_names)) { - _join_spec.data_col_names = dp.schema.columnNames; + _join_spec.data_col_names = dp.Schema.columnNames; } _join_spec.data_col_names = remove_bad_cols(_join_spec.data_col_names); if (null_or_empty(_join_spec.data_col_names)) { - _join_spec.data_col_names = dp.schema.columnNames; + _join_spec.data_col_names = dp.Schema.columnNames; } if (null_or_empty(_join_spec.projected_col_names)) { _join_spec.projected_col_names = _join_spec.data_col_names; @@ -76,10 +76,10 @@ namespace BCG { public void _on_stream_cb(object dp_obj) { //Log.Gen.info($"NonIncJoinBookkeeper._on_stream_cb dp_obj: {dp_obj}"); var timer = Stopwatch.StartNew(); - DataPacket dp = (DataPacket)dp_obj; + var dp = (IDataPacket)dp_obj; _fill_missing_data(dp); if (_schema == null) { - _schema = dp.schema; + _schema = dp.Schema; _join_col_indices = BlueDataUtility.get_column_indices(_schema, _join_spec.join_col_names); _data_col_indices = BlueDataUtility.get_column_indices(_schema, _join_spec.data_col_names); } diff --git a/src/DataStreamSuite/DataStream/Primitives/Join/SuperJoinStream.cs b/src/DataStreamSuite/DataStream/Primitives/Join/SuperJoinStream.cs index b8fae4b51..cb6940cb0 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Join/SuperJoinStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Join/SuperJoinStream.cs @@ -346,17 +346,17 @@ namespace BCG private void myHandleLeftStreamChanges(object newValue) { - myHandleStreamChanges(newValue as DataPacket, true); + myHandleStreamChanges((IDataPacket)newValue, true); } private void myHandleRightStreamChanges(object newValue) { - myHandleStreamChanges(newValue as DataPacket, false); + myHandleStreamChanges((IDataPacket)newValue, false); } - private void myHandleStreamChanges(DataPacket dp, bool isLeft) + private void myHandleStreamChanges(IDataPacket dp, bool isLeft) { - myInitSchema(dp.schema, isLeft); + myInitSchema(dp.Schema, isLeft); BlueTable dels = null, adds = null; if (myState != null) { @@ -522,12 +522,10 @@ namespace BCG protected override void myFireEvent(object o) { - myHandleJoinResults(myLeftUnmatchedRowsDels, myLeftUnmatchedRowsAdds, o as DataPacket); + myHandleJoinResults(myLeftUnmatchedRowsDels, myLeftUnmatchedRowsAdds, (IDataPacket)o); } - private void myHandleJoinResults(Dictionary unmatchedLeftRowsDels, - Dictionary unmatchedLeftRowAdds, DataPacket resultPacket) - { + void myHandleJoinResults(Dictionary unmatchedLeftRowsDels, Dictionary unmatchedLeftRowAdds, IDataPacket resultPacket) { BlueTable dels = resultPacket.deletedRows as BlueTable, adds = resultPacket.addedRows as BlueTable; diff --git a/src/DataStreamSuite/DataStream/Primitives/KeyValue/KeyValueToRelationalStream.cs b/src/DataStreamSuite/DataStream/Primitives/KeyValue/KeyValueToRelationalStream.cs index 2a2fed4a4..34bea7ff7 100644 --- a/src/DataStreamSuite/DataStream/Primitives/KeyValue/KeyValueToRelationalStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/KeyValue/KeyValueToRelationalStream.cs @@ -1,6 +1,4 @@ namespace BCG { - using System.Collections.Generic; - public class KeyValueToRelationalStream : ViewStream { private readonly ViewStream _kv_str; private readonly string _doc_id_col, _key_col, _val_col; @@ -20,7 +18,7 @@ namespace BCG { } private void _on_str_update(object dp_obj) { - DataPacket dp = dp_obj as DataPacket; + var dp = (IDataPacket)dp_obj; var rows = dp.newRows; var rv = BlueDataUtility.keyvalue_to_relational(rows, _doc_id_col, _key_col, _val_col); var dp_out = BlueDataUtility.build_dp_inc(rv, myLastValue as DataPacket, true); @@ -28,4 +26,4 @@ namespace BCG { } } -} \ No newline at end of file +} diff --git a/src/DataStreamSuite/DataStream/Primitives/LeftJoin/LeftInternalJoinStream.cs b/src/DataStreamSuite/DataStream/Primitives/LeftJoin/LeftInternalJoinStream.cs index 0d1921ec2..d90d402c6 100644 --- a/src/DataStreamSuite/DataStream/Primitives/LeftJoin/LeftInternalJoinStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/LeftJoin/LeftInternalJoinStream.cs @@ -1,6 +1,4 @@ -using System; using System.Collections; -using BCG.Utilities; namespace BCG { @@ -11,7 +9,8 @@ namespace BCG [DataStreamUserRespresentation (false)] public class LeftInternalJoinStream : InternalJoinStream { - protected DataPacket myLeftDataPacket, myRightDataPacket; + protected IDataPacket? myLeftDataPacket; + protected IDataPacket? myRightDataPacket; //Container to contain all the left rows that are orphaned during a deletion operation private IDictionary myLeftOrphanedRows; public LeftInternalJoinStream (ViewStream vsLeft, string jcLeft, ViewStream vsRight, string jcRight) : @@ -62,7 +61,7 @@ namespace BCG private void myTestAndFire (bool isLeft) { JoinOperand jo = isLeft ? myLeftOperand : myRightOperand; - DataPacket dp = isLeft ? myLeftDataPacket : myRightDataPacket; + var dp = isLeft ? myLeftDataPacket : myRightDataPacket; //to test whether both have received call backs if (myLeftOperand.hasReceivedData) jo.changeHandler (dp); diff --git a/src/DataStreamSuite/DataStream/Primitives/Map/SuperMapStream.cs b/src/DataStreamSuite/DataStream/Primitives/Map/SuperMapStream.cs index 7d0d42ce8..79b65d166 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Map/SuperMapStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Map/SuperMapStream.cs @@ -93,9 +93,9 @@ namespace BCG { } private void myHandleData(object newValue) { - var dp = ExceptionAssert.Cast(newValue).To(); - myRows ??= new BlueTable(myMapper.getOutputSchema(dp.schema)); - myBaseRows ??= new BlueTable(dp.schema); + var dp = ExceptionAssert.Cast(newValue).To(); + myRows ??= new BlueTable(myMapper.getOutputSchema(dp.Schema)); + myBaseRows ??= new BlueTable(dp.Schema); BlueDataUtility.absorbChanges(myBaseRows, dp.deletedRows, dp.addedRows); var dels = new BlueTable(myRows.schema); var adds = new BlueTable(myRows.schema); diff --git a/src/DataStreamSuite/DataStream/Primitives/Misc/DataPacketRecorderStream.cs b/src/DataStreamSuite/DataStream/Primitives/Misc/DataPacketRecorderStream.cs index 77532d4ce..3afbad70c 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Misc/DataPacketRecorderStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Misc/DataPacketRecorderStream.cs @@ -31,7 +31,7 @@ namespace bts { } private void _handle_update(object dp_obj) { - DataPacket dp = dp_obj as DataPacket; + var dp = (IDataPacket)dp_obj; byte[] ser_data = null; if (_n_updates == 0) { StreamIOMessage.CreateMessage cr_msg = new StreamIOMessage.CreateMessage(dp.newRows); diff --git a/src/DataStreamSuite/DataStream/Primitives/Misc/DebugStream.cs b/src/DataStreamSuite/DataStream/Primitives/Misc/DebugStream.cs index 5fd4a25f6..43164c18d 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Misc/DebugStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Misc/DebugStream.cs @@ -1,7 +1,3 @@ - - -using System; - namespace BCG { // Keeps adding changing rows to the stream, hence preserving the history // and creating a time series, for example this can be used to make bbo updates @@ -9,7 +5,7 @@ namespace BCG { public class DebugStream : ViewStream { private ViewStream _stream; - private IBlueRowCollection _last_recv_rows = null; + IBlueRowCollection? _last_recv_rows; public DebugStream(ViewStream stream) { _stream = stream; @@ -23,7 +19,7 @@ namespace BCG { } private void _onstream_change(object o) { - DataPacket dp = o as DataPacket; + var dp = (IDataPacket)o; BlueDataUtility.validate_table_schema(dp.newRows); BlueDataUtility.validate_table_schema(dp.addedRows); if (_last_recv_rows == null) { @@ -45,4 +41,4 @@ namespace BCG { } } -} \ No newline at end of file +} diff --git a/src/DataStreamSuite/DataStream/Primitives/Project/ProjectStream.cs b/src/DataStreamSuite/DataStream/Primitives/Project/ProjectStream.cs index 6a8be6cb5..bca970bae 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Project/ProjectStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Project/ProjectStream.cs @@ -64,7 +64,7 @@ namespace BCG { internal void myHandleChange (object newValue) { - DataPacket dp = newValue as DataPacket; + var dp = (IDataPacket)newValue; if (myHelper != null) { IBlueRowCollection dels, adds; @@ -79,8 +79,8 @@ namespace BCG { else { //first time a callback is received myHelper = myDic == null ? - new ProjectHelper (dp.schema, myColExp, myTableName) : - new ProjectHelper (dp.schema, myDic, myTableName); + new ProjectHelper (dp.Schema, myColExp, myTableName) : + new ProjectHelper (dp.Schema, myDic, myTableName); IBlueRowCollection temp; myFireEvent (new DataPacket (temp = new ProjectedTable (dp.newRows, myHelper), diff --git a/src/DataStreamSuite/DataStream/Primitives/SQL/SQLite/SqliteStream.cs b/src/DataStreamSuite/DataStream/Primitives/SQL/SQLite/SqliteStream.cs index fe7d4cb55..300913dac 100644 --- a/src/DataStreamSuite/DataStream/Primitives/SQL/SQLite/SqliteStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/SQL/SQLite/SqliteStream.cs @@ -50,7 +50,7 @@ namespace bts.BlueOrb { //IBlueRowCollection rows = new DataTableWrapperTable(dt); _stopwatch.Stop(); Log.Gen.info($"SQLiteStream._read_from_sqlite_and_fire time to load into IBlueRowCollection: {_stopwatch.ElapsedMilliseconds} msecs"); - DataPacket dp = BlueDataUtility.build_dp_inc(rows, myLastValue as DataPacket); + var dp = BlueDataUtility.build_dp_inc(rows, myLastValue as IDataPacket); myFireEvent(dp); } diff --git a/src/DataStreamSuite/DataStream/Primitives/SideEffectStreams/CSVSaverStream.cs b/src/DataStreamSuite/DataStream/Primitives/SideEffectStreams/CSVSaverStream.cs index cc40e5b12..cad5e1820 100644 --- a/src/DataStreamSuite/DataStream/Primitives/SideEffectStreams/CSVSaverStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/SideEffectStreams/CSVSaverStream.cs @@ -38,7 +38,7 @@ namespace BCG { protected override void myOnLastSubscriber() { myStream.onChange -= new ChangeDelegate(myHandleChanges); } private void myHandleChanges(object newValue) { - IBlueRowCollection totalState = (newValue as DataPacket).newRows; + var totalState = ((IDataPacket)newValue).newRows; if (totalState.Count > 0 && myNWrites < myNMaxWrites) { myNWrites++; int i = 0; @@ -60,7 +60,10 @@ namespace BCG { IBlueRow nr = new BlueRow(myResultSchema, 0, myFullyQualifiedFileName, myNWrites, totalState.Count); BlueTable nRows = new BlueTable(myResultSchema); nRows.addRow(nr); - myFireEvent(new DataPacket(nRows, nRows, new BlueTable(myLastValue == null ? new BlueTable(myResultSchema) : (myLastValue as DataPacket).newRows))); + IBlueRowCollection deletedRows = myLastValue is null + ? new BlueTable(myResultSchema) + : new BlueTable(((IDataPacket)myLastValue).newRows); + myFireEvent(new DataPacket(nRows, nRows, deletedRows)); } else myFireEvent(newValue); } @@ -126,7 +129,7 @@ namespace BCG { //_stopwatch.Stop(); //bts.Log.Gen.info($"CSVReaderStream.myOnFirstSubscriber stream csv load col_count: {df.Columns.Count} rows, time: {_stopwatch.ElapsedMilliseconds} msecs"); var rows = LoadFile(_file_address); - DataPacket dp_out = BlueDataUtility.build_dp_inc(rows, myLastValue as DataPacket); + var dp_out = BlueDataUtility.build_dp_inc(rows, myLastValue as IDataPacket); myFireEvent(dp_out); } } diff --git a/src/DataStreamSuite/DataStream/Primitives/SideEffectStreams/SchemaGuesserStream.cs b/src/DataStreamSuite/DataStream/Primitives/SideEffectStreams/SchemaGuesserStream.cs index 6f6ca4b26..1c7f57cf6 100644 --- a/src/DataStreamSuite/DataStream/Primitives/SideEffectStreams/SchemaGuesserStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/SideEffectStreams/SchemaGuesserStream.cs @@ -17,11 +17,11 @@ namespace bts { } private void _on_data(object obj) { - DataPacket dp = obj as DataPacket; + var dp = (IDataPacket)obj; if (_rows == null) { _rows = BlueDataUtility.get_typed_table(dp.newRows); } - var dp_out = BlueDataUtility.build_dp_inc(_rows, myLastValue as DataPacket); + var dp_out = BlueDataUtility.build_dp_inc(_rows, myLastValue as IDataPacket); myFireEvent(dp_out); } @@ -30,4 +30,4 @@ namespace bts { } -} \ No newline at end of file +} diff --git a/src/DataStreamSuite/DataStream/Primitives/Sort/SortStream.cs b/src/DataStreamSuite/DataStream/Primitives/Sort/SortStream.cs index 3e6926b44..e53b3fe6d 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Sort/SortStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Sort/SortStream.cs @@ -16,7 +16,7 @@ public class SortStream : ViewStream { IList sortCols; IComparer? comparer; DataPacket? lastFiredPacket; - DataPacket? lastReceivedPacket; + IDataPacket? lastReceivedPacket; public SortStream(ViewStream stream, string sortExpression) { this.stream = stream; @@ -61,7 +61,7 @@ public class SortStream : ViewStream { [MemberNotNull(nameof(lastFiredPacket))] internal void myChangeHandler(object o) { - lastReceivedPacket = (DataPacket)o; + lastReceivedPacket = (IDataPacket)o; // First callback, so we need to sort the whole table, this is the // only time we will do that for all the other sorting operations would // be sorting the increments and inserting them into the whole list diff --git a/src/DataStreamSuite/DataStream/Primitives/StaticCollectionStream/BlueTableStream.cs b/src/DataStreamSuite/DataStream/Primitives/StaticCollectionStream/BlueTableStream.cs index 96ade131c..614dd75ba 100644 --- a/src/DataStreamSuite/DataStream/Primitives/StaticCollectionStream/BlueTableStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/StaticCollectionStream/BlueTableStream.cs @@ -13,7 +13,7 @@ namespace BCG { } protected override void myOnFirstSubscriber() { - var dp_out = BlueDataUtility.build_dp_inc(_rows, myLastValue as DataPacket); + var dp_out = BlueDataUtility.build_dp_inc(_rows, myLastValue as IDataPacket); myFireEvent(dp_out); } } @@ -25,8 +25,10 @@ namespace BCG { public BlueRowCollectionStaticStream(IBlueRowCollection rows) { loadCollection(rows); } public void loadCollection(IBlueRowCollection rows) { - myFireEvent(new DataPacket(rows, rows, myLastValue != null ? - new BlueTable((myLastValue as DataPacket).newRows) : new BlueTable(rows.schema))); + var deletedRows = myLastValue is null + ? new BlueTable(rows.schema) + : new BlueTable(((IDataPacket)myLastValue).newRows); + myFireEvent(new DataPacket(rows, rows, deletedRows)); } public void crush_with_single_row(IBlueRow r) { @@ -35,7 +37,7 @@ namespace BCG { loadCollection(t); } - public void loadPacket(DataPacket dp) { myFireEvent(dp); } + public void loadPacket(IDataPacket dp) { myFireEvent(dp); } } diff --git a/src/DataStreamSuite/DataStream/Primitives/StaticCollectionStream/MutableStream.cs b/src/DataStreamSuite/DataStream/Primitives/StaticCollectionStream/MutableStream.cs index 17c5a42dd..04a57f8d6 100644 --- a/src/DataStreamSuite/DataStream/Primitives/StaticCollectionStream/MutableStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/StaticCollectionStream/MutableStream.cs @@ -22,24 +22,23 @@ namespace BCG /// public void loadCollection (IBlueRowCollection rows) { - myFireEvent(new DataPacket( - rows, - new BlueTable(rows), - myLastValue is DataPacket dp - ? new BlueTable(dp.newRows) - : new BlueTable(rows.schema))); + var deletedRows = myLastValue is null + ? new BlueTable(rows.schema) + : new BlueTable(((IDataPacket)myLastValue).newRows); + myFireEvent(new DataPacket(rows, new BlueTable(rows), deletedRows)); } /// /// Fires the whole datapacket as one. Its the callers responsibility to make sure that it makes incremental sense /// /// - public void loadPacket (DataPacket dp) {myFireEvent (dp);} + public void loadPacket(IDataPacket dp) => + myFireEvent(dp); protected override void myOnFirstSubscriber() { if (myLastValue != null) - loadPacket (myLastValue as DataPacket); + loadPacket((IDataPacket)myLastValue); } } diff --git a/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/ThreadSafeStream.cs b/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/ThreadSafeStream.cs index 9102987f7..f2aab2c59 100644 --- a/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/ThreadSafeStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/ThreadSafeStream.cs @@ -15,7 +15,7 @@ namespace BCG { private ViewStream myParentStream; - private ThreadSafeQueue myQueuedUpdates; + readonly ThreadSafeQueue myQueuedUpdates = new(); private ViewStreamDatabase myVSD; public ThreadSafeStream(ViewStream parent) : this(ViewStreamDatabase.instance, parent) { } @@ -23,7 +23,6 @@ namespace BCG { myParentStream = parentStream; myVSD = vsd; - myQueuedUpdates = new ThreadSafeQueue(); } protected override void myOnFirstSubscriber() @@ -42,13 +41,12 @@ namespace BCG void myParentStreamChangeHandler(object newValue) { - myQueuedUpdates.enqueue(newValue as DataPacket); + myQueuedUpdates.enqueue((IDataPacket)newValue); } public void doWork() { - foreach (DataPacket dp in myQueuedUpdates.dequeueAll()) - { + foreach (var dp in myQueuedUpdates.dequeueAll()) { myFireEvent(dp); } } diff --git a/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/VSDBMarshallerStream.cs b/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/VSDBMarshallerStream.cs index 4bce8e362..dde8dc9fb 100644 --- a/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/VSDBMarshallerStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/VSDBMarshallerStream.cs @@ -92,7 +92,7 @@ namespace BCG void _source_stream_onChange(object newValue) { // BlueEventLog2.instance().assert(_source_thread == Thread.CurrentThread.ManagedThreadId, "Updates should come from source thread"); - _queued_updates.enqueue(new Update { dp = (DataPacket)newValue, subscription = _current_target_subscription }); + _queued_updates.enqueue(new Update { dp = (IDataPacket)newValue, subscription = _current_target_subscription }); } // target doWork @@ -119,7 +119,7 @@ namespace BCG class Update { - public DataPacket dp; + public IDataPacket? dp; public Guid subscription; } private ThreadSafeQueue _queued_updates; diff --git a/src/DataStreamSuite/DataStream/Primitives/Time/DayStream.cs b/src/DataStreamSuite/DataStream/Primitives/Time/DayStream.cs index 34591314d..efe257bf3 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Time/DayStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Time/DayStream.cs @@ -68,17 +68,14 @@ namespace BCG IBlueRowCollection deletedRows = new BlueTable(s); if (myLastValue != null) - deletedRows = ((DataPacket) myLastValue).newRows; + deletedRows = ((IDataPacket)myLastValue).newRows; myFireEvent(new DataPacket(newRows,newRows,deletedRows)); } } - private object myGetLastDay() - { - return - BlueDataUtility.extractRow(((DataPacket) myLastValue).newRows,0)["dateTime"]; - } + object? myGetLastDay() => + BlueDataUtility.extractRow(((IDataPacket)myLastValue).newRows, 0)?["dateTime"]; private int myOffset; private TimeSpan myZeroHour; diff --git a/src/DataStreamSuite/DataStream/Primitives/Time/MillisecondStream.cs b/src/DataStreamSuite/DataStream/Primitives/Time/MillisecondStream.cs index 82e745c3c..da5e03464 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Time/MillisecondStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Time/MillisecondStream.cs @@ -45,7 +45,7 @@ namespace BCG { IBlueRow nr = new BlueRow(_schema, _id++, _last_fire_time, _last_fire_time.ToString("yyyy-MM-dd HH:mm:ss.fff")); _table.add_row(nr); - var dp = BlueDataUtility.build_dp_inc(_table, myLastValue as DataPacket); + var dp = BlueDataUtility.build_dp_inc(_table, myLastValue as IDataPacket); myFireEvent(dp); } } diff --git a/src/DataStreamSuite/DataStream/Primitives/Time/SecondStream.cs b/src/DataStreamSuite/DataStream/Primitives/Time/SecondStream.cs index 3dce18461..55ae177c8 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Time/SecondStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Time/SecondStream.cs @@ -67,9 +67,9 @@ namespace BCG private void _handle_base_stream_update(object dp_obj){ if (DateTime.Now - _last_fire_time >= _ts){ - DataPacket dp_in = dp_obj as DataPacket; + var dp_in = (IDataPacket)dp_obj; _last_fire_time = DateTime.Now; - DataPacket dp = BlueDataUtility.build_dp_inc(dp_in.newRows, myLastValue as DataPacket); + var dp = BlueDataUtility.build_dp_inc(dp_in.newRows, myLastValue as IDataPacket); myFireEvent(dp); } } diff --git a/src/DataStreamSuite/DataStream/Primitives/TimeAverage/TimeAverageStream.cs b/src/DataStreamSuite/DataStream/Primitives/TimeAverage/TimeAverageStream.cs index 27ef3313e..f770af1ad 100644 --- a/src/DataStreamSuite/DataStream/Primitives/TimeAverage/TimeAverageStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/TimeAverage/TimeAverageStream.cs @@ -35,11 +35,11 @@ namespace BCG private void myToAverage_onChange(object newValue) { - DataPacket dp = (DataPacket) (newValue); + var dp = (IDataPacket)newValue; - int valueCol = dp.schema[myCol_Value].colNo; + int valueCol = dp.Schema[myCol_Value].colNo; - BlueTable result = new BlueTable(dp.schema); + BlueTable result = new BlueTable(dp.Schema); foreach (IBlueRow r in dp.newRows) { string key = r[myCol_Key].ToString(); @@ -50,16 +50,16 @@ namespace BCG r.CopyTo(rowValues, 0); rowValues[valueCol] = myUpdateValue(key, dt, value); - result.addRow(new BlueRow(dp.schema, rowValues)); + result.addRow(new BlueRow(dp.Schema, rowValues)); } if (myLastValue == null) - myFireEvent(new DataPacket(result, result, new BlueTable(dp.schema))); + myFireEvent(new DataPacket(result, result, new BlueTable(dp.Schema))); else { IBlueRowCollection dels, adds; - BlueDataUtility.computeDifferences(result, ((DataPacket)myLastValue).newRows, out dels, out adds); + BlueDataUtility.computeDifferences(result, ((IDataPacket)myLastValue).newRows, out dels, out adds); myFireEvent(new DataPacket(result, adds, dels)); } diff --git a/src/DataStreamSuite/DataStream/Primitives/Timeseries/ColumnEvolutionStream.cs b/src/DataStreamSuite/DataStream/Primitives/Timeseries/ColumnEvolutionStream.cs index a282a04d4..eb2197b20 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Timeseries/ColumnEvolutionStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Timeseries/ColumnEvolutionStream.cs @@ -31,10 +31,10 @@ namespace bts.SilverPine { } private void _handle_base_stream_update(object dp_obj) { - DataPacket dp = dp_obj as DataPacket; + var dp = (IDataPacket)dp_obj; List rows = dp.newRows.to_list(); rows.Sort((r1, r2) => BlueDataUtility.compare_rows(r2, r1, _sort_col)); - BlueTable rv = new BlueTable(dp.schema); + BlueTable rv = new BlueTable(dp.Schema); IBlueRow prev_row = rows.ElementAt(0); foreach (IBlueRow r in rows) { var cr = BlueDataUtility.compare_rows(r, prev_row, _evol_col); @@ -43,9 +43,9 @@ namespace bts.SilverPine { } prev_row = r; } - DataPacket dp_out = BlueDataUtility.build_dp(rv, myLastValue as DataPacket); + var dp_out = BlueDataUtility.build_dp(rv, myLastValue as IDataPacket); myFireEvent(dp_out); } } -} \ No newline at end of file +} diff --git a/src/DataStreamSuite/DataStream/Primitives/Union/AlphabetizeColumnsStream.cs b/src/DataStreamSuite/DataStream/Primitives/Union/AlphabetizeColumnsStream.cs index 498160658..774d70683 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Union/AlphabetizeColumnsStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Union/AlphabetizeColumnsStream.cs @@ -18,7 +18,7 @@ namespace BCG { mySrc.onChange -= new ChangeDelegate(mySrc_onChange); } private void mySrc_onChange(object newValue) { - DataPacket dp = (DataPacket)newValue; + var dp = (IDataPacket)newValue; if (mySchema == null) { SortedList alphabetical = new SortedList(); foreach (ColumnInfo cinfo in dp.newRows.schema.columnInfo) @@ -27,7 +27,7 @@ namespace BCG { alphabetical.Values.CopyTo(cinfos, 0); for (int i = 0; i < cinfos.Length; ++i) cinfos[i] = new ColumnInfo(cinfos[i].colName, i, cinfos[i].colType); - mySchema = new BlueTableSchema(cinfos, dp.schema.tableName); + mySchema = new BlueTableSchema(cinfos, dp.Schema.tableName); } BlueTable deleted = new BlueTable(mySchema), diff --git a/src/DataStreamSuite/DataStream/Primitives/Union/AppendCollection.cs b/src/DataStreamSuite/DataStream/Primitives/Union/AppendCollection.cs index 86e782c7a..5ac1c2bbd 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Union/AppendCollection.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Union/AppendCollection.cs @@ -16,9 +16,9 @@ namespace BCG public AppendCollection () {} - public DataPacket mergeRows (DataPacket dp, bool isLeft) + public DataPacket mergeRows (IDataPacket dp, bool isLeft) { - mySchema = mySchema == null ? dp.schema : mySchema; + mySchema = mySchema == null ? dp.Schema : mySchema; BlueTable dRows = new BlueTable (mySchema), aRows = new BlueTable (mySchema); IDictionary index = isLeft ? myLeftIndex : myRightIndex; diff --git a/src/DataStreamSuite/DataStream/Primitives/Union/AppendStreamModified.cs b/src/DataStreamSuite/DataStream/Primitives/Union/AppendStreamModified.cs index c10b8a32a..40192e28d 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Union/AppendStreamModified.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Union/AppendStreamModified.cs @@ -40,16 +40,15 @@ namespace BCG private void myHandleLeftChanges (object newValue) { - myFireEvent (myGetDataPacket (newValue as DataPacket, true)); + myFireEvent(myGetDataPacket((IDataPacket)newValue, true)); } private void myHandleRightChanges (object newValue) { - myFireEvent (myGetDataPacket (newValue as DataPacket, false)); + myFireEvent(myGetDataPacket((IDataPacket)newValue, false)); } - private DataPacket myGetDataPacket (DataPacket dp, bool isLeft) - { + DataPacket myGetDataPacket(IDataPacket dp, bool isLeft) { DataPacket retVal = myColl.mergeRows (dp, isLeft); return new DataPacket (new ImmutableBlueTable (retVal.newRows), retVal.addedRows, diff --git a/src/DataStreamSuite/DataStream/Primitives/Union/IUnionTable.cs b/src/DataStreamSuite/DataStream/Primitives/Union/IUnionTable.cs index 7c063848a..ef8a7490c 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Union/IUnionTable.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Union/IUnionTable.cs @@ -9,7 +9,7 @@ namespace BCG /// public interface IUnionTable : IBlueRowCollection { - void addRows (IBlueRowCollection rows, bool isLeft, DataPacket dp); - void deleteRows (IBlueRowCollection rows, bool isLeft, DataPacket dp); + void addRows (IBlueRowCollection rows, bool isLeft, IDataPacket dp); + void deleteRows (IBlueRowCollection rows, bool isLeft, IDataPacket dp); } } diff --git a/src/DataStreamSuite/DataStream/Primitives/Union/MutableAppendStream.cs b/src/DataStreamSuite/DataStream/Primitives/Union/MutableAppendStream.cs index eeb849691..b332d7fff 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Union/MutableAppendStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Union/MutableAppendStream.cs @@ -256,11 +256,11 @@ namespace BCG { } private void myHandleStreamChanges(object newValue) { - DataPacket dp = newValue as DataPacket; - myTable = myTable ?? new MutableAppendTable(new BlueTableSchema("MutableAppend", dp.schema.columnInfo)); + var dp = (IDataPacket)newValue; + myTable = myTable ?? new MutableAppendTable(new BlueTableSchema("MutableAppend", dp.Schema.columnInfo)); BlueTable adds = new BlueTable(myTable.schema), dels = new BlueTable(myTable.schema); - int index = Int32.Parse(dp.schema.tableName); + int index = int.Parse(dp.Schema.tableName); foreach (IBlueRow r in dp.deletedRows) { IBlueRow dr = myTable.removeRow(r, index); dels.addRow(dr); diff --git a/src/DataStreamSuite/DataStream/Primitives/Union/RenameStream.cs b/src/DataStreamSuite/DataStream/Primitives/Union/RenameStream.cs index cbf5e51a1..34cea004f 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Union/RenameStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Union/RenameStream.cs @@ -21,7 +21,7 @@ namespace BCG { mySrc.onChange -= new ChangeDelegate (mySrc_onChange); } private void mySrc_onChange (object newValue) { - DataPacket dp = (DataPacket)newValue; + var dp = (IDataPacket)newValue; if (mySchema == null) mySchema = new BlueTableSchema (dp.newRows.schema.columnInfo,myTableName); BlueTable diff --git a/src/DataStreamSuite/DataStream/Primitives/Union/RowBasedAppendStream.cs b/src/DataStreamSuite/DataStream/Primitives/Union/RowBasedAppendStream.cs index de1af0a21..92057a610 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Union/RowBasedAppendStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Union/RowBasedAppendStream.cs @@ -33,7 +33,7 @@ namespace bts.BlueOrb { private void _on_parent_stream_change(object dp_obj) { - DataPacket dp = dp_obj as DataPacket; + var dp = (IDataPacket)dp_obj; foreach (IBlueRow r in dp.deletedRows) { string hash = r.get_row_cols_as_string(_key_cols); ViewStream hash_str = null; @@ -60,4 +60,4 @@ namespace bts.BlueOrb { myFireEvent(dp_obj); } } -} \ No newline at end of file +} diff --git a/src/DataStreamSuite/DataStream/Publish/ViewPublisher.cs b/src/DataStreamSuite/DataStream/Publish/ViewPublisher.cs index 6828256bf..1b45e2f38 100644 --- a/src/DataStreamSuite/DataStream/Publish/ViewPublisher.cs +++ b/src/DataStreamSuite/DataStream/Publish/ViewPublisher.cs @@ -28,7 +28,7 @@ namespace BCG { } private void _handle_update(object o) { - DataPacket dp = o as DataPacket; + var dp = (IDataPacket)o; if (_n_updates == 0) { _broker.create_table(dp.newRows); _n_updates++; diff --git a/src/DataStreamSuite/DataStreamCore/BlueData/BlueDataUtility.cs b/src/DataStreamSuite/DataStreamCore/BlueData/BlueDataUtility.cs index 71e4fccd7..79e5c71ad 100644 --- a/src/DataStreamSuite/DataStreamCore/BlueData/BlueDataUtility.cs +++ b/src/DataStreamSuite/DataStreamCore/BlueData/BlueDataUtility.cs @@ -288,14 +288,17 @@ namespace BCG { } } - public static DataPacket build_dp(IBlueRowCollection new_rows, DataPacket last_fired_dp) { + public static DataPacket build_dp(IBlueRowCollection new_rows, IDataPacket last_fired_dp) { IBlueRowCollection added_rows = new_rows; IBlueRowCollection deleted_rows = last_fired_dp == null ? new BlueTable(new_rows.schema) : last_fired_dp.newRows; return new DataPacket(new_rows, added_rows, deleted_rows); } - public static DataPacket build_dp_inc(IBlueRowCollection new_rows, DataPacket last_fired_dp, bool deep_row_comapre = false) { - if (last_fired_dp == null) { + public static DataPacket build_dp_inc(IBlueRowCollection new_rows, IDataPacket last_fired_dp, bool deep_row_comapre = false) => + build_dp_inc(new_rows, last_fired_dp.newRows, deep_row_comapre); + + public static DataPacket build_dp_inc(IBlueRowCollection new_rows, IBlueRowCollection lastRows, bool deep_row_comapre = false) { + if (lastRows is null) { IBlueRowCollection added_rows = new_rows; IBlueRowCollection deleted_rows = new BlueTable(new_rows.schema); return new DataPacket(new_rows, added_rows, deleted_rows); @@ -303,9 +306,9 @@ namespace BCG { IBlueRowCollection added_rows = null; IBlueRowCollection deleted_rows = null; if (deep_row_comapre) - compute_differences_fast(new_rows, last_fired_dp.newRows, out deleted_rows, out added_rows); + compute_differences_fast(new_rows, lastRows, out deleted_rows, out added_rows); else - compute_differences_id_based(new_rows, last_fired_dp.newRows, out deleted_rows, out added_rows); + compute_differences_id_based(new_rows, lastRows, out deleted_rows, out added_rows); return new DataPacket(new_rows, added_rows, deleted_rows); } } diff --git a/src/DataStreamSuite/DataStreamCore/BlueData/DataPacketEqualityComparer.cs b/src/DataStreamSuite/DataStreamCore/BlueData/DataPacketEqualityComparer.cs index aa2cd1dcd..61832f92d 100644 --- a/src/DataStreamSuite/DataStreamCore/BlueData/DataPacketEqualityComparer.cs +++ b/src/DataStreamSuite/DataStreamCore/BlueData/DataPacketEqualityComparer.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; -public class DataPacketEqualityComparer : IEqualityComparer { +public class DataPacketEqualityComparer : IEqualityComparer { readonly IEqualityComparer rowCollectionComparer; public DataPacketEqualityComparer(IEqualityComparer? rowCollectionComparer = null) => @@ -16,20 +16,20 @@ public class DataPacketEqualityComparer : IEqualityComparer { public static DataPacketEqualityComparer Instance { get; } = new(); - public bool Equals(DataPacket? x, DataPacket? y) { + public bool Equals(IDataPacket? x, IDataPacket? y) { if (x is null) { return y is null; } return y is not null - && x.schema.columnInfo.SequenceEqual(y.schema.columnInfo) + && x.Schema.columnInfo.SequenceEqual(y.Schema.columnInfo) && rowCollectionComparer.Equals(x.addedRows, y.addedRows) && rowCollectionComparer.Equals(x.deletedRows, y.deletedRows) && rowCollectionComparer.Equals(x.newRows, y.newRows); } - public int GetHashCode([DisallowNull] DataPacket obj) { + public int GetHashCode([DisallowNull] IDataPacket obj) { var hash = new HashCode(); - hash.Add(obj.schema.columnNames.Length); + hash.Add(obj.Schema.columnNames.Length); hash.Add(obj.addedRows.Count); hash.Add(obj.deletedRows.Count); return hash.ToHashCode(); diff --git a/src/DataStreamSuite/DataStreamCore/DataPacket.cs b/src/DataStreamSuite/DataStreamCore/DataPacket.cs index 14f5db095..06890c441 100644 --- a/src/DataStreamSuite/DataStreamCore/DataPacket.cs +++ b/src/DataStreamSuite/DataStreamCore/DataPacket.cs @@ -219,15 +219,15 @@ namespace BCG { BlueTable at = null; IBlueRowCollection nt = null; - foreach (DataPacket dp in packets) { + foreach (IDataPacket dp in packets) { ArrayList oldDeleted = deleted; ArrayList oldAdded = added; added = new ArrayList(); deleted = new ArrayList(); if (dt == null) { - dt = new BlueTable(dp.schema); - at = new BlueTable(dp.schema); + dt = new BlueTable(dp.Schema); + at = new BlueTable(dp.Schema); } deleted.AddRange(oldDeleted); @@ -331,7 +331,7 @@ namespace BCG { // } public static class DataPacketExtensions { - public static bool HasChanges(this DataPacket dataPacket) => + public static bool HasChanges(this IDataPacket dataPacket) => dataPacket.addedRows.Count > 0 || dataPacket.deletedRows.Count > 0; } } diff --git a/src/DataStreamSuite/DataStreamCore/ViewStream.cs b/src/DataStreamSuite/DataStreamCore/ViewStream.cs index 14e7b782a..986da90bd 100644 --- a/src/DataStreamSuite/DataStreamCore/ViewStream.cs +++ b/src/DataStreamSuite/DataStreamCore/ViewStream.cs @@ -38,10 +38,8 @@ namespace BCG return null; else { - return new DataPacket( - (myLastValue as DataPacket).newRows, - (myLastValue as DataPacket).newRows, - new BlueTable((myLastValue as DataPacket).newRows.schema)); + var rows = ((IDataPacket)myLastValue).newRows; + return new DataPacket(rows, rows, new BlueTable(rows.schema)); } } diff --git a/src/DataStreamSuite/DataStreamTests/FilterStreamTests.cs b/src/DataStreamSuite/DataStreamTests/FilterStreamTests.cs index f49d63bab..ae5b9fc0e 100644 --- a/src/DataStreamSuite/DataStreamTests/FilterStreamTests.cs +++ b/src/DataStreamSuite/DataStreamTests/FilterStreamTests.cs @@ -25,7 +25,7 @@ public class FilterStreamTests { filterStream.onChange += onFilterStreamChange; void onFilterStreamChange(object newValue) { - var dp = (DataPacket)newValue; + var dp = (IDataPacket)newValue; actual.Add(new(new BlueTable(dp.newRows), new BlueTable(dp.addedRows), new BlueTable(dp.deletedRows))); } @@ -115,9 +115,9 @@ public class FilterStreamTests { /// /// Test outcome, represented as a sequence of DataPackets. /// - class Outcome : IReadOnlyList { + class Outcome : IReadOnlyList { readonly IBlueTableSchema schema; - readonly List history = new(); + readonly List history = new(); BlueTable? currBlueRows; public Outcome(IBlueTableSchema schema) => @@ -125,9 +125,9 @@ public class FilterStreamTests { public int Count => history.Count; - public DataPacket? this[int index] => history[index]; + public IDataPacket? this[int index] => history[index]; - public DataPacket? Add( + public IDataPacket? Add( IEnumerable<(int Id, int Value)>? addedRows = null, IEnumerable<(int Id, int Value)>? removedRows = null ) { @@ -151,7 +151,7 @@ public class FilterStreamTests { return rv; } - public IEnumerator GetEnumerator() => + public IEnumerator GetEnumerator() => history.GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() => diff --git a/src/DataStreamSuite/SharedStreams/BlueOrb/MarketData/Live/ReplayFutureLiveBBOStream.cs b/src/DataStreamSuite/SharedStreams/BlueOrb/MarketData/Live/ReplayFutureLiveBBOStream.cs index a8d67d959..911ededf8 100644 --- a/src/DataStreamSuite/SharedStreams/BlueOrb/MarketData/Live/ReplayFutureLiveBBOStream.cs +++ b/src/DataStreamSuite/SharedStreams/BlueOrb/MarketData/Live/ReplayFutureLiveBBOStream.cs @@ -86,7 +86,7 @@ _last_fire_time.last_fireitme_file = cand_ts_event_dt; BlueTable bt_out = new BlueTable(cand_row.schema); bt_out.addRow(cand_row); - var dp_out = BlueDataUtility.build_dp(bt_out, myLastValue as DataPacket); + var dp_out = BlueDataUtility.build_dp(bt_out, myLastValue as IDataPacket); myFireEvent(dp_out); } } diff --git a/src/DataStreamSuite/SharedStreams/BlueOrb/MarketData/Live/ReplayFutureLiveTradeStream.cs b/src/DataStreamSuite/SharedStreams/BlueOrb/MarketData/Live/ReplayFutureLiveTradeStream.cs index 6d5a135f3..eaed74de3 100644 --- a/src/DataStreamSuite/SharedStreams/BlueOrb/MarketData/Live/ReplayFutureLiveTradeStream.cs +++ b/src/DataStreamSuite/SharedStreams/BlueOrb/MarketData/Live/ReplayFutureLiveTradeStream.cs @@ -86,7 +86,7 @@ _last_fire_time.last_fireitme_file = cand_ts_event_dt; BlueTable bt_out = new BlueTable(cand_row.schema); bt_out.addRow(cand_row); - var dp_out = BlueDataUtility.build_dp(bt_out, myLastValue as DataPacket); + var dp_out = BlueDataUtility.build_dp(bt_out, myLastValue as IDataPacket); myFireEvent(dp_out); } } diff --git a/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpatialArbStatsStream.cs b/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpatialArbStatsStream.cs index 9be8a5da7..e2e35a99a 100644 --- a/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpatialArbStatsStream.cs +++ b/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpatialArbStatsStream.cs @@ -90,7 +90,7 @@ //_tot_str = new SortStream(_tot_str, "-n_trade_ticks"); _tot_str.onChange += _handle_tot_stream; - DataPacket dp = dp_obj as DataPacket; + var dp = (IDataPacket)dp_obj; foreach (IBlueRow r in dp.newRows) { string s1 = r.get("s1"); string s2 = r.get("s2"); diff --git a/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpatialFuturePairsStream.cs b/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpatialFuturePairsStream.cs index 265323b45..8bf759882 100644 --- a/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpatialFuturePairsStream.cs +++ b/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpatialFuturePairsStream.cs @@ -73,7 +73,7 @@ private void _main_stream_onchange(object dp_obj) { _key_map.Clear(); - DataPacket dp = dp_obj as DataPacket; + var dp = (IDataPacket)dp_obj; BlueTable table = new BlueTable(_schema); var rows = dp.newRows.to_list(); foreach (var r1 in rows) { diff --git a/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpreadPerformanceStream.cs b/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpreadPerformanceStream.cs index ce5d46b5a..897f1de46 100644 --- a/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpreadPerformanceStream.cs +++ b/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpreadPerformanceStream.cs @@ -92,7 +92,7 @@ namespace bts.BlueOrb { } private void _handle_spread_prices(object dp_obj) { - DataPacket dp = dp_obj as DataPacket; + var dp = (IDataPacket)dp_obj; List> spread_ts_prices = new List>(); DateTime min_time = DateTime.MaxValue; DateTime max_time = DateTime.MinValue; var sw = Stopwatch.StartNew(); @@ -148,7 +148,7 @@ namespace bts.BlueOrb { max_bid, min_ask, n_buy_signals, cumm_buy_price, n_sell_signals, cumm_sell_price); BlueTable t = new BlueTable(_schema); t.addRow(nr); - var dp_out = BlueDataUtility.build_dp_inc(t, myLastValue as DataPacket, true); + var dp_out = BlueDataUtility.build_dp_inc(t, myLastValue as IDataPacket, true); var perf_msecs = sw.ElapsedMilliseconds; sw.Stop(); Log.Gen.info($"SpreadPerformanceStream._handle_spread_prices comp_time: {perf_msecs} msecs"); diff --git a/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpreadStatArbsWeightLinearRegressionStream.cs b/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpreadStatArbsWeightLinearRegressionStream.cs index 396c94d03..2a3f948e6 100644 --- a/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpreadStatArbsWeightLinearRegressionStream.cs +++ b/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpreadStatArbsWeightLinearRegressionStream.cs @@ -43,7 +43,7 @@ namespace bts.BlueOrb{ } private void _handle_leg_prices(object dp_obj){ - DataPacket dp = dp_obj as DataPacket; + var dp = (IDataPacket)dp_obj; List> leg_prices = new List>(); foreach (IBlueRow r in dp.newRows){ double s1_mid = (r.get("s1_bid_price") + r.get("s1_ask_price")) /2.0; @@ -64,7 +64,7 @@ namespace bts.BlueOrb{ BlueTable state = new BlueTable(_schema); IBlueRow nr = new BlueRow(_schema, 0, t0, t1, curr_windows_seconds, n_ticks,_s1, w1, _s2, w2); state.addRow(nr); - var dp_out = BlueDataUtility.build_dp_inc(state, myLastValue as DataPacket, true); + var dp_out = BlueDataUtility.build_dp_inc(state, myLastValue as IDataPacket, true); myFireEvent(dp_out); } diff --git a/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpreadStatsStream.cs b/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpreadStatsStream.cs index a0afc7ba1..07f0675f4 100644 --- a/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpreadStatsStream.cs +++ b/src/DataStreamSuite/SharedStreams/Business/MarketData/Analytics/SpreadStatsStream.cs @@ -79,7 +79,7 @@ } private void _handle_spread_prices(object dp_obj) { - List rows = (dp_obj as DataPacket).newRows.to_list(); + List rows = ((DataPacket)dp_obj).newRows.to_list(); Func row_filter = (r) => { DateTime ts = r.get_datetime("timestamp"); DateTime start_time = DateTime.Now.Subtract(_window_sz); @@ -139,7 +139,7 @@ stopwatch.Stop(); BlueTable t = new BlueTable(_schema); t.addRow(nr); - var dp_out = BlueDataUtility.build_dp(t, myLastValue as DataPacket); + var dp_out = BlueDataUtility.build_dp(t, myLastValue as IDataPacket); myFireEvent(dp_out); } } diff --git a/src/DataStreamSuite/SharedStreams/Business/MarketData/BBOStream.cs b/src/DataStreamSuite/SharedStreams/Business/MarketData/BBOStream.cs index b68774620..82cc9af98 100644 --- a/src/DataStreamSuite/SharedStreams/Business/MarketData/BBOStream.cs +++ b/src/DataStreamSuite/SharedStreams/Business/MarketData/BBOStream.cs @@ -76,7 +76,7 @@ namespace bts.BlueOrb { bid_price, _rnd.Next(1, 10), ask_price, _rnd.Next(1, 10)); _table.addRow(nr); - var dp = BlueDataUtility.build_dp(new BlueTable(_table), myLastValue as DataPacket); + var dp = BlueDataUtility.build_dp(new BlueTable(_table), myLastValue as IDataPacket); myFireEvent(dp); } } else { @@ -92,7 +92,7 @@ namespace bts.BlueOrb { _table.addRow(nr); } } - var dp = BlueDataUtility.build_dp_inc(new BlueTable(_table), myLastValue as DataPacket, true); + var dp = BlueDataUtility.build_dp_inc(new BlueTable(_table), myLastValue as IDataPacket, true); myFireEvent(dp); } } @@ -172,12 +172,12 @@ namespace bts.BlueOrb { bt.book.asks[0].price, bt.book.asks[0].size); new_state.addRow(r); } - var dp = accumulate(myLastValue as DataPacket, new_state); + var dp = accumulate(myLastValue as IDataPacket, new_state); if (dp.addedRows.Count == 0 && dp.deletedRows.Count == 0) return; myFireEvent(dp); - static DataPacket accumulate(DataPacket? old_dp, BlueTable new_state) { + static DataPacket accumulate(IDataPacket? old_dp, BlueTable new_state) { if (old_dp is null) { return new(new_state, new_state, new BlueTable(_bbo_schema)); } diff --git a/src/DataStreamSuite/SharedStreams/Business/MarketData/BookStream.cs b/src/DataStreamSuite/SharedStreams/Business/MarketData/BookStream.cs index efc1edbd1..2fa2dcb8d 100644 --- a/src/DataStreamSuite/SharedStreams/Business/MarketData/BookStream.cs +++ b/src/DataStreamSuite/SharedStreams/Business/MarketData/BookStream.cs @@ -99,7 +99,7 @@ namespace bts.BlueOrb{ if (myLastValue == null) { dp = new DataPacket(new_state, new_state, new BlueTable(_bbo_schema)); } else { - DataPacket old_dp = myLastValue as DataPacket; + var old_dp = (IDataPacket)myLastValue; IBlueRowCollection added_rows, del_rows; BlueDataUtility.compute_differences_fast(new_state, old_dp.newRows, out del_rows, out added_rows); dp = new DataPacket(new_state, added_rows, del_rows); diff --git a/src/DataStreamSuite/SharedStreams/Business/MarketData/InstrumentsStream.cs b/src/DataStreamSuite/SharedStreams/Business/MarketData/InstrumentsStream.cs index 56865ee65..45cf6862d 100644 --- a/src/DataStreamSuite/SharedStreams/Business/MarketData/InstrumentsStream.cs +++ b/src/DataStreamSuite/SharedStreams/Business/MarketData/InstrumentsStream.cs @@ -101,7 +101,7 @@ namespace bts.BlueOrb { if (myLastValue == null) { dp = new DataPacket(new_state, new_state, new BlueTable(_instrument_schema)); } else { - DataPacket old_dp = myLastValue as DataPacket; + var old_dp = (IDataPacket)myLastValue; IBlueRowCollection added_rows, del_rows; BlueDataUtility.compute_differences_fast(new_state, old_dp.newRows, out del_rows, out added_rows); dp = new DataPacket(new_state, added_rows, del_rows); diff --git a/src/DataStreamSuite/SharedStreams/Business/MarketData/PriceStatsStream.cs b/src/DataStreamSuite/SharedStreams/Business/MarketData/PriceStatsStream.cs index 8c9bbf9a0..540e03893 100644 --- a/src/DataStreamSuite/SharedStreams/Business/MarketData/PriceStatsStream.cs +++ b/src/DataStreamSuite/SharedStreams/Business/MarketData/PriceStatsStream.cs @@ -89,7 +89,7 @@ namespace BCG { if (myLastValue == null) { dp = new DataPacket(new_state, new_state, new BlueTable(_pstats_scheam)); } else { - DataPacket old_dp = myLastValue as DataPacket; + var old_dp = (IDataPacket)myLastValue; IBlueRowCollection added_rows, del_rows; BlueDataUtility.compute_differences_fast(new_state, old_dp.newRows, out del_rows, out added_rows); dp = new DataPacket(new_state, added_rows, del_rows); diff --git a/src/DataStreamSuite/SharedStreams/Business/MarketData/TimeSalesStream.cs b/src/DataStreamSuite/SharedStreams/Business/MarketData/TimeSalesStream.cs index 308db0781..e0cdbcecc 100644 --- a/src/DataStreamSuite/SharedStreams/Business/MarketData/TimeSalesStream.cs +++ b/src/DataStreamSuite/SharedStreams/Business/MarketData/TimeSalesStream.cs @@ -81,7 +81,7 @@ namespace BCG { IBlueRow r = new BlueRow(_schema, _id++, tinf.security.Id, tinf.security.ToString(), to_dt(tinf), tinf.trade.Time, tinf.trade.Mantissa * Math.Pow(10, tinf.trade.Exponent), tinf.trade.Size, tinf.trade.AggressorSide.ToString()); _circulare_table.addRow(r); } - DataPacket dp = BlueDataUtility.build_dp_inc(_circulare_table, myLastValue as DataPacket); + var dp = BlueDataUtility.build_dp_inc(_circulare_table, myLastValue as IDataPacket); myFireEvent(dp); } diff --git a/src/DataStreamSuite/SharedStreams/NL/BlueOrbNLStream.cs b/src/DataStreamSuite/SharedStreams/NL/BlueOrbNLStream.cs index 3fc7b68fc..2fc2f6eb6 100644 --- a/src/DataStreamSuite/SharedStreams/NL/BlueOrbNLStream.cs +++ b/src/DataStreamSuite/SharedStreams/NL/BlueOrbNLStream.cs @@ -22,7 +22,7 @@ } private void _handle_dsl_callback(object dp_obj) { - DataPacket dp = dp_obj as DataPacket; + var dp = (IDataPacket)dp_obj; var r = dp.newRows.to_list().ElementAt(0); string dsl = r.get("response"); _dp_metadata["dsl"] = dsl; @@ -32,8 +32,8 @@ } private void _handle_data_cb(object dp_obj) { - var dp = dp_obj as DataPacket; - DataPacket dp_out = BlueDataUtility.build_dp_inc(dp.newRows, myLastValue as DataPacket, true); + var dp = (IDataPacket)dp_obj; + var dp_out = BlueDataUtility.build_dp_inc(dp.newRows, myLastValue as IDataPacket, true); dp_out.meta_data = new Dictionary(_dp_metadata); myFireEvent(dp_out); } diff --git a/src/DataStreamSuite/SharedStreams/NL/OpenAIPromptStream.cs b/src/DataStreamSuite/SharedStreams/NL/OpenAIPromptStream.cs index c47440516..f0674f981 100644 --- a/src/DataStreamSuite/SharedStreams/NL/OpenAIPromptStream.cs +++ b/src/DataStreamSuite/SharedStreams/NL/OpenAIPromptStream.cs @@ -142,7 +142,7 @@ namespace bts.BlueOrb { IBlueRow nr = new BlueRow(schema, 0, _user_prompt, response.Item1, response.Item2.TotalMilliseconds); BlueTable nt = new BlueTable(schema); nt.addRow(nr); - var dp_out = BlueDataUtility.build_dp(nt, myLastValue as DataPacket); + var dp_out = BlueDataUtility.build_dp(nt, myLastValue as IDataPacket); myFireEvent(dp_out); } } diff --git a/src/DataStreamSuite/SharedStreams/System/PS3/Stats/PubSubServerTagStatsStream.cs b/src/DataStreamSuite/SharedStreams/System/PS3/Stats/PubSubServerTagStatsStream.cs index 9a9ad7fe6..99ac41db8 100644 --- a/src/DataStreamSuite/SharedStreams/System/PS3/Stats/PubSubServerTagStatsStream.cs +++ b/src/DataStreamSuite/SharedStreams/System/PS3/Stats/PubSubServerTagStatsStream.cs @@ -67,7 +67,7 @@ namespace bts { LastUpdateTime = ts_info.last_update_time, }); } - var dp = BlueDataUtility.build_dp_inc(bt, myLastValue as DataPacket, true); + var dp = BlueDataUtility.build_dp_inc(bt, myLastValue as IDataPacket, true); if (dp.addedRows.Count + dp.deletedRows.Count > 0) myFireEvent(dp); diff --git a/src/DataStreamSuite/SharedStreams/System/PS3/Subscription/PubSubServerStateStream.cs b/src/DataStreamSuite/SharedStreams/System/PS3/Subscription/PubSubServerStateStream.cs index 9fddd7497..b4c5cab36 100644 --- a/src/DataStreamSuite/SharedStreams/System/PS3/Subscription/PubSubServerStateStream.cs +++ b/src/DataStreamSuite/SharedStreams/System/PS3/Subscription/PubSubServerStateStream.cs @@ -76,7 +76,7 @@ namespace bts { DeadPublishers = tsi.dead_publishers_as_string, }); } - var dp = BlueDataUtility.build_dp_inc(bt, myLastValue as DataPacket, true); + var dp = BlueDataUtility.build_dp_inc(bt, myLastValue as IDataPacket, true); if (dp.addedRows.Count + dp.deletedRows.Count > 0) myFireEvent(dp); diff --git a/src/DataStreamSuite/SharedStreams/System/PS3/Subscription/PubsubHeartbeatStream.cs b/src/DataStreamSuite/SharedStreams/System/PS3/Subscription/PubsubHeartbeatStream.cs index 77bc275fd..bf42c9444 100644 --- a/src/DataStreamSuite/SharedStreams/System/PS3/Subscription/PubsubHeartbeatStream.cs +++ b/src/DataStreamSuite/SharedStreams/System/PS3/Subscription/PubsubHeartbeatStream.cs @@ -72,7 +72,7 @@ namespace bts { if (_row != null) { var bt = new BlueTable(_schema); bt.addRow(_row); - var dp = BlueDataUtility.build_dp_inc(bt, myLastValue as DataPacket, true); + var dp = BlueDataUtility.build_dp_inc(bt, myLastValue as IDataPacket, true); myFireEvent(dp); } } diff --git a/src/DataStreamSuite/SharedStreams/System/PS3/TableMetaDataStream.cs b/src/DataStreamSuite/SharedStreams/System/PS3/TableMetaDataStream.cs index d9e21f5f6..43e299114 100644 --- a/src/DataStreamSuite/SharedStreams/System/PS3/TableMetaDataStream.cs +++ b/src/DataStreamSuite/SharedStreams/System/PS3/TableMetaDataStream.cs @@ -20,8 +20,7 @@ namespace bts } private void _handle_table_update(object dp_obj) { - DataPacket dp = dp_obj as DataPacket; - schema = dp.schema; + schema = ((IDataPacket)dp_obj).Schema; } public void unsub() { @@ -79,14 +78,14 @@ namespace bts } if (changed) { - var dp_out = BlueDataUtility.build_dp_inc(_state, myLastValue as DataPacket); + var dp_out = BlueDataUtility.build_dp_inc(_state, myLastValue as IDataPacket); myFireEvent(dp_out); } } private void _handle_base_stream(object dp_obj) { - DataPacket dp = dp_obj as DataPacket; + var dp = (IDataPacket)dp_obj; foreach (IBlueRow r in dp.newRows) { string tag = r.get("tag");