Skip to content

Commit

Permalink
Style violation.
Browse files Browse the repository at this point in the history
  • Loading branch information
rxin committed Jan 27, 2015
1 parent b85edfb commit 59b6d8b
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 19 deletions.
34 changes: 17 additions & 17 deletions sql/core/src/main/scala/org/apache/spark/sql/Column.scala
Expand Up @@ -79,45 +79,45 @@ class Column(

override def unary_- : Column = UnaryMinus(expr)

override def ||(other: Column): Column = Or(expr, other.expr)
override def || (other: Column): Column = Or(expr, other.expr)

override def unary_~ : Column = BitwiseNot(expr)

override def !==(other: Column): Column = Not(EqualTo(expr, other.expr))
override def !== (other: Column): Column = Not(EqualTo(expr, other.expr))

override def >(other: Column): Column = GreaterThan(expr, other.expr)
override def > (other: Column): Column = GreaterThan(expr, other.expr)

override def unary_! : Column = Not(expr)

override def &(other: Column): Column = BitwiseAnd(expr, other.expr)
override def & (other: Column): Column = BitwiseAnd(expr, other.expr)

override def /(other: Column): Column = Divide(expr, other.expr)
override def / (other: Column): Column = Divide(expr, other.expr)

override def &&(other: Column): Column = And(expr, other.expr)
override def && (other: Column): Column = And(expr, other.expr)

override def |(other: Column): Column = BitwiseOr(expr, other.expr)
override def | (other: Column): Column = BitwiseOr(expr, other.expr)

override def ^(other: Column): Column = BitwiseXor(expr, other.expr)
override def ^ (other: Column): Column = BitwiseXor(expr, other.expr)

override def <=>(other: Column): Column = EqualNullSafe(expr, other.expr)
override def <=> (other: Column): Column = EqualNullSafe(expr, other.expr)

override def ===(other: Column): Column = EqualTo(expr, other.expr)
override def === (other: Column): Column = EqualTo(expr, other.expr)

override def equalTo(other: Column): Column = this === other

override def +(other: Column): Column = Add(expr, other.expr)
override def + (other: Column): Column = Add(expr, other.expr)

override def rlike(other: Column): Column = RLike(expr, other.expr)

override def %(other: Column): Column = Remainder(expr, other.expr)
override def % (other: Column): Column = Remainder(expr, other.expr)

override def in(list: Column*): Column = In(expr, list.map(_.expr))

override def getItem(ordinal: Int): Column = GetItem(expr, LiteralExpr(ordinal))

override def getItem(ordinal: Column): Column = GetItem(expr, ordinal.expr)

override def <=(other: Column): Column = LessThanOrEqual(expr, other.expr)
override def <= (other: Column): Column = LessThanOrEqual(expr, other.expr)

override def like(other: Column): Column = Like(expr, other.expr)

Expand All @@ -128,23 +128,23 @@ class Column(
override def substr(startPos: Column, len: Column): Column =
Substring(expr, startPos.expr, len.expr)

override def <(other: Column): Column = LessThan(expr, other.expr)
override def < (other: Column): Column = LessThan(expr, other.expr)

override def isNull: Column = IsNull(expr)

override def contains(other: Column): Column = Contains(expr, other.expr)

override def -(other: Column): Column = Subtract(expr, other.expr)
override def - (other: Column): Column = Subtract(expr, other.expr)

override def desc: Column = SortOrder(expr, Descending)

override def >=(other: Column): Column = GreaterThanOrEqual(expr, other.expr)
override def >= (other: Column): Column = GreaterThanOrEqual(expr, other.expr)

override def asc: Column = SortOrder(expr, Ascending)

override def endsWith(other: Column): Column = EndsWith(expr, other.expr)

override def *(other: Column): Column = Multiply(expr, other.expr)
override def * (other: Column): Column = Multiply(expr, other.expr)

override def startsWith(other: Column): Column = StartsWith(expr, other.expr)

Expand Down
Expand Up @@ -58,7 +58,7 @@ package object dsl {
def sqrt(e: Column): Column = Sqrt(e.expr)
def abs(e: Column): Column = Abs(e.expr)


// scalastyle:off

object literals {

Expand Down Expand Up @@ -89,7 +89,6 @@ package object dsl {
implicit def binaryToLiteral(a: Array[Byte]): Column = Literal(a)
}

// scalastyle:off

/* Use the following code to generate:
(0 to 22).map { x =>
Expand Down

0 comments on commit 59b6d8b

Please sign in to comment.