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

Jump to bottom

[Backport 2.x] [Type removal] Remove _type from _bulk yaml test, scripts, unused constants #3391

Merged
merged 1 commit into from
May 18, 2022
Merged

[Backport 2.x] [Type removal] Remove _type from _bulk yaml test, scripts, unused constants #3391

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
1 change: 0 additions & 1 deletion modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ public void testMetadataAvailable() throws Exception {

TestProcessor innerProcessor = new TestProcessor(id -> {
id.setFieldValue("_ingest._value.index", id.getSourceAndMetadata().get("_index"));
id.setFieldValue("_ingest._value.type", id.getSourceAndMetadata().get("_type"));
id.setFieldValue("_ingest._value.id", id.getSourceAndMetadata().get("_id"));
});
ForEachProcessor processor = new ForEachProcessor("_tag", null, "values", innerProcessor, false);
Expand Down
20 changes: 0 additions & 20 deletions rest-api-spec/src/main/resources/rest-api-spec/test/bulk/60_deprecated.yml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion server/src/internalClusterTest/java/org/opensearch/search/fields/SearchFieldsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ protected Map<String, Function<Map<String, Object>, Object>> pluginScripts() {
scripts.put("_fields['num1'].value", vars -> fieldsScript(vars, "num1"));
scripts.put("_fields._uid.value", vars -> fieldsScript(vars, "_uid"));
scripts.put("_fields._id.value", vars -> fieldsScript(vars, "_id"));
scripts.put("_fields._type.value", vars -> fieldsScript(vars, "_type"));

scripts.put("_source.obj1", vars -> sourceScript(vars, "obj1"));
scripts.put("_source.obj1.test", vars -> sourceScript(vars, "obj1.test"));
Expand Down
1 change: 0 additions & 1 deletion server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
static final class Fields {
static final String DOCS = "docs";
static final String _INDEX = "_index";
static final String _TYPE = "_type";
static final String _ID = "_id";
}

Expand Down
1 change: 0 additions & 1 deletion server/src/main/java/org/opensearch/action/update/UpdateHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,6 @@ public static class ContextFields {
public static final String SOURCE = "_source";
public static final String NOW = "_now";
public static final String INDEX = "_index";
public static final String TYPE = "_type";
public static final String ID = "_id";
public static final String VERSION = "_version";
public static final String ROUTING = "_routing";
Expand Down