cleanup: Remove last vestiges of spark proto config from DataStreamCore
This commit is contained in:
1 parent
8f3fa18bca
commit
c4a6b4591d
8 files changed
+5
-39
No files matched your search
@@ -157,7 +157,7 @@ namespace BCG
|
||||
private ViewStream myParentStream;
|
||||
private string myFilterString;
|
||||
private BCG.StreamWorld.Addition.FilterStream myFilterStream;
|
||||
private bool myUseNewFilter = Configuration.get<DataStreamConfig>().UseNewFilter;
|
||||
private bool myUseNewFilter = false;
|
||||
|
||||
#region constructors
|
||||
public delegate bool OnFilter(IBlueRow r);
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace BCG {
|
||||
public class MapStream : MethodDrivenStream {
|
||||
protected IStreamMapper? myMapper;
|
||||
protected IChangeableStreamMapper? myChangeableMapper;
|
||||
private bool myUseNewMap = Configuration.get<DataStreamConfig>().UseNewMap;
|
||||
private bool myUseNewMap = false;
|
||||
|
||||
public class FuncWrapper : IStreamMapper {
|
||||
private Func<IBlueTableSchema, IBlueTableSchema> _schema_map_func;
|
||||
|
||||
@@ -75,16 +75,7 @@ namespace BCG
|
||||
{
|
||||
IDictionary<string, string> origToAlias = new Dictionary<string, string>();
|
||||
|
||||
ColumnMapExpression e;
|
||||
if (Configuration.get<DataStreamConfig>().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";
|
||||
|
||||
@@ -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<DataStreamConfig>().IsTestMode;
|
||||
protected bool myTestMode = false;
|
||||
protected bool myFirstSubImplemented = true,
|
||||
myLastSubImplemented = true;
|
||||
protected IDictionary myDelMap = new Hashtable ();
|
||||
|
||||
@@ -17,10 +17,4 @@
|
||||
<ProjectReference Include="..\PubSub\PubSub.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Proto Include="../../lib_spark/spark/config/protos/data_stream_config.proto" CSName="DataStreamConfig">
|
||||
<OutDir>$(ProtoOutputPath)/lib_spark/spark/config/protos</OutDir>
|
||||
</Proto>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -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<DataStreamConfig>().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)) {
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
using Bts.DataStream;
|
||||
|
||||
using mbts.config;
|
||||
|
||||
using System;
|
||||
|
||||
namespace BCG
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
DataStreamConfig {
|
||||
value {
|
||||
assemblies: "DataStream.dll"
|
||||
assemblies: "SharedStreams.dll"
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user