You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/11/15 00:00:43 UTC
spark git commit: [SQL] Minor cleanup of comments,
errors and override.
Repository: spark
Updated Branches:
refs/heads/master e47c38763 -> f805025e8
[SQL] Minor cleanup of comments, errors and override.
Author: Michael Armbrust <mi...@databricks.com>
Closes #3257 from marmbrus/minorCleanup and squashes the following commits:
d8b5abc [Michael Armbrust] Use interpolation.
2fdf903 [Michael Armbrust] Better error message when coalesce can't be resolved.
f9fa6cf [Michael Armbrust] Methods in a final class do not also need to be final, use override.
199fd98 [Michael Armbrust] Fix typo
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f805025e
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f805025e
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f805025e
Branch: refs/heads/master
Commit: f805025e8efe9cd522e8875141ec27df8d16bbe0
Parents: e47c387
Author: Michael Armbrust <mi...@databricks.com>
Authored: Fri Nov 14 15:00:42 2014 -0800
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Fri Nov 14 15:00:42 2014 -0800
----------------------------------------------------------------------
.../spark/sql/catalyst/expressions/aggregates.scala | 2 +-
.../expressions/codegen/GenerateProjection.scala | 16 ++++++++--------
.../sql/catalyst/expressions/nullFunctions.scala | 4 +++-
3 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/f805025e/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregates.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregates.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregates.scala
index 2b364fc..3ceb5ec 100755
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregates.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregates.scala
@@ -304,7 +304,7 @@ case class Average(child: Expression) extends PartialAggregate with trees.UnaryN
child.dataType match {
case DecimalType.Fixed(_, _) =>
- // Turn the results to unlimited decimals for the divsion, before going back to fixed
+ // Turn the results to unlimited decimals for the division, before going back to fixed
val castedSum = Cast(Sum(partialSum.toAttribute), DecimalType.Unlimited)
val castedCount = Cast(Sum(partialCount.toAttribute), DecimalType.Unlimited)
SplitEvaluation(
http://git-wip-us.apache.org/repos/asf/spark/blob/f805025e/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateProjection.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateProjection.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateProjection.scala
index 7871a62..2ff6116 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateProjection.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateProjection.scala
@@ -53,8 +53,8 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
val nullFunctions =
q"""
private[this] var nullBits = new Array[Boolean](${expressions.size})
- final def setNullAt(i: Int) = { nullBits(i) = true }
- final def isNullAt(i: Int) = nullBits(i)
+ override def setNullAt(i: Int) = { nullBits(i) = true }
+ override def isNullAt(i: Int) = nullBits(i)
""".children
val tupleElements = expressions.zipWithIndex.flatMap {
@@ -82,7 +82,7 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
val iLit = ru.Literal(Constant(i))
q"if(isNullAt($iLit)) { null } else { ${newTermName(s"c$i")} }"
}
- q"final def iterator = Iterator[Any](..$allColumns)"
+ q"override def iterator = Iterator[Any](..$allColumns)"
}
val accessorFailure = q"""scala.sys.error("Invalid ordinal:" + i)"""
@@ -94,7 +94,7 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
q"if(i == $ordinal) { if(isNullAt($i)) return null else return $elementName }"
}
- q"final def apply(i: Int): Any = { ..$cases; $accessorFailure }"
+ q"override def apply(i: Int): Any = { ..$cases; $accessorFailure }"
}
val updateFunction = {
@@ -114,7 +114,7 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
return
}"""
}
- q"final def update(i: Int, value: Any): Unit = { ..$cases; $accessorFailure }"
+ q"override def update(i: Int, value: Any): Unit = { ..$cases; $accessorFailure }"
}
val specificAccessorFunctions = NativeType.all.map { dataType =>
@@ -128,7 +128,7 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
}
q"""
- final def ${accessorForType(dataType)}(i: Int):${termForType(dataType)} = {
+ override def ${accessorForType(dataType)}(i: Int):${termForType(dataType)} = {
..$ifStatements;
$accessorFailure
}"""
@@ -145,7 +145,7 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
}
q"""
- final def ${mutatorForType(dataType)}(i: Int, value: ${termForType(dataType)}): Unit = {
+ override def ${mutatorForType(dataType)}(i: Int, value: ${termForType(dataType)}): Unit = {
..$ifStatements;
$accessorFailure
}"""
@@ -193,7 +193,7 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
val copyFunction =
q"""
- final def copy() = new $genericRowType(this.toArray)
+ override def copy() = new $genericRowType(this.toArray)
"""
val classBody =
http://git-wip-us.apache.org/repos/asf/spark/blob/f805025e/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/nullFunctions.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/nullFunctions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/nullFunctions.scala
index 086d0a3..84a3567 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/nullFunctions.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/nullFunctions.scala
@@ -37,7 +37,9 @@ case class Coalesce(children: Seq[Expression]) extends Expression {
def dataType = if (resolved) {
children.head.dataType
} else {
- throw new UnresolvedException(this, "Coalesce cannot have children of different types.")
+ val childTypes = children.map(c => s"$c: ${c.dataType}").mkString(", ")
+ throw new UnresolvedException(
+ this, s"Coalesce cannot have children of different types. $childTypes")
}
override def eval(input: Row): Any = {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org