Github user cloud-fan commented on a diff in the pull request:
https://github.com/apache/spark/pull/13680#discussion_r68542925
--- Diff:
sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeArrayData.java
---
@@ -337,63 +309,122 @@ public UnsafeArrayData copy() {
return arrayCopy;
}
+ @Override
+ public boolean[] toBooleanArray() {
+ int size = numElements();
+ boolean[] values = new boolean[size];
+ Platform.copyMemory(
+ baseObject, baseOffset + headerInBytes, values,
Platform.BYTE_ARRAY_OFFSET, size);
+ return values;
+ }
+
+ @Override
+ public byte[] toByteArray() {
+ int size = numElements();
+ byte[] values = new byte[size];
+ Platform.copyMemory(
+ baseObject, baseOffset + headerInBytes, values,
Platform.BYTE_ARRAY_OFFSET, size);
+ return values;
+ }
+
+ @Override
+ public short[] toShortArray() {
+ int size = numElements();
+ short[] values = new short[size];
+ Platform.copyMemory(
+ baseObject, baseOffset + headerInBytes, values,
Platform.BYTE_ARRAY_OFFSET, size * 2);
+ return values;
+ }
+
+ @Override
+ public int[] toIntArray() {
+ int size = numElements();
+ int[] values = new int[size];
+ Platform.copyMemory(
+ baseObject, baseOffset + headerInBytes, values,
Platform.BYTE_ARRAY_OFFSET, size * 4);
+ return values;
+ }
+
+ @Override
+ public long[] toLongArray() {
+ int size = numElements();
+ long[] values = new long[size];
+ Platform.copyMemory(
+ baseObject, baseOffset + headerInBytes, values,
Platform.BYTE_ARRAY_OFFSET, size * 8);
+ return values;
+ }
+
+ @Override
+ public float[] toFloatArray() {
+ int size = numElements();
+ float[] values = new float[size];
+ Platform.copyMemory(
+ baseObject, baseOffset + headerInBytes, values,
Platform.BYTE_ARRAY_OFFSET, size * 4);
+ return values;
+ }
+
+ @Override
+ public double[] toDoubleArray() {
+ int size = numElements();
+ double[] values = new double[size];
+ Platform.copyMemory(
+ baseObject, baseOffset + headerInBytes, values,
Platform.BYTE_ARRAY_OFFSET, size * 8);
+ return values;
+ }
+
public static UnsafeArrayData fromPrimitiveArray(int[] arr) {
- if (arr.length > (Integer.MAX_VALUE - 4) / 8) {
+ final int elementSize = 4;
+ final int headerSize = calculateHeaderPortionInBytes(arr.length);
+ if (arr.length > (Integer.MAX_VALUE - headerSize) / elementSize) {
throw new UnsupportedOperationException("Cannot convert this array
to unsafe format as " +
- "it's too big.");
+ "it's too big.");
}
- final int offsetRegionSize = 4 * arr.length;
- final int valueRegionSize = 4 * arr.length;
- final int totalSize = 4 + offsetRegionSize + valueRegionSize;
- final byte[] data = new byte[totalSize];
+ final int valueRegionSize = elementSize * arr.length;
+ final byte[] data = new byte[valueRegionSize + headerSize];
Platform.putInt(data, Platform.BYTE_ARRAY_OFFSET, arr.length);
-
- int offsetPosition = Platform.BYTE_ARRAY_OFFSET + 4;
- int valueOffset = 4 + offsetRegionSize;
- for (int i = 0; i < arr.length; i++) {
- Platform.putInt(data, offsetPosition, valueOffset);
- offsetPosition += 4;
- valueOffset += 4;
- }
-
Platform.copyMemory(arr, Platform.INT_ARRAY_OFFSET, data,
- Platform.BYTE_ARRAY_OFFSET + 4 + offsetRegionSize, valueRegionSize);
+ Platform.BYTE_ARRAY_OFFSET + headerSize, valueRegionSize);
UnsafeArrayData result = new UnsafeArrayData();
- result.pointTo(data, Platform.BYTE_ARRAY_OFFSET, totalSize);
+ result.pointTo(data, Platform.BYTE_ARRAY_OFFSET, valueRegionSize +
headerSize);
return result;
}
public static UnsafeArrayData fromPrimitiveArray(double[] arr) {
--- End diff --
support other primitive arrays?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
