Move some methods from UnsafeHelper to SqlTypesUnsafeHelper

* UnsafeHelper now only handles binary things

Author: HeartSaVioR

common/unsafe/src/main/java/org/apache/spark/unsafe/UnsafeHelper.java

@@ -17,9 +17,6 @@
 
 package org.apache.spark.unsafe;
 
-import org.apache.spark.unsafe.types.CalendarInterval;
-import org.apache.spark.unsafe.types.UTF8String;
-
 import java.nio.ByteBuffer;
 
 public final class UnsafeHelper {
@@ -33,22 +30,6 @@ public static byte[] getBinary(long offsetAndSize, Object baseObject, long baseO
     return bytes;
   }
 
-  public static UTF8String getUTF8String(long offsetAndSize, Object baseObject, long baseOffset) {
-    final int offset = getOffsetFromOffsetAndSize(offsetAndSize);
-    final int size = getSizeFromOffsetAndSize(offsetAndSize);
-    return UTF8String.fromAddress(baseObject, baseOffset + offset, size);
-  }
-
-  public static CalendarInterval getInterval(
-      long offsetAndSize,
-      Object baseObject,
-      long baseOffset) {
-    final int offset = getOffsetFromOffsetAndSize(offsetAndSize);
-    final int months = (int) Platform.getLong(baseObject, baseOffset + offset);
-    final long microseconds = Platform.getLong(baseObject, baseOffset + offset + 8);
-    return new CalendarInterval(months, microseconds);
-  }
-
   public static void writeTo(
       ByteBuffer buffer,
       Object baseObject,

sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/SqlTypesUnsafeHelper.java

@@ -18,14 +18,33 @@
 package org.apache.spark.sql.catalyst.expressions;
 
 import org.apache.spark.sql.types.Decimal;
+import org.apache.spark.unsafe.Platform;
 import org.apache.spark.unsafe.UnsafeHelper;
+import org.apache.spark.unsafe.types.CalendarInterval;
+import org.apache.spark.unsafe.types.UTF8String;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
 public final class SqlTypesUnsafeHelper {
   private SqlTypesUnsafeHelper() {}
 
+  public static UTF8String getUTF8String(long offsetAndSize, Object baseObject, long baseOffset) {
+    final int offset = UnsafeHelper.getOffsetFromOffsetAndSize(offsetAndSize);
+    final int size = UnsafeHelper.getSizeFromOffsetAndSize(offsetAndSize);
+    return UTF8String.fromAddress(baseObject, baseOffset + offset, size);
+  }
+
+  public static CalendarInterval getInterval(
+      long offsetAndSize,
+      Object baseObject,
+      long baseOffset) {
+    final int offset = UnsafeHelper.getOffsetFromOffsetAndSize(offsetAndSize);
+    final int months = (int) Platform.getLong(baseObject, baseOffset + offset);
+    final long microseconds = Platform.getLong(baseObject, baseOffset + offset + 8);
+    return new CalendarInterval(months, microseconds);
+  }
+
   public static Decimal getDecimalExceedingLong(
       byte[] bytes,
       int precision,

sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeArrayData.java

@@ -234,7 +234,7 @@ public Decimal getDecimal(int ordinal, int precision, int scale) {
   @Override
   public UTF8String getUTF8String(int ordinal) {
     if (isNullAt(ordinal)) return null;
-    return UnsafeHelper.getUTF8String(getLong(ordinal), baseObject, baseOffset);
+    return SqlTypesUnsafeHelper.getUTF8String(getLong(ordinal), baseObject, baseOffset);
   }
 
   @Override
@@ -246,7 +246,7 @@ public byte[] getBinary(int ordinal) {
   @Override
   public CalendarInterval getInterval(int ordinal) {
     if (isNullAt(ordinal)) return null;
-    return UnsafeHelper.getInterval(getLong(ordinal), baseObject, baseOffset);
+    return SqlTypesUnsafeHelper.getInterval(getLong(ordinal), baseObject, baseOffset);
   }
 
   @Override

sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeRow.java

@@ -405,7 +405,7 @@ public Decimal getDecimal(int ordinal, int precision, int scale) {
   @Override
   public UTF8String getUTF8String(int ordinal) {
     if (isNullAt(ordinal)) return null;
-    return UnsafeHelper.getUTF8String(getLong(ordinal), baseObject, baseOffset);
+    return SqlTypesUnsafeHelper.getUTF8String(getLong(ordinal), baseObject, baseOffset);
   }
 
   @Override
@@ -422,7 +422,7 @@ public CalendarInterval getInterval(int ordinal) {
     if (isNullAt(ordinal)) {
       return null;
     } else {
-      return UnsafeHelper.getInterval(getLong(ordinal), baseObject, baseOffset);
+      return SqlTypesUnsafeHelper.getInterval(getLong(ordinal), baseObject, baseOffset);
     }
   }