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.

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

Fix class_cast_exception when passing int to _version and other metadata fields in ingest simulate API #10101

Merged
merged 5 commits into from
Oct 5, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Fix broken backward compatibility from 2.7 for IndexSorted field indices ([#10045](https://github.com/opensearch-project/OpenSearch/pull/10045))
- Fix concurrent search NPE when track_total_hits, terminate_after and size=0 are used ([#10082](https://github.com/opensearch-project/OpenSearch/pull/10082))
- Fix remove ingest processor handing ignore_missing parameter not correctly ([10089](https://github.com/opensearch-project/OpenSearch/pull/10089))
- Fix class_cast_exception when passing int to _version and other metadata fields in ingest simulate API ([#10101](https://github.com/opensearch-project/OpenSearch/pull/10101))

### Security

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -976,3 +976,75 @@ teardown:
}
- match: { error.root_cause.0.type: "illegal_argument_exception" }
- match: { error.root_cause.0.reason: "Pipeline processor configured for non-existent pipeline [____pipeline_doesnot_exist___]" }

---
"Test simulate with docs containing metadata fields":
- do:
ingest.simulate:
body: >
{
"pipeline": {
"description": "_description",
"processors": [
{
"set" : {
"field": "field2",
"value": "foo"
}
}
]
},
"docs": [
{
"_index": "index",
"_id": "id",
"_routing": "foo",
"_version": 100,
"_if_seq_no": 12333333333333333,
"_if_primary_term": 1,
"_source": {
"foo": "bar"
}
}
]
}

- length: { docs: 1 }
- match: { docs.0.doc._index: "index" }
- match: { docs.0.doc._id: "id" }
- match: { docs.0.doc._routing: "foo" }
- match: { docs.0.doc._version: "100" }
- match: { docs.0.doc._if_seq_no: "12333333333333333" }
- match: { docs.0.doc._if_primary_term: "1" }
- match: { docs.0.doc._source.foo: "bar" }

- do:
catch: bad_request
ingest.simulate:
body: >
{
"pipeline": {
"description": "_description",
"processors": [
{
"set" : {
"field" : "field2",
"value": "foo"
}
}
]
},
"docs": [
{
"_index": "index",
"_id": "id",
"_routing": "foo",
"_version": "bar",
"_if_seq_no": 123,
"_if_primary_term": 1,
"_source": {
"foo": "bar"
}
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,12 @@
String routing = ConfigurationUtils.readOptionalStringOrIntProperty(null, null, dataMap, Metadata.ROUTING.getFieldName());
Long version = null;
if (dataMap.containsKey(Metadata.VERSION.getFieldName())) {
version = (Long) ConfigurationUtils.readObject(null, null, dataMap, Metadata.VERSION.getFieldName());
Object versionFieldValue = ConfigurationUtils.readObject(null, null, dataMap, Metadata.VERSION.getFieldName());

Check warning on line 221 in server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java#L221

Added line #L221 was not covered by tests
if (versionFieldValue instanceof Integer || versionFieldValue instanceof Long) {
version = ((Number) versionFieldValue).longValue();

Check warning on line 223 in server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java#L223

Added line #L223 was not covered by tests
} else {
throw new IllegalArgumentException("Failed to parse parameter [_version], only int or long is accepted");

Check warning on line 225 in server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java#L225

Added line #L225 was not covered by tests
}
}
VersionType versionType = null;
if (dataMap.containsKey(Metadata.VERSION_TYPE.getFieldName())) {
Expand All @@ -228,12 +233,25 @@
}
IngestDocument ingestDocument = new IngestDocument(index, id, routing, version, versionType, document);
if (dataMap.containsKey(Metadata.IF_SEQ_NO.getFieldName())) {
Long ifSeqNo = (Long) ConfigurationUtils.readObject(null, null, dataMap, Metadata.IF_SEQ_NO.getFieldName());
ingestDocument.setFieldValue(Metadata.IF_SEQ_NO.getFieldName(), ifSeqNo);
Object ifSeqNoFieldValue = ConfigurationUtils.readObject(null, null, dataMap, Metadata.IF_SEQ_NO.getFieldName());

Check warning on line 236 in server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java#L236

Added line #L236 was not covered by tests
if (ifSeqNoFieldValue instanceof Integer || ifSeqNoFieldValue instanceof Long) {
ingestDocument.setFieldValue(Metadata.IF_SEQ_NO.getFieldName(), ((Number) ifSeqNoFieldValue).longValue());

Check warning on line 238 in server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java#L238

Added line #L238 was not covered by tests
} else {
throw new IllegalArgumentException("Failed to parse parameter [_if_seq_no], only int or long is accepted");

Check warning on line 240 in server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java#L240

Added line #L240 was not covered by tests
}
}
if (dataMap.containsKey(Metadata.IF_PRIMARY_TERM.getFieldName())) {
Long ifPrimaryTerm = (Long) ConfigurationUtils.readObject(null, null, dataMap, Metadata.IF_PRIMARY_TERM.getFieldName());
ingestDocument.setFieldValue(Metadata.IF_PRIMARY_TERM.getFieldName(), ifPrimaryTerm);
Object ifPrimaryTermFieldValue = ConfigurationUtils.readObject(

Check warning on line 244 in server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java#L244

Added line #L244 was not covered by tests
null,
null,
dataMap,
Metadata.IF_PRIMARY_TERM.getFieldName()

Check warning on line 248 in server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java#L248

Added line #L248 was not covered by tests
);
if (ifPrimaryTermFieldValue instanceof Integer || ifPrimaryTermFieldValue instanceof Long) {
ingestDocument.setFieldValue(Metadata.IF_PRIMARY_TERM.getFieldName(), ((Number) ifPrimaryTermFieldValue).longValue());

Check warning on line 251 in server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java#L251

Added line #L251 was not covered by tests
} else {
throw new IllegalArgumentException("Failed to parse parameter [_if_primary_term], only int or long is accepted");

Check warning on line 253 in server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/action/ingest/SimulatePipelineRequest.java#L253

Added line #L253 was not covered by tests
}
}
ingestDocumentList.add(ingestDocument);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,17 +144,29 @@ public void innerTestParseWithProvidedPipeline() throws Exception {
List<IngestDocument.Metadata> fields = Arrays.asList(INDEX, ID, ROUTING, VERSION, VERSION_TYPE, IF_SEQ_NO, IF_PRIMARY_TERM);
for (IngestDocument.Metadata field : fields) {
if (field == VERSION) {
Long value = randomLong();
doc.put(field.getFieldName(), value);
expectedDoc.put(field.getFieldName(), value);
if (randomBoolean()) {
Long value = randomLong();
doc.put(field.getFieldName(), value);
expectedDoc.put(field.getFieldName(), value);
} else {
Integer value = randomIntBetween(1, 1000000);
doc.put(field.getFieldName(), value);
expectedDoc.put(field.getFieldName(), value);
}
} else if (field == VERSION_TYPE) {
String value = VersionType.toString(randomFrom(VersionType.INTERNAL, VersionType.EXTERNAL, VersionType.EXTERNAL_GTE));
doc.put(field.getFieldName(), value);
expectedDoc.put(field.getFieldName(), value);
} else if (field == IF_SEQ_NO || field == IF_PRIMARY_TERM) {
Long value = randomNonNegativeLong();
doc.put(field.getFieldName(), value);
expectedDoc.put(field.getFieldName(), value);
if (randomBoolean()) {
Long value = randomNonNegativeLong();
doc.put(field.getFieldName(), value);
expectedDoc.put(field.getFieldName(), value);
} else {
Integer value = randomIntBetween(1, 1000000);
doc.put(field.getFieldName(), value);
expectedDoc.put(field.getFieldName(), value);
}
} else {
if (randomBoolean()) {
String value = randomAlphaOfLengthBetween(1, 10);
Expand Down
Loading