Merge feat/671-time-weighted-aggregates: Part 13 time-weighted aggregates (#671)

2026-10-11 09:10:52 -04:00
parent db6446ce73 56bb4855bb
commit 3b739b982b
29 changed files with 1502 additions and 47 deletions
@@ -292,6 +292,34 @@ public sealed class NodeManagerHistoryReadTests : IDisposable
        await host.DisposeAsync();
    }

+    /// <summary>#671: the Part 13 TimeAverage2 / Total2 aggregate NodeIds map to their own members.</summary>
+    [Theory]
+    [InlineData("TimeAverage2")]
+    [InlineData("Total2")]
+    public async Task Processed_TimeAverage2_and_Total2_dispatch_to_the_source(string name)
+    {
+        var (host, server) = await BootAsync();
+        var nm = server.NodeManager!;
+        var fake = new RecordingHistorianDataSource { ProcessedResult = Empty() };
+        nm.HistorianDataSource = fake;
+        nm.EnsureVariable("eq-1/tw", parentFolderNodeId: null, displayName: "T", dataType: "Float",
+            writable: false, historianTagname: "WW.Tw", realm: AddressSpaceRealm.Uns);
+        var nodeId = nm.TryGetVariable("eq-1/tw")!.NodeId;
+        var (aggregateId, expected) = name == "Total2"
+            ? (ObjectIds.AggregateFunction_Total2, HistoryAggregateType.Total2)
+            : (ObjectIds.AggregateFunction_TimeAverage2, HistoryAggregateType.TimeAverage2);
+
+        InvokeHistoryRead(server, nm, new ReadProcessedDetails
+        {
+            StartTime = DateTime.UtcNow.AddHours(-1), EndTime = DateTime.UtcNow, ProcessingInterval = 10_000.0,
+            AggregateType = new NodeIdCollection { aggregateId },
+        }, nodeId);
+
+        fake.LastCall.ShouldBe("Processed");
+        fake.LastAggregate.ShouldBe(expected);
+        await host.DisposeAsync();
+    }
+
    /// <summary>#285: a backend that cannot serve a mapped aggregate answers BadAggregateNotSupported
    /// (not the generic BadHistoryOperationUnsupported a plain throw produces).</summary>
    [Fact]
@@ -314,6 +342,28 @@ public sealed class NodeManagerHistoryReadTests : IDisposable
        await host.DisposeAsync();
    }

+    /// <summary>#671: a read past a backend size limit (the time-weighted raw-row cap) answers BadTooManyOperations
+    /// for that node (not the generic BadHistoryOperationUnsupported, nor a deadline BadTimeout).</summary>
+    [Fact]
+    public async Task Processed_limit_exceeded_yields_BadTooManyOperations()
+    {
+        var (host, server) = await BootAsync();
+        var nm = server.NodeManager!;
+        nm.HistorianDataSource = new RecordingHistorianDataSource { LimitExceeded = true };
+        nm.EnsureVariable("eq-1/cap", parentFolderNodeId: null, displayName: "C", dataType: "Float",
+            writable: false, historianTagname: "WW.Cap", realm: AddressSpaceRealm.Uns);
+        var nodeId = nm.TryGetVariable("eq-1/cap")!.NodeId;
+
+        var (_, errors) = InvokeHistoryRead(server, nm, new ReadProcessedDetails
+        {
+            StartTime = DateTime.UtcNow.AddHours(-1), EndTime = DateTime.UtcNow, ProcessingInterval = 10_000.0,
+            AggregateType = new NodeIdCollection { ObjectIds.AggregateFunction_Total },
+        }, nodeId);
+
+        errors[0].StatusCode.Code.ShouldBe(StatusCodes.BadTooManyOperations);
+        await host.DisposeAsync();
+    }
+
    /// <summary>AtTime read: the requested timestamps reach ReadAtTimeAsync in order.</summary>
    [Fact]
    public async Task AtTime_dispatches_requested_timestamps()
@@ -477,6 +527,7 @@ public sealed class NodeManagerHistoryReadTests : IDisposable
    {
        public bool ThrowOnRead { get; init; }
        public bool AggregateNotSupported { get; init; }
+        public bool LimitExceeded { get; init; }
        public HistorianRead RawResult { get; set; } = new(Array.Empty<DataValueSnapshot>(), null);
        public HistorianRead ProcessedResult { get; set; } = new(Array.Empty<DataValueSnapshot>(), null);
        public HistorianRead AtTimeResult { get; set; } = new(Array.Empty<DataValueSnapshot>(), null);
@@ -509,6 +560,7 @@ public sealed class NodeManagerHistoryReadTests : IDisposable
        {
            if (ThrowOnRead) throw new InvalidOperationException("backend boom");
            if (AggregateNotSupported) throw new HistoryAggregateNotSupportedException(aggregate);
+            if (LimitExceeded) throw new HistoryReadLimitExceededException(4, "too many raw rows");
            LastCall = "Processed";
            LastTagname = fullReference;
            LastStart = startUtc;
@@ -89,6 +89,16 @@ public sealed class ServerHistorianOptionsTests
        Assert.Contains(w, m => m.Contains("HistoryReadDeadline"));
    }

+    [Fact]
+    public void MaxTimeWeightedRawRows_defaults_to_one_million_and_warns_when_nonpositive()
+    {
+        Assert.Equal(1_000_000, new ServerHistorianOptions().MaxTimeWeightedRawRows);
+        var w = new ServerHistorianOptions
+        { Enabled = true, Endpoint = "https://h:5222", ApiKey = "histgw_x_y", MaxTimeWeightedRawRows = 0 }
+            .Validate();
+        Assert.Contains(w, m => m.Contains("MaxTimeWeightedRawRows"));
+    }
+
    [Fact]
    public void Disabled_with_nonpositive_HistoryRead_knobs_is_silent()
    {