diff --git a/CMakePresets.json b/CMakePresets.json index 5f40cbc93..b21a171e4 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -223,7 +223,10 @@ "inherits": "spark", "displayName": "Data Stream Suite", "description": "Data Stream utils ported over from Edge", - "binaryDir": "${sourceDir}/build/${presetName}" + "binaryDir": "${sourceDir}/build/${presetName}", + "cacheVariables": { + "CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf;config/profiles/data_stream/*.conf" + } } ], diff --git a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs index fd52a450d..7f9533064 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs @@ -4,8 +4,12 @@ using System.Data; using System.Collections; using BCG.Utilities; using System.Text.RegularExpressions; + +using Bts.DataStream; + using mbts; using mbts.spark; +using mbts.config; namespace BCG.StreamWorld.Addition { @@ -146,7 +150,7 @@ namespace BCG private ViewStream myParentStream; private string myFilterString; private BCG.StreamWorld.Addition.FilterStream myFilterStream; - private bool myUseNewFilter = DataStreamLoadFileConfig.instance.useNewFilter; + private bool myUseNewFilter = Configuration.get().UseNewFilter; private HighPerformanceTimer _timer = new HighPerformanceTimer(); #region constructors diff --git a/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs b/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs index 9adbcadb6..90d7c562d 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs @@ -1,8 +1,12 @@ using System; using System.Data; using System.Collections; + +using Bts.DataStream; + using mbts; using mbts.spark; +using mbts.config; namespace BCG { @@ -20,7 +24,7 @@ namespace BCG private HighPerformanceTimer t = new HighPerformanceTimer (); protected IStreamMapper myMapper; protected IChangeableStreamMapper myChangeableMapper = null; - private bool myUseNewMap = DataStreamLoadFileConfig.instance.useNewMap; + private bool myUseNewMap = Configuration.get().UseNewMap; public MapStream(ViewStream vs, IStreamMapper mapper) : base (vs) { diff --git a/src/DataStreamSuite/DataStream/Primitives/Project/ProjectHelper.cs b/src/DataStreamSuite/DataStream/Primitives/Project/ProjectHelper.cs index f012c95ad..82dca1783 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Project/ProjectHelper.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Project/ProjectHelper.cs @@ -1,4 +1,7 @@ using Bts.ColumnMapExpressions; +using Bts.DataStream; + +using mbts.config; using System; using System.Collections; @@ -73,7 +76,7 @@ namespace BCG IDictionary origToAlias = new Dictionary(); ColumnMapExpression e; - if (DataStreamLoadFileConfig.instance.useStaticParser) + if (Configuration.get().UseStaticParser) { e = ColumnMapExpression.Parse(exp); } diff --git a/src/DataStreamSuite/DataStreamCore/DataStream.cs b/src/DataStreamSuite/DataStreamCore/DataStream.cs index b28b59a1b..df63d5ce3 100644 --- a/src/DataStreamSuite/DataStreamCore/DataStream.cs +++ b/src/DataStreamSuite/DataStreamCore/DataStream.cs @@ -1,9 +1,12 @@ +using Bts.DataStream; + using System; using System.Collections; //using BCG.Utilities; //using BCG.Utilities.General; using mbts; +using mbts.config; using mbts.spark; namespace BCG @@ -14,7 +17,7 @@ namespace BCG public class DataStream { internal static event EventHandler onFireStart; - protected bool myTestMode = Convert.ToBoolean (DataStreamLoadFileConfig.instance.isTestMode); + protected bool myTestMode = Configuration.get().IsTestMode; protected bool myFirstSubImplemented = true, myLastSubImplemented = true; protected IDictionary myDelMap = new Hashtable (); diff --git a/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj b/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj index c41a5190c..012d57e16 100644 --- a/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj +++ b/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj @@ -1,4 +1,5 @@ + true net7.0 @@ -14,4 +15,10 @@ + + + $(ProtoOutputPath)/lib/config/protos + + + diff --git a/src/DataStreamSuite/DataStreamCore/DynamicLoading/PrimitiveManager.cs b/src/DataStreamSuite/DataStreamCore/DynamicLoading/PrimitiveManager.cs index 448bd2005..0f7a2d0a5 100644 --- a/src/DataStreamSuite/DataStreamCore/DynamicLoading/PrimitiveManager.cs +++ b/src/DataStreamSuite/DataStreamCore/DynamicLoading/PrimitiveManager.cs @@ -1,14 +1,15 @@ namespace BCG { + using Bts.DataStream; + using bts; + + using mbts.config; + using System; using System.Collections; using System.Reflection; using System.IO; - // using BCG.Utilities.BlueConfiguration; - using bts; - using System.Collections.Generic; - public class PrimitiveManager { private IDictionary myTypeLookupTable = new Hashtable(); @@ -22,13 +23,11 @@ namespace BCG private void myLoadAllTypes() { - DataStreamLoadFileConfig config = DataStreamLoadFileConfig.instance; - AppDomain currentDomain = AppDomain.CurrentDomain; currentDomain.AssemblyResolve += new ResolveEventHandler(myAssemblyResolver); loadAssembly(this.GetType().Assembly.FullName); - foreach (string assemblyName in config.loadedAssemblies ?? new string[] {"DataStream.dll"}) + foreach (string assemblyName in Configuration.get().Assemblies) { string resolvedAssemblyPath = assemblyName; if (!System.IO.Path.IsPathRooted(assemblyName)) diff --git a/src/DataStreamSuite/DataStreamCore/ViewStream.cs b/src/DataStreamSuite/DataStreamCore/ViewStream.cs index 22084a5e4..246bdf010 100644 --- a/src/DataStreamSuite/DataStreamCore/ViewStream.cs +++ b/src/DataStreamSuite/DataStreamCore/ViewStream.cs @@ -1,8 +1,11 @@ using System; -//using BCG.Utilities.BlueConfiguration; using BCG.Utilities; +using Bts.DataStream; + +using mbts.config; + namespace BCG { /// @@ -11,7 +14,8 @@ namespace BCG public abstract class ViewStream : DataStream { private IBlueRowCollection myLastValueForTestMode; - protected bool myUseUncopiedNewRowsInFireEvent = DataStreamLoadFileConfig.instance.useUncopiedNewRowsInFireEvent; + protected bool myUseUncopiedNewRowsInFireEvent = + Configuration.get().UseUncopiedNewRowsInFire; public ViewStream (ViewStream sourceStream) : diff --git a/src/lib/config/profiles/data_stream/data_stream_config.conf b/src/lib/config/profiles/data_stream/data_stream_config.conf new file mode 100644 index 000000000..e0ec47383 --- /dev/null +++ b/src/lib/config/profiles/data_stream/data_stream_config.conf @@ -0,0 +1,5 @@ +DataStreamConfig { + value { + assemblies: "DataStream.dll" + } +} diff --git a/src/lib/config/protos/data_stream_config.proto b/src/lib/config/protos/data_stream_config.proto new file mode 100644 index 000000000..bc939756f --- /dev/null +++ b/src/lib/config/protos/data_stream_config.proto @@ -0,0 +1,19 @@ +syntax = "proto3"; + +package Bts.DataStream; + +option csharp_namespace = "Bts.DataStream"; + +message DataStreamConfig { + repeated string assemblies = 1; + bool use_static_parser = 2; + bool log_blob_packets = 3; + bool is_test_mode = 4; + bool profile_streams = 5; + double profile_threshold = 6; + bool use_new_filter = 7; + bool use_new_map = 8; + bool use_increments_for_multiple_ops = 9; + bool use_uncopied_new_rows_in_fire = 10; + bool use_modularized_data_stream_bridge = 11; +}