Skip to content

Commit 60191b4

Browse files
russcamrusscam
committed
Reinstate TrackTotalHits on SearchRequestParameters
This commit reinstates TrackTotalHits on SearchRequestParameters, which was removed by accident when moving it to the request body in SearchRequest
1 parent 0159b16 commit 60191b4

File tree

55 files changed

+1797
-1785
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1797
-1785
lines changed

‎src/CodeGeneration/ApiGenerator/Configuration/Overrides/Endpoints/SearchOverrides.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,10 @@ public class SearchOverrides : EndpointOverridesBase
2222
"track_scores",
2323
"terminate_after",
2424
};
25+
26+
public override IEnumerable<string> RenderPartial => new[]
27+
{
28+
"track_total_hits"
29+
};
2530
}
2631
}

‎src/CodeGeneration/ApiGenerator/Configuration/Overrides/GlobalOverrides.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public class GlobalOverrides : EndpointOverridesBase
4141
"source", // allows the body to be specified as a request param, we do not want to advertise this with a strongly typed method
4242
"timestamp",
4343
"_source_include", "_source_exclude", // can be removed once https://github.com/elastic/elasticsearch/pull/41439 is in
44-
"track_total_hits"
4544
};
4645
}
4746
}

‎src/Elasticsearch.Net/Api/RequestParameters/RequestParameters.Cat.cs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
// ReSharper disable once CheckNamespace
2525
namespace Elasticsearch.Net.Specification.CatApi
2626
{
27-
///<summary>Request options for Aliases <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-alias.html</para></summary>
27+
///<summary>Request options for Aliases <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-alias.html</para></summary>
2828
public class CatAliasesRequestParameters : RequestParameters<CatAliasesRequestParameters>
2929
{
3030
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -78,7 +78,7 @@ public bool? Verbose
7878
}
7979
}
8080

81-
///<summary>Request options for Allocation <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-allocation.html</para></summary>
81+
///<summary>Request options for Allocation <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-allocation.html</para></summary>
8282
public class CatAllocationRequestParameters : RequestParameters<CatAllocationRequestParameters>
8383
{
8484
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -139,7 +139,7 @@ public bool? Verbose
139139
}
140140
}
141141

142-
///<summary>Request options for Count <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-count.html</para></summary>
142+
///<summary>Request options for Count <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-count.html</para></summary>
143143
public class CatCountRequestParameters : RequestParameters<CatCountRequestParameters>
144144
{
145145
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -193,7 +193,7 @@ public bool? Verbose
193193
}
194194
}
195195

196-
///<summary>Request options for Fielddata <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-fielddata.html</para></summary>
196+
///<summary>Request options for Fielddata <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-fielddata.html</para></summary>
197197
public class CatFielddataRequestParameters : RequestParameters<CatFielddataRequestParameters>
198198
{
199199
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -261,7 +261,7 @@ public bool? Verbose
261261
}
262262
}
263263

264-
///<summary>Request options for Health <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-health.html</para></summary>
264+
///<summary>Request options for Health <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-health.html</para></summary>
265265
public class CatHealthRequestParameters : RequestParameters<CatHealthRequestParameters>
266266
{
267267
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -322,7 +322,7 @@ public bool? Verbose
322322
}
323323
}
324324

325-
///<summary>Request options for Help <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat.html</para></summary>
325+
///<summary>Request options for Help <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat.html</para></summary>
326326
public class CatHelpRequestParameters : RequestParameters<CatHelpRequestParameters>
327327
{
328328
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -341,7 +341,7 @@ public string[] SortByColumns
341341
}
342342
}
343343

344-
///<summary>Request options for Indices <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-indices.html</para></summary>
344+
///<summary>Request options for Indices <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-indices.html</para></summary>
345345
public class CatIndicesRequestParameters : RequestParameters<CatIndicesRequestParameters>
346346
{
347347
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -416,7 +416,7 @@ public bool? Verbose
416416
}
417417
}
418418

419-
///<summary>Request options for Master <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-master.html</para></summary>
419+
///<summary>Request options for Master <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-master.html</para></summary>
420420
public class CatMasterRequestParameters : RequestParameters<CatMasterRequestParameters>
421421
{
422422
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -470,7 +470,7 @@ public bool? Verbose
470470
}
471471
}
472472

473-
///<summary>Request options for NodeAttributes <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-nodeattrs.html</para></summary>
473+
///<summary>Request options for NodeAttributes <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-nodeattrs.html</para></summary>
474474
public class CatNodeAttributesRequestParameters : RequestParameters<CatNodeAttributesRequestParameters>
475475
{
476476
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -524,7 +524,7 @@ public bool? Verbose
524524
}
525525
}
526526

527-
///<summary>Request options for Nodes <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-nodes.html</para></summary>
527+
///<summary>Request options for Nodes <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-nodes.html</para></summary>
528528
public class CatNodesRequestParameters : RequestParameters<CatNodesRequestParameters>
529529
{
530530
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -585,7 +585,7 @@ public bool? Verbose
585585
}
586586
}
587587

588-
///<summary>Request options for PendingTasks <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-pending-tasks.html</para></summary>
588+
///<summary>Request options for PendingTasks <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-pending-tasks.html</para></summary>
589589
public class CatPendingTasksRequestParameters : RequestParameters<CatPendingTasksRequestParameters>
590590
{
591591
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -639,7 +639,7 @@ public bool? Verbose
639639
}
640640
}
641641

642-
///<summary>Request options for Plugins <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-plugins.html</para></summary>
642+
///<summary>Request options for Plugins <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-plugins.html</para></summary>
643643
public class CatPluginsRequestParameters : RequestParameters<CatPluginsRequestParameters>
644644
{
645645
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -693,7 +693,7 @@ public bool? Verbose
693693
}
694694
}
695695

696-
///<summary>Request options for Recovery <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-recovery.html</para></summary>
696+
///<summary>Request options for Recovery <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-recovery.html</para></summary>
697697
public class CatRecoveryRequestParameters : RequestParameters<CatRecoveryRequestParameters>
698698
{
699699
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -747,7 +747,7 @@ public bool? Verbose
747747
}
748748
}
749749

750-
///<summary>Request options for Repositories <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-repositories.html</para></summary>
750+
///<summary>Request options for Repositories <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-repositories.html</para></summary>
751751
public class CatRepositoriesRequestParameters : RequestParameters<CatRepositoriesRequestParameters>
752752
{
753753
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -801,7 +801,7 @@ public bool? Verbose
801801
}
802802
}
803803

804-
///<summary>Request options for Segments <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-segments.html</para></summary>
804+
///<summary>Request options for Segments <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-segments.html</para></summary>
805805
public class CatSegmentsRequestParameters : RequestParameters<CatSegmentsRequestParameters>
806806
{
807807
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -848,7 +848,7 @@ public bool? Verbose
848848
}
849849
}
850850

851-
///<summary>Request options for Shards <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-shards.html</para></summary>
851+
///<summary>Request options for Shards <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-shards.html</para></summary>
852852
public class CatShardsRequestParameters : RequestParameters<CatShardsRequestParameters>
853853
{
854854
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -909,7 +909,7 @@ public bool? Verbose
909909
}
910910
}
911911

912-
///<summary>Request options for Snapshots <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-snapshots.html</para></summary>
912+
///<summary>Request options for Snapshots <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-snapshots.html</para></summary>
913913
public class CatSnapshotsRequestParameters : RequestParameters<CatSnapshotsRequestParameters>
914914
{
915915
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -963,7 +963,7 @@ public bool? Verbose
963963
}
964964
}
965965

966-
///<summary>Request options for Tasks <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html</para></summary>
966+
///<summary>Request options for Tasks <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html</para></summary>
967967
public class CatTasksRequestParameters : RequestParameters<CatTasksRequestParameters>
968968
{
969969
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -1034,7 +1034,7 @@ public bool? Verbose
10341034
}
10351035
}
10361036

1037-
///<summary>Request options for Templates <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-templates.html</para></summary>
1037+
///<summary>Request options for Templates <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-templates.html</para></summary>
10381038
public class CatTemplatesRequestParameters : RequestParameters<CatTemplatesRequestParameters>
10391039
{
10401040
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -1088,7 +1088,7 @@ public bool? Verbose
10881088
}
10891089
}
10901090

1091-
///<summary>Request options for ThreadPool <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-thread-pool.html</para></summary>
1091+
///<summary>Request options for ThreadPool <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-thread-pool.html</para></summary>
10921092
public class CatThreadPoolRequestParameters : RequestParameters<CatThreadPoolRequestParameters>
10931093
{
10941094
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;

‎src/Elasticsearch.Net/Api/RequestParameters/RequestParameters.Cluster.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
// ReSharper disable once CheckNamespace
2525
namespace Elasticsearch.Net.Specification.ClusterApi
2626
{
27-
///<summary>Request options for AllocationExplain <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-allocation-explain.html</para></summary>
27+
///<summary>Request options for AllocationExplain <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-allocation-explain.html</para></summary>
2828
public class ClusterAllocationExplainRequestParameters : RequestParameters<ClusterAllocationExplainRequestParameters>
2929
{
3030
public override HttpMethod DefaultHttpMethod => HttpMethod.POST;
@@ -43,7 +43,7 @@ public bool? IncludeYesDecisions
4343
}
4444
}
4545

46-
///<summary>Request options for GetSettings <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html</para></summary>
46+
///<summary>Request options for GetSettings <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html</para></summary>
4747
public class ClusterGetSettingsRequestParameters : RequestParameters<ClusterGetSettingsRequestParameters>
4848
{
4949
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -76,7 +76,7 @@ public TimeSpan Timeout
7676
}
7777
}
7878

79-
///<summary>Request options for Health <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-health.html</para></summary>
79+
///<summary>Request options for Health <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-health.html</para></summary>
8080
public class ClusterHealthRequestParameters : RequestParameters<ClusterHealthRequestParameters>
8181
{
8282
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -151,7 +151,7 @@ public WaitForStatus? WaitForStatus
151151
}
152152
}
153153

154-
///<summary>Request options for PendingTasks <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-pending.html</para></summary>
154+
///<summary>Request options for PendingTasks <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-pending.html</para></summary>
155155
public class ClusterPendingTasksRequestParameters : RequestParameters<ClusterPendingTasksRequestParameters>
156156
{
157157
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -170,7 +170,7 @@ public TimeSpan MasterTimeout
170170
}
171171
}
172172

173-
///<summary>Request options for PutSettings <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html</para></summary>
173+
///<summary>Request options for PutSettings <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html</para></summary>
174174
public class ClusterPutSettingsRequestParameters : RequestParameters<ClusterPutSettingsRequestParameters>
175175
{
176176
public override HttpMethod DefaultHttpMethod => HttpMethod.PUT;
@@ -196,13 +196,13 @@ public TimeSpan Timeout
196196
}
197197
}
198198

199-
///<summary>Request options for RemoteInfo <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-remote-info.html</para></summary>
199+
///<summary>Request options for RemoteInfo <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-remote-info.html</para></summary>
200200
public class RemoteInfoRequestParameters : RequestParameters<RemoteInfoRequestParameters>
201201
{
202202
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
203203
}
204204

205-
///<summary>Request options for Reroute <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-reroute.html</para></summary>
205+
///<summary>Request options for Reroute <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-reroute.html</para></summary>
206206
public class ClusterRerouteRequestParameters : RequestParameters<ClusterRerouteRequestParameters>
207207
{
208208
public override HttpMethod DefaultHttpMethod => HttpMethod.POST;
@@ -249,7 +249,7 @@ public TimeSpan Timeout
249249
}
250250
}
251251

252-
///<summary>Request options for State <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-state.html</para></summary>
252+
///<summary>Request options for State <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-state.html</para></summary>
253253
public class ClusterStateRequestParameters : RequestParameters<ClusterStateRequestParameters>
254254
{
255255
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
@@ -313,7 +313,7 @@ public TimeSpan WaitForTimeout
313313
}
314314
}
315315

316-
///<summary>Request options for Stats <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-stats.html</para></summary>
316+
///<summary>Request options for Stats <para>http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-stats.html</para></summary>
317317
public class ClusterStatsRequestParameters : RequestParameters<ClusterStatsRequestParameters>
318318
{
319319
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;

0 commit comments

Comments
 (0)