Review comments

apache · Jul 18, 2023 · e970c1d · e970c1d
1 parent c7853e4
commit e970c1d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/...ons/src/test/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFiles.java b/...ons/src/test/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFiles.java
@@ -29,6 +29,7 @@
 import java.math.BigDecimal;
 import java.sql.Date;
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -134,6 +135,14 @@ public void testTimestampPartition() throws Exception {
     testDanglingDelete();
   }
 
+  @Test
+  public void testTimestampNtz() throws Exception {
+    createTable("timestamp_ntz");
+    LocalDateTime baseTimestamp = Timestamp.valueOf("2023-01-01 15:30:00").toLocalDateTime();
+    insertData(baseTimestamp::plusDays);
+    testDanglingDelete();
+  }
+
   @Test
   public void testBytePartition() throws Exception {
     createTable("byte");
@@ -200,7 +209,7 @@ private void testDanglingDelete(int numDataFiles) throws Exception {
     Table table = Spark3Util.loadIcebergTable(spark, tableName);
 
     List<DataFile> dataFiles = dataFiles(table);
-    assertThat(numDataFiles).isEqualTo(dataFiles.size());
+    assertThat(dataFiles).hasSize(numDataFiles);
 
     SparkActions.get(spark)
         .rewriteDataFiles(table)
@@ -210,7 +219,7 @@ private void testDanglingDelete(int numDataFiles) throws Exception {
     // write dangling delete files for 'old data files'
     writePosDeletesForFiles(table, dataFiles);
     List<DeleteFile> deleteFiles = deleteFiles(table);
-    assertThat(numDataFiles * DELETE_FILES_PER_PARTITION).isEqualTo(deleteFiles.size());
+    assertThat(deleteFiles).hasSize(numDataFiles * DELETE_FILES_PER_PARTITION);
 
     List<Object[]> expectedRecords = records(tableName);
 
@@ -221,7 +230,7 @@ private void testDanglingDelete(int numDataFiles) throws Exception {
             .execute();
 
     List<DeleteFile> newDeleteFiles = deleteFiles(table);
-    assertThat(newDeleteFiles.size()).as("Remaining dangling deletes").isEqualTo(0);
+    assertThat(newDeleteFiles).as("Remaining dangling deletes").isEmpty();
     checkResult(result, deleteFiles, Lists.newArrayList(), numDataFiles);
 
     List<Object[]> actualRecords = records(tableName);
@@ -369,9 +378,7 @@ private void checkResult(
         .isEqualTo(size(rewrittenDeletes));
     assertThat(result.addedBytesCount()).as("New Delete byte count").isEqualTo(size(newDeletes));
 
-    assertThat(result.rewriteResults().size())
-        .as("Rewritten group count")
-        .isEqualTo(expectedGroups);
+    assertThat(result.rewriteResults()).as("Rewritten group count").hasSize(expectedGroups);
     assertThat(
             result.rewriteResults().stream()
                 .mapToInt(FileGroupRewriteResult::rewrittenDeleteFilesCount)

diff --git a/...ons/src/test/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFiles.java b/...ons/src/test/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFiles.java
@@ -209,7 +209,7 @@ private void testDanglingDelete(int numDataFiles) throws Exception {
     Table table = Spark3Util.loadIcebergTable(spark, tableName);
 
     List<DataFile> dataFiles = dataFiles(table);
-    assertThat(numDataFiles).isEqualTo(dataFiles.size());
+    assertThat(dataFiles).hasSize(numDataFiles);
 
     SparkActions.get(spark)
         .rewriteDataFiles(table)
@@ -219,7 +219,7 @@ private void testDanglingDelete(int numDataFiles) throws Exception {
     // write dangling delete files for 'old data files'
     writePosDeletesForFiles(table, dataFiles);
     List<DeleteFile> deleteFiles = deleteFiles(table);
-    assertThat(numDataFiles * DELETE_FILES_PER_PARTITION).isEqualTo(deleteFiles.size());
+    assertThat(deleteFiles).hasSize(numDataFiles * DELETE_FILES_PER_PARTITION);
 
     List<Object[]> expectedRecords = records(tableName);
 
@@ -230,7 +230,7 @@ private void testDanglingDelete(int numDataFiles) throws Exception {
             .execute();
 
     List<DeleteFile> newDeleteFiles = deleteFiles(table);
-    assertThat(newDeleteFiles.size()).as("Remaining dangling deletes").isEqualTo(0);
+    assertThat(newDeleteFiles).as("Remaining dangling deletes").isEmpty();
     checkResult(result, deleteFiles, Lists.newArrayList(), numDataFiles);
 
     List<Object[]> actualRecords = records(tableName);
@@ -378,9 +378,7 @@ private void checkResult(
         .isEqualTo(size(rewrittenDeletes));
     assertThat(result.addedBytesCount()).as("New Delete byte count").isEqualTo(size(newDeletes));
 
-    assertThat(result.rewriteResults().size())
-        .as("Rewritten group count")
-        .isEqualTo(expectedGroups);
+    assertThat(result.rewriteResults()).as("Rewritten group count").hasSize(expectedGroups);
     assertThat(
             result.rewriteResults().stream()
                 .mapToInt(FileGroupRewriteResult::rewrittenDeleteFilesCount)