You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by jo...@apache.org on 2015/06/01 01:35:15 UTC
spark git commit: [HOTFIX] Remove trailing whitespace to fix
Scalastyle checks
Repository: spark
Updated Branches:
refs/heads/branch-1.4 f1d4e7e31 -> df0bf71ee
[HOTFIX] Remove trailing whitespace to fix Scalastyle checks
866652c903d06d1cb4356283e0741119d84dcc21 enabled this check.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/df0bf71e
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/df0bf71e
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/df0bf71e
Branch: refs/heads/branch-1.4
Commit: df0bf71ee0db6cc67f19df34b9eefb960deaca82
Parents: f1d4e7e
Author: Josh Rosen <jo...@databricks.com>
Authored: Sun May 31 16:34:20 2015 -0700
Committer: Josh Rosen <jo...@databricks.com>
Committed: Sun May 31 16:34:20 2015 -0700
----------------------------------------------------------------------
.../src/main/scala/org/apache/spark/api/java/JavaRDDLike.scala | 6 +++---
.../apache/spark/sql/catalyst/expressions/complexTypes.scala | 2 +-
.../spark/sql/catalyst/expressions/stringOperations.scala | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/df0bf71e/core/src/main/scala/org/apache/spark/api/java/JavaRDDLike.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/api/java/JavaRDDLike.scala b/core/src/main/scala/org/apache/spark/api/java/JavaRDDLike.scala
index b8e15f3..7b92f61 100644
--- a/core/src/main/scala/org/apache/spark/api/java/JavaRDDLike.scala
+++ b/core/src/main/scala/org/apache/spark/api/java/JavaRDDLike.scala
@@ -60,7 +60,7 @@ trait JavaRDDLike[T, This <: JavaRDDLike[T, This]] extends Serializable {
@deprecated("Use partitions() instead.", "1.1.0")
def splits: JList[Partition] = new java.util.ArrayList(rdd.partitions.toSeq)
-
+
/** Set of partitions in this RDD. */
def partitions: JList[Partition] = new java.util.ArrayList(rdd.partitions.toSeq)
@@ -492,9 +492,9 @@ trait JavaRDDLike[T, This <: JavaRDDLike[T, This]] extends Serializable {
new java.util.ArrayList(arr)
}
- def takeSample(withReplacement: Boolean, num: Int): JList[T] =
+ def takeSample(withReplacement: Boolean, num: Int): JList[T] =
takeSample(withReplacement, num, Utils.random.nextLong)
-
+
def takeSample(withReplacement: Boolean, num: Int, seed: Long): JList[T] = {
import scala.collection.JavaConversions._
val arr: java.util.Collection[T] = rdd.takeSample(withReplacement, num, seed).toSeq
http://git-wip-us.apache.org/repos/asf/spark/blob/df0bf71e/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypes.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypes.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypes.scala
index f4d91d5..98c1c40 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypes.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypes.scala
@@ -25,7 +25,7 @@ import org.apache.spark.sql.types._
*/
case class CreateArray(children: Seq[Expression]) extends Expression {
override type EvaluatedType = Any
-
+
override def foldable: Boolean = children.forall(_.foldable)
lazy val childTypes = children.map(_.dataType).distinct
http://git-wip-us.apache.org/repos/asf/spark/blob/df0bf71e/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringOperations.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringOperations.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringOperations.scala
index 219ed4e..f76e0ca 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringOperations.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringOperations.scala
@@ -211,7 +211,7 @@ case class EndsWith(left: Expression, right: Expression)
*/
case class Substring(str: Expression, pos: Expression, len: Expression)
extends Expression with ExpectsInputTypes {
-
+
type EvaluatedType = Any
override def foldable: Boolean = str.foldable && pos.foldable && len.foldable
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org