Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public sealed partial class TranslateResponseConverter : System.Text.Json.Serial
private static readonly System.Text.Json.JsonEncodedText PropSize = System.Text.Json.JsonEncodedText.Encode("size");
private static readonly System.Text.Json.JsonEncodedText PropSort = System.Text.Json.JsonEncodedText.Encode("sort");
private static readonly System.Text.Json.JsonEncodedText PropSource = System.Text.Json.JsonEncodedText.Encode("_source");
private static readonly System.Text.Json.JsonEncodedText PropTrackTotalHits = System.Text.Json.JsonEncodedText.Encode("track_total_hits");

public override Elastic.Clients.Elasticsearch.Sql.TranslateResponse Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
{
Expand All @@ -41,6 +42,7 @@ public override Elastic.Clients.Elasticsearch.Sql.TranslateResponse Read(ref Sys
LocalJsonValue<long?> propSize = default;
LocalJsonValue<System.Collections.Generic.ICollection<Elastic.Clients.Elasticsearch.SortOptions>?> propSort = default;
LocalJsonValue<Elastic.Clients.Elasticsearch.Core.Search.SourceConfig?> propSource = default;
LocalJsonValue<Elastic.Clients.Elasticsearch.Core.Search.TrackHits?> propTrackTotalHits = default;
while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
{
if (propAggregations.TryReadProperty(ref reader, options, PropAggregations, static System.Collections.Generic.IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>? (ref System.Text.Json.Utf8JsonReader r, System.Text.Json.JsonSerializerOptions o) => r.ReadDictionaryValue<string, Elastic.Clients.Elasticsearch.Aggregations.Aggregation>(o, null, null)))
Expand Down Expand Up @@ -73,6 +75,11 @@ public override Elastic.Clients.Elasticsearch.Sql.TranslateResponse Read(ref Sys
continue;
}

if (propTrackTotalHits.TryReadProperty(ref reader, options, PropTrackTotalHits, null))
{
continue;
}

if (options.UnmappedMemberHandling is System.Text.Json.Serialization.JsonUnmappedMemberHandling.Skip)
{
reader.SafeSkip();
Expand All @@ -90,7 +97,8 @@ public override Elastic.Clients.Elasticsearch.Sql.TranslateResponse Read(ref Sys
Query = propQuery.Value,
Size = propSize.Value,
Sort = propSort.Value,
Source = propSource.Value
Source = propSource.Value,
TrackTotalHits = propTrackTotalHits.Value
};
}

Expand All @@ -103,6 +111,7 @@ public override void Write(System.Text.Json.Utf8JsonWriter writer, Elastic.Clien
writer.WriteProperty(options, PropSize, value.Size, null, static (System.Text.Json.Utf8JsonWriter w, System.Text.Json.JsonSerializerOptions o, long? v) => w.WriteNullableValue<long>(o, v));
writer.WriteProperty(options, PropSort, value.Sort, null, static (System.Text.Json.Utf8JsonWriter w, System.Text.Json.JsonSerializerOptions o, System.Collections.Generic.ICollection<Elastic.Clients.Elasticsearch.SortOptions>? v) => w.WriteSingleOrManyCollectionValue<Elastic.Clients.Elasticsearch.SortOptions>(o, v, null));
writer.WriteProperty(options, PropSource, value.Source, null, null);
writer.WriteProperty(options, PropTrackTotalHits, value.TrackTotalHits, null, null);
writer.WriteEndObject();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ internal TranslateResponse(Elastic.Clients.Elasticsearch.Serialization.JsonConst
public long? Size { get; set; }
public System.Collections.Generic.ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
public Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? Source { get; set; }
public Elastic.Clients.Elasticsearch.Core.Search.TrackHits? TrackTotalHits { get; set; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ internal static void ReadItem(ref System.Text.Json.Utf8JsonReader reader, System
"boxplot" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.BoxplotAggregate>(options, null),
"bucket_metric_value" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.BucketMetricValueAggregate>(options, null),
"cardinality" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregate>(options, null),
"cartesian_bounds" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.CartesianBoundsAggregate>(options, null),
"cartesian_centroid" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.CartesianCentroidAggregate>(options, null),
"change_point" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ChangePointAggregate>(options, null),
"children" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ChildrenAggregate>(options, null),
"composite" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregate>(options, null),
"date_histogram" => reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregate>(options, null),
Expand Down Expand Up @@ -161,6 +164,15 @@ internal static void WriteItem(System.Text.Json.Utf8JsonWriter writer, System.Te
case Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregate v:
writer.WriteProperty(options, key, v, static (System.Text.Json.Utf8JsonWriter w, System.Text.Json.JsonSerializerOptions o, string v) => w.WritePropertyName<string>(o, v), static (System.Text.Json.Utf8JsonWriter w, System.Text.Json.JsonSerializerOptions o, Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregate v) => w.WritePropertyName<Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregate>(o, v));
break;
case Elastic.Clients.Elasticsearch.Aggregations.CartesianBoundsAggregate v:
writer.WriteProperty(options, key, v, static (System.Text.Json.Utf8JsonWriter w, System.Text.Json.JsonSerializerOptions o, string v) => w.WritePropertyName<string>(o, v), static (System.Text.Json.Utf8JsonWriter w, System.Text.Json.JsonSerializerOptions o, Elastic.Clients.Elasticsearch.Aggregations.CartesianBoundsAggregate v) => w.WritePropertyName<Elastic.Clients.Elasticsearch.Aggregations.CartesianBoundsAggregate>(o, v));
break;
case Elastic.Clients.Elasticsearch.Aggregations.CartesianCentroidAggregate v:
writer.WriteProperty(options, key, v, static (System.Text.Json.Utf8JsonWriter w, System.Text.Json.JsonSerializerOptions o, string v) => w.WritePropertyName<string>(o, v), static (System.Text.Json.Utf8JsonWriter w, System.Text.Json.JsonSerializerOptions o, Elastic.Clients.Elasticsearch.Aggregations.CartesianCentroidAggregate v) => w.WritePropertyName<Elastic.Clients.Elasticsearch.Aggregations.CartesianCentroidAggregate>(o, v));
break;
case Elastic.Clients.Elasticsearch.Aggregations.ChangePointAggregate v:
writer.WriteProperty(options, key, v, static (System.Text.Json.Utf8JsonWriter w, System.Text.Json.JsonSerializerOptions o, string v) => w.WritePropertyName<string>(o, v), static (System.Text.Json.Utf8JsonWriter w, System.Text.Json.JsonSerializerOptions o, Elastic.Clients.Elasticsearch.Aggregations.ChangePointAggregate v) => w.WritePropertyName<Elastic.Clients.Elasticsearch.Aggregations.ChangePointAggregate>(o, v));
break;
case Elastic.Clients.Elasticsearch.Aggregations.ChildrenAggregate v:
writer.WriteProperty(options, key, v, static (System.Text.Json.Utf8JsonWriter w, System.Text.Json.JsonSerializerOptions o, string v) => w.WritePropertyName<string>(o, v), static (System.Text.Json.Utf8JsonWriter w, System.Text.Json.JsonSerializerOptions o, Elastic.Clients.Elasticsearch.Aggregations.ChildrenAggregate v) => w.WritePropertyName<Elastic.Clients.Elasticsearch.Aggregations.ChildrenAggregate>(o, v));
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ public bool TryGetAggregate<T>(string key, [System.Diagnostics.CodeAnalysis.NotN
public Elastic.Clients.Elasticsearch.Aggregations.BoxplotAggregate? GetBoxplot(string key) => TryGet<Elastic.Clients.Elasticsearch.Aggregations.BoxplotAggregate>(key);
public Elastic.Clients.Elasticsearch.Aggregations.BucketMetricValueAggregate? GetBucketMetricValue(string key) => TryGet<Elastic.Clients.Elasticsearch.Aggregations.BucketMetricValueAggregate>(key);
public Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregate? GetCardinality(string key) => TryGet<Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregate>(key);
public Elastic.Clients.Elasticsearch.Aggregations.CartesianBoundsAggregate? GetCartesianBounds(string key) => TryGet<Elastic.Clients.Elasticsearch.Aggregations.CartesianBoundsAggregate>(key);
public Elastic.Clients.Elasticsearch.Aggregations.CartesianCentroidAggregate? GetCartesianCentroid(string key) => TryGet<Elastic.Clients.Elasticsearch.Aggregations.CartesianCentroidAggregate>(key);
public Elastic.Clients.Elasticsearch.Aggregations.ChangePointAggregate? GetChangePoint(string key) => TryGet<Elastic.Clients.Elasticsearch.Aggregations.ChangePointAggregate>(key);
public Elastic.Clients.Elasticsearch.Aggregations.ChildrenAggregate? GetChildren(string key) => TryGet<Elastic.Clients.Elasticsearch.Aggregations.ChildrenAggregate>(key);
public Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregate? GetComposite(string key) => TryGet<Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregate>(key);
public Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregate? GetDateHistogram(string key) => TryGet<Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregate>(key);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ public sealed partial class AggregationConverter : System.Text.Json.Serializatio
private static readonly System.Text.Json.JsonEncodedText VariantBucketSelector = System.Text.Json.JsonEncodedText.Encode("bucket_selector");
private static readonly System.Text.Json.JsonEncodedText VariantBucketSort = System.Text.Json.JsonEncodedText.Encode("bucket_sort");
private static readonly System.Text.Json.JsonEncodedText VariantCardinality = System.Text.Json.JsonEncodedText.Encode("cardinality");
private static readonly System.Text.Json.JsonEncodedText VariantCartesianBounds = System.Text.Json.JsonEncodedText.Encode("cartesian_bounds");
private static readonly System.Text.Json.JsonEncodedText VariantCartesianCentroid = System.Text.Json.JsonEncodedText.Encode("cartesian_centroid");
private static readonly System.Text.Json.JsonEncodedText VariantCategorizeText = System.Text.Json.JsonEncodedText.Encode("categorize_text");
private static readonly System.Text.Json.JsonEncodedText VariantChangePoint = System.Text.Json.JsonEncodedText.Encode("change_point");
private static readonly System.Text.Json.JsonEncodedText VariantChildren = System.Text.Json.JsonEncodedText.Encode("children");
private static readonly System.Text.Json.JsonEncodedText VariantComposite = System.Text.Json.JsonEncodedText.Encode("composite");
private static readonly System.Text.Json.JsonEncodedText VariantCumulativeCardinality = System.Text.Json.JsonEncodedText.Encode("cumulative_cardinality");
Expand Down Expand Up @@ -213,6 +216,22 @@ public override Elastic.Clients.Elasticsearch.Aggregations.Aggregation Read(ref
continue;
}

if (reader.ValueTextEquals(VariantCartesianBounds))
{
variantType = VariantCartesianBounds.Value;
reader.Read();
variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.CartesianBoundsAggregation>(options, null);
continue;
}

if (reader.ValueTextEquals(VariantCartesianCentroid))
{
variantType = VariantCartesianCentroid.Value;
reader.Read();
variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.CartesianCentroidAggregation>(options, null);
continue;
}

if (reader.ValueTextEquals(VariantCategorizeText))
{
variantType = VariantCategorizeText.Value;
Expand All @@ -221,6 +240,14 @@ public override Elastic.Clients.Elasticsearch.Aggregations.Aggregation Read(ref
continue;
}

if (reader.ValueTextEquals(VariantChangePoint))
{
variantType = VariantChangePoint.Value;
reader.Read();
variant = reader.ReadValue<Elastic.Clients.Elasticsearch.Aggregations.ChangePointAggregation>(options, null);
continue;
}

if (reader.ValueTextEquals(VariantChildren))
{
variantType = VariantChildren.Value;
Expand Down Expand Up @@ -800,9 +827,18 @@ public override void Write(System.Text.Json.Utf8JsonWriter writer, Elastic.Clien
case "cardinality":
writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.CardinalityAggregation)value.Variant, null, null);
break;
case "cartesian_bounds":
writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.CartesianBoundsAggregation)value.Variant, null, null);
break;
case "cartesian_centroid":
writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.CartesianCentroidAggregation)value.Variant, null, null);
break;
case "categorize_text":
writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.CategorizeTextAggregation)value.Variant, null, null);
break;
case "change_point":
writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.ChangePointAggregation)value.Variant, null, null);
break;
case "children":
writer.WriteProperty(options, value.VariantType, (Elastic.Clients.Elasticsearch.Aggregations.ChildrenAggregation)value.Variant, null, null);
break;
Expand Down
Loading
Loading