Skip to content

[SPARK-8679][SQL] remove dummy java class BaseRow and BaseMutableRow #7059

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
wants to merge 1 commit into from
Closed

[SPARK-8679][SQL] remove dummy java class BaseRow and BaseMutableRow #7059

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
68 changes: 0 additions & 68 deletions sql/catalyst/src/main/java/org/apache/spark/sql/BaseMutableRow.java
View file
Open in desktop

This file was deleted.

197 changes: 0 additions & 197 deletions sql/catalyst/src/main/java/org/apache/spark/sql/BaseRow.java
View file
Open in desktop

This file was deleted.

35 changes: 17 additions & 18 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 @@ -27,7 +27,6 @@
import scala.collection.mutable.ArraySeq;

import org.apache.spark.sql.catalyst.InternalRow;
import org.apache.spark.sql.BaseMutableRow;
import org.apache.spark.sql.types.DataType;
import org.apache.spark.sql.types.StructType;
import org.apache.spark.unsafe.types.UTF8String;
Expand All @@ -52,7 +51,7 @@
*
* Instances of `UnsafeRow` act as pointers to row data stored in this format.
*/
public final class UnsafeRow extends BaseMutableRow {
public final class UnsafeRow extends MutableRow {

private Object baseObject;
private long baseOffset;
Expand Down Expand Up @@ -176,56 +175,56 @@ public void update(int ordinal, Object value) {
}

@Override
public void setInt(int ordinal, int value) {
public void setBoolean(int ordinal, boolean value) {
assertIndexIsValid(ordinal);
setNotNullAt(ordinal);
PlatformDependent.UNSAFE.putInt(baseObject, getFieldOffset(ordinal), value);
PlatformDependent.UNSAFE.putBoolean(baseObject, getFieldOffset(ordinal), value);
}

@Override
public void setLong(int ordinal, long value) {
public void setByte(int ordinal, byte value) {
assertIndexIsValid(ordinal);
setNotNullAt(ordinal);
PlatformDependent.UNSAFE.putLong(baseObject, getFieldOffset(ordinal), value);
PlatformDependent.UNSAFE.putByte(baseObject, getFieldOffset(ordinal), value);
}

@Override
public void setDouble(int ordinal, double value) {
public void setShort(int ordinal, short value) {
assertIndexIsValid(ordinal);
setNotNullAt(ordinal);
PlatformDependent.UNSAFE.putDouble(baseObject, getFieldOffset(ordinal), value);
PlatformDependent.UNSAFE.putShort(baseObject, getFieldOffset(ordinal), value);
}

@Override
public void setBoolean(int ordinal, boolean value) {
public void setInt(int ordinal, int value) {
assertIndexIsValid(ordinal);
setNotNullAt(ordinal);
PlatformDependent.UNSAFE.putBoolean(baseObject, getFieldOffset(ordinal), value);
PlatformDependent.UNSAFE.putInt(baseObject, getFieldOffset(ordinal), value);
}

@Override
public void setShort(int ordinal, short value) {
public void setLong(int ordinal, long value) {
assertIndexIsValid(ordinal);
setNotNullAt(ordinal);
PlatformDependent.UNSAFE.putShort(baseObject, getFieldOffset(ordinal), value);
PlatformDependent.UNSAFE.putLong(baseObject, getFieldOffset(ordinal), value);
}

@Override
public void setByte(int ordinal, byte value) {
public void setFloat(int ordinal, float value) {
assertIndexIsValid(ordinal);
setNotNullAt(ordinal);
PlatformDependent.UNSAFE.putByte(baseObject, getFieldOffset(ordinal), value);
PlatformDependent.UNSAFE.putFloat(baseObject, getFieldOffset(ordinal), value);
}

@Override
public void setFloat(int ordinal, float value) {
public void setDouble(int ordinal, double value) {
assertIndexIsValid(ordinal);
setNotNullAt(ordinal);
PlatformDependent.UNSAFE.putFloat(baseObject, getFieldOffset(ordinal), value);
PlatformDependent.UNSAFE.putDouble(baseObject, getFieldOffset(ordinal), value);
}

@Override
public int size() {
public int length() {
return numFields;
}

Expand All @@ -235,7 +234,7 @@ public StructType schema() {
}

@Override
public Object get(int i) {
public Object apply(int i) {
assertIndexIsValid(i);
assert (schema != null) : "Schema must be defined when calling generic get() method";
final DataType dataType = schema.fields()[i].dataType();
Expand Down
Loading