Skip to content

[SPARK-10095] [SQL] use public API of BigInteger #8286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
davies wants to merge 1 commit into from
Closed

[SPARK-10095] [SQL] use public API of BigInteger #8286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 8 additions & 21 deletions sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeRow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,14 +273,13 @@ public void setDecimal(int ordinal, Decimal value, int precision) {
} else {

final BigInteger integer = value.toJavaBigDecimal().unscaledValue();
final int[] mag = (int[]) Platform.getObjectVolatile(integer,
Platform.BIG_INTEGER_MAG_OFFSET);
assert(mag.length <= 4);
byte[] bytes = integer.toByteArray();
assert(bytes.length <= 16);

// Write the bytes to the variable length portion.
Platform.copyMemory(
mag, Platform.INT_ARRAY_OFFSET, baseObject, baseOffset + cursor, mag.length * 4);
setLong(ordinal, (cursor << 32) | ((long) (((integer.signum() + 1) << 8) + mag.length)));
bytes, Platform.BYTE_ARRAY_OFFSET, baseObject, baseOffset + cursor, bytes.length);
setLong(ordinal, (cursor << 32) | ((long) bytes.length));
}
}
}
Expand Down Expand Up @@ -375,8 +374,6 @@ public double getDouble(int ordinal) {
return Platform.getDouble(baseObject, getFieldOffset(ordinal));
}

private static byte[] EMPTY = new byte[0];

@Override
public Decimal getDecimal(int ordinal, int precision, int scale) {
if (isNullAt(ordinal)) {
Expand All @@ -385,20 +382,10 @@ public Decimal getDecimal(int ordinal, int precision, int scale) {
if (precision <= Decimal.MAX_LONG_DIGITS()) {
return Decimal.apply(getLong(ordinal), precision, scale);
} else {
long offsetAndSize = getLong(ordinal);
long offset = offsetAndSize >>> 32;
int signum = ((int) (offsetAndSize & 0xfff) >> 8);
assert signum >=0 && signum <= 2 : "invalid signum " + signum;
int size = (int) (offsetAndSize & 0xff);
int[] mag = new int[size];
Platform.copyMemory(
baseObject, baseOffset + offset, mag, Platform.INT_ARRAY_OFFSET, size * 4);

// create a BigInteger using signum and mag
BigInteger v = new BigInteger(0, EMPTY); // create the initial object
Platform.putInt(v, Platform.BIG_INTEGER_SIGNUM_OFFSET, signum - 1);
Platform.putObjectVolatile(v, Platform.BIG_INTEGER_MAG_OFFSET, mag);
return Decimal.apply(new BigDecimal(v, scale), precision, scale);
byte[] bytes = getBinary(ordinal);
BigInteger bigInteger = new BigInteger(bytes);
BigDecimal javaDecimal = new BigDecimal(bigInteger, scale);
return Decimal.apply(javaDecimal, precision, scale);
}
}

Expand Down
9 changes: 3 additions & 6 deletions sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeRowWriters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,13 @@ public static int write(UnsafeRow target, int ordinal, int cursor, Decimal input
}

final BigInteger integer = input.toJavaBigDecimal().unscaledValue();
int signum = integer.signum() + 1;
final int[] mag = (int[]) Platform.getObjectVolatile(
integer, Platform.BIG_INTEGER_MAG_OFFSET);
assert(mag.length <= 4);
byte[] bytes = integer.toByteArray();

// Write the bytes to the variable length portion.
Platform.copyMemory(
mag, Platform.INT_ARRAY_OFFSET, base, target.getBaseOffset() + cursor, mag.length * 4);
bytes, Platform.BYTE_ARRAY_OFFSET, base, target.getBaseOffset() + cursor, bytes.length);
// Set the fixed length portion.
target.setLong(ordinal, (((long) cursor) << 32) | ((long) ((signum << 8) + mag.length)));
target.setLong(ordinal, (((long) cursor) << 32) | (long) bytes.length);

return SIZE;
}
Expand Down
18 changes: 0 additions & 18 deletions unsafe/src/main/java/org/apache/spark/unsafe/Platform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.spark.unsafe;

import java.lang.reflect.Field;
import java.math.BigInteger;

import sun.misc.Unsafe;

Expand All @@ -34,10 +33,6 @@ public final class Platform {

public static final int DOUBLE_ARRAY_OFFSET;

// Support for resetting final fields while deserializing
public static final long BIG_INTEGER_SIGNUM_OFFSET;
public static final long BIG_INTEGER_MAG_OFFSET;

public static int getInt(Object object, long offset) {
return _UNSAFE.getInt(object, offset);
}
Expand Down Expand Up @@ -150,24 +145,11 @@ public static void throwException(Throwable t) {
INT_ARRAY_OFFSET = _UNSAFE.arrayBaseOffset(int[].class);
LONG_ARRAY_OFFSET = _UNSAFE.arrayBaseOffset(long[].class);
DOUBLE_ARRAY_OFFSET = _UNSAFE.arrayBaseOffset(double[].class);

long signumOffset = 0;
long magOffset = 0;
try {
signumOffset = _UNSAFE.objectFieldOffset(BigInteger.class.getDeclaredField("signum"));
magOffset = _UNSAFE.objectFieldOffset(BigInteger.class.getDeclaredField("mag"));
} catch (Exception ex) {
// should not happen
}
BIG_INTEGER_SIGNUM_OFFSET = signumOffset;
BIG_INTEGER_MAG_OFFSET = magOffset;
} else {
BYTE_ARRAY_OFFSET = 0;
INT_ARRAY_OFFSET = 0;
LONG_ARRAY_OFFSET = 0;
DOUBLE_ARRAY_OFFSET = 0;
BIG_INTEGER_SIGNUM_OFFSET = 0;
BIG_INTEGER_MAG_OFFSET = 0;
}
}
}