Skip to content

Commit

Permalink
Fix/5 beta1 cherry pick (#2285)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Mpdreamz authored Oct 10, 2016
1 parent 216da03 commit 350db18
Show file tree
Hide file tree
Showing 105 changed files with 1,937 additions and 725 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class SearchDescriptorOverrides : DescriptorOverridesBase
"explain",
"version",
"q", //we dont support GET searches
"fields",
"stored_fields",
"indices_boost",
"source",
"sort",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public class UpdateDescriptorOverrides : DescriptorOverridesBase
{
public override IEnumerable<string> SkipQueryStringParams => new []
{
"fields"
"fields", "_source_include", "_source_exclude"
};
}
}
14 changes: 13 additions & 1 deletion src/CodeGeneration/ApiGenerator/RestSpecification/Core/bulk.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,19 @@
},
"fields": {
"type": "list",
"description" : "Default comma-separated list of fields to return in the response for updates"
"description" : "Default comma-separated list of fields to return in the response for updates, can be overridden on each sub-request"
},
"_source": {
"type" : "list",
"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"
},
"_source_exclude": {
"type" : "list",
"description" : "Default list of fields to exclude from the returned _source field, can be overridden on each sub-request"
},
"_source_include": {
"type" : "list",
"description" : "Default list of fields to extract and return from the _source field, can be overridden on each sub-request"
},
"pipeline" : {
"type" : "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@
"type": "list",
"description" : "Comma-separated list of column names to display"
},
"health": {
"type" : "enum",
"options" : ["green","yellow","red"],
"default" : null,
"description" : "A health status (\"green\", \"yellow\", or \"red\" to filter only indices matching the specified health status"
},
"help": {
"type": "boolean",
"description": "Return help information",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"cat.templates": {
"documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-templates.html",
"methods": ["GET"],
"url": {
"path": "/_cat/templates",
"paths": ["/_cat/templates", "/_cat/templates/{name}"],
"parts": {
"name": {
"type" : "string",
"description" : "A pattern that returned template names must match"
}
},
"params": {
"format": {
"type" : "string",
"description" : "a short version of the Accept header, e.g. json, yaml"
},
"local": {
"type" : "boolean",
"description" : "Return local information, do not retrieve the state from master node (default: false)"
},
"master_timeout": {
"type" : "time",
"description" : "Explicit operation timeout for connection to master node"
},
"h": {
"type": "list",
"description" : "Comma-separated list of column names to display"
},
"help": {
"type": "boolean",
"description": "Return help information",
"default": false
},
"v": {
"type": "boolean",
"description": "Verbose mode. Display column headers",
"default": false
}
}
},
"body": null
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"description" : "Explicit operation timeout"
},
"wait_for_active_shards": {
"type" : "number",
"type" : "string",
"description" : "Wait until the specified number of shards is active"
},
"wait_for_nodes": {
Expand All @@ -43,9 +43,9 @@
"options" : ["immediate", "urgent", "high", "normal", "low", "languid"],
"description" : "Wait until all currently queued events with the given priorty are processed"
},
"wait_for_relocating_shards": {
"type" : "number",
"description" : "Wait until the specified number of relocating shards is finished"
"wait_for_no_relocating_shards": {
"type" : "boolean",
"description" : "Whether to wait until there are no relocating shards in the cluster"
},
"wait_for_status": {
"type" : "enum",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@
"type" : "boolean",
"description" : "Specify whether to return detailed information about score computation as part of a hit"
},
"fields": {
"stored_fields": {
"type" : "list",
"description" : "A comma-separated list of fields to return as part of a hit"
"description" : "A comma-separated list of stored fields to return as part of a hit"
},
"fielddata_fields": {
"docvalue_fields": {
"type" : "list",
"description" : "A comma-separated list of fields to return as the field data representation of a field for each hit"
"description" : "A comma-separated list of fields to return as the docvalue representation of a field for each hit"
},
"from": {
"type" : "number",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
"type" : "string",
"description" : "The default field for query string query (default: _all)"
},
"fields": {
"stored_fields": {
"type": "list",
"description" : "A comma-separated list of fields to return in the response"
"description" : "A comma-separated list of stored fields to return in the response"
},
"lenient": {
"type" : "boolean",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
}
},
"params": {
"fields": {
"stored_fields": {
"type": "list",
"description" : "A comma-separated list of fields to return in the response"
"description" : "A comma-separated list of stored fields to return in the response"
},
"parent": {
"type" : "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"refresh": {
"type" : "enum",
"options": ["true", "false", "wait_for"],
"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."
"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."
},
"routing": {
"type" : "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"wait_if_ongoing": {
"type" : "boolean",
"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."
"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."
},
"ignore_unavailable": {
"type" : "boolean",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"wait_for_completion": {
"type" : "boolean",
"description" : "Specify whether the request should block until the all segments are upgraded (default: false)"
},
},
"only_ancient_segments": {
"type" : "boolean",
"description" : "If true, only ancient (an older Lucene major release) segments will be upgraded"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
}
},
"params": {
"fields": {
"stored_fields": {
"type": "list",
"description" : "A comma-separated list of fields to return in the response"
"description" : "A comma-separated list of stored fields to return in the response"
},
"preference": {
"type" : "string",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"msearch_template": {
"documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/search-template.html",
"documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current/search-multi-search.html",
"methods": ["GET", "POST"],
"url": {
"path": "/_msearch/template",
Expand Down
Loading

0 comments on commit 350db18

Please sign in to comment.