Skip to content

Commit 01a17d5

Browse files
gmarzgmarz
authored
Merge pull request #2233 from elastic/feature/get-task
Support for get task API
2 parents c55107c + fb7f81b commit 01a17d5

35 files changed

+604
-362
lines changed

‎src/Benchmarking/Tester.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ protected IndexResults GenerateAndIndex(int numMessages, int bufferSize)
137137
})
138138
).ToArray();
139139

140-
Task.WaitAll(array);
140+
System.Threading.Tasks.Task.WaitAll(array);
141141
sw.Stop();
142142

143143
Console.WriteLine();
@@ -157,7 +157,7 @@ protected IndexResults GenerateAndIndex(int numMessages, int bufferSize)
157157

158158
public void SearchUsingSingleClient(int numberOfSearches)
159159
{
160-
var tasks = new List<Task>();
160+
var tasks = new List<System.Threading.Tasks.Task>();
161161
for (var p = 0; p < numberOfSearches; p++)
162162
{
163163
var t = this.Client.SearchAsync<Message>(s => s.MatchAll())
@@ -170,7 +170,7 @@ public void SearchUsingSingleClient(int numberOfSearches)
170170
tasks.Add(t);
171171
}
172172

173-
Task.WaitAll(tasks.ToArray());
173+
System.Threading.Tasks.Task.WaitAll(tasks.ToArray());
174174
}
175175
}
176176
}

‎src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.Generated.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4339,32 +4339,32 @@ public class SuggestRequestParameters : FluentRequestParameters<SuggestRequestPa
43394339
///http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html
43404340
///</pre>
43414341
///</summary>
4342-
public class TasksCancelRequestParameters : FluentRequestParameters<TasksCancelRequestParameters>
4342+
public class CancelTasksRequestParameters : FluentRequestParameters<CancelTasksRequestParameters>
43434343
{
43444344
public override HttpMethod DefaultHttpMethod => HttpMethod.POST;
43454345

43464346
///<summary>A comma-separated list of node IDs or names to limit the returned information; use `_local` to return information from the node you&#39;re connecting to, leave empty to get information from all nodes</summary>
4347-
public TasksCancelRequestParameters NodeId(params string[] node_id) => this.AddQueryString("node_id", node_id);
4347+
public CancelTasksRequestParameters NodeId(params string[] node_id) => this.AddQueryString("node_id", node_id);
43484348

43494349

43504350
///<summary>A comma-separated list of actions that should be cancelled. Leave empty to cancel all.</summary>
4351-
public TasksCancelRequestParameters Actions(params string[] actions) => this.AddQueryString("actions", actions);
4351+
public CancelTasksRequestParameters Actions(params string[] actions) => this.AddQueryString("actions", actions);
43524352

43534353

43544354
///<summary>Cancel tasks with specified parent node.</summary>
4355-
public TasksCancelRequestParameters ParentNode(string parent_node) => this.AddQueryString("parent_node", parent_node);
4355+
public CancelTasksRequestParameters ParentNode(string parent_node) => this.AddQueryString("parent_node", parent_node);
43564356

43574357

43584358
///<summary>Cancel tasks with specified parent task id (node_id:task_number). Set to -1 to cancel all.</summary>
4359-
public TasksCancelRequestParameters ParentTask(string parent_task) => this.AddQueryString("parent_task", parent_task);
4359+
public CancelTasksRequestParameters ParentTask(string parent_task) => this.AddQueryString("parent_task", parent_task);
43604360

43614361

43624362
///<summary>The URL-encoded request definition</summary>
4363-
public TasksCancelRequestParameters Source(string source) => this.AddQueryString("source", source);
4363+
public CancelTasksRequestParameters Source(string source) => this.AddQueryString("source", source);
43644364

43654365

43664366
///<summary>Comma separated list of filters used to reduce the response returned by Elasticsearch</summary>
4367-
public TasksCancelRequestParameters FilterPath(string filter_path) => this.AddQueryString("filter_path", filter_path);
4367+
public CancelTasksRequestParameters FilterPath(string filter_path) => this.AddQueryString("filter_path", filter_path);
43684368

43694369
}
43704370

@@ -4373,20 +4373,20 @@ public class TasksCancelRequestParameters : FluentRequestParameters<TasksCancelR
43734373
///http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html
43744374
///</pre>
43754375
///</summary>
4376-
public class TasksGetRequestParameters : FluentRequestParameters<TasksGetRequestParameters>
4376+
public class GetTaskRequestParameters : FluentRequestParameters<GetTaskRequestParameters>
43774377
{
43784378
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
43794379

43804380
///<summary>Wait for the matching tasks to complete (default: false)</summary>
4381-
public TasksGetRequestParameters WaitForCompletion(bool wait_for_completion) => this.AddQueryString("wait_for_completion", wait_for_completion);
4381+
public GetTaskRequestParameters WaitForCompletion(bool wait_for_completion) => this.AddQueryString("wait_for_completion", wait_for_completion);
43824382

43834383

43844384
///<summary>The URL-encoded request definition</summary>
4385-
public TasksGetRequestParameters Source(string source) => this.AddQueryString("source", source);
4385+
public GetTaskRequestParameters Source(string source) => this.AddQueryString("source", source);
43864386

43874387

43884388
///<summary>Comma separated list of filters used to reduce the response returned by Elasticsearch</summary>
4389-
public TasksGetRequestParameters FilterPath(string filter_path) => this.AddQueryString("filter_path", filter_path);
4389+
public GetTaskRequestParameters FilterPath(string filter_path) => this.AddQueryString("filter_path", filter_path);
43904390

43914391
}
43924392

@@ -4395,44 +4395,44 @@ public class TasksGetRequestParameters : FluentRequestParameters<TasksGetRequest
43954395
///http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html
43964396
///</pre>
43974397
///</summary>
4398-
public class TasksListRequestParameters : FluentRequestParameters<TasksListRequestParameters>
4398+
public class ListTasksRequestParameters : FluentRequestParameters<ListTasksRequestParameters>
43994399
{
44004400
public override HttpMethod DefaultHttpMethod => HttpMethod.GET;
44014401

44024402
///<summary>A comma-separated list of node IDs or names to limit the returned information; use `_local` to return information from the node you&#39;re connecting to, leave empty to get information from all nodes</summary>
4403-
public TasksListRequestParameters NodeId(params string[] node_id) => this.AddQueryString("node_id", node_id);
4403+
public ListTasksRequestParameters NodeId(params string[] node_id) => this.AddQueryString("node_id", node_id);
44044404

44054405

44064406
///<summary>A comma-separated list of actions that should be returned. Leave empty to return all.</summary>
4407-
public TasksListRequestParameters Actions(params string[] actions) => this.AddQueryString("actions", actions);
4407+
public ListTasksRequestParameters Actions(params string[] actions) => this.AddQueryString("actions", actions);
44084408

44094409

44104410
///<summary>Return detailed task information (default: false)</summary>
4411-
public TasksListRequestParameters Detailed(bool detailed) => this.AddQueryString("detailed", detailed);
4411+
public ListTasksRequestParameters Detailed(bool detailed) => this.AddQueryString("detailed", detailed);
44124412

44134413

44144414
///<summary>Return tasks with specified parent node.</summary>
4415-
public TasksListRequestParameters ParentNode(string parent_node) => this.AddQueryString("parent_node", parent_node);
4415+
public ListTasksRequestParameters ParentNode(string parent_node) => this.AddQueryString("parent_node", parent_node);
44164416

44174417

44184418
///<summary>Return tasks with specified parent task id (node_id:task_number). Set to -1 to return all.</summary>
4419-
public TasksListRequestParameters ParentTask(string parent_task) => this.AddQueryString("parent_task", parent_task);
4419+
public ListTasksRequestParameters ParentTask(string parent_task) => this.AddQueryString("parent_task", parent_task);
44204420

44214421

44224422
///<summary>Wait for the matching tasks to complete (default: false)</summary>
4423-
public TasksListRequestParameters WaitForCompletion(bool wait_for_completion) => this.AddQueryString("wait_for_completion", wait_for_completion);
4423+
public ListTasksRequestParameters WaitForCompletion(bool wait_for_completion) => this.AddQueryString("wait_for_completion", wait_for_completion);
44244424

44254425

44264426
///<summary>Group tasks by nodes or parent/child relationships</summary>
4427-
public TasksListRequestParameters GroupBy(GroupBy group_by) => this.AddQueryString("group_by", group_by);
4427+
public ListTasksRequestParameters GroupBy(GroupBy group_by) => this.AddQueryString("group_by", group_by);
44284428

44294429

44304430
///<summary>The URL-encoded request definition</summary>
4431-
public TasksListRequestParameters Source(string source) => this.AddQueryString("source", source);
4431+
public ListTasksRequestParameters Source(string source) => this.AddQueryString("source", source);
44324432

44334433

44344434
///<summary>Comma separated list of filters used to reduce the response returned by Elasticsearch</summary>
4435-
public TasksListRequestParameters FilterPath(string filter_path) => this.AddQueryString("filter_path", filter_path);
4435+
public ListTasksRequestParameters FilterPath(string filter_path) => this.AddQueryString("filter_path", filter_path);
44364436

44374437
}
44384438

‎src/Elasticsearch.Net/ElasticLowLevelClient.Generated.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7752,7 +7752,7 @@ public ElasticsearchResponse<T> SuggestGet<T>(string index, Func<SuggestRequestP
77527752
///<para>See also: http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html </para>
77537753
///</summary>
77547754
///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
7755-
public ElasticsearchResponse<T> TasksCancel<T>(Func<TasksCancelRequestParameters, TasksCancelRequestParameters> requestParameters = null)
7755+
public ElasticsearchResponse<T> TasksCancel<T>(Func<CancelTasksRequestParameters, CancelTasksRequestParameters> requestParameters = null)
77567756
where T : class => this.DoRequest<T>(POST, Url($"_tasks/_cancel"), null, _params(requestParameters));
77577757

77587758
///<summary>Represents a POST on /_tasks/_cancel
@@ -7765,7 +7765,7 @@ public ElasticsearchResponse<T> TasksCancel<T>(Func<TasksCancelRequestParameters
77657765
///<para>See also: http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html </para>
77667766
///</summary>
77677767
///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
7768-
public Task<ElasticsearchResponse<T>> TasksCancelAsync<T>(Func<TasksCancelRequestParameters, TasksCancelRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken))
7768+
public Task<ElasticsearchResponse<T>> TasksCancelAsync<T>(Func<CancelTasksRequestParameters, CancelTasksRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken))
77697769
where T : class => this.DoRequestAsync<T>(POST, Url($"_tasks/_cancel"), cancellationToken, null, _params(requestParameters));
77707770

77717771
///<summary>Represents a POST on /_tasks/{task_id}/_cancel
@@ -7779,7 +7779,7 @@ public ElasticsearchResponse<T> TasksCancel<T>(Func<TasksCancelRequestParameters
77797779
///</summary>
77807780
///<param name="task_id">Cancel the task with specified task id (node_id:task_number)</param>
77817781
///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
7782-
public ElasticsearchResponse<T> TasksCancel<T>(string task_id, Func<TasksCancelRequestParameters, TasksCancelRequestParameters> requestParameters = null)
7782+
public ElasticsearchResponse<T> TasksCancel<T>(string task_id, Func<CancelTasksRequestParameters, CancelTasksRequestParameters> requestParameters = null)
77837783
where T : class => this.DoRequest<T>(POST, Url($"_tasks/{task_id}/_cancel"), null, _params(requestParameters));
77847784

77857785
///<summary>Represents a POST on /_tasks/{task_id}/_cancel
@@ -7793,7 +7793,7 @@ public ElasticsearchResponse<T> TasksCancel<T>(string task_id, Func<TasksCancelR
77937793
///</summary>
77947794
///<param name="task_id">Cancel the task with specified task id (node_id:task_number)</param>
77957795
///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
7796-
public Task<ElasticsearchResponse<T>> TasksCancelAsync<T>(string task_id, Func<TasksCancelRequestParameters, TasksCancelRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken))
7796+
public Task<ElasticsearchResponse<T>> TasksCancelAsync<T>(string task_id, Func<CancelTasksRequestParameters, CancelTasksRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken))
77977797
where T : class => this.DoRequestAsync<T>(POST, Url($"_tasks/{task_id}/_cancel"), cancellationToken, null, _params(requestParameters));
77987798

77997799
///<summary>Represents a GET on /_tasks/{task_id}
@@ -7807,7 +7807,7 @@ public ElasticsearchResponse<T> TasksCancel<T>(string task_id, Func<TasksCancelR
78077807
///</summary>
78087808
///<param name="task_id">Return the task with specified id (node_id:task_number)</param>
78097809
///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
7810-
public ElasticsearchResponse<T> TasksGet<T>(string task_id, Func<TasksGetRequestParameters, TasksGetRequestParameters> requestParameters = null)
7810+
public ElasticsearchResponse<T> TasksGet<T>(string task_id, Func<GetTaskRequestParameters, GetTaskRequestParameters> requestParameters = null)
78117811
where T : class => this.DoRequest<T>(GET, Url($"_tasks/{task_id}"), null, _params(requestParameters));
78127812

78137813
///<summary>Represents a GET on /_tasks/{task_id}
@@ -7821,7 +7821,7 @@ public ElasticsearchResponse<T> TasksGet<T>(string task_id, Func<TasksGetRequest
78217821
///</summary>
78227822
///<param name="task_id">Return the task with specified id (node_id:task_number)</param>
78237823
///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
7824-
public Task<ElasticsearchResponse<T>> TasksGetAsync<T>(string task_id, Func<TasksGetRequestParameters, TasksGetRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken))
7824+
public Task<ElasticsearchResponse<T>> TasksGetAsync<T>(string task_id, Func<GetTaskRequestParameters, GetTaskRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken))
78257825
where T : class => this.DoRequestAsync<T>(GET, Url($"_tasks/{task_id}"), cancellationToken, null, _params(requestParameters));
78267826

78277827
///<summary>Represents a GET on /_tasks
@@ -7834,7 +7834,7 @@ public ElasticsearchResponse<T> TasksGet<T>(string task_id, Func<TasksGetRequest
78347834
///<para>See also: http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html </para>
78357835
///</summary>
78367836
///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
7837-
public ElasticsearchResponse<T> TasksList<T>(Func<TasksListRequestParameters, TasksListRequestParameters> requestParameters = null)
7837+
public ElasticsearchResponse<T> TasksList<T>(Func<ListTasksRequestParameters, ListTasksRequestParameters> requestParameters = null)
78387838
where T : class => this.DoRequest<T>(GET, Url($"_tasks"), null, _params(requestParameters));
78397839

78407840
///<summary>Represents a GET on /_tasks
@@ -7847,7 +7847,7 @@ public ElasticsearchResponse<T> TasksList<T>(Func<TasksListRequestParameters, Ta
78477847
///<para>See also: http://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html </para>
78487848
///</summary>
78497849
///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
7850-
public Task<ElasticsearchResponse<T>> TasksListAsync<T>(Func<TasksListRequestParameters, TasksListRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken))
7850+
public Task<ElasticsearchResponse<T>> TasksListAsync<T>(Func<ListTasksRequestParameters, ListTasksRequestParameters> requestParameters = null, CancellationToken cancellationToken = default(CancellationToken))
78517851
where T : class => this.DoRequestAsync<T>(GET, Url($"_tasks"), cancellationToken, null, _params(requestParameters));
78527852

78537853
///<summary>Represents a GET on /{index}/{type}/_termvectors

0 commit comments

Comments
 (0)