From c4a6b4591d8e94d759d67baaf12e00561b7b5ccf Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 10 Dec 2025 13:06:55 -0500 Subject: [PATCH] cleanup: Remove last vestiges of spark proto config from DataStreamCore --- .../DataStream/Primitives/Filter/FilterStream.cs | 2 +- .../DataStream/Primitives/Map/MapStream.cs | 2 +- .../DataStream/Primitives/Project/ProjectHelper.cs | 11 +---------- src/DataStreamSuite/DataStreamCore/DataStream.cs | 6 +----- .../DataStreamCore/DataStreamCore.csproj | 6 ------ .../DataStreamCore/DynamicLoading/PrimitiveManager.cs | 7 +------ src/DataStreamSuite/DataStreamCore/ViewStream.cs | 4 ---- .../profiles/data_stream/data_stream_config.conf | 6 ------ 8 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 src/lib_spark/spark/config/profiles/data_stream/data_stream_config.conf diff --git a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs index c5bb0daad..9de8ed84c 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs @@ -157,7 +157,7 @@ namespace BCG private ViewStream myParentStream; private string myFilterString; private BCG.StreamWorld.Addition.FilterStream myFilterStream; - private bool myUseNewFilter = Configuration.get().UseNewFilter; + private bool myUseNewFilter = false; #region constructors public delegate bool OnFilter(IBlueRow r); diff --git a/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs b/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs index d2607ab73..28d54ce5c 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs @@ -21,7 +21,7 @@ namespace BCG { public class MapStream : MethodDrivenStream { protected IStreamMapper? myMapper; protected IChangeableStreamMapper? myChangeableMapper; - private bool myUseNewMap = Configuration.get().UseNewMap; + private bool myUseNewMap = false; public class FuncWrapper : IStreamMapper { private Func _schema_map_func; diff --git a/src/DataStreamSuite/DataStream/Primitives/Project/ProjectHelper.cs b/src/DataStreamSuite/DataStream/Primitives/Project/ProjectHelper.cs index 82dca1783..c4cf98e75 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Project/ProjectHelper.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Project/ProjectHelper.cs @@ -75,16 +75,7 @@ namespace BCG { IDictionary origToAlias = new Dictionary(); - ColumnMapExpression e; - if (Configuration.get().UseStaticParser) - { - e = ColumnMapExpression.Parse(exp); - } - else - { - // TODO (maybe): Actually use non-static parser (unclear what advantages it will have) - e = ColumnMapExpression.Parse(exp); - } + var e = ColumnMapExpression.Parse(exp); if (e.IsInclusive) { origToAlias = e.Columns.ToDictionary(); origToAlias["id"] = "id"; diff --git a/src/DataStreamSuite/DataStreamCore/DataStream.cs b/src/DataStreamSuite/DataStreamCore/DataStream.cs index dd1e367c2..3d80bd605 100644 --- a/src/DataStreamSuite/DataStreamCore/DataStream.cs +++ b/src/DataStreamSuite/DataStreamCore/DataStream.cs @@ -1,9 +1,5 @@ using bts; -using Bts.DataStream; - -using mbts.config; - using System; using System.Collections; using System.Diagnostics; @@ -16,7 +12,7 @@ namespace BCG public class DataStream { internal static event EventHandler onFireStart; - protected bool myTestMode = Configuration.get().IsTestMode; + protected bool myTestMode = false; 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 c8fe4d5d3..3e7284e62 100644 --- a/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj +++ b/src/DataStreamSuite/DataStreamCore/DataStreamCore.csproj @@ -17,10 +17,4 @@ - - - $(ProtoOutputPath)/lib_spark/spark/config/protos - - - diff --git a/src/DataStreamSuite/DataStreamCore/DynamicLoading/PrimitiveManager.cs b/src/DataStreamSuite/DataStreamCore/DynamicLoading/PrimitiveManager.cs index a889290cb..66fbaa629 100644 --- a/src/DataStreamSuite/DataStreamCore/DynamicLoading/PrimitiveManager.cs +++ b/src/DataStreamSuite/DataStreamCore/DynamicLoading/PrimitiveManager.cs @@ -1,9 +1,6 @@ namespace BCG { - using Bts.DataStream; using bts; - using mbts.config; - using System; using System.Collections; using System.Reflection; @@ -25,9 +22,7 @@ namespace BCG { currentDomain.AssemblyResolve += new ResolveEventHandler(myAssemblyResolver); loadAssembly(this.GetType().Assembly.FullName); var assemblies = new string[] { "DataStream.dll", "SharedStreams.dll" }; - var config_assemblies = Configuration.get().Assemblies; - bts.Log.Gen.info($"PrimitiveManager.myLoadAllTypes config_assemblies: {config_assemblies}"); - foreach (string assemblyName in assemblies/*config_assemblies*/) { + foreach (string assemblyName in assemblies) { bts.Log.Gen.info($"PrimitiveManager.myLoadAllTypes assemblyName: {assemblyName}"); string resolvedAssemblyPath = assemblyName; if (!System.IO.Path.IsPathRooted(assemblyName)) { diff --git a/src/DataStreamSuite/DataStreamCore/ViewStream.cs b/src/DataStreamSuite/DataStreamCore/ViewStream.cs index 87be9ee84..aa9bc98ac 100644 --- a/src/DataStreamSuite/DataStreamCore/ViewStream.cs +++ b/src/DataStreamSuite/DataStreamCore/ViewStream.cs @@ -1,7 +1,3 @@ -using Bts.DataStream; - -using mbts.config; - using System; namespace BCG diff --git a/src/lib_spark/spark/config/profiles/data_stream/data_stream_config.conf b/src/lib_spark/spark/config/profiles/data_stream/data_stream_config.conf deleted file mode 100644 index 9c9d8c0b2..000000000 --- a/src/lib_spark/spark/config/profiles/data_stream/data_stream_config.conf +++ /dev/null @@ -1,6 +0,0 @@ -DataStreamConfig { - value { - assemblies: "DataStream.dll" - assemblies: "SharedStreams.dll" - } -}