refactor: Replace DataPacket w/ IDataPacket in many places
This commit is contained in:
1 parent
49a952fb32
commit
03a8f4e9c0
64 files changed
+191
-200
No files matched your search
@@ -3,7 +3,7 @@ using System;
|
||||
namespace BCG {
|
||||
[DataStreamUserRespresentation("CountStream")]
|
||||
public class CountStream : ViewStream {
|
||||
private DataPacket myLastFiredDataPacket;
|
||||
IDataPacket? myLastFiredDataPacket;
|
||||
private IBlueTableSchema mySchema = new BlueTableSchema("count",
|
||||
new ColumnInfo("id", 0, typeof(int)),
|
||||
new ColumnInfo("count", 1, typeof(int)));
|
||||
@@ -39,8 +39,7 @@ namespace BCG {
|
||||
|
||||
private IBlueRowCollection myGetRows(object dp, int id) {
|
||||
BlueTable retVal = new BlueTable(mySchema);
|
||||
retVal.addRow
|
||||
(new BlueRow(mySchema, id, (dp as DataPacket).newRows.Count));
|
||||
retVal.addRow(new BlueRow(mySchema, id, ((IDataPacket)dp).newRows.Count));
|
||||
return retVal;
|
||||
}
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@ namespace bts.BlueOrb {
|
||||
}
|
||||
|
||||
protected override void myFireEvent(object o) {
|
||||
DataPacket dp = o as DataPacket;
|
||||
var dp = (IDataPacket)o;
|
||||
if (myLastValue == null || dp.addedRows.Count + dp.deletedRows.Count > 0)
|
||||
base.myFireEvent(o);
|
||||
}
|
||||
@@ -94,7 +94,7 @@ namespace bts.BlueOrb {
|
||||
|
||||
private void myHandleCallbacks(object newValue) {
|
||||
DataPacket retVal;
|
||||
DataPacket arrivedPacket = newValue as DataPacket;
|
||||
IDataPacket arrivedPacket = (IDataPacket)newValue;
|
||||
myLastReceivedRows = arrivedPacket.newRows;
|
||||
if (myLastFiredRows != null) {
|
||||
retVal = new DataPacket(myLastFiredRows, new BlueTable(myLastFiredRows.schema),
|
||||
@@ -110,7 +110,7 @@ namespace bts.BlueOrb {
|
||||
(retVal.addedRows as BlueTable).addRow(r);
|
||||
}
|
||||
} else {
|
||||
myLastFiredRows = new BlueTable(arrivedPacket.schema);
|
||||
myLastFiredRows = new BlueTable(arrivedPacket.Schema);
|
||||
retVal = new DataPacket(myLastFiredRows, myLastFiredRows, new BlueTable(myLastFiredRows.schema));
|
||||
foreach (IBlueRow r in arrivedPacket.newRows)
|
||||
if (myFilter.filter(r))
|
||||
|
||||
@@ -95,7 +95,7 @@ namespace bts.BlueOrb {
|
||||
protected override void myOnLastSubscriber() { _main_stream.onChange -= _main_stream_onchange; }
|
||||
|
||||
private void _main_stream_onchange(object nv) {
|
||||
DataPacket dp = nv as DataPacket;
|
||||
var dp = (IDataPacket)nv;
|
||||
///grouping together
|
||||
_timer.Restart();
|
||||
IDictionary<int, List<IBlueRow>> grouped_rows = (_groupby_cols == null || _groupby_cols.Length == 0) ?
|
||||
@@ -121,7 +121,10 @@ namespace bts.BlueOrb {
|
||||
Log.DataFlow.info(
|
||||
$"Time to evaluate {grouped_rows.Count} groups {_timer.ElapsedMilliseconds}ms, ratio {_n_expensive_fires}/{_n_total_fires}");
|
||||
}
|
||||
myFireEvent(new DataPacket(total_state, total_state, myLastValue == null ? new BlueTable(total_state.schema) : (myLastValue as DataPacket).newRows));
|
||||
var deletedRows = myLastValue is null
|
||||
? new BlueTable(total_state.schema)
|
||||
: ((IDataPacket)myLastValue).newRows;
|
||||
myFireEvent(new DataPacket(total_state, total_state, deletedRows));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,13 +1,11 @@
|
||||
namespace bts.BlueOrb {
|
||||
using BCG;
|
||||
using RowHash = System.Int32;
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Collections;
|
||||
using System.Data.Entity.Core.Mapping;
|
||||
|
||||
using RowHash = System.Int32;
|
||||
|
||||
[DataStreamUserRespresentation("JoinStream")]
|
||||
public class SimpleJoinStream : ViewStream {
|
||||
@@ -44,10 +42,10 @@
|
||||
return _hasher.get_hash(r, _join_cols);
|
||||
}
|
||||
|
||||
public void update_data(DataPacket dp) {
|
||||
public void update_data(IDataPacket dp) {
|
||||
if (!ready) {
|
||||
_schema = dp.newRows.schema;
|
||||
_join_cols = _join_col_names.Count == 0 ? new int[] { } : _join_col_names.Select(n => dp.schema[n].colNo).ToArray();
|
||||
_join_cols = _join_col_names.Count == 0 ? new int[] { } : _join_col_names.Select(n => _schema[n].colNo).ToArray();
|
||||
}
|
||||
_hash_row_map.Clear();
|
||||
foreach (IBlueRow r in dp.newRows) {
|
||||
@@ -95,13 +93,13 @@
|
||||
}
|
||||
|
||||
private void _ls_onchange(object dp_obj) {
|
||||
DataPacket dp = dp_obj as DataPacket;
|
||||
var dp = (IDataPacket)dp_obj;
|
||||
_ldata.update_data(dp);
|
||||
_form_and_fire();
|
||||
}
|
||||
|
||||
private void _rs_onchange(object dp_obj) {
|
||||
DataPacket dp = dp_obj as DataPacket;
|
||||
var dp = (IDataPacket)dp_obj;
|
||||
_rdata.update_data(dp);
|
||||
_form_and_fire();
|
||||
}
|
||||
@@ -179,7 +177,7 @@
|
||||
foreach (object[] rval in res_rows) {
|
||||
rv.addRow(new BlueRow(_schema, rval));
|
||||
}
|
||||
var dp = BlueDataUtility.build_dp(rv, myLastValue as DataPacket);
|
||||
var dp = BlueDataUtility.build_dp(rv, myLastValue as IDataPacket);
|
||||
myFireEvent(dp);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
}
|
||||
|
||||
private void _parent_str_onchange(object dp_obj) {
|
||||
DataPacket dp = dp_obj as DataPacket;
|
||||
var dp = (IDataPacket)dp_obj;
|
||||
var rows = dp.newRows.to_list();
|
||||
BlueTable out_table = null;
|
||||
for (int i = 0; i < rows.Count; i++) {
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ namespace BCG
|
||||
|
||||
private void _stream_onChange(object newValue)
|
||||
{
|
||||
DataPacket dp = newValue as DataPacket;
|
||||
var dp = (IDataPacket)newValue;
|
||||
if (dp != null && dp.newRows.Count > 0)
|
||||
{
|
||||
_stream.onChange -= _stream_onChange;
|
||||
|
||||
@@ -39,9 +39,9 @@ namespace BCG
|
||||
|
||||
void myDataSource_onChange(object newValue)
|
||||
{
|
||||
DataPacket dp = (DataPacket)newValue;
|
||||
var dp = (IDataPacket)newValue;
|
||||
if (myLastPacketArrival == DateTime.MinValue)
|
||||
mySchema = myBuildOutputSchema(dp.schema);
|
||||
mySchema = myBuildOutputSchema(dp.Schema);
|
||||
else
|
||||
{
|
||||
DateTime now = DateTime.Now;
|
||||
@@ -55,7 +55,7 @@ namespace BCG
|
||||
else
|
||||
{
|
||||
IBlueRowCollection deleted, added;
|
||||
BlueDataUtility.computeDifferences(thisVersion, ((DataPacket)myLastValue).newRows, out deleted, out added);
|
||||
BlueDataUtility.computeDifferences(thisVersion, ((IDataPacket)myLastValue).newRows, out deleted, out added);
|
||||
myFireEvent(new DataPacket(thisVersion, added, deleted));
|
||||
}
|
||||
}
|
||||
@@ -84,8 +84,8 @@ namespace BCG
|
||||
cols[cols.Length - 1] = new ColumnInfo(myOutputColumn, cols.Length - 1, typeof(double));
|
||||
return new BlueTableSchema("derviative of " + inSchema.tableName, cols);
|
||||
}
|
||||
protected void myStoreNewPacketInfo(DataPacket dp)
|
||||
{
|
||||
|
||||
protected void myStoreNewPacketInfo(IDataPacket dp) {
|
||||
myPreviousValues = new Dictionary<string, double>();
|
||||
myLastPacketArrival = DateTime.Now;
|
||||
foreach (IBlueRow row in dp.newRows)
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace BCG
|
||||
{
|
||||
public class FileViewStream : ViewStream
|
||||
{
|
||||
private DataPacket myDp;
|
||||
DataPacket? myDp;
|
||||
public FileViewStream (string dataFileName,
|
||||
string schemaFileName)
|
||||
: this (dataFileName, schemaFileName, Int32.MaxValue)
|
||||
|
||||
@@ -52,14 +52,15 @@ namespace BCG.StreamWorld.Addition {
|
||||
|
||||
private void myHandleChanges(object newValue) {
|
||||
try {
|
||||
DataPacket dp = newValue as DataPacket;
|
||||
var dp = (IDataPacket)newValue;
|
||||
var schema = dp.Schema;
|
||||
if (myStateTable == null) {
|
||||
bts.Log.assert(myBaseTable == null);
|
||||
myStateTable = new BlueTable(dp.schema);
|
||||
myBaseTable = new BlueTable(dp.schema);
|
||||
myStateTable = new BlueTable(schema);
|
||||
myBaseTable = new BlueTable(schema);
|
||||
}
|
||||
BlueTable dels = new BlueTable(dp.schema),
|
||||
adds = new BlueTable(dp.schema);
|
||||
var dels = new BlueTable(schema);
|
||||
var adds = new BlueTable(schema);
|
||||
foreach (IBlueRow r in dp.deletedRows) {
|
||||
myBaseTable.deleteRow(r);
|
||||
if (myStateTable.containsID((int)r["id"])) {
|
||||
@@ -224,7 +225,7 @@ namespace BCG
|
||||
|
||||
protected override void myFireEvent(object o)
|
||||
{
|
||||
DataPacket dp = o as DataPacket;
|
||||
var dp = (IDataPacket)o;
|
||||
if (myLastValue == null || dp.addedRows.Count + dp.deletedRows.Count > 0)
|
||||
base.myFireEvent(o);
|
||||
}
|
||||
@@ -233,7 +234,7 @@ namespace BCG
|
||||
private void myHandleCallbacks(object newValue)
|
||||
{
|
||||
DataPacket retVal;
|
||||
DataPacket arrivedPacket = newValue as DataPacket;
|
||||
var arrivedPacket = (IDataPacket)newValue;
|
||||
myLastReceivedRows = arrivedPacket.newRows;
|
||||
try {
|
||||
if (myLastFiredRows != null)
|
||||
@@ -255,7 +256,7 @@ namespace BCG
|
||||
}
|
||||
else
|
||||
{
|
||||
myLastFiredRows = new BlueTable(arrivedPacket.schema);
|
||||
myLastFiredRows = new BlueTable(arrivedPacket.Schema);
|
||||
retVal = new DataPacket(myLastFiredRows, myLastFiredRows, new BlueTable(myLastFiredRows.schema));
|
||||
foreach (IBlueRow r in arrivedPacket.newRows)
|
||||
if (filterRow(r))
|
||||
|
||||
+7
-3
@@ -80,7 +80,7 @@ namespace BCG {
|
||||
protected override void myOnLastSubscriber() { _main_stream.onChange -= _main_stream_onchange; }
|
||||
|
||||
private void _main_stream_onchange(object nv) {
|
||||
DataPacket dp = nv as DataPacket;
|
||||
var dp = (IDataPacket)nv;
|
||||
///grouping together
|
||||
_timer.Restart();
|
||||
IDictionary<int, List<IBlueRow>> grouped_rows = (_groupby_cols == null || _groupby_cols.Length == 0) ?
|
||||
@@ -108,8 +108,12 @@ namespace BCG {
|
||||
$"Time to evaluate {grouped_rows.Count} groups {_timer.ElapsedMilliseconds}ms, ratio {_n_expensive_fires}/{_n_total_fires}");
|
||||
}
|
||||
// TODO,
|
||||
if (total_state != null)
|
||||
myFireEvent(new DataPacket(total_state, total_state, myLastValue == null ? new BlueTable(total_state.schema) : (myLastValue as DataPacket).newRows));
|
||||
if (total_state != null) {
|
||||
var deletedRows = myLastValue is null
|
||||
? new BlueTable(total_state.schema)
|
||||
: ((IDataPacket)myLastValue).newRows;
|
||||
myFireEvent(new DataPacket(total_state, total_state, deletedRows));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -173,8 +173,7 @@ namespace BCG
|
||||
/// </summary>
|
||||
/// <param name="leftPacket"></param>
|
||||
/// <param name="rightPacket"></param>
|
||||
public void test (DataPacket dp, bool isLeft)
|
||||
{
|
||||
public void test(IDataPacket dp, bool isLeft) {
|
||||
JoinOperand jo = isLeft ? myLeftOperand : myRightOperand;
|
||||
jo.changeHandler (dp);
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace BCG
|
||||
public class JoinOperand
|
||||
{
|
||||
private string myJoinCol;
|
||||
private DataPacket myLastArrivedPacket;
|
||||
IDataPacket? myLastArrivedPacket;
|
||||
private JoinOperand myOtherOperand;
|
||||
private bool myIsLeft;
|
||||
private JoinOperandRowIndex myRowIndex;
|
||||
@@ -26,15 +26,14 @@ namespace BCG
|
||||
|
||||
internal void changeHandler (object o)
|
||||
{
|
||||
DataPacket temp = (DataPacket)o;
|
||||
var dp = (IDataPacket)o;
|
||||
if (myLastArrivedPacket != null)
|
||||
mySubsequentChangeHandler ((DataPacket)o);
|
||||
mySubsequentChangeHandler (dp);
|
||||
else
|
||||
myFirstChangeHandler ((DataPacket)o);
|
||||
myFirstChangeHandler(dp);
|
||||
}
|
||||
|
||||
private void myFirstChangeHandler (DataPacket arrivedDp)
|
||||
{
|
||||
void myFirstChangeHandler(IDataPacket arrivedDp) {
|
||||
myLastArrivedPacket = arrivedDp;
|
||||
myOpSchema = myLastArrivedPacket.newRows.schema;
|
||||
myOtherOperand = myMaster.getOtherOperand (this);
|
||||
@@ -55,8 +54,7 @@ namespace BCG
|
||||
myOpSchema["id"].colNo);
|
||||
}
|
||||
|
||||
private void mySubsequentChangeHandler (DataPacket arrivedDp)
|
||||
{
|
||||
void mySubsequentChangeHandler (IDataPacket arrivedDp) {
|
||||
myLastArrivedPacket = arrivedDp;
|
||||
if (!myOtherOperand.hasReceivedData)
|
||||
{
|
||||
|
||||
+6
-6
@@ -38,7 +38,7 @@ namespace BCG {
|
||||
}
|
||||
|
||||
private bool _filled_missing_data = false;
|
||||
private void _fill_missing_data(DataPacket dp) {
|
||||
void _fill_missing_data(IDataPacket dp) {
|
||||
if (_filled_missing_data)
|
||||
return;
|
||||
Func<string[], bool> null_or_empty = (str_arr) => {
|
||||
@@ -52,17 +52,17 @@ namespace BCG {
|
||||
return true;
|
||||
};
|
||||
Func<string[], string[]> remove_bad_cols = (col_names) => {
|
||||
HashSet<string> schema_col_map = new HashSet<string>(dp.schema.columnNames);
|
||||
HashSet<string> schema_col_map = new HashSet<string>(dp.Schema.columnNames);
|
||||
List<string> cols_list = new List<string>(col_names);
|
||||
cols_list.RemoveWhere(c => !schema_col_map.Contains(c));
|
||||
return cols_list.ToArray();
|
||||
};
|
||||
if (null_or_empty(_join_spec.data_col_names)) {
|
||||
_join_spec.data_col_names = dp.schema.columnNames;
|
||||
_join_spec.data_col_names = dp.Schema.columnNames;
|
||||
}
|
||||
_join_spec.data_col_names = remove_bad_cols(_join_spec.data_col_names);
|
||||
if (null_or_empty(_join_spec.data_col_names)) {
|
||||
_join_spec.data_col_names = dp.schema.columnNames;
|
||||
_join_spec.data_col_names = dp.Schema.columnNames;
|
||||
}
|
||||
if (null_or_empty(_join_spec.projected_col_names)) {
|
||||
_join_spec.projected_col_names = _join_spec.data_col_names;
|
||||
@@ -76,10 +76,10 @@ namespace BCG {
|
||||
public void _on_stream_cb(object dp_obj) {
|
||||
//Log.Gen.info($"NonIncJoinBookkeeper._on_stream_cb dp_obj: {dp_obj}");
|
||||
var timer = Stopwatch.StartNew();
|
||||
DataPacket dp = (DataPacket)dp_obj;
|
||||
var dp = (IDataPacket)dp_obj;
|
||||
_fill_missing_data(dp);
|
||||
if (_schema == null) {
|
||||
_schema = dp.schema;
|
||||
_schema = dp.Schema;
|
||||
_join_col_indices = BlueDataUtility.get_column_indices(_schema, _join_spec.join_col_names);
|
||||
_data_col_indices = BlueDataUtility.get_column_indices(_schema, _join_spec.data_col_names);
|
||||
}
|
||||
|
||||
@@ -346,17 +346,17 @@ namespace BCG
|
||||
|
||||
private void myHandleLeftStreamChanges(object newValue)
|
||||
{
|
||||
myHandleStreamChanges(newValue as DataPacket, true);
|
||||
myHandleStreamChanges((IDataPacket)newValue, true);
|
||||
}
|
||||
|
||||
private void myHandleRightStreamChanges(object newValue)
|
||||
{
|
||||
myHandleStreamChanges(newValue as DataPacket, false);
|
||||
myHandleStreamChanges((IDataPacket)newValue, false);
|
||||
}
|
||||
|
||||
private void myHandleStreamChanges(DataPacket dp, bool isLeft)
|
||||
private void myHandleStreamChanges(IDataPacket dp, bool isLeft)
|
||||
{
|
||||
myInitSchema(dp.schema, isLeft);
|
||||
myInitSchema(dp.Schema, isLeft);
|
||||
BlueTable dels = null, adds = null;
|
||||
if (myState != null)
|
||||
{
|
||||
@@ -522,12 +522,10 @@ namespace BCG
|
||||
|
||||
protected override void myFireEvent(object o)
|
||||
{
|
||||
myHandleJoinResults(myLeftUnmatchedRowsDels, myLeftUnmatchedRowsAdds, o as DataPacket);
|
||||
myHandleJoinResults(myLeftUnmatchedRowsDels, myLeftUnmatchedRowsAdds, (IDataPacket)o);
|
||||
}
|
||||
|
||||
private void myHandleJoinResults(Dictionary<int, IBlueRow> unmatchedLeftRowsDels,
|
||||
Dictionary<int, IBlueRow> unmatchedLeftRowAdds, DataPacket resultPacket)
|
||||
{
|
||||
void myHandleJoinResults(Dictionary<int, IBlueRow> unmatchedLeftRowsDels, Dictionary<int, IBlueRow> unmatchedLeftRowAdds, IDataPacket resultPacket) {
|
||||
BlueTable dels = resultPacket.deletedRows as BlueTable,
|
||||
adds = resultPacket.addedRows as BlueTable;
|
||||
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
namespace BCG {
|
||||
using System.Collections.Generic;
|
||||
|
||||
public class KeyValueToRelationalStream : ViewStream {
|
||||
private readonly ViewStream _kv_str;
|
||||
private readonly string _doc_id_col, _key_col, _val_col;
|
||||
@@ -20,7 +18,7 @@ namespace BCG {
|
||||
}
|
||||
|
||||
private void _on_str_update(object dp_obj) {
|
||||
DataPacket dp = dp_obj as DataPacket;
|
||||
var dp = (IDataPacket)dp_obj;
|
||||
var rows = dp.newRows;
|
||||
var rv = BlueDataUtility.keyvalue_to_relational<string>(rows, _doc_id_col, _key_col, _val_col);
|
||||
var dp_out = BlueDataUtility.build_dp_inc(rv, myLastValue as DataPacket, true);
|
||||
@@ -28,4 +26,4 @@ namespace BCG {
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,4 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using BCG.Utilities;
|
||||
|
||||
namespace BCG
|
||||
{
|
||||
@@ -11,7 +9,8 @@ namespace BCG
|
||||
[DataStreamUserRespresentation (false)]
|
||||
public class LeftInternalJoinStream : InternalJoinStream
|
||||
{
|
||||
protected DataPacket myLeftDataPacket, myRightDataPacket;
|
||||
protected IDataPacket? myLeftDataPacket;
|
||||
protected IDataPacket? myRightDataPacket;
|
||||
//Container to contain all the left rows that are orphaned during a deletion operation
|
||||
private IDictionary myLeftOrphanedRows;
|
||||
public LeftInternalJoinStream (ViewStream vsLeft, string jcLeft, ViewStream vsRight, string jcRight) :
|
||||
@@ -62,7 +61,7 @@ namespace BCG
|
||||
private void myTestAndFire (bool isLeft)
|
||||
{
|
||||
JoinOperand jo = isLeft ? myLeftOperand : myRightOperand;
|
||||
DataPacket dp = isLeft ? myLeftDataPacket : myRightDataPacket;
|
||||
var dp = isLeft ? myLeftDataPacket : myRightDataPacket;
|
||||
//to test whether both have received call backs
|
||||
if (myLeftOperand.hasReceivedData)
|
||||
jo.changeHandler (dp);
|
||||
|
||||
@@ -93,9 +93,9 @@ namespace BCG {
|
||||
}
|
||||
|
||||
private void myHandleData(object newValue) {
|
||||
var dp = ExceptionAssert.Cast(newValue).To<DataPacket>();
|
||||
myRows ??= new BlueTable(myMapper.getOutputSchema(dp.schema));
|
||||
myBaseRows ??= new BlueTable(dp.schema);
|
||||
var dp = ExceptionAssert.Cast(newValue).To<IDataPacket>();
|
||||
myRows ??= new BlueTable(myMapper.getOutputSchema(dp.Schema));
|
||||
myBaseRows ??= new BlueTable(dp.Schema);
|
||||
BlueDataUtility.absorbChanges(myBaseRows, dp.deletedRows, dp.addedRows);
|
||||
var dels = new BlueTable(myRows.schema);
|
||||
var adds = new BlueTable(myRows.schema);
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace bts {
|
||||
}
|
||||
|
||||
private void _handle_update(object dp_obj) {
|
||||
DataPacket dp = dp_obj as DataPacket;
|
||||
var dp = (IDataPacket)dp_obj;
|
||||
byte[] ser_data = null;
|
||||
if (_n_updates == 0) {
|
||||
StreamIOMessage.CreateMessage cr_msg = new StreamIOMessage.CreateMessage(dp.newRows);
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
|
||||
|
||||
using System;
|
||||
|
||||
namespace BCG {
|
||||
// Keeps adding changing rows to the stream, hence preserving the history
|
||||
// and creating a time series, for example this can be used to make bbo updates
|
||||
@@ -9,7 +5,7 @@ namespace BCG {
|
||||
public class DebugStream : ViewStream {
|
||||
|
||||
private ViewStream _stream;
|
||||
private IBlueRowCollection _last_recv_rows = null;
|
||||
IBlueRowCollection? _last_recv_rows;
|
||||
|
||||
public DebugStream(ViewStream stream) {
|
||||
_stream = stream;
|
||||
@@ -23,7 +19,7 @@ namespace BCG {
|
||||
}
|
||||
|
||||
private void _onstream_change(object o) {
|
||||
DataPacket dp = o as DataPacket;
|
||||
var dp = (IDataPacket)o;
|
||||
BlueDataUtility.validate_table_schema(dp.newRows);
|
||||
BlueDataUtility.validate_table_schema(dp.addedRows);
|
||||
if (_last_recv_rows == null) {
|
||||
@@ -45,4 +41,4 @@ namespace BCG {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -64,7 +64,7 @@ namespace BCG {
|
||||
|
||||
internal void myHandleChange (object newValue)
|
||||
{
|
||||
DataPacket dp = newValue as DataPacket;
|
||||
var dp = (IDataPacket)newValue;
|
||||
if (myHelper != null)
|
||||
{
|
||||
IBlueRowCollection dels, adds;
|
||||
@@ -79,8 +79,8 @@ namespace BCG {
|
||||
else
|
||||
{ //first time a callback is received
|
||||
myHelper = myDic == null ?
|
||||
new ProjectHelper (dp.schema, myColExp, myTableName) :
|
||||
new ProjectHelper (dp.schema, myDic, myTableName);
|
||||
new ProjectHelper (dp.Schema, myColExp, myTableName) :
|
||||
new ProjectHelper (dp.Schema, myDic, myTableName);
|
||||
|
||||
IBlueRowCollection temp;
|
||||
myFireEvent (new DataPacket (temp = new ProjectedTable (dp.newRows, myHelper),
|
||||
|
||||
@@ -50,7 +50,7 @@ namespace bts.BlueOrb {
|
||||
//IBlueRowCollection rows = new DataTableWrapperTable(dt);
|
||||
_stopwatch.Stop();
|
||||
Log.Gen.info($"SQLiteStream._read_from_sqlite_and_fire time to load into IBlueRowCollection: {_stopwatch.ElapsedMilliseconds} msecs");
|
||||
DataPacket dp = BlueDataUtility.build_dp_inc(rows, myLastValue as DataPacket);
|
||||
var dp = BlueDataUtility.build_dp_inc(rows, myLastValue as IDataPacket);
|
||||
myFireEvent(dp);
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace BCG {
|
||||
protected override void myOnLastSubscriber() { myStream.onChange -= new ChangeDelegate(myHandleChanges); }
|
||||
|
||||
private void myHandleChanges(object newValue) {
|
||||
IBlueRowCollection totalState = (newValue as DataPacket).newRows;
|
||||
var totalState = ((IDataPacket)newValue).newRows;
|
||||
if (totalState.Count > 0 && myNWrites < myNMaxWrites) {
|
||||
myNWrites++;
|
||||
int i = 0;
|
||||
@@ -60,7 +60,10 @@ namespace BCG {
|
||||
IBlueRow nr = new BlueRow(myResultSchema, 0, myFullyQualifiedFileName, myNWrites, totalState.Count);
|
||||
BlueTable nRows = new BlueTable(myResultSchema);
|
||||
nRows.addRow(nr);
|
||||
myFireEvent(new DataPacket(nRows, nRows, new BlueTable(myLastValue == null ? new BlueTable(myResultSchema) : (myLastValue as DataPacket).newRows)));
|
||||
IBlueRowCollection deletedRows = myLastValue is null
|
||||
? new BlueTable(myResultSchema)
|
||||
: new BlueTable(((IDataPacket)myLastValue).newRows);
|
||||
myFireEvent(new DataPacket(nRows, nRows, deletedRows));
|
||||
} else
|
||||
myFireEvent(newValue);
|
||||
}
|
||||
@@ -126,7 +129,7 @@ namespace BCG {
|
||||
//_stopwatch.Stop();
|
||||
//bts.Log.Gen.info($"CSVReaderStream.myOnFirstSubscriber stream csv load col_count: {df.Columns.Count} rows, time: {_stopwatch.ElapsedMilliseconds} msecs");
|
||||
var rows = LoadFile(_file_address);
|
||||
DataPacket dp_out = BlueDataUtility.build_dp_inc(rows, myLastValue as DataPacket);
|
||||
var dp_out = BlueDataUtility.build_dp_inc(rows, myLastValue as IDataPacket);
|
||||
myFireEvent(dp_out);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,11 +17,11 @@ namespace bts {
|
||||
}
|
||||
|
||||
private void _on_data(object obj) {
|
||||
DataPacket dp = obj as DataPacket;
|
||||
var dp = (IDataPacket)obj;
|
||||
if (_rows == null) {
|
||||
_rows = BlueDataUtility.get_typed_table(dp.newRows);
|
||||
}
|
||||
var dp_out = BlueDataUtility.build_dp_inc(_rows, myLastValue as DataPacket);
|
||||
var dp_out = BlueDataUtility.build_dp_inc(_rows, myLastValue as IDataPacket);
|
||||
myFireEvent(dp_out);
|
||||
|
||||
}
|
||||
@@ -30,4 +30,4 @@ namespace bts {
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -16,7 +16,7 @@ public class SortStream : ViewStream {
|
||||
IList<ColumnSortExpression> sortCols;
|
||||
IComparer? comparer;
|
||||
DataPacket? lastFiredPacket;
|
||||
DataPacket? lastReceivedPacket;
|
||||
IDataPacket? lastReceivedPacket;
|
||||
|
||||
public SortStream(ViewStream stream, string sortExpression) {
|
||||
this.stream = stream;
|
||||
@@ -61,7 +61,7 @@ public class SortStream : ViewStream {
|
||||
|
||||
[MemberNotNull(nameof(lastFiredPacket))]
|
||||
internal void myChangeHandler(object o) {
|
||||
lastReceivedPacket = (DataPacket)o;
|
||||
lastReceivedPacket = (IDataPacket)o;
|
||||
// First callback, so we need to sort the whole table, this is the
|
||||
// only time we will do that for all the other sorting operations would
|
||||
// be sorting the increments and inserting them into the whole list
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace BCG {
|
||||
}
|
||||
|
||||
protected override void myOnFirstSubscriber() {
|
||||
var dp_out = BlueDataUtility.build_dp_inc(_rows, myLastValue as DataPacket);
|
||||
var dp_out = BlueDataUtility.build_dp_inc(_rows, myLastValue as IDataPacket);
|
||||
myFireEvent(dp_out);
|
||||
}
|
||||
}
|
||||
@@ -25,8 +25,10 @@ namespace BCG {
|
||||
public BlueRowCollectionStaticStream(IBlueRowCollection rows) { loadCollection(rows); }
|
||||
|
||||
public void loadCollection(IBlueRowCollection rows) {
|
||||
myFireEvent(new DataPacket(rows, rows, myLastValue != null ?
|
||||
new BlueTable((myLastValue as DataPacket).newRows) : new BlueTable(rows.schema)));
|
||||
var deletedRows = myLastValue is null
|
||||
? new BlueTable(rows.schema)
|
||||
: new BlueTable(((IDataPacket)myLastValue).newRows);
|
||||
myFireEvent(new DataPacket(rows, rows, deletedRows));
|
||||
}
|
||||
|
||||
public void crush_with_single_row(IBlueRow r) {
|
||||
@@ -35,7 +37,7 @@ namespace BCG {
|
||||
loadCollection(t);
|
||||
}
|
||||
|
||||
public void loadPacket(DataPacket dp) { myFireEvent(dp); }
|
||||
public void loadPacket(IDataPacket dp) { myFireEvent(dp); }
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -22,24 +22,23 @@ namespace BCG
|
||||
/// <param name="rows"></param>
|
||||
public void loadCollection (IBlueRowCollection rows)
|
||||
{
|
||||
myFireEvent(new DataPacket(
|
||||
rows,
|
||||
new BlueTable(rows),
|
||||
myLastValue is DataPacket dp
|
||||
? new BlueTable(dp.newRows)
|
||||
: new BlueTable(rows.schema)));
|
||||
var deletedRows = myLastValue is null
|
||||
? new BlueTable(rows.schema)
|
||||
: new BlueTable(((IDataPacket)myLastValue).newRows);
|
||||
myFireEvent(new DataPacket(rows, new BlueTable(rows), deletedRows));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Fires the whole datapacket as one. Its the callers responsibility to make sure that it makes incremental sense
|
||||
/// </summary>
|
||||
/// <param name="dp"></param>
|
||||
public void loadPacket (DataPacket dp) {myFireEvent (dp);}
|
||||
public void loadPacket(IDataPacket dp) =>
|
||||
myFireEvent(dp);
|
||||
|
||||
protected override void myOnFirstSubscriber()
|
||||
{
|
||||
if (myLastValue != null)
|
||||
loadPacket (myLastValue as DataPacket);
|
||||
loadPacket((IDataPacket)myLastValue);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ namespace BCG
|
||||
{
|
||||
|
||||
private ViewStream myParentStream;
|
||||
private ThreadSafeQueue<DataPacket> myQueuedUpdates;
|
||||
readonly ThreadSafeQueue<IDataPacket> myQueuedUpdates = new();
|
||||
private ViewStreamDatabase myVSD;
|
||||
|
||||
public ThreadSafeStream(ViewStream parent) : this(ViewStreamDatabase.instance, parent) { }
|
||||
@@ -23,7 +23,6 @@ namespace BCG
|
||||
{
|
||||
myParentStream = parentStream;
|
||||
myVSD = vsd;
|
||||
myQueuedUpdates = new ThreadSafeQueue<DataPacket>();
|
||||
}
|
||||
|
||||
protected override void myOnFirstSubscriber()
|
||||
@@ -42,13 +41,12 @@ namespace BCG
|
||||
|
||||
void myParentStreamChangeHandler(object newValue)
|
||||
{
|
||||
myQueuedUpdates.enqueue(newValue as DataPacket);
|
||||
myQueuedUpdates.enqueue((IDataPacket)newValue);
|
||||
}
|
||||
|
||||
public void doWork()
|
||||
{
|
||||
foreach (DataPacket dp in myQueuedUpdates.dequeueAll())
|
||||
{
|
||||
foreach (var dp in myQueuedUpdates.dequeueAll()) {
|
||||
myFireEvent(dp);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ namespace BCG
|
||||
void _source_stream_onChange(object newValue)
|
||||
{
|
||||
// BlueEventLog2.instance().assert(_source_thread == Thread.CurrentThread.ManagedThreadId, "Updates should come from source thread");
|
||||
_queued_updates.enqueue(new Update { dp = (DataPacket)newValue, subscription = _current_target_subscription });
|
||||
_queued_updates.enqueue(new Update { dp = (IDataPacket)newValue, subscription = _current_target_subscription });
|
||||
}
|
||||
|
||||
// target doWork
|
||||
@@ -119,7 +119,7 @@ namespace BCG
|
||||
|
||||
class Update
|
||||
{
|
||||
public DataPacket dp;
|
||||
public IDataPacket? dp;
|
||||
public Guid subscription;
|
||||
}
|
||||
private ThreadSafeQueue<Update> _queued_updates;
|
||||
|
||||
@@ -68,17 +68,14 @@ namespace BCG
|
||||
|
||||
IBlueRowCollection deletedRows = new BlueTable(s);
|
||||
if (myLastValue != null)
|
||||
deletedRows = ((DataPacket) myLastValue).newRows;
|
||||
deletedRows = ((IDataPacket)myLastValue).newRows;
|
||||
|
||||
myFireEvent(new DataPacket(newRows,newRows,deletedRows));
|
||||
}
|
||||
}
|
||||
|
||||
private object myGetLastDay()
|
||||
{
|
||||
return
|
||||
BlueDataUtility.extractRow(((DataPacket) myLastValue).newRows,0)["dateTime"];
|
||||
}
|
||||
object? myGetLastDay() =>
|
||||
BlueDataUtility.extractRow(((IDataPacket)myLastValue).newRows, 0)?["dateTime"];
|
||||
|
||||
private int myOffset;
|
||||
private TimeSpan myZeroHour;
|
||||
|
||||
@@ -45,7 +45,7 @@ namespace BCG {
|
||||
IBlueRow nr = new BlueRow(_schema, _id++, _last_fire_time,
|
||||
_last_fire_time.ToString("yyyy-MM-dd HH:mm:ss.fff"));
|
||||
_table.add_row(nr);
|
||||
var dp = BlueDataUtility.build_dp_inc(_table, myLastValue as DataPacket);
|
||||
var dp = BlueDataUtility.build_dp_inc(_table, myLastValue as IDataPacket);
|
||||
myFireEvent(dp);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,9 +67,9 @@ namespace BCG
|
||||
|
||||
private void _handle_base_stream_update(object dp_obj){
|
||||
if (DateTime.Now - _last_fire_time >= _ts){
|
||||
DataPacket dp_in = dp_obj as DataPacket;
|
||||
var dp_in = (IDataPacket)dp_obj;
|
||||
_last_fire_time = DateTime.Now;
|
||||
DataPacket dp = BlueDataUtility.build_dp_inc(dp_in.newRows, myLastValue as DataPacket);
|
||||
var dp = BlueDataUtility.build_dp_inc(dp_in.newRows, myLastValue as IDataPacket);
|
||||
myFireEvent(dp);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,11 +35,11 @@ namespace BCG
|
||||
|
||||
private void myToAverage_onChange(object newValue)
|
||||
{
|
||||
DataPacket dp = (DataPacket) (newValue);
|
||||
var dp = (IDataPacket)newValue;
|
||||
|
||||
int valueCol = dp.schema[myCol_Value].colNo;
|
||||
int valueCol = dp.Schema[myCol_Value].colNo;
|
||||
|
||||
BlueTable result = new BlueTable(dp.schema);
|
||||
BlueTable result = new BlueTable(dp.Schema);
|
||||
foreach (IBlueRow r in dp.newRows)
|
||||
{
|
||||
string key = r[myCol_Key].ToString();
|
||||
@@ -50,16 +50,16 @@ namespace BCG
|
||||
r.CopyTo(rowValues, 0);
|
||||
rowValues[valueCol] = myUpdateValue(key, dt, value);
|
||||
|
||||
result.addRow(new BlueRow(dp.schema, rowValues));
|
||||
result.addRow(new BlueRow(dp.Schema, rowValues));
|
||||
}
|
||||
|
||||
if (myLastValue == null)
|
||||
myFireEvent(new DataPacket(result, result, new BlueTable(dp.schema)));
|
||||
myFireEvent(new DataPacket(result, result, new BlueTable(dp.Schema)));
|
||||
else
|
||||
{
|
||||
IBlueRowCollection dels, adds;
|
||||
|
||||
BlueDataUtility.computeDifferences(result, ((DataPacket)myLastValue).newRows, out dels, out adds);
|
||||
BlueDataUtility.computeDifferences(result, ((IDataPacket)myLastValue).newRows, out dels, out adds);
|
||||
|
||||
myFireEvent(new DataPacket(result, adds, dels));
|
||||
}
|
||||
|
||||
@@ -31,10 +31,10 @@ namespace bts.SilverPine {
|
||||
}
|
||||
|
||||
private void _handle_base_stream_update(object dp_obj) {
|
||||
DataPacket dp = dp_obj as DataPacket;
|
||||
var dp = (IDataPacket)dp_obj;
|
||||
List<IBlueRow> rows = dp.newRows.to_list();
|
||||
rows.Sort((r1, r2) => BlueDataUtility.compare_rows(r2, r1, _sort_col));
|
||||
BlueTable rv = new BlueTable(dp.schema);
|
||||
BlueTable rv = new BlueTable(dp.Schema);
|
||||
IBlueRow prev_row = rows.ElementAt(0);
|
||||
foreach (IBlueRow r in rows) {
|
||||
var cr = BlueDataUtility.compare_rows(r, prev_row, _evol_col);
|
||||
@@ -43,9 +43,9 @@ namespace bts.SilverPine {
|
||||
}
|
||||
prev_row = r;
|
||||
}
|
||||
DataPacket dp_out = BlueDataUtility.build_dp(rv, myLastValue as DataPacket);
|
||||
var dp_out = BlueDataUtility.build_dp(rv, myLastValue as IDataPacket);
|
||||
myFireEvent(dp_out);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -18,7 +18,7 @@ namespace BCG {
|
||||
mySrc.onChange -= new ChangeDelegate(mySrc_onChange);
|
||||
}
|
||||
private void mySrc_onChange(object newValue) {
|
||||
DataPacket dp = (DataPacket)newValue;
|
||||
var dp = (IDataPacket)newValue;
|
||||
if (mySchema == null) {
|
||||
SortedList alphabetical = new SortedList();
|
||||
foreach (ColumnInfo cinfo in dp.newRows.schema.columnInfo)
|
||||
@@ -27,7 +27,7 @@ namespace BCG {
|
||||
alphabetical.Values.CopyTo(cinfos, 0);
|
||||
for (int i = 0; i < cinfos.Length; ++i)
|
||||
cinfos[i] = new ColumnInfo(cinfos[i].colName, i, cinfos[i].colType);
|
||||
mySchema = new BlueTableSchema(cinfos, dp.schema.tableName);
|
||||
mySchema = new BlueTableSchema(cinfos, dp.Schema.tableName);
|
||||
}
|
||||
BlueTable
|
||||
deleted = new BlueTable(mySchema),
|
||||
|
||||
@@ -16,9 +16,9 @@ namespace BCG
|
||||
|
||||
public AppendCollection () {}
|
||||
|
||||
public DataPacket mergeRows (DataPacket dp, bool isLeft)
|
||||
public DataPacket mergeRows (IDataPacket dp, bool isLeft)
|
||||
{
|
||||
mySchema = mySchema == null ? dp.schema : mySchema;
|
||||
mySchema = mySchema == null ? dp.Schema : mySchema;
|
||||
BlueTable dRows = new BlueTable (mySchema),
|
||||
aRows = new BlueTable (mySchema);
|
||||
IDictionary index = isLeft ? myLeftIndex : myRightIndex;
|
||||
|
||||
@@ -40,16 +40,15 @@ namespace BCG
|
||||
|
||||
private void myHandleLeftChanges (object newValue)
|
||||
{
|
||||
myFireEvent (myGetDataPacket (newValue as DataPacket, true));
|
||||
myFireEvent(myGetDataPacket((IDataPacket)newValue, true));
|
||||
}
|
||||
|
||||
private void myHandleRightChanges (object newValue)
|
||||
{
|
||||
myFireEvent (myGetDataPacket (newValue as DataPacket, false));
|
||||
myFireEvent(myGetDataPacket((IDataPacket)newValue, false));
|
||||
}
|
||||
|
||||
private DataPacket myGetDataPacket (DataPacket dp, bool isLeft)
|
||||
{
|
||||
DataPacket myGetDataPacket(IDataPacket dp, bool isLeft) {
|
||||
DataPacket retVal = myColl.mergeRows (dp, isLeft);
|
||||
return new DataPacket (new ImmutableBlueTable (retVal.newRows),
|
||||
retVal.addedRows,
|
||||
|
||||
@@ -9,7 +9,7 @@ namespace BCG
|
||||
/// </summary>
|
||||
public interface IUnionTable : IBlueRowCollection
|
||||
{
|
||||
void addRows (IBlueRowCollection rows, bool isLeft, DataPacket dp);
|
||||
void deleteRows (IBlueRowCollection rows, bool isLeft, DataPacket dp);
|
||||
void addRows (IBlueRowCollection rows, bool isLeft, IDataPacket dp);
|
||||
void deleteRows (IBlueRowCollection rows, bool isLeft, IDataPacket dp);
|
||||
}
|
||||
}
|
||||
@@ -256,11 +256,11 @@ namespace BCG {
|
||||
}
|
||||
|
||||
private void myHandleStreamChanges(object newValue) {
|
||||
DataPacket dp = newValue as DataPacket;
|
||||
myTable = myTable ?? new MutableAppendTable(new BlueTableSchema("MutableAppend", dp.schema.columnInfo));
|
||||
var dp = (IDataPacket)newValue;
|
||||
myTable = myTable ?? new MutableAppendTable(new BlueTableSchema("MutableAppend", dp.Schema.columnInfo));
|
||||
BlueTable adds = new BlueTable(myTable.schema),
|
||||
dels = new BlueTable(myTable.schema);
|
||||
int index = Int32.Parse(dp.schema.tableName);
|
||||
int index = int.Parse(dp.Schema.tableName);
|
||||
foreach (IBlueRow r in dp.deletedRows) {
|
||||
IBlueRow dr = myTable.removeRow(r, index);
|
||||
dels.addRow(dr);
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace BCG {
|
||||
mySrc.onChange -= new ChangeDelegate (mySrc_onChange);
|
||||
}
|
||||
private void mySrc_onChange (object newValue) {
|
||||
DataPacket dp = (DataPacket)newValue;
|
||||
var dp = (IDataPacket)newValue;
|
||||
if (mySchema == null)
|
||||
mySchema = new BlueTableSchema (dp.newRows.schema.columnInfo,myTableName);
|
||||
BlueTable
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace bts.BlueOrb {
|
||||
|
||||
|
||||
private void _on_parent_stream_change(object dp_obj) {
|
||||
DataPacket dp = dp_obj as DataPacket;
|
||||
var dp = (IDataPacket)dp_obj;
|
||||
foreach (IBlueRow r in dp.deletedRows) {
|
||||
string hash = r.get_row_cols_as_string(_key_cols);
|
||||
ViewStream hash_str = null;
|
||||
@@ -60,4 +60,4 @@ namespace bts.BlueOrb {
|
||||
myFireEvent(dp_obj);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,7 @@ namespace BCG {
|
||||
}
|
||||
|
||||
private void _handle_update(object o) {
|
||||
DataPacket dp = o as DataPacket;
|
||||
var dp = (IDataPacket)o;
|
||||
if (_n_updates == 0) {
|
||||
_broker.create_table(dp.newRows);
|
||||
_n_updates++;
|
||||
|
||||
Reference in new issue
Block a user