lokeshj1703 commented on code in PR #13526:
URL: https://github.com/apache/hudi/pull/13526#discussion_r2221842316
##########
hudi-common/src/test/java/org/apache/hudi/common/table/read/TestHoodieFileGroupReaderBase.java:
##########
@@ -604,13 +651,30 @@ protected void
validateOutputFromFileGroupReader(StorageConfiguration<?> storage
List<HoodieRecord>
expectedHoodieUnmergedRecords) throws Exception {
HoodieTableMetaClient metaClient =
HoodieTestUtils.createMetaClient(storageConf, tablePath);
Schema avroSchema = new
TableSchemaResolver(metaClient).getTableAvroSchema();
+ expectedHoodieRecords =
getExpectedHoodieRecordsWithOrderingValue(expectedHoodieRecords, metaClient,
avroSchema);
+ expectedHoodieUnmergedRecords =
getExpectedHoodieRecordsWithOrderingValue(expectedHoodieUnmergedRecords,
metaClient, avroSchema);
List<HoodieTestDataGenerator.RecordIdentifier> expectedRecords =
convertHoodieRecords(expectedHoodieRecords, avroSchema);
List<HoodieTestDataGenerator.RecordIdentifier> expectedUnmergedRecords =
convertHoodieRecords(expectedHoodieUnmergedRecords, avroSchema);
validateOutputFromFileGroupReaderWithExistingRecords(
storageConf, tablePath, containsBaseFile, expectedLogFileNum,
recordMergeMode,
expectedRecords, expectedUnmergedRecords);
}
+ private static List<HoodieRecord>
getExpectedHoodieRecordsWithOrderingValue(List<HoodieRecord>
expectedHoodieRecords, HoodieTableMetaClient metaClient, Schema avroSchema) {
+ return expectedHoodieRecords.stream().map(rec -> {
+ RawTripTestPayload oldPayload = (RawTripTestPayload) rec.getData();
+ try {
+ List<String> orderingFields =
metaClient.getTableConfig().getPreCombineFieldList().get();
+ HoodieAvroRecord avroRecord = ((HoodieAvroRecord) rec);
+ Comparable orderingValue = Comparables.create(orderingFields, field ->
(Comparable) avroRecord.getColumnValueAsJava(avroSchema, field, new
TypedProperties()));
+ RawTripTestPayload newPayload = new
RawTripTestPayload(Option.ofNullable(oldPayload.getJsonData()),
oldPayload.getRowKey(), oldPayload.getPartitionPath(), null, false,
orderingValue);
Review Comment:
We can fix it in a separate jira. Multiple tests might fail with this kind
of a fix.
##########
hudi-common/src/test/java/org/apache/hudi/common/table/read/TestHoodieFileGroupReaderBase.java:
##########
@@ -185,6 +189,49 @@ public void
testReadFileGroupInMergeOnReadTable(RecordMergeMode recordMergeMode,
}
}
+ @ParameterizedTest
+ @ValueSource(strings = {"avro", "parquet"})
+ public void testReadFileGroupWithMultipleOrderingFields(String
logDataBlockFormat) throws Exception {
Review Comment:
Addressed
--
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]
