Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TSI] Query client library optimizations and improvements #20673

Merged
merged 13 commits into from
Apr 28, 2021
+2,800 −1,479
Merged

[TSI] Query client library optimizations and improvements #20673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ed8219c
Design QueryResults
Apr 9, 2021
ee67d1c
Add TimeSeriesValue variant type
Apr 16, 2021
fc2ded9
Remove commented code
Apr 16, 2021
c6790d1
Remove commented code
Apr 16, 2021
bfa6789
rename some stuff
Apr 18, 2021
a7b3ebd
use jsoneelement
Apr 19, 2021
9e6d443
Add aggregate series
Apr 21, 2021
0ad13e9
add aggregation tests
Apr 21, 2021
b560be4
Rename Query APIs
Apr 26, 2021
a4a9b6f
clean up
Apr 26, 2021
a75eea1
Merge branch 'master' into feature/timeseriesinsights/barustum/QueryR…
Apr 26, 2021
7492a50
fix a test
Apr 26, 2021
ec96dec
PR feedback
Apr 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 75 additions & 12 deletions ...sinsights/Azure.IoT.TimeSeriesInsights/api/Azure.IoT.TimeSeriesInsights.netstandard2.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ namespace Azure.IoT.TimeSeriesInsights
{
public partial class AggregateSeries
{
public AggregateSeries(System.Collections.Generic.IEnumerable<object> timeSeriesId, Azure.IoT.TimeSeriesInsights.DateTimeRange searchSpan, System.TimeSpan interval) { }
public AggregateSeries(Azure.IoT.TimeSeriesInsights.TimeSeriesId timeSeriesId, Azure.IoT.TimeSeriesInsights.DateTimeRange searchSpan, System.TimeSpan interval) { }
public Azure.IoT.TimeSeriesInsights.TimeSeriesExpression Filter { get { throw null; } set { } }
public System.Collections.Generic.IDictionary<string, Azure.IoT.TimeSeriesInsights.TimeSeriesVariable> InlineVariables { get { throw null; } }
public System.TimeSpan Interval { get { throw null; } }
public System.Collections.Generic.IList<string> ProjectedVariables { get { throw null; } }
public Azure.IoT.TimeSeriesInsights.DateTimeRange SearchSpan { get { throw null; } }
public System.Collections.Generic.IList<object> TimeSeriesId { get { throw null; } }
public Azure.IoT.TimeSeriesInsights.TimeSeriesId TimeSeriesId { get { throw null; } }
}
public partial class AggregateVariable : Azure.IoT.TimeSeriesInsights.TimeSeriesVariable
{
Expand Down Expand Up @@ -209,23 +209,35 @@ internal PagedResponse() { }
public partial class PropertyValues : Azure.IoT.TimeSeriesInsights.EventProperty
{
public PropertyValues() { }
public System.Collections.Generic.IList<object> Values { get { throw null; } }
public Azure.IoT.TimeSeriesInsights.TimeSeriesValue[] Values { get { throw null; } }
}
public partial class QueryAggregateSeriesRequestOptions : Azure.IoT.TimeSeriesInsights.QueryRequestOptions
{
public QueryAggregateSeriesRequestOptions() { }
public System.Collections.Generic.IDictionary<string, Azure.IoT.TimeSeriesInsights.TimeSeriesVariable> InlineVariables { get { throw null; } }
public System.Collections.Generic.List<string> ProjectedVariables { get { throw null; } }
}
public partial class QueryAnalyzer
{
internal QueryAnalyzer() { }
public double? Progress { get { throw null; } }
public Azure.Pageable<Azure.IoT.TimeSeriesInsights.TimeSeriesPoint> GetResults() { throw null; }
public Azure.AsyncPageable<Azure.IoT.TimeSeriesInsights.TimeSeriesPoint> GetResultsAsync() { throw null; }
}
public partial class QueryClient
{
protected QueryClient() { }
public virtual Azure.Pageable<Azure.IoT.TimeSeriesInsights.QueryResultPage> GetEvents(Azure.IoT.TimeSeriesInsights.TimeSeriesId timeSeriesId, System.DateTimeOffset startTime, System.DateTimeOffset endTime, Azure.IoT.TimeSeriesInsights.QueryEventsRequestOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.Pageable<Azure.IoT.TimeSeriesInsights.QueryResultPage> GetEvents(Azure.IoT.TimeSeriesInsights.TimeSeriesId timeSeriesId, System.TimeSpan timeSpan, System.DateTimeOffset? endTime = default(System.DateTimeOffset?), Azure.IoT.TimeSeriesInsights.QueryEventsRequestOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.AsyncPageable<Azure.IoT.TimeSeriesInsights.QueryResultPage> GetEventsAsync(Azure.IoT.TimeSeriesInsights.TimeSeriesId timeSeriesId, System.DateTimeOffset startTime, System.DateTimeOffset endTime, Azure.IoT.TimeSeriesInsights.QueryEventsRequestOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.AsyncPageable<Azure.IoT.TimeSeriesInsights.QueryResultPage> GetEventsAsync(Azure.IoT.TimeSeriesInsights.TimeSeriesId timeSeriesId, System.TimeSpan timeSpan, System.DateTimeOffset? endTime = default(System.DateTimeOffset?), Azure.IoT.TimeSeriesInsights.QueryEventsRequestOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.Pageable<Azure.IoT.TimeSeriesInsights.QueryResultPage> GetSeries(Azure.IoT.TimeSeriesInsights.TimeSeriesId timeSeriesId, System.DateTimeOffset startTime, System.DateTimeOffset endTime, Azure.IoT.TimeSeriesInsights.QuerySeriesRequestOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.Pageable<Azure.IoT.TimeSeriesInsights.QueryResultPage> GetSeries(Azure.IoT.TimeSeriesInsights.TimeSeriesId timeSeriesId, System.TimeSpan timeSpan, System.DateTimeOffset? endTime = default(System.DateTimeOffset?), Azure.IoT.TimeSeriesInsights.QuerySeriesRequestOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.AsyncPageable<Azure.IoT.TimeSeriesInsights.QueryResultPage> GetSeriesAsync(Azure.IoT.TimeSeriesInsights.TimeSeriesId timeSeriesId, System.DateTimeOffset startTime, System.DateTimeOffset endTime, Azure.IoT.TimeSeriesInsights.QuerySeriesRequestOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.AsyncPageable<Azure.IoT.TimeSeriesInsights.QueryResultPage> GetSeriesAsync(Azure.IoT.TimeSeriesInsights.TimeSeriesId timeSeriesId, System.TimeSpan timeSpan, System.DateTimeOffset? endTime = default(System.DateTimeOffset?), Azure.IoT.TimeSeriesInsights.QuerySeriesRequestOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.IoT.TimeSeriesInsights.QueryAnalyzer CreateAggregateSeriesQueryAnalyzer(Azure.IoT.TimeSeriesInsights.TimeSeriesId timeSeriesId, System.DateTimeOffset startTime, System.DateTimeOffset endTime, System.TimeSpan interval, Azure.IoT.TimeSeriesInsights.QueryAggregateSeriesRequestOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.IoT.TimeSeriesInsights.QueryAnalyzer CreateAggregateSeriesQueryAnalyzer(Azure.IoT.TimeSeriesInsights.TimeSeriesId timeSeriesId, System.TimeSpan interval, System.TimeSpan timeSpan, System.DateTimeOffset? endTime = default(System.DateTimeOffset?), Azure.IoT.TimeSeriesInsights.QueryAggregateSeriesRequestOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.IoT.TimeSeriesInsights.QueryAnalyzer CreateEventsQueryAnalyzer(Azure.IoT.TimeSeriesInsights.TimeSeriesId timeSeriesId, System.DateTimeOffset startTime, System.DateTimeOffset endTime, Azure.IoT.TimeSeriesInsights.QueryEventsRequestOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.IoT.TimeSeriesInsights.QueryAnalyzer CreateEventsQueryAnalyzer(Azure.IoT.TimeSeriesInsights.TimeSeriesId timeSeriesId, System.TimeSpan timeSpan, System.DateTimeOffset? endTime = default(System.DateTimeOffset?), Azure.IoT.TimeSeriesInsights.QueryEventsRequestOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.IoT.TimeSeriesInsights.QueryAnalyzer CreateSeriesQueryAnalyzer(Azure.IoT.TimeSeriesInsights.TimeSeriesId timeSeriesId, System.DateTimeOffset startTime, System.DateTimeOffset endTime, Azure.IoT.TimeSeriesInsights.QuerySeriesRequestOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.IoT.TimeSeriesInsights.QueryAnalyzer CreateSeriesQueryAnalyzer(Azure.IoT.TimeSeriesInsights.TimeSeriesId timeSeriesId, System.TimeSpan timeSpan, System.DateTimeOffset? endTime = default(System.DateTimeOffset?), Azure.IoT.TimeSeriesInsights.QuerySeriesRequestOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
}
public partial class QueryEventsRequestOptions : Azure.IoT.TimeSeriesInsights.QueryRequestOptions
{
public QueryEventsRequestOptions() { }
public int? MaximumNumberOfEvents { get { throw null; } set { } }
public System.Collections.Generic.List<Azure.IoT.TimeSeriesInsights.EventProperty> ProjectedProperties { get { throw null; } }
}
public partial class QueryRequest
Expand All @@ -239,7 +251,6 @@ public abstract partial class QueryRequestOptions
{
protected QueryRequestOptions() { }
public string Filter { get { throw null; } set { } }
public int? MaximumNumberOfEvents { get { throw null; } set { } }
public Azure.IoT.TimeSeriesInsights.StoreType StoreType { get { throw null; } set { } }
}
public partial class QueryResultPage : Azure.IoT.TimeSeriesInsights.PagedResponse
Expand All @@ -253,6 +264,7 @@ public partial class QuerySeriesRequestOptions : Azure.IoT.TimeSeriesInsights.Qu
{
public QuerySeriesRequestOptions() { }
public System.Collections.Generic.IDictionary<string, Azure.IoT.TimeSeriesInsights.TimeSeriesVariable> InlineVariables { get { throw null; } }
public int? MaximumNumberOfEvents { get { throw null; } set { } }
public System.Collections.Generic.List<string> ProjectedVariables { get { throw null; } }
}
public partial class StoreType
Expand Down Expand Up @@ -373,6 +385,16 @@ internal TimeSeriesOperationErrorDetails() { }
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
public bool TryGetValue(string key, out object value) { throw null; }
}
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
public partial struct TimeSeriesPoint
{
private object _dummy;
private int _dummyPrimitive;
public TimeSeriesPoint(System.DateTimeOffset timestamp, System.Collections.Generic.IDictionary<string, Azure.IoT.TimeSeriesInsights.PropertyValues> propertyNameToPageValues, int index) { throw null; }
public System.DateTimeOffset Timestamp { get { throw null; } }
public string[] GetUniquePropertyNames() { throw null; }
public Azure.IoT.TimeSeriesInsights.TimeSeriesValue GetValue(string propertyName) { throw null; }
}
public partial class TimeSeriesType
{
public TimeSeriesType(string name, System.Collections.Generic.IDictionary<string, Azure.IoT.TimeSeriesInsights.TimeSeriesVariable> variables) { }
Expand All @@ -387,6 +409,47 @@ internal TimeSeriesTypeOperationResult() { }
public Azure.IoT.TimeSeriesInsights.TimeSeriesOperationError Error { get { throw null; } }
public Azure.IoT.TimeSeriesInsights.TimeSeriesType TimeSeriesType { get { throw null; } }
}
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
public readonly partial struct TimeSeriesValue
{
private readonly object _dummy;
private readonly int _dummyPrimitive;
public TimeSeriesValue(bool value) { throw null; }
public TimeSeriesValue(byte[] utf8, int index, int count) { throw null; }
public TimeSeriesValue(System.DateTimeOffset value) { throw null; }
public TimeSeriesValue(double value) { throw null; }
public TimeSeriesValue(int value) { throw null; }
public TimeSeriesValue(bool? value) { throw null; }
public TimeSeriesValue(System.DateTimeOffset? value) { throw null; }
public TimeSeriesValue(double? value) { throw null; }
public TimeSeriesValue(int? value) { throw null; }
public TimeSeriesValue(System.TimeSpan? value) { throw null; }
public TimeSeriesValue(string value) { throw null; }
public TimeSeriesValue(System.TimeSpan value) { throw null; }
public System.Type Type { get { throw null; } }
public static explicit operator bool (Azure.IoT.TimeSeriesInsights.TimeSeriesValue variant) { throw null; }
public static explicit operator System.DateTimeOffset (Azure.IoT.TimeSeriesInsights.TimeSeriesValue variant) { throw null; }
public static explicit operator double (Azure.IoT.TimeSeriesInsights.TimeSeriesValue variant) { throw null; }
public static explicit operator int (Azure.IoT.TimeSeriesInsights.TimeSeriesValue variant) { throw null; }
public static explicit operator bool? (Azure.IoT.TimeSeriesInsights.TimeSeriesValue variant) { throw null; }
public static explicit operator System.DateTimeOffset? (Azure.IoT.TimeSeriesInsights.TimeSeriesValue variant) { throw null; }
public static explicit operator double? (Azure.IoT.TimeSeriesInsights.TimeSeriesValue variant) { throw null; }
public static explicit operator int? (Azure.IoT.TimeSeriesInsights.TimeSeriesValue variant) { throw null; }
public static explicit operator System.TimeSpan? (Azure.IoT.TimeSeriesInsights.TimeSeriesValue variant) { throw null; }
public static explicit operator string (Azure.IoT.TimeSeriesInsights.TimeSeriesValue variant) { throw null; }
public static explicit operator System.TimeSpan (Azure.IoT.TimeSeriesInsights.TimeSeriesValue variant) { throw null; }
public static implicit operator Azure.IoT.TimeSeriesInsights.TimeSeriesValue (bool value) { throw null; }
public static implicit operator Azure.IoT.TimeSeriesInsights.TimeSeriesValue (System.DateTimeOffset value) { throw null; }
public static implicit operator Azure.IoT.TimeSeriesInsights.TimeSeriesValue (double value) { throw null; }
public static implicit operator Azure.IoT.TimeSeriesInsights.TimeSeriesValue (int value) { throw null; }
public static implicit operator Azure.IoT.TimeSeriesInsights.TimeSeriesValue (bool? value) { throw null; }
public static implicit operator Azure.IoT.TimeSeriesInsights.TimeSeriesValue (System.DateTimeOffset? value) { throw null; }
public static implicit operator Azure.IoT.TimeSeriesInsights.TimeSeriesValue (double? value) { throw null; }
public static implicit operator Azure.IoT.TimeSeriesInsights.TimeSeriesValue (int? value) { throw null; }
public static implicit operator Azure.IoT.TimeSeriesInsights.TimeSeriesValue (System.TimeSpan? value) { throw null; }
public static implicit operator Azure.IoT.TimeSeriesInsights.TimeSeriesValue (string value) { throw null; }
public static implicit operator Azure.IoT.TimeSeriesInsights.TimeSeriesValue (System.TimeSpan value) { throw null; }
}
public partial class TimeSeriesVariable
{
public TimeSeriesVariable() { }
Expand Down
61 changes: 61 additions & 0 deletions ...ights/Azure.IoT.TimeSeriesInsights/src/Customized/Models/AggregateSeries.Serialization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System.Text.Json;
using Azure.Core;

namespace Azure.IoT.TimeSeriesInsights
{
/// <summary>
/// This class definition overrides serialization and deserialization implementation in
/// order to turn Time Series Ids from a strongly typed object to an list of objects that
/// the service can understand, and vice versa.
/// </summary>
public partial class AggregateSeries : IUtf8JsonSerializable
{
// The use of fully qualified name for IUtf8JsonSerializable is a work around until this
// issue is fixed: https://github.com/Azure/autorest.csharp/issues/793
void global::Azure.Core.IUtf8JsonSerializable.Write(Utf8JsonWriter writer)
{
writer.WriteStartObject();
writer.WritePropertyName("timeSeriesId");
writer.WriteStartArray();
foreach (var item in TimeSeriesId.ToArray())
{
writer.WriteObjectValue(item);
}
writer.WriteEndArray();
writer.WritePropertyName("searchSpan");
writer.WriteObjectValue(SearchSpan);
if (Optional.IsDefined(Filter))
{
writer.WritePropertyName("filter");
writer.WriteObjectValue(Filter);
}
writer.WritePropertyName("interval");
writer.WriteStringValue(Interval, "P");
if (Optional.IsCollectionDefined(ProjectedVariables))
{
writer.WritePropertyName("projectedVariables");
writer.WriteStartArray();
foreach (var item in ProjectedVariables)
{
writer.WriteStringValue(item);
}
writer.WriteEndArray();
}
if (Optional.IsCollectionDefined(InlineVariables))
{
writer.WritePropertyName("inlineVariables");
writer.WriteStartObject();
foreach (var item in InlineVariables)
{
writer.WritePropertyName(item.Key);
writer.WriteObjectValue(item.Value);
}
writer.WriteEndObject();
}
writer.WriteEndObject();
}
}
}
Loading