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

[7.x] Set processor's copy_from should deep copy non-primitive mutable types #69870

Merged
merged 1 commit into from
Mar 3, 2021
Merged

[7.x] Set processor's copy_from should deep copy non-primitive mutable types #69870

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
2 changes: 1 addition & 1 deletion modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/SetProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public IngestDocument execute(IngestDocument document) {
if (overrideEnabled || document.hasField(field) == false || document.getFieldValue(field, Object.class) == null) {
if (copyFrom != null) {
Object fieldValue = document.getFieldValue(copyFrom, Object.class, ignoreEmptyValue);
document.setFieldValue(field, fieldValue, ignoreEmptyValue);
document.setFieldValue(field, IngestDocument.deepCopy(fieldValue), ignoreEmptyValue);
} else {
document.setFieldValue(field, value, ignoreEmptyValue);
}
Expand Down
63 changes: 63 additions & 0 deletions modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/SetProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,13 @@
import org.elasticsearch.test.ESTestCase;
import org.hamcrest.Matchers;

import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import static org.hamcrest.Matchers.equalTo;

Expand Down Expand Up @@ -144,6 +149,64 @@ public void testCopyFromOtherField() throws Exception {
assertThat(ingestDocument.getFieldValue(fieldName, Object.class), equalTo(fieldValue));
}

public void testCopyFromDeepCopiesNonPrimitiveMutableTypes() throws Exception {
final String originalField = "originalField";
final String targetField = "targetField";
Processor processor = createSetProcessor(targetField, null, originalField, true, false);

// map types
Map<String, Object> document = new HashMap<>();
Map<String, Object> originalMap = new HashMap<>();
originalMap.put("foo", "bar");
document.put(originalField, originalMap);
IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random(), document);
IngestDocument output = processor.execute(ingestDocument);
originalMap.put("foo", "not-bar");
Map<?, ?> outputMap = output.getFieldValue(targetField, Map.class);
assertThat(outputMap.get("foo"), equalTo("bar"));

// set types
document = new HashMap<>();
Set<String> originalSet = randomUnique(() -> randomAlphaOfLength(5), 5);
Set<String> preservedSet = new HashSet<>(originalSet);
document.put(originalField, originalSet);
ingestDocument = RandomDocumentPicks.randomIngestDocument(random(), document);
processor.execute(ingestDocument);
originalSet.add(randomValueOtherThanMany(originalSet::contains, () -> randomAlphaOfLength(5)));
assertThat(ingestDocument.getFieldValue(targetField, Object.class), equalTo(preservedSet));

// list types
document = new HashMap<>();
List<String> originalList = randomList(1, 5, () -> randomAlphaOfLength(5));
List<String> preservedList = new ArrayList<>(originalList);
document.put(originalField, originalList);
ingestDocument = RandomDocumentPicks.randomIngestDocument(random(), document);
processor.execute(ingestDocument);
originalList.add(randomValueOtherThanMany(originalList::contains, () -> randomAlphaOfLength(5)));
assertThat(ingestDocument.getFieldValue(targetField, Object.class), equalTo(preservedList));

// byte[] types
document = new HashMap<>();
byte[] originalBytes = randomByteArrayOfLength(10);
byte[] preservedBytes = new byte[originalBytes.length];
System.arraycopy(originalBytes, 0, preservedBytes, 0, originalBytes.length);
document.put(originalField, originalBytes);
ingestDocument = RandomDocumentPicks.randomIngestDocument(random(), document);
processor.execute(ingestDocument);
originalBytes[0] = originalBytes[0] == 0 ? (byte) 1 : (byte) 0;
assertThat(ingestDocument.getFieldValue(targetField, Object.class), equalTo(preservedBytes));

// Date types
document = new HashMap<>();
Date originalDate = new Date();
Date preservedDate = new Date(originalDate.getTime());
document.put(originalField, originalDate);
ingestDocument = RandomDocumentPicks.randomIngestDocument(random(), document);
processor.execute(ingestDocument);
originalDate.setTime(originalDate.getTime() + 1);
assertThat(ingestDocument.getFieldValue(targetField, Object.class), equalTo(preservedDate));
}

private static Processor createSetProcessor(String fieldName, Object fieldValue, String copyFrom, boolean overrideEnabled,
boolean ignoreEmptyValue) {
return new SetProcessor(randomAlphaOfLength(10), null, new TestTemplateService.MockTemplateScript.Factory(fieldName),
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/ingest/IngestDocument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ public static <K, V> Map<K, V> deepCopyMap(Map<K, V> source) {
return (Map<K, V>) deepCopy(source);
}

private static Object deepCopy(Object value) {
public static Object deepCopy(Object value) {
if (value instanceof Map) {
Map<?, ?> mapValue = (Map<?, ?>) value;
Map<Object, Object> copy = new HashMap<>(mapValue.size());
Expand Down