github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-25 07:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Ingest: IngestDocument requires non-null version (#87665)

Browse source 
Changes the type of the version parameter in `IngestDocument` from
`Long` to `long` and moves it to the third argument, so all required
values occur before nullable arguments.

The `IngestService` expects a non-null version for a document and will
throw an `NullPointerException` if one is not provided.

Related: #87309
This commit is contained in:
Stuart Tettemer 2022-06-15 07:50:45 -05:00 • committed by GitHub
parent aebb7bc3cb
commit d42211c431
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 91 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/reference/ingest.asciidoc
View file

@ -191,6 +191,7 @@ The API returns transformed documents:
"doc": {
"_index": "_index",
"_id": "_id",
"_version": "-3",
"_source": {
"my-keyword-field": "foo"
},
@ -203,6 +204,7 @@ The API returns transformed documents:
"doc": {
"_index": "_index",
"_id": "_id",
"_version": "-3",
"_source": {
"my-keyword-field": "bar"
},

8
docs/reference/ingest/apis/simulate-pipeline.asciidoc
View file

@ -179,6 +179,7 @@ The API returns the following response:
"doc": {
"_id": "id",
"_index": "index",
"_version": "-3",
"_source": {
"field2": "_value",
"foo": "bar"
@ -192,6 +193,7 @@ The API returns the following response:
"doc": {
"_id": "id",
"_index": "index",
"_version": "-3",
"_source": {
"field2": "_value",
"foo": "rab"
@ -256,6 +258,7 @@ The API returns the following response:
"doc": {
"_id": "id",
"_index": "index",
"_version": "-3",
"_source": {
"field2": "_value",
"foo": "bar"
@ -269,6 +272,7 @@ The API returns the following response:
"doc": {
"_id": "id",
"_index": "index",
"_version": "-3",
"_source": {
"field2": "_value",
"foo": "rab"
@ -350,6 +354,7 @@ The API returns the following response:
"doc" : {
"_index" : "index",
"_id" : "id",
"_version": "-3",
"_source" : {
"field2" : "_value2",
"foo" : "bar"
@ -366,6 +371,7 @@ The API returns the following response:
"doc" : {
"_index" : "index",
"_id" : "id",
"_version": "-3",
"_source" : {
"field3" : "_value3",
"field2" : "_value2",
@ -387,6 +393,7 @@ The API returns the following response:
"doc" : {
"_index" : "index",
"_id" : "id",
"_version": "-3",
"_source" : {
"field2" : "_value2",
"foo" : "rab"
@ -403,6 +410,7 @@ The API returns the following response:
"doc" : {
"_index" : "index",
"_id" : "id",
"_version": "-3",
"_source" : {
"field3" : "_value3",
"field2" : "_value2",

1
docs/reference/ingest/processors/date-index-name.asciidoc
View file

@ -111,6 +111,7 @@ and the result:
"doc" : {
"_id" : "_id",
"_index" : "<my-index-{2016-04-25||/M{yyyy-MM-dd|UTC}}>",
"_version" : "-3",
"_source" : {
"date1" : "2016-04-25T12:02:01.789Z"
},

2
docs/reference/ingest/processors/fingerprint.asciidoc
View file

@ -86,4 +86,4 @@ Which produces the following result:
]
}
----
// TESTRESPONSE[s/\.\.\./"_index":"_index","_id":"_id","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]
// TESTRESPONSE[s/\.\.\./"_index":"_index","_id":"_id","_version":"-3","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]

3
docs/reference/ingest/processors/grok.asciidoc
View file

@ -70,6 +70,7 @@ This pipeline will insert these named captures as new fields within the document
"doc": {
"_index": "_index",
"_id": "_id",
"_version": "-3",
"_source" : {
"duration" : 0.043,
"request" : "/index.html",
@ -166,6 +167,7 @@ response:
"doc": {
"_index": "_index",
"_id": "_id",
"_version": "-3",
"_source": {
"message": "I love burmese cats!",
"pet": "burmese"
@ -225,6 +227,7 @@ POST _ingest/pipeline/_simulate
"doc": {
"_index": "_index",
"_id": "_id",
"_version": "-3",
"_source": {
"message": "I love burmese cats!",
"pet": "burmese"

2
docs/reference/ingest/processors/network-direction.asciidoc
View file

@ -115,5 +115,5 @@ Which produces the following result:
]
}
----
// TESTRESPONSE[s/\.\.\./"_index":"_index","_id":"_id","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]
// TESTRESPONSE[s/\.\.\./"_index":"_index","_id":"_id","_version":"-3","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]
// NOTCONSOLE

2
docs/reference/ingest/processors/registered-domain.asciidoc
View file

@ -78,4 +78,4 @@ Which produces the following result:
]
}
----
// TESTRESPONSE[s/\.\.\./"_index":"_index","_id":"_id","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]
// TESTRESPONSE[s/\.\.\./"_index":"_index","_id":"_id","_version":"-3","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]

4
docs/reference/ingest/processors/script.asciidoc
View file

@ -98,7 +98,7 @@ The processor produces:
]
}
----
// TESTRESPONSE[s/\.\.\./"_index":"_index","_id":"_id","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]
// TESTRESPONSE[s/\.\.\./"_index":"_index","_id":"_id","_version":"-3","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]
[discrete]
@ -158,4 +158,4 @@ The processor changes the document's `_index` to `fr-catalog` from
]
}
----
// TESTRESPONSE[s/\.\.\./"_id":"_id","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]
// TESTRESPONSE[s/\.\.\./"_id":"_id","_version":"-3","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]

2
docs/reference/ingest/processors/set.asciidoc
View file

@ -72,6 +72,7 @@ Result:
"doc" : {
"_index" : "_index",
"_id" : "_id",
"_version" : "-3",
"_source" : {
"host" : {
"os" : {
@ -127,6 +128,7 @@ Result:
"doc" : {
"_index" : "_index",
"_id" : "_id",
"_version" : "-3",
"_source" : {
"bar": ["foo1", "foo2"],
"foo": ["foo1", "foo2"]

12
modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateIndexNameProcessorTests.java
View file

@ -37,7 +37,7 @@ public class DateIndexNameProcessorTests extends ESTestCase {
IngestDocument document = new IngestDocument(
"_index",
"_id",
null,
1,
null,
null,
Collections.singletonMap("_field", "2016-04-25T12:24:20.101Z")
@ -59,7 +59,7 @@ public class DateIndexNameProcessorTests extends ESTestCase {
IngestDocument document = new IngestDocument(
"_index",
"_id",
null,
1,
null,
null,
Collections.singletonMap("_field", (randomBoolean() ? "@" : "") + "4000000050d506482dbdf024")
@ -78,11 +78,11 @@ public class DateIndexNameProcessorTests extends ESTestCase {
"m",
"yyyyMMdd"
);
IngestDocument document = new IngestDocument("_index", "_id", null, null, null, Collections.singletonMap("_field", "1000500"));
IngestDocument document = new IngestDocument("_index", "_id", 1, null, null, Collections.singletonMap("_field", "1000500"));
dateProcessor.execute(document);
assertThat(document.getSourceAndMetadata().get("_index"), equalTo("<events-{19700101||/m{yyyyMMdd|UTC}}>"));
document = new IngestDocument("_index", "_id", null, null, null, Collections.singletonMap("_field", 1000500L));
document = new IngestDocument("_index", "_id", 1, null, null, Collections.singletonMap("_field", 1000500L));
dateProcessor.execute(document);
assertThat(document.getSourceAndMetadata().get("_index"), equalTo("<events-{19700101||/m{yyyyMMdd|UTC}}>"));
}
@ -97,7 +97,7 @@ public class DateIndexNameProcessorTests extends ESTestCase {
"m",
"yyyyMMdd"
);
IngestDocument document = new IngestDocument("_index", "_id", null, null, null, Collections.singletonMap("_field", "1000.5"));
IngestDocument document = new IngestDocument("_index", "_id", 1, null, null, Collections.singletonMap("_field", "1000.5"));
dateProcessor.execute(document);
assertThat(document.getSourceAndMetadata().get("_index"), equalTo("<events-{19700101||/m{yyyyMMdd|UTC}}>"));
}
@ -118,7 +118,7 @@ public class DateIndexNameProcessorTests extends ESTestCase {
indexNameFormat
);
IngestDocument document = new IngestDocument("_index", "_id", null, null, null, Collections.singletonMap("_field", date));
IngestDocument document = new IngestDocument("_index", "_id", 1, null, null, Collections.singletonMap("_field", date));
dateProcessor.execute(document);
assertThat(

8
modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DissectProcessorTests.java
View file

@ -32,7 +32,7 @@ public class DissectProcessorTests extends ESTestCase {
IngestDocument ingestDocument = new IngestDocument(
"_index",
"_id",
null,
1,
null,
null,
Collections.singletonMap("message", "foo,bar,baz")
@ -48,7 +48,7 @@ public class DissectProcessorTests extends ESTestCase {
IngestDocument ingestDocument = new IngestDocument(
"_index",
"_id",
null,
1,
null,
null,
MapBuilder.<String, Object>newMapBuilder().put("message", "foo,bar,baz").put("a", "willgetstompped").map()
@ -65,7 +65,7 @@ public class DissectProcessorTests extends ESTestCase {
IngestDocument ingestDocument = new IngestDocument(
"_index",
"_id",
null,
1,
null,
null,
Collections.singletonMap("message", "foo bar,,,,,,,baz nope:notagain 😊 🐇 🙃")
@ -90,7 +90,7 @@ public class DissectProcessorTests extends ESTestCase {
IngestDocument ingestDocument = new IngestDocument(
"_index",
"_id",
null,
1,
null,
null,
Collections.singletonMap("message", "foo:bar,baz")

30
modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/ForEachProcessorTests.java
View file

@ -41,7 +41,7 @@ public class ForEachProcessorTests extends ESTestCase {
values.add("foo");
values.add("bar");
values.add("baz");
IngestDocument ingestDocument = new IngestDocument("_index", "_id", null, null, null, Collections.singletonMap("values", values));
IngestDocument ingestDocument = new IngestDocument("_index", "_id", 1, null, null, Collections.singletonMap("values", values));
ForEachProcessor processor = new ForEachProcessor("_tag", null, "values", new AsyncUpperCaseProcessor("_ingest._value"), false);
execProcessor(processor, ingestDocument, (result, e) -> {});
@ -60,7 +60,7 @@ public class ForEachProcessorTests extends ESTestCase {
IngestDocument ingestDocument = new IngestDocument(
"_index",
"_id",
null,
1,
null,
null,
Collections.singletonMap("values", Arrays.asList("a", "b", "c"))
@ -104,7 +104,7 @@ public class ForEachProcessorTests extends ESTestCase {
List<Map<String, Object>> values = new ArrayList<>();
values.add(new HashMap<>());
values.add(new HashMap<>());
IngestDocument ingestDocument = new IngestDocument("_index", "_id", null, null, null, Collections.singletonMap("values", values));
IngestDocument ingestDocument = new IngestDocument("_index", "_id", 1, null, null, Collections.singletonMap("values", values));
TestProcessor innerProcessor = new TestProcessor(id -> {
id.setFieldValue("_ingest._value.index", id.getSourceAndMetadata().get("_index"));
@ -131,7 +131,7 @@ public class ForEachProcessorTests extends ESTestCase {
document.put("values", values);
document.put("flat_values", new ArrayList<>());
document.put("other", "value");
IngestDocument ingestDocument = new IngestDocument("_index", "_id", null, null, null, document);
IngestDocument ingestDocument = new IngestDocument("_index", "_id", 1, null, null, document);
ForEachProcessor processor = new ForEachProcessor(
"_tag",
@ -182,7 +182,7 @@ public class ForEachProcessorTests extends ESTestCase {
int numValues = randomIntBetween(1, 10000);
List<String> values = IntStream.range(0, numValues).mapToObj(i -> "").collect(Collectors.toList());
IngestDocument ingestDocument = new IngestDocument("_index", "_id", null, null, null, Collections.singletonMap("values", values));
IngestDocument ingestDocument = new IngestDocument("_index", "_id", 1, null, null, Collections.singletonMap("values", values));
ForEachProcessor processor = new ForEachProcessor("_tag", null, "values", innerProcessor, false);
execProcessor(processor, ingestDocument, (result, e) -> {});
@ -198,7 +198,7 @@ public class ForEachProcessorTests extends ESTestCase {
values.add("string");
values.add(1);
values.add(null);
IngestDocument ingestDocument = new IngestDocument("_index", "_id", null, null, null, Collections.singletonMap("values", values));
IngestDocument ingestDocument = new IngestDocument("_index", "_id", 1, null, null, Collections.singletonMap("values", values));
TemplateScript.Factory template = new TestTemplateService.MockTemplateScript.Factory("errors");
@ -232,7 +232,7 @@ public class ForEachProcessorTests extends ESTestCase {
Map<String, Object> source = new HashMap<>();
source.put("_value", "new_value");
source.put("values", values);
IngestDocument ingestDocument = new IngestDocument("_index", "_id", null, null, null, source);
IngestDocument ingestDocument = new IngestDocument("_index", "_id", 1, null, null, source);
TestProcessor processor = new TestProcessor(
doc -> doc.setFieldValue("_ingest._value", doc.getFieldValue("_source._value", String.class))
@ -262,7 +262,7 @@ public class ForEachProcessorTests extends ESTestCase {
value.put("values2", innerValues);
values.add(value);
IngestDocument ingestDocument = new IngestDocument("_index", "_id", null, null, null, Collections.singletonMap("values1", values));
IngestDocument ingestDocument = new IngestDocument("_index", "_id", 1, null, null, Collections.singletonMap("values1", values));
TestProcessor testProcessor = new TestProcessor(
doc -> doc.setFieldValue("_ingest._value", doc.getFieldValue("_ingest._value", String.class).toUpperCase(Locale.ENGLISH))
@ -291,7 +291,7 @@ public class ForEachProcessorTests extends ESTestCase {
Map<String, Object> innerMap3 = Map.of("foo3", 7, "bar3", 8, "baz3", 9, "otherKey", 42);
Map<String, Object> outerMap = Map.of("foo", innerMap1, "bar", innerMap2, "baz", innerMap3);
IngestDocument ingestDocument = new IngestDocument("_index", "_id", null, null, null, Map.of("field", outerMap));
IngestDocument ingestDocument = new IngestDocument("_index", "_id", 1, null, null, Map.of("field", outerMap));
List<String> visitedKeys = new ArrayList<>();
List<Object> visitedValues = new ArrayList<>();
@ -337,7 +337,7 @@ public class ForEachProcessorTests extends ESTestCase {
}
public void testIgnoreMissing() {
IngestDocument originalIngestDocument = new IngestDocument("_index", "_id", null, null, null, Collections.emptyMap());
IngestDocument originalIngestDocument = new IngestDocument("_index", "_id", 1, null, null, Collections.emptyMap());
IngestDocument ingestDocument = new IngestDocument(originalIngestDocument);
TestProcessor testProcessor = new TestProcessor(doc -> {});
ForEachProcessor processor = new ForEachProcessor("_tag", null, "_ingest._value", testProcessor, true);
@ -347,7 +347,7 @@ public class ForEachProcessorTests extends ESTestCase {
}
public void testAppendingToTheSameField() {
IngestDocument originalIngestDocument = new IngestDocument("_index", "_id", null, null, null, Map.of("field", List.of("a", "b")));
IngestDocument originalIngestDocument = new IngestDocument("_index", "_id", 1, null, null, Map.of("field", List.of("a", "b")));
IngestDocument ingestDocument = new IngestDocument(originalIngestDocument);
TestProcessor testProcessor = new TestProcessor(id -> id.appendFieldValue("field", "a"));
ForEachProcessor processor = new ForEachProcessor("_tag", null, "field", testProcessor, true);
@ -358,7 +358,7 @@ public class ForEachProcessorTests extends ESTestCase {
}
public void testRemovingFromTheSameField() {
IngestDocument originalIngestDocument = new IngestDocument("_index", "_id", null, null, null, Map.of("field", List.of("a", "b")));
IngestDocument originalIngestDocument = new IngestDocument("_index", "_id", 1, null, null, Map.of("field", List.of("a", "b")));
IngestDocument ingestDocument = new IngestDocument(originalIngestDocument);
TestProcessor testProcessor = new TestProcessor(id -> id.removeField("field.0"));
ForEachProcessor processor = new ForEachProcessor("_tag", null, "field", testProcessor, true);
@ -370,7 +370,7 @@ public class ForEachProcessorTests extends ESTestCase {
public void testMapIteration() {
Map<String, Object> mapValue = Map.of("foo", 1, "bar", 2, "baz", 3);
IngestDocument ingestDocument = new IngestDocument("_index", "_id", null, null, null, Map.of("field", mapValue));
IngestDocument ingestDocument = new IngestDocument("_index", "_id", 1, null, null, Map.of("field", mapValue));
List<String> encounteredKeys = new ArrayList<>();
List<Object> encounteredValues = new ArrayList<>();
@ -399,7 +399,7 @@ public class ForEachProcessorTests extends ESTestCase {
public void testRemovalOfMapKey() {
Map<String, Object> mapValue = Map.of("foo", 1, "bar", 2, "baz", 3);
IngestDocument ingestDocument = new IngestDocument("_index", "_id", null, null, null, Map.of("field", mapValue));
IngestDocument ingestDocument = new IngestDocument("_index", "_id", 1, null, null, Map.of("field", mapValue));
List<String> encounteredKeys = new ArrayList<>();
List<Object> encounteredValues = new ArrayList<>();
@ -428,7 +428,7 @@ public class ForEachProcessorTests extends ESTestCase {
Map<String, Object> innerMap3 = Map.of("foo3", 7, "bar3", 8, "baz3", 9, "otherKey", 42);
Map<String, Object> outerMap = Map.of("foo", innerMap1, "bar", innerMap2, "baz", innerMap3);
IngestDocument ingestDocument = new IngestDocument("_index", "_id", null, null, null, Map.of("field", outerMap));
IngestDocument ingestDocument = new IngestDocument("_index", "_id", 1, null, null, Map.of("field", outerMap));
List<String> visitedKeys = new ArrayList<>();
List<Object> visitedValues = new ArrayList<>();

4
modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/ReloadingDatabasesWhilePerformingGeoLookupsIT.java
View file

@ -96,8 +96,8 @@ public class ReloadingDatabasesWhilePerformingGeoLookupsIT extends ESTestCase {
IngestDocument document1 = new IngestDocument(
"index",
"id",
"routing",
1L,
"routing",
VersionType.EXTERNAL,
Map.of("_field", "89.160.20.128")
);
@ -106,8 +106,8 @@ public class ReloadingDatabasesWhilePerformingGeoLookupsIT extends ESTestCase {
IngestDocument document2 = new IngestDocument(
"index",
"id",
"routing",
1L,
"routing",
VersionType.EXTERNAL,
Map.of("_field", "89.160.20.128")
);

4
modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java
View file

@ -305,7 +305,7 @@ public class GeoIpProcessorFactoryTests extends ESTestCase {
}
final Map<String, Object> field = Collections.singletonMap("_field", "1.1.1.1");
final IngestDocument document = new IngestDocument("index", "id", "routing", 1L, VersionType.EXTERNAL, field);
final IngestDocument document = new IngestDocument("index", "id", 1L, "routing", VersionType.EXTERNAL, field);
Map<String, Object> config = new HashMap<>();
config.put("field", "_field");
@ -368,7 +368,7 @@ public class GeoIpProcessorFactoryTests extends ESTestCase {
}
final Map<String, Object> field = Collections.singletonMap("_field", "1.1.1.1");
final IngestDocument document = new IngestDocument("index", "id", "routing", 1L, VersionType.EXTERNAL, field);
final IngestDocument document = new IngestDocument("index", "id", 1L, "routing", VersionType.EXTERNAL, field);
Map<String, Object> config = new HashMap<>();
config.put("field", "_field");

8
qa/smoke-test-ingest-with-all-dependencies/src/yamlRestTest/java/org/elasticsearch/ingest/IngestDocumentMustacheIT.java
View file

@ -22,7 +22,7 @@ public class IngestDocumentMustacheIT extends AbstractScriptTestCase {
public void testAccessMetadataViaTemplate() {
Map<String, Object> document = new HashMap<>();
document.put("foo", "bar");
IngestDocument ingestDocument = new IngestDocument("index", "id", null, null, null, document);
IngestDocument ingestDocument = new IngestDocument("index", "id", 1, null, null, document);
ingestDocument.setFieldValue(compile("field1"), ValueSource.wrap("1 {{foo}}", scriptService));
assertThat(ingestDocument.getFieldValue("field1", String.class), equalTo("1 bar"));
@ -37,7 +37,7 @@ public class IngestDocumentMustacheIT extends AbstractScriptTestCase {
innerObject.put("baz", "hello baz");
innerObject.put("qux", Collections.singletonMap("fubar", "hello qux and fubar"));
document.put("foo", innerObject);
IngestDocument ingestDocument = new IngestDocument("index", "id", null, null, null, document);
IngestDocument ingestDocument = new IngestDocument("index", "id", 1, null, null, document);
ingestDocument.setFieldValue(compile("field1"), ValueSource.wrap("1 {{foo.bar}} {{foo.baz}} {{foo.qux.fubar}}", scriptService));
assertThat(ingestDocument.getFieldValue("field1", String.class), equalTo("1 hello bar hello baz hello qux and fubar"));
@ -57,7 +57,7 @@ public class IngestDocumentMustacheIT extends AbstractScriptTestCase {
list.add(value);
list.add(null);
document.put("list2", list);
IngestDocument ingestDocument = new IngestDocument("index", "id", null, null, null, document);
IngestDocument ingestDocument = new IngestDocument("index", "id", 1, null, null, document);
ingestDocument.setFieldValue(compile("field1"), ValueSource.wrap("1 {{list1.0}} {{list2.0}}", scriptService));
assertThat(ingestDocument.getFieldValue("field1", String.class), equalTo("1 foo {field=value}"));
}
@ -67,7 +67,7 @@ public class IngestDocumentMustacheIT extends AbstractScriptTestCase {
Map<String, Object> ingestMap = new HashMap<>();
ingestMap.put("timestamp", "bogus_timestamp");
document.put("_ingest", ingestMap);
IngestDocument ingestDocument = new IngestDocument("index", "id", null, null, null, document);
IngestDocument ingestDocument = new IngestDocument("index", "id", 1, null, null, document);
ingestDocument.setFieldValue(
compile("ingest_timestamp"),
ValueSource.wrap("{{_ingest.timestamp}} and {{_source._ingest.timestamp}}", scriptService)

2
qa/smoke-test-ingest-with-all-dependencies/src/yamlRestTest/java/org/elasticsearch/ingest/ValueSourceMustacheIT.java
View file

@ -55,7 +55,7 @@ public class ValueSourceMustacheIT extends AbstractScriptTestCase {
}
public void testAccessSourceViaTemplate() {
IngestDocument ingestDocument = new IngestDocument("marvel", "id", null, null, null, new HashMap<>());
IngestDocument ingestDocument = new IngestDocument("marvel", "id", 1, null, null, new HashMap<>());
assertThat(ingestDocument.hasField("marvel"), is(false));
ingestDocument.setFieldValue(compile("{{_index}}"), ValueSource.wrap("{{_index}}", scriptService));
assertThat(ingestDocument.getFieldValue("marvel", String.class), equalTo("marvel"));

3
server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java
View file

@ -27,6 +27,7 @@ import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.client.internal.Requests;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.lucene.uid.Versions;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.test.ESIntegTestCase;
@ -112,7 +113,7 @@ public class IngestClientIT extends ESIntegTestCase {
source.put("foo", "bar");
source.put("fail", false);
source.put("processed", true);
IngestDocument ingestDocument = new IngestDocument("index", "id", null, null, null, source);
IngestDocument ingestDocument = new IngestDocument("index", "id", Versions.MATCH_ANY, null, null, source);
assertThat(simulateDocumentBaseResult.getIngestDocument().getSourceAndMetadata(), equalTo(ingestDocument.getSourceAndMetadata()));
assertThat(simulateDocumentBaseResult.getFailure(), nullValue());

7
server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java
View file

@ -14,6 +14,7 @@ import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.lucene.uid.Versions;
import org.elasticsearch.common.xcontent.XContentHelper;
import org.elasticsearch.core.RestApiVersion;
import org.elasticsearch.index.VersionType;
@ -178,7 +179,7 @@ public class SimulatePipelineRequest extends ActionRequest implements ToXContent
"[types removal] specifying _type in pipeline simulation requests is deprecated"
);
}
Long version = null;
long version = Versions.MATCH_ANY;
if (dataMap.containsKey(Metadata.VERSION.getFieldName())) {
String versionValue = ConfigurationUtils.readOptionalStringOrLongProperty(
null,
@ -187,7 +188,7 @@ public class SimulatePipelineRequest extends ActionRequest implements ToXContent
Metadata.VERSION.getFieldName()
);
if (versionValue != null) {
version = Long.valueOf(versionValue);
version = Long.parseLong(versionValue);
} else {
throw new IllegalArgumentException("[_version] cannot be null");
}
@ -198,7 +199,7 @@ public class SimulatePipelineRequest extends ActionRequest implements ToXContent
ConfigurationUtils.readStringProperty(null, null, dataMap, Metadata.VERSION_TYPE.getFieldName())
);
}
IngestDocument ingestDocument = new IngestDocument(index, id, routing, version, versionType, document);
IngestDocument ingestDocument = new IngestDocument(index, id, version, routing, versionType, document);
if (dataMap.containsKey(Metadata.IF_SEQ_NO.getFieldName())) {
String ifSeqNoValue = ConfigurationUtils.readOptionalStringOrLongProperty(
null,

6
server/src/main/java/org/elasticsearch/ingest/IngestDocument.java
View file

@ -58,18 +58,16 @@ public final class IngestDocument {
private boolean doNoSelfReferencesCheck = false;
public IngestDocument(String index, String id, String routing, Long version, VersionType versionType, Map<String, Object> source) {
public IngestDocument(String index, String id, long version, String routing, VersionType versionType, Map<String, Object> source) {
// source + at max 5 extra fields
this.sourceAndMetadata = Maps.newMapWithExpectedSize(source.size() + 5);
this.sourceAndMetadata.putAll(source);
this.sourceAndMetadata.put(Metadata.INDEX.getFieldName(), index);
this.sourceAndMetadata.put(Metadata.ID.getFieldName(), id);
this.sourceAndMetadata.put(Metadata.VERSION.getFieldName(), version);
if (routing != null) {
this.sourceAndMetadata.put(Metadata.ROUTING.getFieldName(), routing);
}
if (version != null) {
sourceAndMetadata.put(Metadata.VERSION.getFieldName(), version);
}
if (versionType != null) {
sourceAndMetadata.put(Metadata.VERSION_TYPE.getFieldName(), VersionType.toString(versionType));
}

4
server/src/main/java/org/elasticsearch/ingest/IngestService.java
View file

@ -883,10 +883,10 @@ public class IngestService implements ClusterStateApplier, ReportingService<Inge
String index = indexRequest.index();
String id = indexRequest.id();
String routing = indexRequest.routing();
Long version = indexRequest.version();
long version = indexRequest.version();
VersionType versionType = indexRequest.versionType();
Map<String, Object> sourceAsMap = indexRequest.sourceAsMap();
IngestDocument ingestDocument = new IngestDocument(index, id, routing, version, versionType, sourceAsMap);
IngestDocument ingestDocument = new IngestDocument(index, id, version, routing, versionType, sourceAsMap);
ingestDocument.executePipeline(pipeline, (result, e) -> {
long ingestTimeInNanos = System.nanoTime() - startTimeInNanos;
totalMetrics.postIngest(ingestTimeInNanos);

2
server/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java
View file

@ -329,7 +329,7 @@ public class SimulateExecutionServiceTests extends ESTestCase {
int numDocs = randomIntBetween(1, 64);
List<IngestDocument> documents = new ArrayList<>(numDocs);
for (int id = 0; id < numDocs; id++) {
documents.add(new IngestDocument("_index", Integer.toString(id), null, 0L, VersionType.INTERNAL, new HashMap<>()));
documents.add(new IngestDocument("_index", Integer.toString(id), 0L, null, VersionType.INTERNAL, new HashMap<>()));
}
Processor processor1 = new AbstractProcessor(null, null) {

22
server/src/test/java/org/elasticsearch/ingest/IngestDocumentTests.java
View file

@ -83,7 +83,7 @@ public class IngestDocumentTests extends ESTestCase {
DoubleStream.generate(ESTestCase::randomDouble).limit(randomInt(1000)).toArray() }
);
ingestDocument = new IngestDocument("index", "id", null, null, null, document);
ingestDocument = new IngestDocument("index", "id", 1, null, null, document);
}
public void testSimpleGetFieldValue() {
@ -797,23 +797,23 @@ public class IngestDocumentTests extends ESTestCase {
public void testRemoveField() {
ingestDocument.removeField("foo");
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(9));
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(10));
assertThat(ingestDocument.getSourceAndMetadata().containsKey("foo"), equalTo(false));
ingestDocument.removeField("_index");
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(8));
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(9));
assertThat(ingestDocument.getSourceAndMetadata().containsKey("_index"), equalTo(false));
ingestDocument.removeField("_source.fizz");
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(7));
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(8));
assertThat(ingestDocument.getSourceAndMetadata().containsKey("fizz"), equalTo(false));
assertThat(ingestDocument.getIngestMetadata().size(), equalTo(1));
ingestDocument.removeField("_ingest.timestamp");
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(7));
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(8));
assertThat(ingestDocument.getIngestMetadata().size(), equalTo(0));
}
public void testRemoveInnerField() {
ingestDocument.removeField("fizz.buzz");
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(10));
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(11));
assertThat(ingestDocument.getSourceAndMetadata().get("fizz"), instanceOf(Map.class));
@SuppressWarnings("unchecked")
Map<String, Object> map = (Map<String, Object>) ingestDocument.getSourceAndMetadata().get("fizz");
@ -822,17 +822,17 @@ public class IngestDocumentTests extends ESTestCase {
ingestDocument.removeField("fizz.foo_null");
assertThat(map.size(), equalTo(2));
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(10));
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(11));
assertThat(ingestDocument.getSourceAndMetadata().containsKey("fizz"), equalTo(true));
ingestDocument.removeField("fizz.1");
assertThat(map.size(), equalTo(1));
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(10));
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(11));
assertThat(ingestDocument.getSourceAndMetadata().containsKey("fizz"), equalTo(true));
ingestDocument.removeField("fizz.list");
assertThat(map.size(), equalTo(0));
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(10));
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(11));
assertThat(ingestDocument.getSourceAndMetadata().containsKey("fizz"), equalTo(true));
}
@ -868,7 +868,7 @@ public class IngestDocumentTests extends ESTestCase {
public void testRemoveIngestObject() {
ingestDocument.removeField("_ingest");
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(9));
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(10));
assertThat(ingestDocument.getSourceAndMetadata().containsKey("_ingest"), equalTo(false));
}
@ -890,7 +890,7 @@ public class IngestDocumentTests extends ESTestCase {
public void testListRemoveField() {
ingestDocument.removeField("list.0.field");
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(10));
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(11));
assertThat(ingestDocument.getSourceAndMetadata().containsKey("list"), equalTo(true));
Object object = ingestDocument.getSourceAndMetadata().get("list");
assertThat(object, instanceOf(List.class));

8
server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java
View file

@ -2170,7 +2170,7 @@ public class IngestServiceTests extends ESTestCase {
return argThat(new IngestDocumentMatcher("_index", "_type", "_id", -3L, VersionType.INTERNAL, source));
}
private IngestDocument eqIndexTypeId(final Long version, final VersionType versionType, final Map<String, Object> source) {
private IngestDocument eqIndexTypeId(final long version, final VersionType versionType, final Map<String, Object> source) {
return argThat(new IngestDocumentMatcher("_index", "_type", "_id", version, versionType, source));
}
@ -2220,11 +2220,11 @@ public class IngestServiceTests extends ESTestCase {
private final IngestDocument ingestDocument;
IngestDocumentMatcher(String index, String type, String id, Map<String, Object> source) {
this.ingestDocument = new IngestDocument(index, id, null, null, null, source);
this.ingestDocument = new IngestDocument(index, id, 1, null, null, source);
}
IngestDocumentMatcher(String index, String type, String id, Long version, VersionType versionType, Map<String, Object> source) {
this.ingestDocument = new IngestDocument(index, id, null, version, versionType, source);
IngestDocumentMatcher(String index, String type, String id, long version, VersionType versionType, Map<String, Object> source) {
this.ingestDocument = new IngestDocument(index, id, version, null, versionType, source);
}
@Override

2
test/framework/src/main/java/org/elasticsearch/ingest/RandomDocumentPicks.java
View file

@ -136,7 +136,7 @@ public final class RandomDocumentPicks {
if (random.nextBoolean()) {
routing = randomString(random);
}
return new IngestDocument(index, id, routing, version, versionType, source);
return new IngestDocument(index, id, version, routing, versionType, source);
}
public static Map<String, Object> randomSource(Random random) {

2
x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichProcessorFactoryTests.java
View file

@ -288,8 +288,8 @@ public class EnrichProcessorFactoryTests extends ESTestCase {
IngestDocument ingestDocument = new IngestDocument(
"_index",
"_id",
"_routing",
1L,
"_routing",
VersionType.INTERNAL,
Map.of("domain", "elastic.co")
);

2
x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/GeoMatchProcessorTests.java
View file

@ -96,8 +96,8 @@ public class GeoMatchProcessorTests extends ESTestCase {
IngestDocument ingestDocument = new IngestDocument(
"_index",
"_id",
"_routing",
1L,
"_routing",
VersionType.INTERNAL,
Map.of("location", fieldValue)
);

14
x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/MatchProcessorTests.java
View file

@ -51,8 +51,8 @@ public class MatchProcessorTests extends ESTestCase {
IngestDocument ingestDocument = new IngestDocument(
"_index",
"_id",
"_routing",
1L,
"_routing",
VersionType.INTERNAL,
Map.of("domain", "elastic.co")
);
@ -106,8 +106,8 @@ public class MatchProcessorTests extends ESTestCase {
IngestDocument ingestDocument = new IngestDocument(
"_index",
"_id",
"_routing",
1L,
"_routing",
VersionType.INTERNAL,
Map.of("domain", "elastic.com")
);
@ -153,8 +153,8 @@ public class MatchProcessorTests extends ESTestCase {
IngestDocument ingestDocument = new IngestDocument(
"_index",
"_id",
"_routing",
1L,
"_routing",
VersionType.INTERNAL,
Map.of("domain", "elastic.com")
);
@ -201,7 +201,7 @@ public class MatchProcessorTests extends ESTestCase {
"domain",
1
);
IngestDocument ingestDocument = new IngestDocument("_index", "_id", "_routing", 1L, VersionType.INTERNAL, Map.of());
IngestDocument ingestDocument = new IngestDocument("_index", "_id", 1L, "_routing", VersionType.INTERNAL, Map.of());
assertThat(ingestDocument.getSourceAndMetadata().size(), equalTo(5));
IngestDocument[] holder = new IngestDocument[1];
@ -222,7 +222,7 @@ public class MatchProcessorTests extends ESTestCase {
"domain",
1
);
IngestDocument ingestDocument = new IngestDocument("_index", "_id", "_routing", 1L, VersionType.INTERNAL, Map.of());
IngestDocument ingestDocument = new IngestDocument("_index", "_id", 1L, "_routing", VersionType.INTERNAL, Map.of());
IngestDocument[] resultHolder = new IngestDocument[1];
Exception[] exceptionHolder = new Exception[1];
processor.execute(ingestDocument, (result, e) -> {
@ -306,7 +306,7 @@ public class MatchProcessorTests extends ESTestCase {
"domain",
1
);
IngestDocument ingestDocument = new IngestDocument("_index", "_id", "_routing", 1L, VersionType.INTERNAL, Map.of("domain", 2));
IngestDocument ingestDocument = new IngestDocument("_index", "_id", 1L, "_routing", VersionType.INTERNAL, Map.of("domain", 2));
// Execute
IngestDocument[] holder = new IngestDocument[1];
@ -346,8 +346,8 @@ public class MatchProcessorTests extends ESTestCase {
IngestDocument ingestDocument = new IngestDocument(
"_index",
"_id",
"_routing",
1L,
"_routing",
VersionType.INTERNAL,
Map.of("domain", List.of("1", "2"))
);