Skip to content

Commit fc4d057

Browse files
staplerxin
authored andcommitted
Minor indentation and comment typo fixes.
Author: Aaron Staple <[email protected]> Closes apache#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.
1 parent 20424da commit fc4d057

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -210,21 +210,21 @@ class SqlParser extends StandardTokenParsers with PackratParsers {
210210
} |
211211
"(" ~> query ~ ")" ~ opt(AS) ~ ident ^^ { case s ~ _ ~ _ ~ a => Subquery(a, s) }
212212

213-
protected lazy val joinedRelation: Parser[LogicalPlan] =
214-
relationFactor ~ opt(joinType) ~ JOIN ~ relationFactor ~ opt(joinConditions) ^^ {
213+
protected lazy val joinedRelation: Parser[LogicalPlan] =
214+
relationFactor ~ opt(joinType) ~ JOIN ~ relationFactor ~ opt(joinConditions) ^^ {
215215
case r1 ~ jt ~ _ ~ r2 ~ cond =>
216216
Join(r1, r2, joinType = jt.getOrElse(Inner), cond)
217-
}
217+
}
218218

219-
protected lazy val joinConditions: Parser[Expression] =
220-
ON ~> expression
219+
protected lazy val joinConditions: Parser[Expression] =
220+
ON ~> expression
221221

222-
protected lazy val joinType: Parser[JoinType] =
223-
INNER ^^^ Inner |
224-
LEFT ~ SEMI ^^^ LeftSemi |
225-
LEFT ~ opt(OUTER) ^^^ LeftOuter |
226-
RIGHT ~ opt(OUTER) ^^^ RightOuter |
227-
FULL ~ opt(OUTER) ^^^ FullOuter
222+
protected lazy val joinType: Parser[JoinType] =
223+
INNER ^^^ Inner |
224+
LEFT ~ SEMI ^^^ LeftSemi |
225+
LEFT ~ opt(OUTER) ^^^ LeftOuter |
226+
RIGHT ~ opt(OUTER) ^^^ RightOuter |
227+
FULL ~ opt(OUTER) ^^^ FullOuter
228228

229229
protected lazy val filter: Parser[Expression] = WHERE ~ expression ^^ { case _ ~ e => e }
230230

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ object NamedExpression {
2828
}
2929

3030
/**
31-
* A globally (within this JVM) id for a given named expression.
32-
* Used to identify with attribute output by a relation is being
31+
* A globally unique (within this JVM) id for a given named expression.
32+
* Used to identify which attribute output by a relation is being
3333
* referenced in a subsequent computation.
3434
*/
3535
case class ExprId(id: Long)

0 commit comments

Comments
 (0)