wombatu-kun commented on code in PR #18375:
URL: https://github.com/apache/hudi/pull/18375#discussion_r3036754739
##########
hudi-client/hudi-client-common/src/main/java/org/apache/hudi/index/HoodieIndexUtils.java:
##########
@@ -396,24 +399,51 @@ private static <R> Option<HoodieRecord<R>>
mergeIncomingWithExistingRecordWithEx
}
//record is inserted or updated
- String partitionPath = inferPartitionPath(incoming, existing,
writeSchemaWithMetaFields, keyGenerator, existingRecordContext, mergeResult);
- HoodieRecord<R> result =
existingRecordContext.constructHoodieRecord(mergeResult, partitionPath);
+ String partitionPath = inferPartitionPath(incoming, existing,
writeSchemaWithMetaFields, keyGenerator,
+ existingRecordContext, mergeResult, incomingBufferedRecord,
existingBufferedRecord, incomingRecordContext);
+ // When HoodieAvroRecordMerger creates a genuinely new BufferedRecord, it
encodes the schema into
+ // incomingRecordContext. Re-encode into existingRecordContext so
constructHoodieRecord (which uses
+ // existingRecordContext for the correct payload class) can resolve the
schema for SPARK records.
+ BufferedRecord<R> mergeResultForConstruct = mergeResult;
+ if (mergeResult != incomingBufferedRecord && mergeResult !=
existingBufferedRecord) {
+ HoodieSchema mergedSchema =
incomingRecordContext.getSchemaFromBufferRecord(mergeResult);
+ if (mergedSchema != null &&
existingRecordContext.getSchemaFromBufferRecord(mergeResult) == null) {
Review Comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
