Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make index and bulk APIs work without types. #29479

Merged
merged 1 commit into from
Apr 13, 2018
Merged

Make index and bulk APIs work without types. #29479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions rest-api-spec/src/main/resources/rest-api-spec/api/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"methods": ["POST", "PUT"],
"url": {
"path": "/{index}/{type}",
"paths": ["/{index}/{type}", "/{index}/{type}/{id}"],
"paths": ["/{index}/{type}", "/{index}/{type}/{id}", "/{index}/_doc/{id}", "/{index}/_doc"],
"parts": {
"id": {
"type" : "string",
Expand All @@ -17,7 +17,6 @@
},
"type": {
"type" : "string",
"required" : true,
"description" : "The type of the document"
}
},
Expand Down
39 changes: 39 additions & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/20_no_types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,45 @@
- match: { index.mappings.properties.foo.type: "keyword" }
- match: { index.mappings.properties.bar.type: "float" }

# Explicit id
- do:
index:
index: index
id: 1
body: { foo: bar }

# Implicit id
- do:
index:
index: index
body: { foo: bar }

# Bulk with explicit id
- do:
bulk:
index: index
body: |
{ "index": { "_id": "2" } }
{ "doc": { "foo": "baz" } }

# Bulk with implicit id
- do:
bulk:
index: index
body: |
{ "index": { } }
{ "doc": { "foo": "baz" } }

- do:
indices.refresh:
index: index

- do:
count:
index: index

- match: { count: 4 }

---
"PUT mapping with a type and include_type_name: false":

Expand Down
3 changes: 2 additions & 1 deletion server/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.logging.Loggers;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestController;
import org.elasticsearch.rest.RestRequest;
Expand Down Expand Up @@ -76,7 +77,7 @@ public String getName() {
public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
BulkRequest bulkRequest = Requests.bulkRequest();
String defaultIndex = request.param("index");
String defaultType = request.param("type");
String defaultType = request.param("type", MapperService.SINGLE_MAPPING_NAME);
String defaultRouting = request.param("routing");
FetchSourceContext defaultFetchSourceContext = FetchSourceContext.parseFromRestRequest(request);
String fieldsParam = request.param("fields");
Expand Down