From 8ceaffe488894d85a35715e68b462efc3f863be4 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 11 Jul 2024 10:07:19 -0400 Subject: [PATCH] refactor: Decouple RemoteQueryManager from IManagedSubscriber, IPubTableBroker impl --- .../DataStream/Offloading/RemoteQueryManager.cs | 12 ++++++++---- .../SubscriptionUtilities/IManagedSubscriber.cs | 7 +++++++ .../SubscriptionUtilities/ManagedSubscriber.cs | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 src/DataStreamSuite/PubSub/Client/SubscriptionUtilities/IManagedSubscriber.cs diff --git a/src/DataStreamSuite/DataStream/Offloading/RemoteQueryManager.cs b/src/DataStreamSuite/DataStream/Offloading/RemoteQueryManager.cs index effb56f1d..7aba07317 100644 --- a/src/DataStreamSuite/DataStream/Offloading/RemoteQueryManager.cs +++ b/src/DataStreamSuite/DataStream/Offloading/RemoteQueryManager.cs @@ -4,6 +4,8 @@ using System.Collections.Generic; using Bts.DataStreamExpressions; using BCG.Utilities.General; using bts; +using Bts.PubSub; +using Bts.DataStreamCore; namespace BCG { // listens to the requests posted on "cloud_streams" request table, and @@ -40,13 +42,15 @@ namespace BCG { private IDictionary _stream_pub_map = new Dictionary(); private ViewStream _stream = new TableStream("cloud_streams"); - private PubTableBroker _broker = new PubTableBroker(); - private ManagedSubscriber _sub = ManagedSubscriber.instance; + readonly IPubTableBroker _broker; + readonly IManagedSubscriber _sub; - public RemoteQueryManager() { + public RemoteQueryManager(IManagedSubscriber managedSubscriber, IPubTableBroker pubTableBroker) { + _sub = managedSubscriber; + _broker = pubTableBroker; _stream.onChange += _on_str; - _sub.subscribe("RemoteRequest", (string tag, byte[] data) => { + _sub.Subscribe("RemoteRequest", (string tag, byte[] data) => { RemoteRequest req = RemoteRequest.construct_from_bytes(data); _spawn_remote_stream(req.published_table_name, req.stream_expression, false); }); diff --git a/src/DataStreamSuite/PubSub/Client/SubscriptionUtilities/IManagedSubscriber.cs b/src/DataStreamSuite/PubSub/Client/SubscriptionUtilities/IManagedSubscriber.cs new file mode 100644 index 000000000..e4c6870f9 --- /dev/null +++ b/src/DataStreamSuite/PubSub/Client/SubscriptionUtilities/IManagedSubscriber.cs @@ -0,0 +1,7 @@ +namespace Bts.PubSub; + +using System; + +public interface IManagedSubscriber { + void Subscribe(string tag, Action onData); +} diff --git a/src/DataStreamSuite/PubSub/Client/SubscriptionUtilities/ManagedSubscriber.cs b/src/DataStreamSuite/PubSub/Client/SubscriptionUtilities/ManagedSubscriber.cs index 3c36507d3..df1a3d4a7 100644 --- a/src/DataStreamSuite/PubSub/Client/SubscriptionUtilities/ManagedSubscriber.cs +++ b/src/DataStreamSuite/PubSub/Client/SubscriptionUtilities/ManagedSubscriber.cs @@ -17,7 +17,7 @@ namespace BCG { /// Provides a callback based interface to the SubscriptionCore (this class is mainly here to allow backward compatibility /// with PubSub, as some clients are still using ManagedSubcribers) /// - public class ManagedSubscriber : IWorker, IDisposable { + public class ManagedSubscriber : IManagedSubscriber, IWorker, IDisposable { private static ManagedSubscriber? _self; private ISubscriberCore _subcore; // private IDictionary myTypedDispatchTable = new Hashtable(),