Skip to content

[SPARK-3412][SQL]add missing row api #2529

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

[SPARK-3412][SQL]add missing row api #2529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1614493
add missing row api
adrian-wang Sep 25, 2014
4c18c29
remove setAs[T] and null judge
adrian-wang Sep 28, 2014
7a39456
rename file and refresh getAs[T]
adrian-wang Oct 8, 2014
7b7e6e3
update pattern match
adrian-wang Oct 8, 2014
c6594b2
using boxed
adrian-wang Oct 9, 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
15 changes: 15 additions & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Projection.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ class JoinedRow extends Row {
def getString(i: Int): String =
if (i < row1.size) row1.getString(i) else row2.getString(i - row1.size)

override def getAs[T](i: Int): T =
if (i < row1.size) row1.getAs[T](i) else row2.getAs[T](i - row1.size)

def copy() = {
val totalSize = row1.size + row2.size
val copiedValues = new Array[Any](totalSize)
Expand Down Expand Up @@ -226,6 +229,9 @@ class JoinedRow2 extends Row {
def getString(i: Int): String =
if (i < row1.size) row1.getString(i) else row2.getString(i - row1.size)

override def getAs[T](i: Int): T =
if (i < row1.size) row1.getAs[T](i) else row2.getAs[T](i - row1.size)

def copy() = {
val totalSize = row1.size + row2.size
val copiedValues = new Array[Any](totalSize)
Expand Down Expand Up @@ -309,6 +315,9 @@ class JoinedRow3 extends Row {
def getString(i: Int): String =
if (i < row1.size) row1.getString(i) else row2.getString(i - row1.size)

override def getAs[T](i: Int): T =
if (i < row1.size) row1.getAs[T](i) else row2.getAs[T](i - row1.size)

def copy() = {
val totalSize = row1.size + row2.size
val copiedValues = new Array[Any](totalSize)
Expand Down Expand Up @@ -392,6 +401,9 @@ class JoinedRow4 extends Row {
def getString(i: Int): String =
if (i < row1.size) row1.getString(i) else row2.getString(i - row1.size)

override def getAs[T](i: Int): T =
if (i < row1.size) row1.getAs[T](i) else row2.getAs[T](i - row1.size)

def copy() = {
val totalSize = row1.size + row2.size
val copiedValues = new Array[Any](totalSize)
Expand Down Expand Up @@ -475,6 +487,9 @@ class JoinedRow5 extends Row {
def getString(i: Int): String =
if (i < row1.size) row1.getString(i) else row2.getString(i - row1.size)

override def getAs[T](i: Int): T =
if (i < row1.size) row1.getAs[T](i) else row2.getAs[T](i - row1.size)

def copy() = {
val totalSize = row1.size + row2.size
val copiedValues = new Array[Any](totalSize)
Expand Down
20 changes: 11 additions & 9 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Row.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ trait Row extends Seq[Any] with Serializable {
def getShort(i: Int): Short
def getByte(i: Int): Byte
def getString(i: Int): String
def getAs[T](i: Int): T = apply(i).asInstanceOf[T]

override def toString() =
s"[${this.mkString(",")}]"
Expand Down Expand Up @@ -118,6 +119,7 @@ object EmptyRow extends Row {
def getShort(i: Int): Short = throw new UnsupportedOperationException
def getByte(i: Int): Byte = throw new UnsupportedOperationException
def getString(i: Int): String = throw new UnsupportedOperationException
override def getAs[T](i: Int): T = throw new UnsupportedOperationException

def copy() = this
}
Expand Down Expand Up @@ -217,19 +219,19 @@ class GenericMutableRow(size: Int) extends GenericRow(size) with MutableRow {
/** No-arg constructor for serialization. */
def this() = this(0)

override def setBoolean(ordinal: Int,value: Boolean): Unit = { values(ordinal) = value }
override def setByte(ordinal: Int,value: Byte): Unit = { values(ordinal) = value }
override def setDouble(ordinal: Int,value: Double): Unit = { values(ordinal) = value }
override def setFloat(ordinal: Int,value: Float): Unit = { values(ordinal) = value }
override def setInt(ordinal: Int,value: Int): Unit = { values(ordinal) = value }
override def setLong(ordinal: Int,value: Long): Unit = { values(ordinal) = value }
override def setString(ordinal: Int,value: String): Unit = { values(ordinal) = value }
override def setBoolean(ordinal: Int, value: Boolean): Unit = { values(ordinal) = value }
override def setByte(ordinal: Int, value: Byte): Unit = { values(ordinal) = value }
override def setDouble(ordinal: Int, value: Double): Unit = { values(ordinal) = value }
override def setFloat(ordinal: Int, value: Float): Unit = { values(ordinal) = value }
override def setInt(ordinal: Int, value: Int): Unit = { values(ordinal) = value }
override def setLong(ordinal: Int, value: Long): Unit = { values(ordinal) = value }
override def setString(ordinal: Int, value: String): Unit = { values(ordinal) = value }

override def setNullAt(i: Int): Unit = { values(i) = null }

override def setShort(ordinal: Int,value: Short): Unit = { values(ordinal) = value }
override def setShort(ordinal: Int, value: Short): Unit = { values(ordinal) = value }

override def update(ordinal: Int,value: Any): Unit = { values(ordinal) = value }
override def update(ordinal: Int, value: Any): Unit = { values(ordinal) = value }

override def copy() = new GenericRow(values.clone())
}
Expand Down
8 changes: 6 additions & 2 deletions ...ql/catalyst/expressions/SpecificRow.scala → ...lyst/expressions/SpecificMutableRow.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,9 @@ final class SpecificMutableRow(val values: Array[MutableValue]) extends MutableR

override def iterator: Iterator[Any] = values.map(_.boxed).iterator

def setString(ordinal: Int, value: String) = update(ordinal, value)
override def setString(ordinal: Int, value: String) = update(ordinal, value)

def getString(ordinal: Int) = apply(ordinal).asInstanceOf[String]
override def getString(ordinal: Int) = apply(ordinal).asInstanceOf[String]

override def setInt(ordinal: Int, value: Int): Unit = {
val currentValue = values(ordinal).asInstanceOf[MutableInt]
Expand Down Expand Up @@ -306,4 +306,8 @@ final class SpecificMutableRow(val values: Array[MutableValue]) extends MutableR
override def getByte(i: Int): Byte = {
values(i).asInstanceOf[MutableByte].value
}

override def getAs[T](i: Int): T = {
values(i).boxed.asInstanceOf[T]
}
}