Fixing a little more

apache · Apr 4, 2022 · a4c391f · a4c391f
1 parent 270cab1
commit a4c391f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/...i-client-common/src/test/java/org/apache/hudi/io/storage/TestHoodieHFileReaderWriter.java b/...i-client-common/src/test/java/org/apache/hudi/io/storage/TestHoodieHFileReaderWriter.java
@@ -172,11 +172,17 @@ public void testWriteReadHFileWithMetaFields(boolean populateMetaFields, boolean
     for (int i = 0; i < 2; i++) {
       int randomRowstoFetch = 5 + RANDOM.nextInt(10);
       Set<String> rowsToFetch = getRandomKeys(randomRowstoFetch, keys);
+
       List<String> rowsList = new ArrayList<>(rowsToFetch);
       Collections.sort(rowsList);
+
+      List<GenericRecord> expectedRecords = rowsList.stream().map(recordMap::get).collect(Collectors.toList());
+
       hoodieHFileReader = (HoodieHFileReader<GenericRecord>) createReader(conf);
       List<GenericRecord> result = HoodieHFileReader.readRecords(hoodieHFileReader, rowsList);
-      assertEquals(recordMap.values(), result);
+
+      assertEquals(expectedRecords, result);
+
       result.forEach(entry -> {
         if (populateMetaFields && testAvroWithMeta) {
           assertNotNull(entry.get(HoodieRecord.RECORD_KEY_METADATA_FIELD));

diff --git a/...park-client/src/test/java/org/apache/hudi/client/functional/TestHoodieBackedMetadata.java b/...park-client/src/test/java/org/apache/hudi/client/functional/TestHoodieBackedMetadata.java
@@ -106,7 +106,6 @@
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.io.hfile.CacheConfig;
-import org.apache.hadoop.hbase.util.Pair;
 import org.apache.hadoop.util.Time;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;

diff --git a/...client/src/test/java/org/apache/hudi/client/functional/TestHoodieBackedTableMetadata.java b/...client/src/test/java/org/apache/hudi/client/functional/TestHoodieBackedTableMetadata.java
@@ -21,9 +21,9 @@
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericRecord;
 import org.apache.avro.generic.IndexedRecord;
+import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.io.hfile.CacheConfig;
-import org.apache.hadoop.hbase.util.Pair;
 import org.apache.hudi.avro.HoodieAvroUtils;
 import org.apache.hudi.avro.model.HoodieMetadataRecord;
 import org.apache.hudi.common.config.HoodieMetadataConfig;
@@ -51,8 +51,6 @@
 import org.apache.hudi.metadata.MetadataPartitionType;
 import org.apache.hudi.table.HoodieSparkTable;
 import org.apache.hudi.table.HoodieTable;
-
-import org.apache.hadoop.fs.FileStatus;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.apache.parquet.avro.AvroSchemaConverter;

diff --git a/hudi-common/src/main/java/org/apache/hudi/io/storage/HoodieHFileReader.java b/hudi-common/src/main/java/org/apache/hudi/io/storage/HoodieHFileReader.java
@@ -344,6 +344,7 @@ public static <R extends IndexedRecord> List<R> readRecords(HoodieHFileReader<R>
   public static <R extends IndexedRecord> List<R> readRecords(HoodieHFileReader<R> reader,
                                                               List<String> keys,
                                                               Schema schema) throws IOException {
+    Collections.sort(keys);
     return toStream(reader.getRecordsByKeysIterator(keys, schema))
         .collect(Collectors.toList());
   }