Skip to content

[SPARK-3294][SQL] Eliminates boxing costs from in-memory columnar storage #2327

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

[SPARK-3294][SQL] Eliminates boxing costs from in-memory columnar storage #2327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b70d519
Made some in-memory columnar storage interfaces row-based
liancheng Sep 8, 2014
8216936
Removes boxing cost in IntDelta and LongDelta by providing specialize…
liancheng Sep 8, 2014
edac3cd
Makes ColumnAccessor.extractSingle row based
liancheng Sep 9, 2014
456c366
Made compression decoder row based
liancheng Sep 9, 2014
9cf30b0
Added row based ColumnType.append/extract
liancheng Sep 9, 2014
f2a7890
Use SpecificMutableRow in InMemoryColumnarTableScan to avoid boxing
liancheng Sep 9, 2014
5b39cb9
Lowers log level of compression scheme details
liancheng Sep 9, 2014
3dc1f94
Minor changes to eliminate row object creation
liancheng Sep 9, 2014
97bbc4e
Optimizes hive.TableReader by by providing specific Writable unwrappe…
liancheng Sep 10, 2014
489f97b
Bug fix: TableReader.fillObject uses wrong ordinals
liancheng Sep 10, 2014
8b8552b
Only checks for partition batch pruning flag once
liancheng Sep 10, 2014
e5d2cf2
Bug fix: should call setNullAt when field value is null to avoid NPE
liancheng Sep 11, 2014
4419fe4
Addressing comments
liancheng Sep 13, 2014
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
2 changes: 1 addition & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/SpecificRow.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ final class MutableByte extends MutableValue {
}

final class MutableAny extends MutableValue {
var value: Any = 0
var value: Any = _
def boxed = if (isNull) null else value
def update(v: Any) = value = {
isNull = false
Expand Down
8 changes: 5 additions & 3 deletions sql/core/src/main/scala/org/apache/spark/sql/columnar/ColumnAccessor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,13 @@ private[sql] abstract class BasicColumnAccessor[T <: DataType, JvmType](

def hasNext = buffer.hasRemaining

def extractTo(row: MutableRow, ordinal: Int) {
columnType.setField(row, ordinal, extractSingle(buffer))
def extractTo(row: MutableRow, ordinal: Int): Unit = {
extractSingle(row, ordinal)
}

def extractSingle(buffer: ByteBuffer): JvmType = columnType.extract(buffer)
def extractSingle(row: MutableRow, ordinal: Int): Unit = {
columnType.extract(buffer, row, ordinal)
}

protected def underlyingBuffer = buffer
}
Expand Down
27 changes: 13 additions & 14 deletions sql/core/src/main/scala/org/apache/spark/sql/columnar/ColumnBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,9 @@ private[sql] class BasicColumnBuilder[T <: DataType, JvmType](
buffer.order(ByteOrder.nativeOrder()).putInt(columnType.typeId)
}

override def appendFrom(row: Row, ordinal: Int) {
val field = columnType.getField(row, ordinal)
buffer = ensureFreeSpace(buffer, columnType.actualSize(field))
columnType.append(field, buffer)
override def appendFrom(row: Row, ordinal: Int): Unit = {
buffer = ensureFreeSpace(buffer, columnType.actualSize(row, ordinal))
columnType.append(row, ordinal, buffer)
}

override def build() = {
Expand Down Expand Up @@ -142,16 +141,16 @@ private[sql] object ColumnBuilder {
useCompression: Boolean = false): ColumnBuilder = {

val builder = (typeId match {
case INT.typeId => new IntColumnBuilder
case LONG.typeId => new LongColumnBuilder
case FLOAT.typeId => new FloatColumnBuilder
case DOUBLE.typeId => new DoubleColumnBuilder
case BOOLEAN.typeId => new BooleanColumnBuilder
case BYTE.typeId => new ByteColumnBuilder
case SHORT.typeId => new ShortColumnBuilder
case STRING.typeId => new StringColumnBuilder
case BINARY.typeId => new BinaryColumnBuilder
case GENERIC.typeId => new GenericColumnBuilder
case INT.typeId => new IntColumnBuilder
case LONG.typeId => new LongColumnBuilder
case FLOAT.typeId => new FloatColumnBuilder
case DOUBLE.typeId => new DoubleColumnBuilder
case BOOLEAN.typeId => new BooleanColumnBuilder
case BYTE.typeId => new ByteColumnBuilder
case SHORT.typeId => new ShortColumnBuilder
case STRING.typeId => new StringColumnBuilder
case BINARY.typeId => new BinaryColumnBuilder
case GENERIC.typeId => new GenericColumnBuilder
case TIMESTAMP.typeId => new TimestampColumnBuilder
}).asInstanceOf[ColumnBuilder]

Expand Down
16 changes: 8 additions & 8 deletions sql/core/src/main/scala/org/apache/spark/sql/columnar/ColumnStats.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private[sql] class ByteColumnStats extends ColumnStats {
var lower = Byte.MaxValue
var nullCount = 0

override def gatherStats(row: Row, ordinal: Int) {
override def gatherStats(row: Row, ordinal: Int): Unit = {
if (!row.isNullAt(ordinal)) {
val value = row.getByte(ordinal)
if (value > upper) upper = value
Expand All @@ -87,7 +87,7 @@ private[sql] class ShortColumnStats extends ColumnStats {
var lower = Short.MaxValue
var nullCount = 0

override def gatherStats(row: Row, ordinal: Int) {
override def gatherStats(row: Row, ordinal: Int): Unit = {
if (!row.isNullAt(ordinal)) {
val value = row.getShort(ordinal)
if (value > upper) upper = value
Expand All @@ -105,7 +105,7 @@ private[sql] class LongColumnStats extends ColumnStats {
var lower = Long.MaxValue
var nullCount = 0

override def gatherStats(row: Row, ordinal: Int) {
override def gatherStats(row: Row, ordinal: Int): Unit = {
if (!row.isNullAt(ordinal)) {
val value = row.getLong(ordinal)
if (value > upper) upper = value
Expand All @@ -123,7 +123,7 @@ private[sql] class DoubleColumnStats extends ColumnStats {
var lower = Double.MaxValue
var nullCount = 0

override def gatherStats(row: Row, ordinal: Int) {
override def gatherStats(row: Row, ordinal: Int): Unit = {
if (!row.isNullAt(ordinal)) {
val value = row.getDouble(ordinal)
if (value > upper) upper = value
Expand All @@ -141,7 +141,7 @@ private[sql] class FloatColumnStats extends ColumnStats {
var lower = Float.MaxValue
var nullCount = 0

override def gatherStats(row: Row, ordinal: Int) {
override def gatherStats(row: Row, ordinal: Int): Unit = {
if (!row.isNullAt(ordinal)) {
val value = row.getFloat(ordinal)
if (value > upper) upper = value
Expand All @@ -159,7 +159,7 @@ private[sql] class IntColumnStats extends ColumnStats {
var lower = Int.MaxValue
var nullCount = 0

override def gatherStats(row: Row, ordinal: Int) {
override def gatherStats(row: Row, ordinal: Int): Unit = {
if (!row.isNullAt(ordinal)) {
val value = row.getInt(ordinal)
if (value > upper) upper = value
Expand All @@ -177,7 +177,7 @@ private[sql] class StringColumnStats extends ColumnStats {
var lower: String = null
var nullCount = 0

override def gatherStats(row: Row, ordinal: Int) {
override def gatherStats(row: Row, ordinal: Int): Unit = {
if (!row.isNullAt(ordinal)) {
val value = row.getString(ordinal)
if (upper == null || value.compareTo(upper) > 0) upper = value
Expand All @@ -195,7 +195,7 @@ private[sql] class TimestampColumnStats extends ColumnStats {
var lower: Timestamp = null
var nullCount = 0

override def gatherStats(row: Row, ordinal: Int) {
override def gatherStats(row: Row, ordinal: Int): Unit = {
if (!row.isNullAt(ordinal)) {
val value = row(ordinal).asInstanceOf[Timestamp]
if (upper == null || value.compareTo(upper) > 0) upper = value
Expand Down
Loading