Fix bug where ingestion failed for input document containing list of nested objects #1040
+242
−45
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nested objects Signed-off-by: Yizhe Liu <[email protected]>
This was referenced Dec 22, 2024
yizheliu-amazon
requested review from
heemin32,
navneet1v,
VijayanB,
vamshin,
jmazanec15,
naveentatikonda,
junqiu-lei,
martin-gaievski,
sean-zheng-amazon,
model-collapse,
zane-neo,
vibrantvarun,
zhichao-aws,
yuye-aws and
minalsha
as code owners
|
Can we have IT test for this? |
heemin32
reviewed
Dec 24, 2024
| int nestedElementIndex | ||
| ) { | ||
| if (processorKey == null || sourceAndMetadataMap == null || sourceValue == null) return; | ||
| if (sourceValue instanceof Map) { |
There was a problem hiding this comment.
Isn't sourceValue always an instance of Map?
| int nestedElementIndex | ||
| ) { | ||
| if (processorKey == null || sourceAndMetadataMap == null || sourceValue == null) return; | ||
| if (sourceValue instanceof Map) { |
There was a problem hiding this comment.
Suggested change
| if (sourceValue instanceof Map) { | |
| assert sourceValue instanceof Map, "sourceValue should be an instance of Map" |
heemin32
added
the
backport 2.x
| */ | ||
| Map<String, Object> child1Level2 = buildObjMapWithSingleField(CHILD_1_TEXT_FIELD, TEXT_VALUE_1); | ||
| Map<String, Object> child1Level1 = buildObjMapWithSingleField(CHILD_FIELD_LEVEL_1, child1Level2); | ||
| Map<String, Object> child2Level2 = buildObjMapWithSingleField(CHILD_1_TEXT_FIELD, TEXT_VALUE_1); |
There was a problem hiding this comment.
is this critical for test case to have all identical values for both nested fields? In real life scenario most of the times values will be different, can we edit this method or add a new test case with 2+ different fields?
| List<Map<String, Object>> nestedElementList = (List<Map<String, Object>>) sourceAndMetadataMap.get(processorKey); | ||
|
|
||
| IntStream.range(0, nestedElementList.size()).forEach(nestedElementIndex -> { | ||
| Map<String, Object> nestedElement = nestedElementList.get(nestedElementIndex); |
There was a problem hiding this comment.
how about following version, get by index from list can be not optimal in case of some list implementations like linked list:
Iterator<Map<String, Object>> iterator = nestedElementList.iterator();
Stream.iterate(0, i -> i + 1)
.limit(nestedElementList.size())
.forEach(index -> {
Map<String, Object> nestedElement = iterator.next();
putNLPResultToSingleSourceMapInList(
entryKey,
entryValue,
results,
indexWrapper,
nestedElement,
index
);
});
| } | ||
| } else if (inputNestedMapEntry.getValue() instanceof Map) { |
There was a problem hiding this comment.
can you please refactor logic for each type in a separate method, this should make code cleaner:
if (entryValue instanceof List) {
processListTypeEntry(entryKey, (List<Object>) entryValue, processorKey,
results, indexWrapper, sourceAndMetadataMap);
} else if (entryValue instanceof Map) {
processMapTypeEntry(entryKey, entryValue, processorKey,
results, indexWrapper, sourceAndMetadataMap);
}
There was a problem hiding this comment.
I would rather have same method name.
if (entryValue instanceof List) {
processEntry(entryKey, (List<Object>) entryValue, processorKey, results, indexWrapper, sourceAndMetadataMap);
}
else if (entryValue instanceof Map) {
processEntry(entryKey, (Map<String, Object>) entryValue, processorKey, results, indexWrapper, sourceAndMetadataMap);
}
private void processEntry(..., List<Object> entryValue, ...){...}
private void processEntry(..., Map<String, Object> entryValue, ...){...}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fix bug where ingestion failed for input document containing list of nested objects
Related Issues
Resolves #1024
Check List
--signoff.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.