diff --git a/src/DataStreamSuite/DataStreamCore/DataPacket.cs b/src/DataStreamSuite/DataStreamCore/DataPacket.cs index adc3dbed4..14f5db095 100644 --- a/src/DataStreamSuite/DataStreamCore/DataPacket.cs +++ b/src/DataStreamSuite/DataStreamCore/DataPacket.cs @@ -52,6 +52,13 @@ namespace BCG { this.addedRows = addedRows; this.deletedRows = deletedRows; } + public DataPacket(IBlueRowCollection newRows, IBlueRowCollection addedRows, IBlueRowCollection deletedRows, + IDictionary meta_data) { + this.newRows = newRows; + this.addedRows = addedRows; + this.deletedRows = deletedRows; + this.meta_data = meta_data != null ? new Dictionary(meta_data) : null; + } IBlueRowCollection IDataPacket.newRows => newRows; IBlueRowCollection IDataPacket.addedRows => addedRows; @@ -246,25 +253,35 @@ namespace BCG { return new DataPacket(nt, at, dt); } - public DataPacket deepCopy() { - return new DataPacket(new OrderedBlueTable(newRows), - new OrderedBlueTable(newRows), - new BlueTable(deletedRows)); + public object Clone() { + var copy = (DataPacket)MemberwiseClone(); + if (meta_data != null) + copy.meta_data = new Dictionary(meta_data); + return copy; } + public DataPacket deepCopy() { + var copy = new DataPacket( + new OrderedBlueTable(newRows), + new OrderedBlueTable(addedRows), + new BlueTable(deletedRows) + ); + if (meta_data != null) + copy.meta_data = new Dictionary(meta_data); + return copy; + } + + public virtual DataPacket createImmutable() { return new DataPacket( newRows is IImmutableRowCollection ? newRows : new ImmutableBlueTable(newRows), addedRows, - deletedRows); + deletedRows, meta_data); } #region ICloneable Members - public object Clone() { - return MemberwiseClone(); - } - + #endregion public string toIncrementalIDString() { diff --git a/src/DataStreamSuite/SharedStreams/NL/BlueOrbNLStream.cs b/src/DataStreamSuite/SharedStreams/NL/BlueOrbNLStream.cs index 330dfc309..3fc7b68fc 100644 --- a/src/DataStreamSuite/SharedStreams/NL/BlueOrbNLStream.cs +++ b/src/DataStreamSuite/SharedStreams/NL/BlueOrbNLStream.cs @@ -33,8 +33,8 @@ private void _handle_data_cb(object dp_obj) { var dp = dp_obj as DataPacket; - dp.meta_data = new Dictionary(_dp_metadata); DataPacket dp_out = BlueDataUtility.build_dp_inc(dp.newRows, myLastValue as DataPacket, true); + dp_out.meta_data = new Dictionary(_dp_metadata); myFireEvent(dp_out); } } diff --git a/src/client/spark_websocket/Core/WebsocketSubscriptionHandler.cs b/src/client/spark_websocket/Core/WebsocketSubscriptionHandler.cs index 5d6794eab..91f376f41 100644 --- a/src/client/spark_websocket/Core/WebsocketSubscriptionHandler.cs +++ b/src/client/spark_websocket/Core/WebsocketSubscriptionHandler.cs @@ -115,8 +115,10 @@ namespace bts.websocket_core { var changedRows = new Dictionary(); var addedRows = new Dictionary(); - hdlr.dis = vs.AsObservable().Subscribe(OnData); - + hdlr.dis = vs.AsObservable().Subscribe(OnData, OnError); + void OnError(Exception e) { + bts.Log.Gen.error(e.Message); + } void OnData(DataPacket dp) { lock (syncRoot) { removedRows.Clear(); @@ -138,6 +140,10 @@ namespace bts.websocket_core { added = addedRows.Values, changed = changedRows.Values, removed = removedRows.Values, + metaData = new { + dsl = dp.meta_data?["dsl"], + dp.schema + } }); } }