(iceberg) branch main updated: Core: Collapse redundant nested if statements (#17491)

[szehon]

This is an automated email from the ASF dual-hosted git repository.

szehon-ho pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git


The following commit(s) were added to refs/heads/main by this push:
     new 1d8c71529e Core: Collapse redundant nested if statements (#17491)
1d8c71529e is described below

commit 1d8c71529e0013bb57716451a67dcd284ea35965
Author: Uros Bojanic <221401595+uro...@users.noreply.github.com>
AuthorDate: Tue Aug 4 20:14:54 2026 +0200

    Core: Collapse redundant nested if statements (#17491)
---
 core/src/main/java/org/apache/iceberg/AllManifestsTable.java | 12 ++++--------
 .../main/java/org/apache/iceberg/rest/ScanTaskIterable.java  |  6 ++----
 core/src/main/java/org/apache/iceberg/util/WapUtil.java      |  6 ++----
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/core/src/main/java/org/apache/iceberg/AllManifestsTable.java 
b/core/src/main/java/org/apache/iceberg/AllManifestsTable.java
index 288b6d6baa..a1de519519 100644
--- a/core/src/main/java/org/apache/iceberg/AllManifestsTable.java
+++ b/core/src/main/java/org/apache/iceberg/AllManifestsTable.java
@@ -405,20 +405,16 @@ public class AllManifestsTable extends BaseMetadataTable {
 
       @Override
       public <T> Boolean in(BoundReference<T> ref, Set<T> literalSet) {
-        if (isSnapshotRef(ref)) {
-          if (!literalSet.contains(snapshotId)) {
-            return ROWS_CANNOT_MATCH;
-          }
+        if (isSnapshotRef(ref) && !literalSet.contains(snapshotId)) {
+          return ROWS_CANNOT_MATCH;
         }
         return ROWS_MIGHT_MATCH;
       }
 
       @Override
       public <T> Boolean notIn(BoundReference<T> ref, Set<T> literalSet) {
-        if (isSnapshotRef(ref)) {
-          if (literalSet.contains(snapshotId)) {
-            return ROWS_CANNOT_MATCH;
-          }
+        if (isSnapshotRef(ref) && literalSet.contains(snapshotId)) {
+          return ROWS_CANNOT_MATCH;
         }
         return ROWS_MIGHT_MATCH;
       }
diff --git a/core/src/main/java/org/apache/iceberg/rest/ScanTaskIterable.java 
b/core/src/main/java/org/apache/iceberg/rest/ScanTaskIterable.java
index 4500ecf4df..3f5664caa5 100644
--- a/core/src/main/java/org/apache/iceberg/rest/ScanTaskIterable.java
+++ b/core/src/main/java/org/apache/iceberg/rest/ScanTaskIterable.java
@@ -185,10 +185,8 @@ class ScanTaskIterable implements 
CloseableIterable<FileScanTask> {
     private void offerInitialFileScanTasks() throws InterruptedException {
       while (!initialFileScanTasks.isEmpty() && 
!Thread.currentThread().isInterrupted()) {
         FileScanTask initialFileScanTask = initialFileScanTasks.poll();
-        if (initialFileScanTask != null) {
-          if (!offerWithTimeout(initialFileScanTask)) {
-            return;
-          }
+        if (initialFileScanTask != null && 
!offerWithTimeout(initialFileScanTask)) {
+          return;
         }
       }
     }
diff --git a/core/src/main/java/org/apache/iceberg/util/WapUtil.java 
b/core/src/main/java/org/apache/iceberg/util/WapUtil.java
index 4718d138b5..090de06d38 100644
--- a/core/src/main/java/org/apache/iceberg/util/WapUtil.java
+++ b/core/src/main/java/org/apache/iceberg/util/WapUtil.java
@@ -50,10 +50,8 @@ public class WapUtil {
   public static String validateWapPublish(TableMetadata current, long 
wapSnapshotId) {
     Snapshot cherryPickSnapshot = current.snapshot(wapSnapshotId);
     String wapId = stagedWapId(cherryPickSnapshot);
-    if (wapId != null && !wapId.isEmpty()) {
-      if (WapUtil.isWapIdPublished(current, wapId)) {
-        throw new DuplicateWAPCommitException(wapId);
-      }
+    if (wapId != null && !wapId.isEmpty() && WapUtil.isWapIdPublished(current, 
wapId)) {
+      throw new DuplicateWAPCommitException(wapId);
     }
 
     return wapId;