Skip to content

Commit 4fec590

Browse files
committed
Style/formatting issues from code review
1 parent b4cb7bf commit 4fec590

File tree

2 files changed

+13
-21
lines changed

2 files changed

+13
-21
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/StringUtils.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,7 @@ object StringUtils extends Logging {
150150
strings.foreach(result.append)
151151
result.append(truncateMsg)
152152
result.toString
153-
}
154-
else {
153+
} else {
155154
super.toString
156155
}
157156
}

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/StringUtilsSuite.scala

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,25 +46,25 @@ class StringUtilsSuite extends SparkFunSuite {
4646

4747
test("string concatenation") {
4848
def concat(seq: String*): String = {
49-
seq.foldLeft(new StringConcat())((acc, s) => {acc.append(s); acc}).toString
49+
seq.foldLeft(new StringConcat()) { (acc, s) => acc.append(s); acc }.toString
5050
}
5151

5252
assert(new StringConcat().toString == "")
53-
assert(concat("") == "")
54-
assert(concat(null) == "")
55-
assert(concat("a") == "a")
56-
assert(concat("1", "2") == "12")
57-
assert(concat("abc", "\n", "123") == "abc\n123")
53+
assert(concat("") === "")
54+
assert(concat(null) === "")
55+
assert(concat("a") === "a")
56+
assert(concat("1", "2") === "12")
57+
assert(concat("abc", "\n", "123") === "abc\n123")
5858
}
5959

6060
test("string concatenation with limit") {
6161
def concat(seq: String*): String = {
62-
seq.foldLeft(new StringConcat(7))((acc, s) => {acc.append(s); acc}).toString
62+
seq.foldLeft(new StringConcat(7)) { (acc, s) => acc.append(s); acc }.toString
6363
}
64-
assert(concat("under") == "under")
65-
assert(concat("under", "over", "extra") == "underov")
66-
assert(concat("underover") == "underov")
67-
assert(concat("under", "ov") == "underov")
64+
assert(concat("under") === "under")
65+
assert(concat("under", "over", "extra") === "underov")
66+
assert(concat("underover") === "underov")
67+
assert(concat("under", "ov") === "underov")
6868
}
6969

7070
test("string concatenation return value") {
@@ -73,15 +73,8 @@ class StringUtilsSuite extends SparkFunSuite {
7373
sc.append(s)
7474
sc.atLimit
7575
}
76-
assert(checkLimit("under") == false)
76+
assert(checkLimit("under") === false)
7777
assert(checkLimit("1234567"))
7878
assert(checkLimit("1234567890"))
7979
}
80-
81-
test("string concatenation append after limit") {
82-
val concat = new StringConcat(7)
83-
concat.append("under")
84-
concat.append("extra")
85-
assert(concat.toString === "underex")
86-
}
8780
}

0 commit comments

Comments
 (0)