Add ErrorChanged event to propagate DataStream exceptions
This commit is contained in:
1 parent
f5c2537b26
commit
7401b90486
4 files changed
+89
-15
No files matched your search
@@ -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,6 +40,16 @@ 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) {
|
||||
@@ -54,7 +68,7 @@ namespace BCG.StreamWorld.Addition {
|
||||
}
|
||||
foreach (IBlueRow r in dp.addedRows) {
|
||||
myBaseTable.addRow(r);
|
||||
if (myFilter.filter(r)) {
|
||||
if (filterRow(r)) {
|
||||
adds.addRow(r);
|
||||
myStateTable.addRow(r);
|
||||
}
|
||||
@@ -69,9 +83,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));
|
||||
@@ -217,7 +242,7 @@ namespace BCG
|
||||
(retVal.deletedRows as BlueTable).addRow(r);
|
||||
}
|
||||
foreach (IBlueRow r in arrivedPacket.addedRows)
|
||||
if (myFilter.filter(r))
|
||||
if (filterRow(r))
|
||||
{
|
||||
myLastFiredRows.addRow(r);
|
||||
(retVal.addedRows as BlueTable).addRow(r);
|
||||
@@ -228,7 +253,7 @@ namespace BCG
|
||||
myLastFiredRows = new BlueTable(arrivedPacket.schema);
|
||||
retVal = new DataPacket(myLastFiredRows, myLastFiredRows, new BlueTable(myLastFiredRows.schema));
|
||||
foreach (IBlueRow r in arrivedPacket.newRows)
|
||||
if (myFilter.filter(r))
|
||||
if (filterRow(r))
|
||||
myLastFiredRows.addRow(r);
|
||||
}
|
||||
myFireEvent(retVal);
|
||||
@@ -251,7 +276,7 @@ namespace BCG
|
||||
{
|
||||
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);
|
||||
@@ -282,5 +307,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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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; }
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
@@ -121,8 +124,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;}
|
||||
@@ -144,6 +154,10 @@ namespace BCG
|
||||
}
|
||||
}
|
||||
|
||||
protected void OnError(Exception error) {
|
||||
ErrorChanged?.Invoke(error);
|
||||
}
|
||||
|
||||
public Guid ID
|
||||
{
|
||||
get
|
||||
|
||||
@@ -1,11 +1,5 @@
|
||||
using System;
|
||||
|
||||
using BCG.Utilities;
|
||||
|
||||
using Bts.DataStream;
|
||||
|
||||
using mbts.config;
|
||||
|
||||
namespace BCG
|
||||
{
|
||||
/// <summary>
|
||||
@@ -18,14 +12,26 @@ namespace BCG
|
||||
// Configuration.get<DataStreamConfig>().UseUncopiedNewRowsInFire;
|
||||
protected bool myUseUncopiedNewRowsInFireEvent = false;
|
||||
|
||||
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
|
||||
|
||||
Reference in new issue
Block a user