From ea8bd4082fdcefbf14859bfbc13c51306e819824 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 26 Nov 2025 15:39:09 +0000 Subject: [PATCH] cleanup: Remove redundant IBlueTableSchema 'ResolveIndices' ext fns --- .../DataStream/DataStreamExtensions.cs | 42 +------------------ 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/src/DataStreamSuite/DataStream/DataStreamExtensions.cs b/src/DataStreamSuite/DataStream/DataStreamExtensions.cs index 8dd418a9e..9bba2bb40 100644 --- a/src/DataStreamSuite/DataStream/DataStreamExtensions.cs +++ b/src/DataStreamSuite/DataStream/DataStreamExtensions.cs @@ -121,46 +121,6 @@ public static class DataStreamExtensions { public static ViewStream AsViewStream(this IObservable> source, IBlueTableSchema schema) where T : IBlueRow => source.AsDataPackets(schema).AsViewStream(); - public static int ResolveIndices(this IBlueTableSchema schema, string name) { - var indices = ResolveIndices(schema, new[] { name }); - return indices[0]; - } - - public static (int, int) ResolveIndices(this IBlueTableSchema schema, string name1, string name2) { - var indices = ResolveIndices(schema, new[] { name1, name2 }); - return (indices[0], indices[1]); - } - - public static (int, int, int) ResolveIndices(this IBlueTableSchema schema, string name1, string name2, string name3) { - var indices = ResolveIndices(schema, new[] { name1, name2, name3 }); - return (indices[0], indices[1], indices[2]); - } - - public static (int, int, int, int) ResolveIndices(this IBlueTableSchema schema, string name1, string name2, string name3, string name4) { - var indices = ResolveIndices(schema, new[] { name1, name2, name3, name4 }); - return (indices[0], indices[1], indices[2], indices[3]); - } - - public static int[] ResolveIndices(this IBlueTableSchema schema, string[] columnNames) { - var columns = schema.columnInfo; - var indices = new int[columnNames.Length]; - int nResolved = 0; - for (int i = 0; i < columnNames.Length; i++) { - int origNResolved = nResolved; - for (int j = 0; j < columns.Length; j++) { - if (columns[j].colName == columnNames[i]) { - indices[i] = j; - nResolved++; - break; - } - } - if (nResolved == origNResolved) { - throw new ArgumentException($"No column named '{columnNames[i]}'", nameof(schema)); - } - } - return indices; - } - public static IObservable OnWorkScheduler(this IObservable source, IWorkScheduler scheduler) => Observable.Create(o => { var inputGate = new AtomicGate(); @@ -185,7 +145,7 @@ public static class DataStreamExtensions { foreach (IBlueRow r in value.addedRows) { bd.AddOrUpdate(r); } - pendingDpOut = bd.ToDataPacket(out lastTable); + pendingDpOut = bd.ToDataPacket(out lastTable, false); } }