You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/07/29 10:35:29 UTC
git commit: Minor indentation and comment typo fixes.
Repository: spark
Updated Branches:
refs/heads/master 20424dad3 -> fc4d05700
Minor indentation and comment typo fixes.
Author: Aaron Staple <as...@gmail.com>
Closes #1630 from staple/minor and squashes the following commits:
6f295a2 [Aaron Staple] Fix typos in comment about ExprId.
8566467 [Aaron Staple] Fix off by one column indentation in SqlParser.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/fc4d0570
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/fc4d0570
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/fc4d0570
Branch: refs/heads/master
Commit: fc4d05700026f4ee9cc5544cf493d900039c38f3
Parents: 20424da
Author: Aaron Staple <as...@gmail.com>
Authored: Tue Jul 29 01:35:26 2014 -0700
Committer: Reynold Xin <rx...@apache.org>
Committed: Tue Jul 29 01:35:26 2014 -0700
----------------------------------------------------------------------
.../apache/spark/sql/catalyst/SqlParser.scala | 22 ++++++++++----------
.../catalyst/expressions/namedExpressions.scala | 4 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/fc4d0570/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala
index a34b236..2c73a80 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala
@@ -210,21 +210,21 @@ class SqlParser extends StandardTokenParsers with PackratParsers {
} |
"(" ~> query ~ ")" ~ opt(AS) ~ ident ^^ { case s ~ _ ~ _ ~ a => Subquery(a, s) }
- protected lazy val joinedRelation: Parser[LogicalPlan] =
- relationFactor ~ opt(joinType) ~ JOIN ~ relationFactor ~ opt(joinConditions) ^^ {
+ protected lazy val joinedRelation: Parser[LogicalPlan] =
+ relationFactor ~ opt(joinType) ~ JOIN ~ relationFactor ~ opt(joinConditions) ^^ {
case r1 ~ jt ~ _ ~ r2 ~ cond =>
Join(r1, r2, joinType = jt.getOrElse(Inner), cond)
- }
+ }
- protected lazy val joinConditions: Parser[Expression] =
- ON ~> expression
+ protected lazy val joinConditions: Parser[Expression] =
+ ON ~> expression
- protected lazy val joinType: Parser[JoinType] =
- INNER ^^^ Inner |
- LEFT ~ SEMI ^^^ LeftSemi |
- LEFT ~ opt(OUTER) ^^^ LeftOuter |
- RIGHT ~ opt(OUTER) ^^^ RightOuter |
- FULL ~ opt(OUTER) ^^^ FullOuter
+ protected lazy val joinType: Parser[JoinType] =
+ INNER ^^^ Inner |
+ LEFT ~ SEMI ^^^ LeftSemi |
+ LEFT ~ opt(OUTER) ^^^ LeftOuter |
+ RIGHT ~ opt(OUTER) ^^^ RightOuter |
+ FULL ~ opt(OUTER) ^^^ FullOuter
protected lazy val filter: Parser[Expression] = WHERE ~ expression ^^ { case _ ~ e => e }
http://git-wip-us.apache.org/repos/asf/spark/blob/fc4d0570/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala
index 934bad8..ed69928 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala
@@ -28,8 +28,8 @@ object NamedExpression {
}
/**
- * A globally (within this JVM) id for a given named expression.
- * Used to identify with attribute output by a relation is being
+ * A globally unique (within this JVM) id for a given named expression.
+ * Used to identify which attribute output by a relation is being
* referenced in a subsequent computation.
*/
case class ExprId(id: Long)