From 8660dea85aedc4d0e9252394736668ee985fcab8 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 8 Feb 2024 13:53:54 -0600 Subject: [PATCH] build: Downgrade new DataStream code from net8 -> net7 The AddColumnsStream, SortStream, and requisite yacc/lex grammar were originally added to a new branch, off of development, which is on net8. I forgot to change it to net7 when I cherry-picked the commits for the regular development branch. It's wasn't quite as simple as flipping net8 -> net7 in csproj files, because I was eager to use new language features only available in net8! Namely, primary constructors and collection expressions. --- .../Bts.ColumnExpressions.csproj | 2 +- .../Bts.ColumnExpressions/ColumnExpression.cs | 22 ++++++++++++------- .../ColumnExpressionGrammar.y | 2 +- .../Bts.ColumnSortExpressions.csproj | 2 +- .../ColumnSortExpression.cs | 11 +++++++--- .../ColumnSortExpressionGrammar.y | 2 +- .../Primitives/AddColumns/AddColumnsStream.cs | 6 +++-- .../Primitives/AddColumns/ColumnAdder.cs | 10 +++++---- .../DataStream/Primitives/Sort/SortStream.cs | 3 ++- .../DataStream/Primitives/Sort/SortedTable.cs | 6 ++--- 10 files changed, 41 insertions(+), 25 deletions(-) diff --git a/src/DataStreamSuite/Bts.ColumnExpressions/Bts.ColumnExpressions.csproj b/src/DataStreamSuite/Bts.ColumnExpressions/Bts.ColumnExpressions.csproj index 39adf039f..3c12da7d5 100644 --- a/src/DataStreamSuite/Bts.ColumnExpressions/Bts.ColumnExpressions.csproj +++ b/src/DataStreamSuite/Bts.ColumnExpressions/Bts.ColumnExpressions.csproj @@ -1,7 +1,7 @@  - net8.0 + net7.0 enable enable diff --git a/src/DataStreamSuite/Bts.ColumnExpressions/ColumnExpression.cs b/src/DataStreamSuite/Bts.ColumnExpressions/ColumnExpression.cs index ee6a94217..e8c7abced 100644 --- a/src/DataStreamSuite/Bts.ColumnExpressions/ColumnExpression.cs +++ b/src/DataStreamSuite/Bts.ColumnExpressions/ColumnExpression.cs @@ -1,15 +1,21 @@ namespace Bts.ColumnExpressions; -public class ColumnExpression(string name, Type? type = null, object? value = null) { - public string Name { get; } = name; +public class ColumnExpression { + public ColumnExpression(string name, Type? type = null, object? value = null) { + Name = name; + Type = type + ?? value?.GetType() + ?? throw new ArgumentException( + "Type must be specified explicitly when value is null", nameof(type)); + Value = value + ?? DBNull.Value; + } - public Type Type { get; } = type - ?? value?.GetType() - ?? throw new ArgumentException( - "Type must be specified explicitly when value is null", nameof(type)); + public string Name { get; } - public object Value { get; } = value - ?? DBNull.Value; + public Type Type { get; } + + public object Value { get; } public static ColumnExpression Create(string name, T value, Type? type = null) { // Try to convert value to 'type' to verify they are compatible diff --git a/src/DataStreamSuite/Bts.ColumnExpressions/ColumnExpressionGrammar.y b/src/DataStreamSuite/Bts.ColumnExpressions/ColumnExpressionGrammar.y index f8c545933..942a62b0e 100644 --- a/src/DataStreamSuite/Bts.ColumnExpressions/ColumnExpressionGrammar.y +++ b/src/DataStreamSuite/Bts.ColumnExpressions/ColumnExpressionGrammar.y @@ -29,7 +29,7 @@ %% ColumnExpressions : - ColumnExpression { $$ = [$1]; } + ColumnExpression { $$ = ImmutableList.CreateRange(new[] { $1 }); } | ColumnExpressions ColumnExpression { $$ = $1.Add($2); } ; diff --git a/src/DataStreamSuite/Bts.ColumnSortExpressions/Bts.ColumnSortExpressions.csproj b/src/DataStreamSuite/Bts.ColumnSortExpressions/Bts.ColumnSortExpressions.csproj index 0702bb4d2..b8d537b2f 100644 --- a/src/DataStreamSuite/Bts.ColumnSortExpressions/Bts.ColumnSortExpressions.csproj +++ b/src/DataStreamSuite/Bts.ColumnSortExpressions/Bts.ColumnSortExpressions.csproj @@ -1,7 +1,7 @@  - net8.0 + net7.0 enable enable diff --git a/src/DataStreamSuite/Bts.ColumnSortExpressions/ColumnSortExpression.cs b/src/DataStreamSuite/Bts.ColumnSortExpressions/ColumnSortExpression.cs index fdb4da2fe..b52f0092c 100644 --- a/src/DataStreamSuite/Bts.ColumnSortExpressions/ColumnSortExpression.cs +++ b/src/DataStreamSuite/Bts.ColumnSortExpressions/ColumnSortExpression.cs @@ -1,6 +1,11 @@ namespace Bts.ColumnSortExpressions; -public class ColumnSortExpression(string name, bool isAscending = true) { - public string Name { get; } = name; - public bool IsAscending { get; } = isAscending; +public class ColumnSortExpression { + public ColumnSortExpression(string name, bool isAscending = true) { + Name = name; + IsAscending = isAscending; + } + + public string Name { get; } + public bool IsAscending { get; } } diff --git a/src/DataStreamSuite/Bts.ColumnSortExpressions/ColumnSortExpressionGrammar.y b/src/DataStreamSuite/Bts.ColumnSortExpressions/ColumnSortExpressionGrammar.y index 69413d975..e1f38872c 100644 --- a/src/DataStreamSuite/Bts.ColumnSortExpressions/ColumnSortExpressionGrammar.y +++ b/src/DataStreamSuite/Bts.ColumnSortExpressions/ColumnSortExpressionGrammar.y @@ -18,7 +18,7 @@ %% Columns : - Column { $$ = [$1]; } + Column { $$ = ImmutableList.CreateRange(new[] { $1 }); } | Columns Column { $$ = $1.Add($2); } ; diff --git a/src/DataStreamSuite/DataStream/Primitives/AddColumns/AddColumnsStream.cs b/src/DataStreamSuite/DataStream/Primitives/AddColumns/AddColumnsStream.cs index 0c4cec642..3c79de595 100644 --- a/src/DataStreamSuite/DataStream/Primitives/AddColumns/AddColumnsStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/AddColumns/AddColumnsStream.cs @@ -1,4 +1,6 @@ namespace BCG; -public class AddColumnsStream(ViewStream vs, string columnDef) - : MapStream(vs, new ColumnAdder(columnDef)) { } +public class AddColumnsStream : MapStream { + public AddColumnsStream(ViewStream vs, string columnDef) + : base(vs, new ColumnAdder(columnDef)) { } +} diff --git a/src/DataStreamSuite/DataStream/Primitives/AddColumns/ColumnAdder.cs b/src/DataStreamSuite/DataStream/Primitives/AddColumns/ColumnAdder.cs index 35ee9934a..75346aac8 100644 --- a/src/DataStreamSuite/DataStream/Primitives/AddColumns/ColumnAdder.cs +++ b/src/DataStreamSuite/DataStream/Primitives/AddColumns/ColumnAdder.cs @@ -13,14 +13,16 @@ namespace BCG; /// /// String represting the columns to add to the output table /// -public class ColumnAdder(string columnsExpression) : IStreamMapper { +public class ColumnAdder : IStreamMapper { // Store tuples of (column, index) to preserve order - protected readonly IDictionary myNewColumns = - (ColumnExpressionInterpreter.Evaluate(columnsExpression) ?? + protected readonly IDictionary myNewColumns; + protected IBlueTableSchema? mySchema; + + public ColumnAdder(string columnsExpression) => + myNewColumns = (ColumnExpressionInterpreter.Evaluate(columnsExpression) ?? throw new Exception("Invalid columnn expression: " + columnsExpression)) .Select((c, i) => (c, i)) .ToDictionary(c => c.c.Name, c => (c.c, c.i)); - protected IBlueTableSchema? mySchema; [MemberNotNull(nameof(mySchema))] public virtual IBlueRow map(IBlueRow row) { diff --git a/src/DataStreamSuite/DataStream/Primitives/Sort/SortStream.cs b/src/DataStreamSuite/DataStream/Primitives/Sort/SortStream.cs index 3954edd0d..a9b27dcb2 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Sort/SortStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Sort/SortStream.cs @@ -1,5 +1,6 @@ using Bts.ColumnSortExpressions; +using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; @@ -30,7 +31,7 @@ public class SortStream : ViewStream { public SortStream(ViewStream stream, IComparer comparer) { this.stream = stream; this.comparer = comparer; - sortCols = []; + sortCols = Array.Empty(); } [MemberNotNull(nameof(sortCols))] diff --git a/src/DataStreamSuite/DataStream/Primitives/Sort/SortedTable.cs b/src/DataStreamSuite/DataStream/Primitives/Sort/SortedTable.cs index 51252b16d..77dfecd42 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Sort/SortedTable.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Sort/SortedTable.cs @@ -11,9 +11,9 @@ namespace BCG; /// Represents an IBlueRowCollection with the rows sorted according to the /// public class SortedTable : IBlueRowCollection { - readonly List rows = []; - readonly Dictionary rowIndex = []; - readonly IList sortCols = []; + readonly List rows = new(0); + readonly Dictionary rowIndex = new(0); + readonly IList sortCols = Array.Empty(); readonly IComparer? comparer; ///