From d669d24aeaf2c18e1d67e1df91da8f6ea96e46e0 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 20 Jul 2024 04:06:31 +0000 Subject: [PATCH] fix: Add a few null checks * TimeBasedFilter * TableAccumulator2 * NonIncGroupByStream --- .../DataStream/Primitives/Filter/TimeBasedFilter.cs | 2 +- .../Primitives/GroupBy/NonIncremental/NonIncGroupByStream.cs | 4 ++++ .../Messaging/Subscription/TableAccumulator2.cs | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/DataStreamSuite/DataStream/Primitives/Filter/TimeBasedFilter.cs b/src/DataStreamSuite/DataStream/Primitives/Filter/TimeBasedFilter.cs index d4f5e205a..9c9b1fc7b 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Filter/TimeBasedFilter.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Filter/TimeBasedFilter.cs @@ -89,7 +89,7 @@ namespace BCG { if (now > myNextFilter) { // fire event - onFilterChange(); + onFilterChange?.Invoke(); myNextFilter = now.Add(_filter_period); } diff --git a/src/DataStreamSuite/DataStream/Primitives/GroupBy/NonIncremental/NonIncGroupByStream.cs b/src/DataStreamSuite/DataStream/Primitives/GroupBy/NonIncremental/NonIncGroupByStream.cs index c3dedbbfe..fbc8ef6e4 100644 --- a/src/DataStreamSuite/DataStream/Primitives/GroupBy/NonIncremental/NonIncGroupByStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/GroupBy/NonIncremental/NonIncGroupByStream.cs @@ -96,6 +96,10 @@ namespace BCG { _timer.Restart(); IBlueRowCollection total_state = _groupby_func.evaluate(grouped_rows); _timer.Stop(); + if (total_state is null) { + Log.Gen.warn("NonIncGroupByStream _groupby_func.evaluate returned null (ignoring last update)."); + return; + } var applyElapsedMs = _timer.ElapsedMilliseconds; _n_total_fires++; if (applyElapsedMs >= 50) { diff --git a/src/DataStreamSuite/DataStreamCore/Messaging/Subscription/TableAccumulator2.cs b/src/DataStreamSuite/DataStreamCore/Messaging/Subscription/TableAccumulator2.cs index d27353e79..f6c4aaeed 100644 --- a/src/DataStreamSuite/DataStreamCore/Messaging/Subscription/TableAccumulator2.cs +++ b/src/DataStreamSuite/DataStreamCore/Messaging/Subscription/TableAccumulator2.cs @@ -91,7 +91,7 @@ namespace BCG IBlueRowCollection d_rows, a_rows; //BlueDataUtility.compute_differences_id_based(_table, table_0, out d_rows, out a_rows); BlueDataUtility.compute_differences_fast(_table, table_0, out d_rows, out a_rows); - _on_update_delegate(_table, a_rows, d_rows); + _on_update_delegate?.Invoke(_table, a_rows, d_rows); } public void update(Stream[] streams)