cleanup: Fix more build warnings in DataStreamSuite
Alot more
This commit is contained in:
1 parent
989d103eef
commit
bcd207f89e
118 files changed
+1812
-1597
No files matched your search
@@ -1,13 +1,11 @@
|
||||
using Bts.ColumnMapExpressions;
|
||||
using Bts.DataStream;
|
||||
|
||||
using mbts.config;
|
||||
using Spark.Core.Diagnostics;
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
// using BCG.Evaluator.ColumnMapExpression;
|
||||
|
||||
namespace BCG
|
||||
{
|
||||
@@ -26,7 +24,7 @@ namespace BCG
|
||||
/// <param name="isch">original(unprojected) schema</param>
|
||||
/// <param name="exp">expression defining the mapping</param>
|
||||
/// <param name="tableName">table name of the new schema</param>
|
||||
internal ProjectHelper (IBlueTableSchema isch, string exp, string tableName)
|
||||
internal ProjectHelper (IBlueTableSchema isch, string exp, string? tableName)
|
||||
: this (isch, myGetDictionary (isch, exp), tableName)
|
||||
{}
|
||||
|
||||
@@ -36,7 +34,7 @@ namespace BCG
|
||||
/// <param name="origToAlias">dictionary mapping unprojected names to their projected names, dropped cols should not be there</param>
|
||||
/// <param name="tableName">table name of the new schema</param>
|
||||
internal ProjectHelper (
|
||||
IBlueTableSchema isch, IDictionary<string, string> origToAlias, string tableName)
|
||||
IBlueTableSchema isch, IDictionary<string, string> origToAlias, string? tableName)
|
||||
{
|
||||
ArrayList colMapAl = new ArrayList (),
|
||||
colInfoAl = new ArrayList ();
|
||||
@@ -61,7 +59,7 @@ namespace BCG
|
||||
|
||||
schema = new BlueTableSchema (tableName == null ? isch.tableName : tableName,
|
||||
colInfoAl.ToArray (typeof(ColumnInfo)) as ColumnInfo[]);
|
||||
colMap = colMapAl.ToArray (typeof(int)) as int[];
|
||||
colMap = (int[])colMapAl.ToArray(typeof(int));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -74,8 +72,8 @@ namespace BCG
|
||||
private static IDictionary<string, string> myGetDictionary (IBlueTableSchema isch, string exp)
|
||||
{
|
||||
IDictionary<string, string> origToAlias = new Dictionary<string, string>();
|
||||
|
||||
var e = ColumnMapExpression.Parse(exp);
|
||||
var e = ColumnMapExpression.Parse(exp)
|
||||
?? throw new ArgumentException("Failed to parse ColumnMapExpression", nameof(exp));
|
||||
if (e.IsInclusive) {
|
||||
origToAlias = e.Columns.ToDictionary();
|
||||
origToAlias["id"] = "id";
|
||||
@@ -95,7 +93,7 @@ namespace BCG
|
||||
{
|
||||
IDictionary retVal = new Hashtable (dic.Count);
|
||||
foreach (DictionaryEntry de in dic)
|
||||
retVal.Add (de.Value, de.Key);
|
||||
retVal.Add(ExceptionAssert.NotNull(de.Value), de.Key);
|
||||
return retVal;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user