Skip to content

[SPARK-8610] [SQL] Separate Row and InternalRow (part 2) #7003

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 12 commits into from
Closed

[SPARK-8610] [SQL] Separate Row and InternalRow (part 2) #7003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9d24350
separate Row and InternalRow (part 2)
Jun 24, 2015
288b31f
Merge branch 'master' of github.com:apache/spark into internalrow
Jun 24, 2015
defe931
remove BaseRow
Jun 25, 2015
6f99a97
fix catalyst test
Jun 25, 2015
bdfb78f
remove BaseMutableRow
Jun 27, 2015
bd4e99c
Merge branch 'master' of github.com:apache/spark into internalrow
Jun 27, 2015
eb4b473
mark expensive API as final
Jun 27, 2015
d2ebd72
fix style
Jun 27, 2015
87b13cf
fix test
Jun 27, 2015
efd0b25
fix copy of MutableRow
Jun 28, 2015
72878dd
Merge branch 'master' of github.com:apache/spark into internalrow
Jun 28, 2015
d05866c
fix test: rollback changes for pyspark
Jun 28, 2015
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.

19 changes: 4 additions & 15 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 @@ -23,16 +23,12 @@
import java.util.HashSet;
import java.util.Set;

import scala.collection.Seq;
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;
import org.apache.spark.unsafe.PlatformDependent;
import org.apache.spark.unsafe.bitset.BitSetMethods;
import org.apache.spark.unsafe.types.UTF8String;

import static org.apache.spark.sql.types.DataTypes.*;

Expand All @@ -52,7 +48,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 All @@ -63,6 +59,8 @@ public final class UnsafeRow extends BaseMutableRow {
/** The number of fields in this row, used for calculating the bitset width (and in assertions) */
private int numFields;

public int length() { return numFields; }

/** The width of the null tracking bit set, in bytes */
private int bitSetWidthInBytes;
/**
Expand Down Expand Up @@ -344,13 +342,4 @@ public InternalRow copy() {
public boolean anyNull() {
return BitSetMethods.anySet(baseObject, baseOffset, bitSetWidthInBytes);
}

@Override
public Seq<Object> toSeq() {
final ArraySeq<Object> values = new ArraySeq<Object>(numFields);
for (int fieldNumber = 0; fieldNumber < numFields; fieldNumber++) {
values.update(fieldNumber, get(fieldNumber));
}
return values;
}
}
Loading