Skip to content

Commit 350db18

Browse files
authored
Fix/5 beta1 cherry pick (#2285)
* removed deleted file from csproj deprecate _ttl/_timestamp and remove them from our tests as per elastic/elasticsearch#18980 so that migrated 2.x indices do not have their code altered (just yet) explicit 5.x spec generation fix failing nodes test because is removed as per elastic/elasticsearch#19218 fixed failing integration tests due to lang no longer defaulting to groovy elastic/elasticsearch#19960 fields => stored fields, updated failing cathelp tests due to endpoint changing suggest response is now generic and gets _source returned in accordance with elastic/elasticsearch#19536 histogram key double not long source filtering include and exclude are now plural script fields tests did not explicitly specify groovy search's StoredFields still sent get task api tests wreaked havoc on the readonly tests scripted metric did not specify lang set script.max_compilations_per_minute on node fix top hits not setting groovy explicitly multi search now response 404 properly multitermvector tests making sure it took more then 0 is no longer reliable beta1 is too fast :) foreach put pipeline processors is no longer an array as per elastic/elasticsearch#19402 revert field=>stored_fields rename on update request remove propery name with dot failure assertion integration test, no longer valid since elastic/elasticsearch#19899 use existing elasticsearch node in test framework could still spawn a new java process revert field=>stored_fields rename on update request get pipeline api is now dictionary based as per elastic/elasticsearch#19685 xpack beta1 related fixes reindex tests not setting all waithandles and taking 3 minutes for no good reason missing fieldsecurity class fix post integration test failures unit test failures add back run as tests now that we send the right header in the beta1 world * make sure code is generated of master after mass picking commits of 5.x branch
1 parent 216da03 commit 350db18

File tree

105 files changed

+1937
-725
lines changed

Some content is hidden

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

105 files changed

+1937
-725
lines changed

src/CodeGeneration/ApiGenerator/Overrides/Descriptors/SearchDescriptorOverrides.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class SearchDescriptorOverrides : DescriptorOverridesBase
1515
"explain",
1616
"version",
1717
"q", //we dont support GET searches
18-
"fields",
18+
"stored_fields",
1919
"indices_boost",
2020
"source",
2121
"sort",

src/CodeGeneration/ApiGenerator/Overrides/Descriptors/UpdateDescriptorOverrides.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class UpdateDescriptorOverrides : DescriptorOverridesBase
77
{
88
public override IEnumerable<string> SkipQueryStringParams => new []
99
{
10-
"fields"
10+
"fields", "_source_include", "_source_exclude"
1111
};
1212
}
1313
}

src/CodeGeneration/ApiGenerator/RestSpecification/Core/bulk.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,19 @@
3939
},
4040
"fields": {
4141
"type": "list",
42-
"description" : "Default comma-separated list of fields to return in the response for updates"
42+
"description" : "Default comma-separated list of fields to return in the response for updates, can be overridden on each sub-request"
43+
},
44+
"_source": {
45+
"type" : "list",
46+
"description" : "True or false to return the _source field or not, or default list of fields to return, can be overridden on each sub-request"
47+
},
48+
"_source_exclude": {
49+
"type" : "list",
50+
"description" : "Default list of fields to exclude from the returned _source field, can be overridden on each sub-request"
51+
},
52+
"_source_include": {
53+
"type" : "list",
54+
"description" : "Default list of fields to extract and return from the _source field, can be overridden on each sub-request"
4355
},
4456
"pipeline" : {
4557
"type" : "string",

src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.indices.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@
3333
"type": "list",
3434
"description" : "Comma-separated list of column names to display"
3535
},
36+
"health": {
37+
"type" : "enum",
38+
"options" : ["green","yellow","red"],
39+
"default" : null,
40+
"description" : "A health status (\"green\", \"yellow\", or \"red\" to filter only indices matching the specified health status"
41+
},
3642
"help": {
3743
"type": "boolean",
3844
"description": "Return help information",
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"cat.templates": {
3+
"documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-templates.html",
4+
"methods": ["GET"],
5+
"url": {
6+
"path": "/_cat/templates",
7+
"paths": ["/_cat/templates", "/_cat/templates/{name}"],
8+
"parts": {
9+
"name": {
10+
"type" : "string",
11+
"description" : "A pattern that returned template names must match"
12+
}
13+
},
14+
"params": {
15+
"format": {
16+
"type" : "string",
17+
"description" : "a short version of the Accept header, e.g. json, yaml"
18+
},
19+
"local": {
20+
"type" : "boolean",
21+
"description" : "Return local information, do not retrieve the state from master node (default: false)"
22+
},
23+
"master_timeout": {
24+
"type" : "time",
25+
"description" : "Explicit operation timeout for connection to master node"
26+
},
27+
"h": {
28+
"type": "list",
29+
"description" : "Comma-separated list of column names to display"
30+
},
31+
"help": {
32+
"type": "boolean",
33+
"description": "Return help information",
34+
"default": false
35+
},
36+
"v": {
37+
"type": "boolean",
38+
"description": "Verbose mode. Display column headers",
39+
"default": false
40+
}
41+
}
42+
},
43+
"body": null
44+
}
45+
}

src/CodeGeneration/ApiGenerator/RestSpecification/Core/cluster.health.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"description" : "Explicit operation timeout"
3232
},
3333
"wait_for_active_shards": {
34-
"type" : "number",
34+
"type" : "string",
3535
"description" : "Wait until the specified number of shards is active"
3636
},
3737
"wait_for_nodes": {
@@ -43,9 +43,9 @@
4343
"options" : ["immediate", "urgent", "high", "normal", "low", "languid"],
4444
"description" : "Wait until all currently queued events with the given priorty are processed"
4545
},
46-
"wait_for_relocating_shards": {
47-
"type" : "number",
48-
"description" : "Wait until the specified number of relocating shards is finished"
46+
"wait_for_no_relocating_shards": {
47+
"type" : "boolean",
48+
"description" : "Whether to wait until there are no relocating shards in the cluster"
4949
},
5050
"wait_for_status": {
5151
"type" : "enum",

src/CodeGeneration/ApiGenerator/RestSpecification/Core/delete_by_query.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
"type" : "boolean",
4141
"description" : "Specify whether to return detailed information about score computation as part of a hit"
4242
},
43-
"fields": {
43+
"stored_fields": {
4444
"type" : "list",
45-
"description" : "A comma-separated list of fields to return as part of a hit"
45+
"description" : "A comma-separated list of stored fields to return as part of a hit"
4646
},
47-
"fielddata_fields": {
47+
"docvalue_fields": {
4848
"type" : "list",
49-
"description" : "A comma-separated list of fields to return as the field data representation of a field for each hit"
49+
"description" : "A comma-separated list of fields to return as the docvalue representation of a field for each hit"
5050
},
5151
"from": {
5252
"type" : "number",

src/CodeGeneration/ApiGenerator/RestSpecification/Core/explain.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
"type" : "string",
4242
"description" : "The default field for query string query (default: _all)"
4343
},
44-
"fields": {
44+
"stored_fields": {
4545
"type": "list",
46-
"description" : "A comma-separated list of fields to return in the response"
46+
"description" : "A comma-separated list of stored fields to return in the response"
4747
},
4848
"lenient": {
4949
"type" : "boolean",

src/CodeGeneration/ApiGenerator/RestSpecification/Core/get.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
}
2424
},
2525
"params": {
26-
"fields": {
26+
"stored_fields": {
2727
"type": "list",
28-
"description" : "A comma-separated list of fields to return in the response"
28+
"description" : "A comma-separated list of stored fields to return in the response"
2929
},
3030
"parent": {
3131
"type" : "string",

src/CodeGeneration/ApiGenerator/RestSpecification/Core/index.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"refresh": {
4040
"type" : "enum",
4141
"options": ["true", "false", "wait_for"],
42-
"description" : "If `true` then refresh the effected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes."
42+
"description" : "If `true` then refresh the affected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes."
4343
},
4444
"routing": {
4545
"type" : "string",

src/CodeGeneration/ApiGenerator/RestSpecification/Core/indices.flush.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"wait_if_ongoing": {
2020
"type" : "boolean",
21-
"description" : "If set to true the flush operation will block until the flush can be executed if another flush operation is already executing. The default is false and will cause an exception to be thrown on the shard level if another flush operation is already running."
21+
"description" : "If set to true the flush operation will block until the flush can be executed if another flush operation is already executing. The default is true. If set to false the flush will be skipped iff if another flush operation is already running."
2222
},
2323
"ignore_unavailable": {
2424
"type" : "boolean",

src/CodeGeneration/ApiGenerator/RestSpecification/Core/indices.upgrade.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"wait_for_completion": {
3030
"type" : "boolean",
3131
"description" : "Specify whether the request should block until the all segments are upgraded (default: false)"
32-
},
32+
},
3333
"only_ancient_segments": {
3434
"type" : "boolean",
3535
"description" : "If true, only ancient (an older Lucene major release) segments will be upgraded"

src/CodeGeneration/ApiGenerator/RestSpecification/Core/mget.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
}
1717
},
1818
"params": {
19-
"fields": {
19+
"stored_fields": {
2020
"type": "list",
21-
"description" : "A comma-separated list of fields to return in the response"
21+
"description" : "A comma-separated list of stored fields to return in the response"
2222
},
2323
"preference": {
2424
"type" : "string",

src/CodeGeneration/ApiGenerator/RestSpecification/Core/msearch_template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"msearch_template": {
3-
"documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/search-template.html",
3+
"documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/search-multi-search.html",
44
"methods": ["GET", "POST"],
55
"url": {
66
"path": "/_msearch/template",

0 commit comments

Comments
 (0)