-
Notifications
You must be signed in to change notification settings - Fork 25.9k
Don't emit deprecation warnings on calls to the monitoring bulk API. #39805
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
301 changes: 20 additions & 281 deletions
301
server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
Large diffs are not rendered by default.
Oops, something went wrong.
309 changes: 309 additions & 0 deletions
309
server/src/main/java/org/elasticsearch/action/bulk/BulkRequestParser.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 114 additions & 0 deletions
114
server/src/test/java/org/elasticsearch/action/bulk/BulkRequestParserTests.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.action.bulk; | ||
|
|
||
| import org.elasticsearch.common.bytes.BytesArray; | ||
| import org.elasticsearch.common.xcontent.XContentType; | ||
| import org.elasticsearch.rest.action.document.RestBulkAction; | ||
| import org.elasticsearch.test.ESTestCase; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.concurrent.atomic.AtomicBoolean; | ||
|
|
||
| public class BulkRequestParserTests extends ESTestCase { | ||
|
|
||
| public void testIndexRequest() throws IOException { | ||
| BytesArray request = new BytesArray("{ \"index\":{ \"_id\": \"bar\" } }\n{}\n"); | ||
| BulkRequestParser parser = new BulkRequestParser(randomBoolean()); | ||
| final AtomicBoolean parsed = new AtomicBoolean(); | ||
| parser.parse(request, "foo", null, null, null, null, false, XContentType.JSON, | ||
| indexRequest -> { | ||
| assertFalse(parsed.get()); | ||
| assertEquals("foo", indexRequest.index()); | ||
| assertEquals("bar", indexRequest.id()); | ||
| parsed.set(true); | ||
| }, | ||
| req -> fail(), req -> fail()); | ||
| assertTrue(parsed.get()); | ||
| } | ||
|
|
||
| public void testDeleteRequest() throws IOException { | ||
| BytesArray request = new BytesArray("{ \"delete\":{ \"_id\": \"bar\" } }\n"); | ||
| BulkRequestParser parser = new BulkRequestParser(randomBoolean()); | ||
| final AtomicBoolean parsed = new AtomicBoolean(); | ||
| parser.parse(request, "foo", null, null, null, null, false, XContentType.JSON, | ||
| req -> fail(), req -> fail(), | ||
| deleteRequest -> { | ||
| assertFalse(parsed.get()); | ||
| assertEquals("foo", deleteRequest.index()); | ||
| assertEquals("bar", deleteRequest.id()); | ||
| parsed.set(true); | ||
| }); | ||
| assertTrue(parsed.get()); | ||
| } | ||
|
|
||
| public void testUpdateRequest() throws IOException { | ||
| BytesArray request = new BytesArray("{ \"update\":{ \"_id\": \"bar\" } }\n{}\n"); | ||
| BulkRequestParser parser = new BulkRequestParser(randomBoolean()); | ||
| final AtomicBoolean parsed = new AtomicBoolean(); | ||
| parser.parse(request, "foo", null, null, null, null, false, XContentType.JSON, | ||
| req -> fail(), | ||
| updateRequest -> { | ||
| assertFalse(parsed.get()); | ||
| assertEquals("foo", updateRequest.index()); | ||
| assertEquals("bar", updateRequest.id()); | ||
| parsed.set(true); | ||
| }, | ||
| req -> fail()); | ||
| assertTrue(parsed.get()); | ||
| } | ||
|
|
||
| public void testBarfOnLackOfTrailingNewline() throws IOException { | ||
| BytesArray request = new BytesArray("{ \"index\":{ \"_id\": \"bar\" } }\n{}"); | ||
| BulkRequestParser parser = new BulkRequestParser(randomBoolean()); | ||
| IllegalArgumentException e = expectThrows(IllegalArgumentException.class, | ||
| () -> parser.parse(request, "foo", null, null, null, null, false, XContentType.JSON, | ||
| indexRequest -> fail(), req -> fail(), req -> fail())); | ||
| assertEquals("The bulk request must be terminated by a newline [\\n]", e.getMessage()); | ||
| } | ||
|
|
||
| public void testFailOnExplicitIndex() throws IOException { | ||
| BytesArray request = new BytesArray("{ \"index\":{ \"_index\": \"foo\", \"_id\": \"bar\" } }\n{}\n"); | ||
| BulkRequestParser parser = new BulkRequestParser(randomBoolean()); | ||
|
|
||
| IllegalArgumentException ex = expectThrows(IllegalArgumentException.class, | ||
| () -> parser.parse(request, null, null, null, null, null, false, XContentType.JSON, | ||
| req -> fail(), req -> fail(), req -> fail())); | ||
| assertEquals("explicit index in bulk is not allowed", ex.getMessage()); | ||
| } | ||
|
|
||
| public void testTypeWarning() throws IOException { | ||
| BytesArray request = new BytesArray("{ \"index\":{ \"_type\": \"quux\", \"_id\": \"bar\" } }\n{}\n"); | ||
| BulkRequestParser parser = new BulkRequestParser(true); | ||
| final AtomicBoolean parsed = new AtomicBoolean(); | ||
| parser.parse(request, "foo", null, null, null, null, false, XContentType.JSON, | ||
| indexRequest -> { | ||
| assertFalse(parsed.get()); | ||
| assertEquals("foo", indexRequest.index()); | ||
| assertEquals("bar", indexRequest.id()); | ||
| parsed.set(true); | ||
| }, | ||
| req -> fail(), req -> fail()); | ||
| assertTrue(parsed.get()); | ||
|
|
||
| assertWarnings(RestBulkAction.TYPES_DEPRECATION_MESSAGE); | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this (and tests below) need to conditionally assert
assertWarnings(RestBulkAction.TYPES_DEPRECATION_MESSAGE);based on therandomBoolean()(line 34) ?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They don't since the document doesn't include a
_type.