More warning cleanup

jeanlyn · Apr 24, 2015 · 06e929d · 06e929d
1 parent ef6b3d3
commit 06e929d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 23 deletions.
diff --git a/...c/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeFixedWidthAggregationMap.java b/...c/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeFixedWidthAggregationMap.java
@@ -237,6 +237,7 @@ public void free() {
     map.free();
   }
 
+  @SuppressWarnings("UseOfSystemOutOrSystemErr")
   public void printPerfMetrics() {
     if (!enablePerfMetrics) {
       throw new IllegalStateException("Perf metrics not enabled");

diff --git a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeRow.java b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeRow.java
@@ -24,10 +24,7 @@
 import javax.annotation.Nullable;
 import java.math.BigDecimal;
 import java.sql.Date;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import org.apache.spark.sql.Row;
 import org.apache.spark.sql.types.DataType;
@@ -73,7 +70,7 @@ public final class UnsafeRow implements MutableRow {
   private StructType schema;
 
   private long getFieldOffset(int ordinal) {
-   return baseOffset + bitSetWidthInBytes + ordinal * 8;
+   return baseOffset + bitSetWidthInBytes + ordinal * 8L;
   }
 
   public static int calculateBitSetWidthInBytes(int numFields) {
@@ -91,21 +88,25 @@ public static int calculateBitSetWidthInBytes(int numFields) {
   public static final Set<DataType> readableFieldTypes;
 
   static {
-    settableFieldTypes = new HashSet<DataType>(Arrays.asList(new DataType[] {
-      IntegerType,
-      LongType,
-      DoubleType,
-      BooleanType,
-      ShortType,
-      ByteType,
-      FloatType
-    }));
+    settableFieldTypes = Collections.unmodifiableSet(
+      new HashSet<DataType>(
+        Arrays.asList(new DataType[] {
+          IntegerType,
+          LongType,
+          DoubleType,
+          BooleanType,
+          ShortType,
+          ByteType,
+          FloatType
+    })));
 
     // We support get() on a superset of the types for which we support set():
-    readableFieldTypes = new HashSet<DataType>(Arrays.asList(new DataType[] {
-      StringType
-    }));
-    readableFieldTypes.addAll(settableFieldTypes);
+    final Set<DataType> _readableFieldTypes = new HashSet<DataType>(
+      Arrays.asList(new DataType[]{
+        StringType
+      }));
+    _readableFieldTypes.addAll(settableFieldTypes);
+    readableFieldTypes = Collections.unmodifiableSet(_readableFieldTypes);
   }
 
   /**
@@ -156,9 +157,6 @@ private void setNotNullAt(int i) {
 
   @Override
   public void update(int ordinal, Object value) {
-    assert schema != null : "schema cannot be null when calling the generic update()";
-    final DataType type = schema.fields()[ordinal].dataType();
-    // TODO: match based on the type, then set.  This will be slow.
     throw new UnsupportedOperationException();
   }
 
@@ -240,6 +238,7 @@ public Object apply(int i) {
   @Override
   public Object get(int i) {
     assertIndexIsValid(i);
+    assert (schema != null) : "Schema must be defined when calling generic get() method";
     final DataType dataType = schema.fields()[i].dataType();
     // The ordering of these `if` statements is intentional: internally, it looks like this only
     // gets invoked in JoinedRow when trying to access UTF8String columns. It's extremely unlikely

diff --git a/unsafe/src/main/java/org/apache/spark/unsafe/bitset/BitSetMethods.java b/unsafe/src/main/java/org/apache/spark/unsafe/bitset/BitSetMethods.java
@@ -19,8 +19,6 @@
 
 import org.apache.spark.unsafe.PlatformDependent;
 
-import java.lang.Object;
-
 /**
  * Methods for working with fixed-size uncompressed bitsets.
  *