Skip to content

Commit d42211c

Browse files
stu-elasticstu-elastic
authored
Ingest: IngestDocument requires non-null version (#87665)
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
1 parent aebb7bc commit d42211c

File tree

27 files changed

+91
-75
lines changed

27 files changed

+91
-75
lines changed

‎docs/reference/ingest.asciidoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ The API returns transformed documents:
191191
"doc": {
192192
"_index": "_index",
193193
"_id": "_id",
194+
"_version": "-3",
194195
"_source": {
195196
"my-keyword-field": "foo"
196197
},
@@ -203,6 +204,7 @@ The API returns transformed documents:
203204
"doc": {
204205
"_index": "_index",
205206
"_id": "_id",
207+
"_version": "-3",
206208
"_source": {
207209
"my-keyword-field": "bar"
208210
},

‎docs/reference/ingest/apis/simulate-pipeline.asciidoc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ The API returns the following response:
179179
"doc": {
180180
"_id": "id",
181181
"_index": "index",
182+
"_version": "-3",
182183
"_source": {
183184
"field2": "_value",
184185
"foo": "bar"
@@ -192,6 +193,7 @@ The API returns the following response:
192193
"doc": {
193194
"_id": "id",
194195
"_index": "index",
196+
"_version": "-3",
195197
"_source": {
196198
"field2": "_value",
197199
"foo": "rab"
@@ -256,6 +258,7 @@ The API returns the following response:
256258
"doc": {
257259
"_id": "id",
258260
"_index": "index",
261+
"_version": "-3",
259262
"_source": {
260263
"field2": "_value",
261264
"foo": "bar"
@@ -269,6 +272,7 @@ The API returns the following response:
269272
"doc": {
270273
"_id": "id",
271274
"_index": "index",
275+
"_version": "-3",
272276
"_source": {
273277
"field2": "_value",
274278
"foo": "rab"
@@ -350,6 +354,7 @@ The API returns the following response:
350354
"doc" : {
351355
"_index" : "index",
352356
"_id" : "id",
357+
"_version": "-3",
353358
"_source" : {
354359
"field2" : "_value2",
355360
"foo" : "bar"
@@ -366,6 +371,7 @@ The API returns the following response:
366371
"doc" : {
367372
"_index" : "index",
368373
"_id" : "id",
374+
"_version": "-3",
369375
"_source" : {
370376
"field3" : "_value3",
371377
"field2" : "_value2",
@@ -387,6 +393,7 @@ The API returns the following response:
387393
"doc" : {
388394
"_index" : "index",
389395
"_id" : "id",
396+
"_version": "-3",
390397
"_source" : {
391398
"field2" : "_value2",
392399
"foo" : "rab"
@@ -403,6 +410,7 @@ The API returns the following response:
403410
"doc" : {
404411
"_index" : "index",
405412
"_id" : "id",
413+
"_version": "-3",
406414
"_source" : {
407415
"field3" : "_value3",
408416
"field2" : "_value2",

‎docs/reference/ingest/processors/date-index-name.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ and the result:
111111
"doc" : {
112112
"_id" : "_id",
113113
"_index" : "<my-index-{2016-04-25||/M{yyyy-MM-dd|UTC}}>",
114+
"_version" : "-3",
114115
"_source" : {
115116
"date1" : "2016-04-25T12:02:01.789Z"
116117
},

‎docs/reference/ingest/processors/fingerprint.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@ Which produces the following result:
8686
]
8787
}
8888
----
89-
// TESTRESPONSE[s/\.\.\./"_index":"_index","_id":"_id","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]
89+
// TESTRESPONSE[s/\.\.\./"_index":"_index","_id":"_id","_version":"-3","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]

‎docs/reference/ingest/processors/grok.asciidoc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ This pipeline will insert these named captures as new fields within the document
7070
"doc": {
7171
"_index": "_index",
7272
"_id": "_id",
73+
"_version": "-3",
7374
"_source" : {
7475
"duration" : 0.043,
7576
"request" : "/index.html",
@@ -166,6 +167,7 @@ response:
166167
"doc": {
167168
"_index": "_index",
168169
"_id": "_id",
170+
"_version": "-3",
169171
"_source": {
170172
"message": "I love burmese cats!",
171173
"pet": "burmese"
@@ -225,6 +227,7 @@ POST _ingest/pipeline/_simulate
225227
"doc": {
226228
"_index": "_index",
227229
"_id": "_id",
230+
"_version": "-3",
228231
"_source": {
229232
"message": "I love burmese cats!",
230233
"pet": "burmese"

‎docs/reference/ingest/processors/network-direction.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,5 +115,5 @@ Which produces the following result:
115115
]
116116
}
117117
----
118-
// TESTRESPONSE[s/\.\.\./"_index":"_index","_id":"_id","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]
118+
// TESTRESPONSE[s/\.\.\./"_index":"_index","_id":"_id","_version":"-3","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]
119119
// NOTCONSOLE

‎docs/reference/ingest/processors/registered-domain.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ Which produces the following result:
7878
]
7979
}
8080
----
81-
// TESTRESPONSE[s/\.\.\./"_index":"_index","_id":"_id","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]
81+
// TESTRESPONSE[s/\.\.\./"_index":"_index","_id":"_id","_version":"-3","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]

‎docs/reference/ingest/processors/script.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ The processor produces:
9898
]
9999
}
100100
----
101-
// TESTRESPONSE[s/\.\.\./"_index":"_index","_id":"_id","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]
101+
// TESTRESPONSE[s/\.\.\./"_index":"_index","_id":"_id","_version":"-3","_ingest":{"timestamp":$body.docs.0.doc._ingest.timestamp},/]
102102

103103

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

‎docs/reference/ingest/processors/set.asciidoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ Result:
7272
"doc" : {
7373
"_index" : "_index",
7474
"_id" : "_id",
75+
"_version" : "-3",
7576
"_source" : {
7677
"host" : {
7778
"os" : {
@@ -127,6 +128,7 @@ Result:
127128
"doc" : {
128129
"_index" : "_index",
129130
"_id" : "_id",
131+
"_version" : "-3",
130132
"_source" : {
131133
"bar": ["foo1", "foo2"],
132134
"foo": ["foo1", "foo2"]

‎modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateIndexNameProcessorTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void testJavaPattern() throws Exception {
3737
IngestDocument document = new IngestDocument(
3838
"_index",
3939
"_id",
40-
null,
40+
1,
4141
null,
4242
null,
4343
Collections.singletonMap("_field", "2016-04-25T12:24:20.101Z")
@@ -59,7 +59,7 @@ public void testTAI64N() throws Exception {
5959
IngestDocument document = new IngestDocument(
6060
"_index",
6161
"_id",
62-
null,
62+
1,
6363
null,
6464
null,
6565
Collections.singletonMap("_field", (randomBoolean() ? "@" : "") + "4000000050d506482dbdf024")
@@ -78,11 +78,11 @@ public void testUnixMs() throws Exception {
7878
"m",
7979
"yyyyMMdd"
8080
);
81-
IngestDocument document = new IngestDocument("_index", "_id", null, null, null, Collections.singletonMap("_field", "1000500"));
81+
IngestDocument document = new IngestDocument("_index", "_id", 1, null, null, Collections.singletonMap("_field", "1000500"));
8282
dateProcessor.execute(document);
8383
assertThat(document.getSourceAndMetadata().get("_index"), equalTo("<events-{19700101||/m{yyyyMMdd|UTC}}>"));
8484

85-
document = new IngestDocument("_index", "_id", null, null, null, Collections.singletonMap("_field", 1000500L));
85+
document = new IngestDocument("_index", "_id", 1, null, null, Collections.singletonMap("_field", 1000500L));
8686
dateProcessor.execute(document);
8787
assertThat(document.getSourceAndMetadata().get("_index"), equalTo("<events-{19700101||/m{yyyyMMdd|UTC}}>"));
8888
}
@@ -97,7 +97,7 @@ public void testUnix() throws Exception {
9797
"m",
9898
"yyyyMMdd"
9999
);
100-
IngestDocument document = new IngestDocument("_index", "_id", null, null, null, Collections.singletonMap("_field", "1000.5"));
100+
IngestDocument document = new IngestDocument("_index", "_id", 1, null, null, Collections.singletonMap("_field", "1000.5"));
101101
dateProcessor.execute(document);
102102
assertThat(document.getSourceAndMetadata().get("_index"), equalTo("<events-{19700101||/m{yyyyMMdd|UTC}}>"));
103103
}
@@ -118,7 +118,7 @@ public void testTemplatedFields() throws Exception {
118118
indexNameFormat
119119
);
120120

121-
IngestDocument document = new IngestDocument("_index", "_id", null, null, null, Collections.singletonMap("_field", date));
121+
IngestDocument document = new IngestDocument("_index", "_id", 1, null, null, Collections.singletonMap("_field", date));
122122
dateProcessor.execute(document);
123123

124124
assertThat(

0 commit comments

Comments
 (0)