Skip to content

Commit 40a3bdc

Browse files
Fix incorrect Total value for search responses (#8095) (#8097)
Co-authored-by: Florian Bernd <[email protected]>
1 parent c182754 commit 40a3bdc

File tree

5 files changed

+4
-6
lines changed

5 files changed

+4
-6
lines changed

src/Elastic.Clients.Elasticsearch.Shared/Api/ScrollResponse.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ public partial class ScrollResponse<TDocument>
2121
public IReadOnlyCollection<TDocument> Documents => HitsMetadata.Hits.Select(s => s.Source).ToReadOnlyCollection();
2222

2323
[JsonIgnore]
24-
public long Total => HitsMetadata?.Total?.Item2 ?? HitsMetadata?.Total?.Item1.Value ?? -1;
24+
public long Total => HitsMetadata?.Total?.Item1?.Value ?? HitsMetadata?.Total?.Item2 ?? -1;
2525
}

src/Elastic.Clients.Elasticsearch.Shared/Api/SearchResponse.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ public partial class SearchResponse<TDocument>
2121
public IReadOnlyCollection<TDocument> Documents => HitsMetadata.Hits.Select(s => s.Source).ToReadOnlyCollection();
2222

2323
[JsonIgnore]
24-
public long Total => HitsMetadata?.Total?.Item2 ?? HitsMetadata?.Total?.Item1.Value ?? -1;
24+
public long Total => HitsMetadata?.Total?.Item1?.Value ?? HitsMetadata?.Total?.Item2 ?? -1;
2525
}

src/Elastic.Clients.Elasticsearch.Shared/Core/Infer/Fields/FieldsConverter.cs

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
using System.Text.Json;
88
using System.Text.Json.Serialization;
99

10-
using Elastic.Clients.Elasticsearch.Serialization;
11-
1210
#if ELASTICSEARCH_SERVERLESS
1311
namespace Elastic.Clients.Elasticsearch.Serverless;
1412
#else

src/Elastic.Clients.Elasticsearch.Shared/Types/AsyncSearch/AsyncSearch.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ public partial class AsyncSearch<TDocument>
3030
/// The total number of hits returned for this search.
3131
/// </summary>
3232
[JsonIgnore]
33-
public long Total => HitsMetadata?.Total?.Item2 ?? HitsMetadata?.Total?.Item1.Value ?? -1;
33+
public long Total => HitsMetadata?.Total?.Item1?.Value ?? HitsMetadata?.Total?.Item2 ?? -1;
3434
}

src/Elastic.Clients.Elasticsearch.Shared/Types/MultiSearchItem.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ public partial class MultiSearchItem<TDocument>
2121
public IReadOnlyCollection<TDocument> Documents => HitsMetadata.Hits.Select(s => s.Source).ToReadOnlyCollection();
2222

2323
[JsonIgnore]
24-
public long Total => HitsMetadata?.Total?.Item2 ?? HitsMetadata?.Total?.Item1.Value ?? -1;
24+
public long Total => HitsMetadata?.Total?.Item1?.Value ?? HitsMetadata?.Total?.Item2 ?? -1;
2525
}

0 commit comments

Comments
 (0)