fix

amogh-jahagirdar · amogh-jahagirdar · commit c2c5827d0e5c · 2025-04-28T17:36:38.000-06:00
diff --git a/data/src/test/java/org/apache/iceberg/data/RandomGenericData.java b/data/src/test/java/org/apache/iceberg/data/RandomGenericData.java
@@ -218,8 +218,7 @@ public Object list(Types.ListType list, Supplier<Object> elementResult) {
 
       List<Object> result = Lists.newArrayListWithExpectedSize(numElements);
       for (int i = 0; i < numElements; i += 1) {
-        // return null 5% of the time when the value is optional
-        if (list.isElementOptional() && random.nextInt(20) == 1) {
+        if (list.isElementOptional() && isNull()) {
           result.add(null);
         } else {
           result.add(elementResult.get());
@@ -251,8 +250,7 @@ public Object map(Types.MapType map, Supplier<Object> keyResult, Supplier<Object
 
         keySet.add(key);
 
-        // return null 5% of the time when the value is optional
-        if (map.isValueOptional() && random.nextInt(20) == 1) {
+        if (map.isValueOptional() && isNull()) {
           result.put(key, null);
         } else {
           result.put(key, valueResult.get());
diff --git a/data/src/test/java/org/apache/iceberg/data/TestLocalScan.java b/data/src/test/java/org/apache/iceberg/data/TestLocalScan.java
@@ -36,6 +36,7 @@
 import java.nio.ByteOrder;
 import java.nio.file.Files;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -263,9 +264,36 @@ public void testRandomData() throws IOException {
 
     append.commit();
 
-    Set<Record> records = Sets.newHashSet(IcebergGenerics.read(table).build());
+    RecordComparator comparator = new RecordComparator();
+    List<Record> records = Lists.newArrayList(IcebergGenerics.read(table).build());
+
+    expected.sort(comparator);
+    records.sort(comparator);
     assertThat(records).as("Should produce correct number of records").hasSameSizeAs(expected);
-    assertThat(records).as("Random record set should match").isEqualTo(Sets.newHashSet(expected));
+    assertThat(records).as("Random record set should match").isEqualTo(expected);
+  }
+
+  class RecordComparator implements Comparator<Record> {
+
+    @Override
+    public int compare(Record r1, Record r2) {
+      long idComparison = r1.get(0, Long.class) - r2.get(0, Long.class);
+      if (idComparison < 0) {
+        return -1;
+      } else if (idComparison > 0) {
+        return 1;
+      }
+
+      if (r1.get(1, String.class) == null) {
+        return -1;
+      }
+
+      if (r2.get(1, String.class) == null) {
+        return 1;
+      }
+
+      return r1.get(1, String.class).compareTo(r2.get(1, String.class));
+    }
   }
 
   @TestTemplate
