diff --git a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs index 2ccd591a5..c5bb0daad 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs @@ -1,4 +1,7 @@ +using bts; + using Bts.DataStream; +using Bts.DataStream.Primitives.Filter; using mbts.config; @@ -21,6 +24,7 @@ namespace BCG.StreamWorld.Addition { public FilterStream(ViewStream vs, IStreamFilter filter) { myBaseStream = vs; myFilter = filter; + vs.ErrorChanged += OnError; if (filter is IDynamicStreamFilter) (filter as IDynamicStreamFilter).onFilterChange += new FilterChangeDelegate(myHandleFilterChange); } @@ -36,31 +40,45 @@ namespace BCG.StreamWorld.Addition { myStateTable.clear(); } + bool filterRow(IBlueRow r) { + try { + return myFilter.filter(r); + } catch (Exception ex) { + Log.Gen.error($"FilterStream delegate threw exception: {ex}"); + OnError(new StreamFilterException(StreamId, StreamName, null, ex, r)); + } + return false; + } + private void myHandleChanges(object newValue) { - DataPacket dp = newValue as DataPacket; - if (myStateTable == null) { - bts.Log.assert(myBaseTable == null); - myStateTable = new BlueTable(dp.schema); - myBaseTable = new BlueTable(dp.schema); - } - BlueTable dels = new BlueTable(dp.schema), - adds = new BlueTable(dp.schema); - foreach (IBlueRow r in dp.deletedRows) { - myBaseTable.deleteRow(r); - if (myStateTable.containsID((int)r["id"])) { - dels.addRow(r); - myStateTable.deleteRow(r); + try { + DataPacket dp = newValue as DataPacket; + if (myStateTable == null) { + bts.Log.assert(myBaseTable == null); + myStateTable = new BlueTable(dp.schema); + myBaseTable = new BlueTable(dp.schema); } - } - foreach (IBlueRow r in dp.addedRows) { - myBaseTable.addRow(r); - if (myFilter.filter(r)) { - adds.addRow(r); - myStateTable.addRow(r); + BlueTable dels = new BlueTable(dp.schema), + adds = new BlueTable(dp.schema); + foreach (IBlueRow r in dp.deletedRows) { + myBaseTable.deleteRow(r); + if (myStateTable.containsID((int)r["id"])) { + dels.addRow(r); + myStateTable.deleteRow(r); + } } + foreach (IBlueRow r in dp.addedRows) { + myBaseTable.addRow(r); + if (filterRow(r)) { + adds.addRow(r); + myStateTable.addRow(r); + } + } + if ((dels.Count > 0 || adds.Count > 0) || (myLastValue == null)) + myFireEvent(new DataPacket(myStateTable, adds, dels)); + } catch (Exception ex) { + OnError(ex); } - if ((dels.Count > 0 || adds.Count > 0) || (myLastValue == null)) - myFireEvent(new DataPacket(myStateTable, adds, dels)); } public IStreamFilter filter { @@ -69,9 +87,20 @@ namespace BCG.StreamWorld.Addition { if (myBaseTable != null) { IBlueRowCollection oldState = new BlueTable(myStateTable); myStateTable.clear(); - foreach (IBlueRow r in myBaseTable) - if (myFilter.filter(r)) - myStateTable.addRow(r); + // If the filter throws an exception, we can rethrow it as a StreamFilterException + // and include the 'currentRow' (for which the filter failed) to provide context. + IBlueRow? currentRow = null; + foreach (IBlueRow r in myBaseTable) { + try { + currentRow = r; + if (filterRow(r)) { + myStateTable.addRow(r); + } + } catch (Exception ex) { + Log.Gen.error($"FilterStream delegate threw exception: {ex}"); + OnError(new StreamFilterException(StreamId, StreamName, null, ex, currentRow)); + } + } IBlueRowCollection dels, adds; BlueDataUtility.computeDifferences(myStateTable, oldState, out dels, out adds); myFireEvent(new DataPacket(myStateTable, adds, dels)); @@ -206,32 +235,36 @@ namespace BCG DataPacket retVal; DataPacket arrivedPacket = newValue as DataPacket; myLastReceivedRows = arrivedPacket.newRows; - if (myLastFiredRows != null) - { - retVal = new DataPacket(myLastFiredRows, new BlueTable(myLastFiredRows.schema), - new BlueTable(myLastFiredRows.schema)); - foreach (IBlueRow r in arrivedPacket.deletedRows) - if (myLastFiredRows.containsID((int)r["id"])) - { - myLastFiredRows.deleteRow(r); - (retVal.deletedRows as BlueTable).addRow(r); - } - foreach (IBlueRow r in arrivedPacket.addedRows) - if (myFilter.filter(r)) - { - myLastFiredRows.addRow(r); - (retVal.addedRows as BlueTable).addRow(r); - } + try { + if (myLastFiredRows != null) + { + retVal = new DataPacket(myLastFiredRows, new BlueTable(myLastFiredRows.schema), + new BlueTable(myLastFiredRows.schema)); + foreach (IBlueRow r in arrivedPacket.deletedRows) + if (myLastFiredRows.containsID((int)r["id"])) + { + myLastFiredRows.deleteRow(r); + (retVal.deletedRows as BlueTable).addRow(r); + } + foreach (IBlueRow r in arrivedPacket.addedRows) + if (filterRow(r)) + { + myLastFiredRows.addRow(r); + (retVal.addedRows as BlueTable).addRow(r); + } + } + else + { + myLastFiredRows = new BlueTable(arrivedPacket.schema); + retVal = new DataPacket(myLastFiredRows, myLastFiredRows, new BlueTable(myLastFiredRows.schema)); + foreach (IBlueRow r in arrivedPacket.newRows) + if (filterRow(r)) + myLastFiredRows.addRow(r); + } + myFireEvent(retVal); + } catch (Exception ex) { + OnError(ex); } - else - { - myLastFiredRows = new BlueTable(arrivedPacket.schema); - retVal = new DataPacket(myLastFiredRows, myLastFiredRows, new BlueTable(myLastFiredRows.schema)); - foreach (IBlueRow r in arrivedPacket.newRows) - if (myFilter.filter(r)) - myLastFiredRows.addRow(r); - } - myFireEvent(retVal); } public IStreamFilter filter @@ -249,16 +282,20 @@ namespace BCG { if (myLastReceivedRows != null) { + try { BlueTable nRows = new BlueTable(myLastReceivedRows.schema); foreach (IBlueRow r in myLastReceivedRows) - if (myFilter.filter(r)) + if (filterRow(r)) nRows.addRow(r); IBlueRowCollection dRows = new BlueTable(nRows.schema), aRows = new BlueTable(nRows.schema); BlueDataUtility.computeDifferences(nRows, myLastFiredRows, out dRows, out aRows); myLastFiredRows = nRows; myFireEvent(new DataPacket(nRows, aRows, dRows)); - } + } catch (Exception ex) { + OnError(ex); + } + } } } } @@ -282,5 +319,15 @@ namespace BCG { filter = myFilter; } + + bool filterRow(IBlueRow r) { + try { + return myFilter.filter(r); + } catch (Exception ex) { + Log.Gen.error($"FilterStream delegate threw exception: {ex}"); + OnError(new StreamFilterException(StreamId, StreamName, null, ex, r)); + } + return false; + } } } diff --git a/src/DataStreamSuite/DataStream/Primitives/Filter/StreamFilterException.cs b/src/DataStreamSuite/DataStream/Primitives/Filter/StreamFilterException.cs new file mode 100644 index 000000000..008c5b5bc --- /dev/null +++ b/src/DataStreamSuite/DataStream/Primitives/Filter/StreamFilterException.cs @@ -0,0 +1,19 @@ +#nullable enable +namespace Bts.DataStream.Primitives.Filter; + +using BCG; + +using System; + +public class StreamFilterException : Exception { + public StreamFilterException(Guid streamId, string streamName, string? message, Exception? innerException, IBlueRow? badRow = null) + : base(message, innerException) { + StreamId = streamId; + StreamName = streamName; + BadRow = badRow; + } + + public Guid StreamId { get; } + public string StreamName { get; } + public IBlueRow? BadRow { get; } +} diff --git a/src/DataStreamSuite/DataStreamCore/DataStream.cs b/src/DataStreamSuite/DataStreamCore/DataStream.cs index 63f5e9dd6..dd1e367c2 100644 --- a/src/DataStreamSuite/DataStreamCore/DataStream.cs +++ b/src/DataStreamSuite/DataStreamCore/DataStream.cs @@ -32,6 +32,9 @@ namespace BCG public DataStream (DataStream realSource) { myRealSource = realSource; + if (myRealSource is not null) { + myRealSource.ErrorChanged += OnError; + } myOnChangeDelegate = null; myPendingAdds = new Stack(); } @@ -48,6 +51,8 @@ namespace BCG } } + public event Action ErrorChanged; + public delegate void ChangeDelegate(object newValue); public event ChangeDelegate onChange { @@ -120,8 +125,15 @@ namespace BCG protected virtual object myGetValueForInitialSubscription() {return myLastValue;} - protected void mySetRealSource (DataStream src) - {myRealSource = src;} + protected void mySetRealSource (DataStream src) { + if (myRealSource is not null) { + myRealSource.ErrorChanged -= OnError; + } + myRealSource = src; + if (myRealSource is not null) { + myRealSource.ErrorChanged += OnError; + } + } protected virtual void myOnFirstSubscriber() {myFirstSubImplemented = false;} protected virtual void myOnLastSubscriber () {myLastSubImplemented = false;} @@ -143,6 +155,11 @@ namespace BCG } } + protected void OnError(Exception error) { + Log.Gen.error($"{GetType()} OnError: {error}"); + ErrorChanged?.Invoke(error); + } + public Guid ID { get diff --git a/src/DataStreamSuite/DataStreamCore/ViewStream.cs b/src/DataStreamSuite/DataStreamCore/ViewStream.cs index 03baf677a..dd2452b18 100644 --- a/src/DataStreamSuite/DataStreamCore/ViewStream.cs +++ b/src/DataStreamSuite/DataStreamCore/ViewStream.cs @@ -1,11 +1,9 @@ -using System; - -using BCG.Utilities; - using Bts.DataStream; using mbts.config; +using System; + namespace BCG { /// @@ -17,14 +15,26 @@ namespace BCG protected bool myUseUncopiedNewRowsInFireEvent = Configuration.get().UseUncopiedNewRowsInFire; + string streamName; + public ViewStream (ViewStream sourceStream) : base(sourceStream) {} + public ViewStream(string streamName) { + this.streamName = streamName; + } + public ViewStream() {} + public Guid StreamId { get; } = Guid.NewGuid(); + + public string StreamName => streamName + ?? (myRealSource as ViewStream)?.StreamName + ?? GetType().Name; + public IBlueRowCollection rows { get