diff --git a/src/DataStreamSuite/DataStream/Core/TablePacket.cs b/src/DataStreamSuite/DataStream/Core/TablePacket.cs deleted file mode 100644 index 89a0e75d3..000000000 --- a/src/DataStreamSuite/DataStream/Core/TablePacket.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Data; -using System.Collections; - -namespace BCG -{ - /// - /// Defines the type that will be passed as the callback from the TableStream class - /// - public class TablePacket - { - public DataTable newTable = new DataTable(); - public DataTable addedRows = new DataTable(); - public DataTable deletedRows = new DataTable(); - - public TablePacket () {} - - public TablePacket (DataTable nt, DataTable ar, DataTable dr) - { - newTable = nt; - addedRows = ar; - deletedRows = dr; - } - - } -} diff --git a/src/DataStreamSuite/DataStreamCore/BlueData/IBlueRow.cs b/src/DataStreamSuite/DataStreamCore/BlueData/IBlueRow.cs index d351ef36d..1225e5c4e 100644 --- a/src/DataStreamSuite/DataStreamCore/BlueData/IBlueRow.cs +++ b/src/DataStreamSuite/DataStreamCore/BlueData/IBlueRow.cs @@ -1,3 +1,4 @@ +#nullable enable using System; using System.Collections; @@ -21,18 +22,18 @@ namespace BCG /// a sizeable time, eg for a table with 20000 rows and a schema of 20 columns, we will save about /// half a million type checkings /// - object this[int index] {get;} - object this[string colName] {get;} + object? this[int index] {get;} + object? this[string colName] {get;} } namespace Extensions { public static class IBlueRowExtensions { - public static bool isDBNull(this object val) + public static bool isDBNull(this object? val) { return (val == null || val == DBNull.Value); } - public static bool isNotDBNull(this object val) + public static bool isNotDBNull(this object? val) { return (val != null && val != DBNull.Value); } diff --git a/src/DataStreamSuite/DataStream/Config/DataStreamLoadFileConfig.cs b/src/DataStreamSuite/DataStreamCore/Config/DataStreamLoadFileConfig.cs similarity index 100% rename from src/DataStreamSuite/DataStream/Config/DataStreamLoadFileConfig.cs rename to src/DataStreamSuite/DataStreamCore/Config/DataStreamLoadFileConfig.cs diff --git a/src/DataStreamSuite/DataStream/Core/DataStream.cs b/src/DataStreamSuite/DataStreamCore/DataStream.cs similarity index 99% rename from src/DataStreamSuite/DataStream/Core/DataStream.cs rename to src/DataStreamSuite/DataStreamCore/DataStream.cs index 1f14a3027..b28b59a1b 100644 --- a/src/DataStreamSuite/DataStream/Core/DataStream.cs +++ b/src/DataStreamSuite/DataStreamCore/DataStream.cs @@ -4,6 +4,7 @@ using System.Collections; //using BCG.Utilities; //using BCG.Utilities.General; using mbts; +using mbts.spark; namespace BCG { diff --git a/src/DataStreamSuite/DataStream/Core/IExportableDataStream.cs b/src/DataStreamSuite/DataStreamCore/IExportableDataStream.cs similarity index 100% rename from src/DataStreamSuite/DataStream/Core/IExportableDataStream.cs rename to src/DataStreamSuite/DataStreamCore/IExportableDataStream.cs diff --git a/src/DataStreamSuite/DataStream/Core/LightTableStream.cs b/src/DataStreamSuite/DataStreamCore/LightTableStream.cs similarity index 100% rename from src/DataStreamSuite/DataStream/Core/LightTableStream.cs rename to src/DataStreamSuite/DataStreamCore/LightTableStream.cs diff --git a/src/DataStreamSuite/DataStream/Core/ProxyStream.cs b/src/DataStreamSuite/DataStreamCore/ProxyStream.cs similarity index 100% rename from src/DataStreamSuite/DataStream/Core/ProxyStream.cs rename to src/DataStreamSuite/DataStreamCore/ProxyStream.cs diff --git a/src/DataStreamSuite/DataStream/Core/TableStream.cs b/src/DataStreamSuite/DataStreamCore/TableStream.cs similarity index 100% rename from src/DataStreamSuite/DataStream/Core/TableStream.cs rename to src/DataStreamSuite/DataStreamCore/TableStream.cs diff --git a/src/DataStreamSuite/DataStream/Core/ViewStream.cs b/src/DataStreamSuite/DataStreamCore/ViewStream.cs similarity index 100% rename from src/DataStreamSuite/DataStream/Core/ViewStream.cs rename to src/DataStreamSuite/DataStreamCore/ViewStream.cs diff --git a/src/DataStreamSuite/DataStream/Core/ViewStreamDatabase.cs b/src/DataStreamSuite/DataStreamCore/ViewStreamDatabase.cs similarity index 100% rename from src/DataStreamSuite/DataStream/Core/ViewStreamDatabase.cs rename to src/DataStreamSuite/DataStreamCore/ViewStreamDatabase.cs