You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by ru...@apache.org on 2026/09/02 21:31:19 UTC

(iceberg) branch main updated: Core, API, Parquet: Collapse redundant nested if statements (#17905)

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

RussellSpitzer 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 8ea7d00410 Core, API, Parquet: Collapse redundant nested if statements (#17905)
8ea7d00410 is described below

commit 8ea7d00410b9be99dd740c9e16f92f3857c7cd56
Author: Damanpreet Singh <da...@gmail.com>
AuthorDate: Thu Sep 3 03:01:11 2026 +0530

    Core, API, Parquet: Collapse redundant nested if statements (#17905)
---
 api/src/main/java/org/apache/iceberg/Files.java                   | 6 ++----
 core/src/main/java/org/apache/iceberg/BaseEntriesTable.java       | 7 +++----
 core/src/main/java/org/apache/iceberg/CachingCatalog.java         | 7 +++----
 .../java/org/apache/iceberg/parquet/VariantShreddingAnalyzer.java | 8 +++-----
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/api/src/main/java/org/apache/iceberg/Files.java b/api/src/main/java/org/apache/iceberg/Files.java
index bee5b3f241..aa3fc8e359 100644
--- a/api/src/main/java/org/apache/iceberg/Files.java
+++ b/api/src/main/java/org/apache/iceberg/Files.java
@@ -73,10 +73,8 @@ public class Files {
 
     @Override
     public PositionOutputStream createOrOverwrite() {
-      if (file.exists()) {
-        if (!file.delete()) {
-          throw new RuntimeIOException("Failed to delete: %s", file);
-        }
+      if (file.exists() && !file.delete()) {
+        throw new RuntimeIOException("Failed to delete: %s", file);
       }
       return create();
     }
diff --git a/core/src/main/java/org/apache/iceberg/BaseEntriesTable.java b/core/src/main/java/org/apache/iceberg/BaseEntriesTable.java
index d51a419dfe..a82e11ec58 100644
--- a/core/src/main/java/org/apache/iceberg/BaseEntriesTable.java
+++ b/core/src/main/java/org/apache/iceberg/BaseEntriesTable.java
@@ -224,10 +224,9 @@ abstract class BaseEntriesTable extends BaseMetadataTable {
 
       @Override
       public <T> Boolean in(BoundReference<T> ref, Set<T> literalSet) {
-        if (fileContent(ref)) {
-          if (literalSet.stream().noneMatch(lit -> mayContainFileContent((Integer) lit))) {
-            return ROWS_CANNOT_MATCH;
-          }
+        if (fileContent(ref)
+            && literalSet.stream().noneMatch(lit -> mayContainFileContent((Integer) lit))) {
+          return ROWS_CANNOT_MATCH;
         }
         return ROWS_MIGHT_MATCH;
       }
diff --git a/core/src/main/java/org/apache/iceberg/CachingCatalog.java b/core/src/main/java/org/apache/iceberg/CachingCatalog.java
index 5c92fe7db6..700cfc6cb5 100644
--- a/core/src/main/java/org/apache/iceberg/CachingCatalog.java
+++ b/core/src/main/java/org/apache/iceberg/CachingCatalog.java
@@ -95,10 +95,9 @@ public class CachingCatalog implements Catalog {
     @Override
     public void onRemoval(TableIdentifier tableIdentifier, Table table, RemovalCause cause) {
       LOG.debug("Evicted {} from the table cache ({})", tableIdentifier, cause);
-      if (RemovalCause.EXPIRED.equals(cause)) {
-        if (!MetadataTableUtils.hasMetadataTableName(tableIdentifier)) {
-          tableCache.invalidateAll(metadataTableIdentifiers(tableIdentifier));
-        }
+      if (RemovalCause.EXPIRED.equals(cause)
+          && !MetadataTableUtils.hasMetadataTableName(tableIdentifier)) {
+        tableCache.invalidateAll(metadataTableIdentifiers(tableIdentifier));
       }
     }
   }
diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/VariantShreddingAnalyzer.java b/parquet/src/main/java/org/apache/iceberg/parquet/VariantShreddingAnalyzer.java
index 0b83afe96f..2b05a7e9d8 100644
--- a/parquet/src/main/java/org/apache/iceberg/parquet/VariantShreddingAnalyzer.java
+++ b/parquet/src/main/java/org/apache/iceberg/parquet/VariantShreddingAnalyzer.java
@@ -447,11 +447,9 @@ public abstract class VariantShreddingAnalyzer<T, S> {
       typeCounts[type.ordinal()]++;
 
       // Track max precision and scale for decimal types
-      if (DECIMAL_TYPES.contains(type)) {
-        if (value.asPrimitive().get() instanceof BigDecimal bd) {
-          maxDecimalIntegerDigits = Math.max(maxDecimalIntegerDigits, bd.precision() - bd.scale());
-          maxDecimalScale = Math.max(maxDecimalScale, bd.scale());
-        }
+      if (DECIMAL_TYPES.contains(type) && value.asPrimitive().get() instanceof BigDecimal bd) {
+        maxDecimalIntegerDigits = Math.max(maxDecimalIntegerDigits, bd.precision() - bd.scale());
+        maxDecimalScale = Math.max(maxDecimalScale, bd.scale());
       }
     }