You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by bl...@apache.org on 2020/09/29 00:30:57 UTC

[iceberg] branch master updated: API: Add null check to PruneColumns (#1491)

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

blue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git


The following commit(s) were added to refs/heads/master by this push:
     new 465369c  API: Add null check to PruneColumns (#1491)
465369c is described below

commit 465369c342ac99401695e007559af4ead0188f59
Author: Kyle Bendickson <98...@users.noreply.github.com>
AuthorDate: Mon Sep 28 17:30:46 2020 -0700

    API: Add null check to PruneColumns (#1491)
---
 api/src/main/java/org/apache/iceberg/types/PruneColumns.java       | 2 ++
 core/src/main/java/org/apache/iceberg/avro/PruneColumns.java       | 1 +
 parquet/src/main/java/org/apache/iceberg/parquet/PruneColumns.java | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/api/src/main/java/org/apache/iceberg/types/PruneColumns.java b/api/src/main/java/org/apache/iceberg/types/PruneColumns.java
index 2ef9bfd..f586703 100644
--- a/api/src/main/java/org/apache/iceberg/types/PruneColumns.java
+++ b/api/src/main/java/org/apache/iceberg/types/PruneColumns.java
@@ -22,12 +22,14 @@ package org.apache.iceberg.types;
 import java.util.List;
 import java.util.Set;
 import org.apache.iceberg.Schema;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
 import org.apache.iceberg.relocated.com.google.common.collect.Lists;
 
 class PruneColumns extends TypeUtil.SchemaVisitor<Type> {
   private final Set<Integer> selected;
 
   PruneColumns(Set<Integer> selected) {
+    Preconditions.checkNotNull(selected, "Selected field ids cannot be null");
     this.selected = selected;
   }
 
diff --git a/core/src/main/java/org/apache/iceberg/avro/PruneColumns.java b/core/src/main/java/org/apache/iceberg/avro/PruneColumns.java
index 1e89954..6176070 100644
--- a/core/src/main/java/org/apache/iceberg/avro/PruneColumns.java
+++ b/core/src/main/java/org/apache/iceberg/avro/PruneColumns.java
@@ -39,6 +39,7 @@ class PruneColumns extends AvroSchemaVisitor<Schema> {
   private final NameMapping nameMapping;
 
   PruneColumns(Set<Integer> selectedIds, NameMapping nameMapping) {
+    Preconditions.checkNotNull(selectedIds, "Selected field ids cannot be null");
     this.selectedIds = selectedIds;
     this.nameMapping = nameMapping;
   }
diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/PruneColumns.java b/parquet/src/main/java/org/apache/iceberg/parquet/PruneColumns.java
index d05db46..42598ac 100644
--- a/parquet/src/main/java/org/apache/iceberg/parquet/PruneColumns.java
+++ b/parquet/src/main/java/org/apache/iceberg/parquet/PruneColumns.java
@@ -21,6 +21,7 @@ package org.apache.iceberg.parquet;
 
 import java.util.List;
 import java.util.Set;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
 import org.apache.iceberg.relocated.com.google.common.collect.Lists;
 import org.apache.parquet.schema.GroupType;
 import org.apache.parquet.schema.MessageType;
@@ -32,6 +33,7 @@ class PruneColumns extends ParquetTypeVisitor<Type> {
   private final Set<Integer> selectedIds;
 
   PruneColumns(Set<Integer> selectedIds) {
+    Preconditions.checkNotNull(selectedIds, "Selected field ids cannot be null");
     this.selectedIds = selectedIds;
   }