Cleanup code in MappedRecordSet

prestodb · Aug 19, 2015 · 49b4053 · 49b4053
1 parent 4accbc7
commit 49b4053
Showing 1 changed file with 9 additions and 16 deletions.
diff --git a/presto-main/src/main/java/com/facebook/presto/split/MappedRecordSet.java b/presto-main/src/main/java/com/facebook/presto/split/MappedRecordSet.java
@@ -16,12 +16,14 @@
 import com.facebook.presto.spi.RecordCursor;
 import com.facebook.presto.spi.RecordSet;
 import com.facebook.presto.spi.type.Type;
-import com.google.common.collect.ImmutableList;
+import com.google.common.primitives.Ints;
 import io.airlift.slice.Slice;
 
 import java.util.List;
 
-import static com.google.common.base.Preconditions.checkArgument;
+import static com.facebook.presto.util.ImmutableCollectors.toImmutableList;
+import static com.google.common.base.Preconditions.checkElementIndex;
+import static java.util.Objects.requireNonNull;
 
 public class MappedRecordSet
         implements RecordSet
@@ -32,19 +34,11 @@ public class MappedRecordSet
 
     public MappedRecordSet(RecordSet delegate, List<Integer> delegateFieldIndex)
     {
-        this.delegate = delegate;
+        this.delegate = requireNonNull(delegate, "delegate is null");
-        this.delegateFieldIndex = new int[delegateFieldIndex.size()];
+        this.delegateFieldIndex = Ints.toArray(requireNonNull(delegateFieldIndex, "delegateFieldIndex is null"));
-        for (int i = 0; i < delegateFieldIndex.size(); i++) {
-            this.delegateFieldIndex[i] = delegateFieldIndex.get(i);
-        }
 
-        List<Type> delegateColumnTypes = delegate.getColumnTypes();
+        List<Type> types = delegate.getColumnTypes();
-        ImmutableList.Builder<Type> columnTypes = ImmutableList.builder();
+        this.columnTypes = delegateFieldIndex.stream().map(types::get).collect(toImmutableList());
-        for (int delegateField : delegateFieldIndex) {
-            checkArgument(delegateField >= 0 && delegateField < delegateColumnTypes.size(), "Invalid system field %s", delegateField);
-            columnTypes.add(delegateColumnTypes.get(delegateField));
-        }
-        this.columnTypes = columnTypes.build();
     }
 
     @Override
@@ -145,8 +139,7 @@ public void close()
 
         private int toDelegateField(int field)
         {
-            checkArgument(field >= 0, "field is negative");
+            checkElementIndex(field, delegateFieldIndex.length, "field");
-            checkArgument(field < delegateFieldIndex.length);
             return delegateFieldIndex[field];
         }
     }