From 748b87a38575664fcfc877ccc575678ba54a9df6 Mon Sep 17 00:00:00 2001 From: Tarek Auel Date: Sun, 19 Jul 2015 01:22:43 -0700 Subject: [PATCH 1/5] [SPARK-9178] Add empty string constant to UTF8String --- .../apache/spark/unsafe/types/UTF8String.java | 2 + .../spark/unsafe/types/UTF8StringSuite.java | 72 +++++++++---------- 2 files changed, 36 insertions(+), 38 deletions(-) diff --git a/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java b/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java index 9723b6e0834b2..5ef1b68cb9c47 100644 --- a/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java +++ b/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java @@ -49,6 +49,8 @@ public final class UTF8String implements Comparable, Serializable { 5, 5, 5, 5, 6, 6, 6, 6}; + public static UTF8String EMPTY_STRING = new UTF8String(new byte[0], BYTE_ARRAY_OFFSET, 0); + /** * Creates an UTF8String from byte array, which should be encoded in UTF-8. * diff --git a/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java b/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java index 0db7522b50c1a..2fd6f5bb5bdbc 100644 --- a/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java +++ b/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java @@ -54,6 +54,12 @@ public void basicTest() throws UnsupportedEncodingException { checkBasic("大 千 世 界", 7); } + @Test + public void emptyStringTest() { + assertEquals(fromString(""), EMPTY_STRING); + assertEquals(fromBytes(new byte[0]), EMPTY_STRING); + } + @Test public void compareTo() { assertTrue(fromString("abc").compareTo(fromString("ABC")) > 0); @@ -88,21 +94,21 @@ public void upperAndLower() { @Test public void concatTest() { - assertEquals(concat(), fromString("")); - assertEquals(concat(null), fromString("")); - assertEquals(concat(fromString("")), fromString("")); + assertEquals(concat(), EMPTY_STRING); + assertEquals(concat(null), EMPTY_STRING); + assertEquals(concat(EMPTY_STRING), EMPTY_STRING); assertEquals(concat(fromString("ab")), fromString("ab")); assertEquals(concat(fromString("a"), fromString("b")), fromString("ab")); assertEquals(concat(fromString("a"), fromString("b"), fromString("c")), fromString("abc")); assertEquals(concat(fromString("a"), null, fromString("c")), fromString("ac")); assertEquals(concat(fromString("a"), null, null), fromString("a")); - assertEquals(concat(null, null, null), fromString("")); + assertEquals(concat(null, null, null), EMPTY_STRING); assertEquals(concat(fromString("数据"), fromString("砖头")), fromString("数据砖头")); } @Test public void contains() { - assertTrue(fromString("").contains(fromString(""))); + assertTrue(EMPTY_STRING.contains(EMPTY_STRING)); assertTrue(fromString("hello").contains(fromString("ello"))); assertFalse(fromString("hello").contains(fromString("vello"))); assertFalse(fromString("hello").contains(fromString("hellooo"))); @@ -113,7 +119,7 @@ public void contains() { @Test public void startsWith() { - assertTrue(fromString("").startsWith(fromString(""))); + assertTrue(EMPTY_STRING.startsWith(EMPTY_STRING)); assertTrue(fromString("hello").startsWith(fromString("hell"))); assertFalse(fromString("hello").startsWith(fromString("ell"))); assertFalse(fromString("hello").startsWith(fromString("hellooo"))); @@ -124,7 +130,7 @@ public void startsWith() { @Test public void endsWith() { - assertTrue(fromString("").endsWith(fromString(""))); + assertTrue(EMPTY_STRING.endsWith(EMPTY_STRING)); assertTrue(fromString("hello").endsWith(fromString("ello"))); assertFalse(fromString("hello").endsWith(fromString("ellov"))); assertFalse(fromString("hello").endsWith(fromString("hhhello"))); @@ -135,7 +141,7 @@ public void endsWith() { @Test public void substring() { - assertEquals(fromString(""), fromString("hello").substring(0, 0)); + assertEquals(EMPTY_STRING, fromString("hello").substring(0, 0)); assertEquals(fromString("el"), fromString("hello").substring(1, 3)); assertEquals(fromString("数"), fromString("数据砖头").substring(0, 1)); assertEquals(fromString("据砖"), fromString("数据砖头").substring(1, 3)); @@ -149,9 +155,9 @@ public void trims() { assertEquals(fromString("hello "), fromString(" hello ").trimLeft()); assertEquals(fromString(" hello"), fromString(" hello ").trimRight()); - assertEquals(fromString(""), fromString(" ").trim()); - assertEquals(fromString(""), fromString(" ").trimLeft()); - assertEquals(fromString(""), fromString(" ").trimRight()); + assertEquals(EMPTY_STRING, fromString(" ").trim()); + assertEquals(EMPTY_STRING, fromString(" ").trimLeft()); + assertEquals(EMPTY_STRING, fromString(" ").trimRight()); assertEquals(fromString("数据砖头"), fromString(" 数据砖头 ").trim()); assertEquals(fromString("数据砖头 "), fromString(" 数据砖头 ").trimLeft()); @@ -164,9 +170,9 @@ public void trims() { @Test public void indexOf() { - assertEquals(0, fromString("").indexOf(fromString(""), 0)); - assertEquals(-1, fromString("").indexOf(fromString("l"), 0)); - assertEquals(0, fromString("hello").indexOf(fromString(""), 0)); + assertEquals(0, EMPTY_STRING.indexOf(EMPTY_STRING, 0)); + assertEquals(-1, EMPTY_STRING.indexOf(fromString("l"), 0)); + assertEquals(0, fromString("hello").indexOf(EMPTY_STRING, 0)); assertEquals(2, fromString("hello").indexOf(fromString("l"), 0)); assertEquals(3, fromString("hello").indexOf(fromString("l"), 3)); assertEquals(-1, fromString("hello").indexOf(fromString("a"), 0)); @@ -181,7 +187,7 @@ public void indexOf() { @Test public void reverse() { assertEquals(fromString("olleh"), fromString("hello").reverse()); - assertEquals(fromString(""), fromString("").reverse()); + assertEquals(EMPTY_STRING, EMPTY_STRING.reverse()); assertEquals(fromString("者行孙"), fromString("孙行者").reverse()); assertEquals(fromString("者行孙 olleh"), fromString("hello 孙行者").reverse()); } @@ -190,7 +196,7 @@ public void reverse() { public void repeat() { assertEquals(fromString("数d数d数d数d数d"), fromString("数d").repeat(5)); assertEquals(fromString("数d"), fromString("数d").repeat(1)); - assertEquals(fromString(""), fromString("数d").repeat(-1)); + assertEquals(EMPTY_STRING, fromString("数d").repeat(-1)); } @Test @@ -200,14 +206,14 @@ public void pad() { assertEquals(fromString("?hello"), fromString("hello").lpad(6, fromString("????"))); assertEquals(fromString("???????hello"), fromString("hello").lpad(12, fromString("????"))); assertEquals(fromString("?????hello"), fromString("hello").lpad(10, fromString("?????"))); - assertEquals(fromString("???????"), fromString("").lpad(7, fromString("?????"))); + assertEquals(fromString("???????"), EMPTY_STRING.lpad(7, fromString("?????"))); assertEquals(fromString("hel"), fromString("hello").rpad(3, fromString("????"))); assertEquals(fromString("hello"), fromString("hello").rpad(5, fromString("????"))); assertEquals(fromString("hello?"), fromString("hello").rpad(6, fromString("????"))); assertEquals(fromString("hello???????"), fromString("hello").rpad(12, fromString("????"))); assertEquals(fromString("hello?????"), fromString("hello").rpad(10, fromString("?????"))); - assertEquals(fromString("???????"), fromString("").rpad(7, fromString("?????"))); + assertEquals(fromString("???????"), EMPTY_STRING.rpad(7, fromString("?????"))); assertEquals(fromString("数据砖"), fromString("数据砖头").lpad(3, fromString("????"))); @@ -227,25 +233,15 @@ public void pad() { @Test public void levenshteinDistance() { - assertEquals( - UTF8String.fromString("").levenshteinDistance(UTF8String.fromString("")), 0); - assertEquals( - UTF8String.fromString("").levenshteinDistance(UTF8String.fromString("a")), 1); - assertEquals( - UTF8String.fromString("aaapppp").levenshteinDistance(UTF8String.fromString("")), 7); - assertEquals( - UTF8String.fromString("frog").levenshteinDistance(UTF8String.fromString("fog")), 1); - assertEquals( - UTF8String.fromString("fly").levenshteinDistance(UTF8String.fromString("ant")),3); - assertEquals( - UTF8String.fromString("elephant").levenshteinDistance(UTF8String.fromString("hippo")), 7); - assertEquals( - UTF8String.fromString("hippo").levenshteinDistance(UTF8String.fromString("elephant")), 7); - assertEquals( - UTF8String.fromString("hippo").levenshteinDistance(UTF8String.fromString("zzzzzzzz")), 8); - assertEquals( - UTF8String.fromString("hello").levenshteinDistance(UTF8String.fromString("hallo")),1); - assertEquals( - UTF8String.fromString("世界千世").levenshteinDistance(UTF8String.fromString("千a世b")),4); + assertEquals(EMPTY_STRING.levenshteinDistance(EMPTY_STRING), 0); + assertEquals(EMPTY_STRING.levenshteinDistance(fromString("a")), 1); + assertEquals(fromString("aaapppp").levenshteinDistance(EMPTY_STRING), 7); + assertEquals(fromString("frog").levenshteinDistance(fromString("fog")), 1); + assertEquals(fromString("fly").levenshteinDistance(fromString("ant")),3); + assertEquals(fromString("elephant").levenshteinDistance(fromString("hippo")), 7); + assertEquals(fromString("hippo").levenshteinDistance(fromString("elephant")), 7); + assertEquals(fromString("hippo").levenshteinDistance(fromString("zzzzzzzz")), 8); + assertEquals(fromString("hello").levenshteinDistance(fromString("hallo")),1); + assertEquals(fromString("世界千世").levenshteinDistance(fromString("千a世b")),4); } } From 4a37344dd33837b0e03c649c65d77481bff27f9f Mon Sep 17 00:00:00 2001 From: Tarek Auel Date: Sun, 19 Jul 2015 12:25:05 -0700 Subject: [PATCH 2/5] [SPARK-9178] changed name to EMPTY_UTF8, added tests --- .../apache/spark/unsafe/types/UTF8String.java | 2 +- .../spark/unsafe/types/UTF8StringSuite.java | 48 ++++++++++--------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java b/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java index 5ef1b68cb9c47..8e17ef6d049a2 100644 --- a/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java +++ b/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java @@ -49,7 +49,7 @@ public final class UTF8String implements Comparable, Serializable { 5, 5, 5, 5, 6, 6, 6, 6}; - public static UTF8String EMPTY_STRING = new UTF8String(new byte[0], BYTE_ARRAY_OFFSET, 0); + public static UTF8String EMPTY_UTF8 = UTF8String.fromString(""); /** * Creates an UTF8String from byte array, which should be encoded in UTF-8. diff --git a/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java b/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java index 2fd6f5bb5bdbc..366ee021d81a8 100644 --- a/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java +++ b/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java @@ -56,8 +56,10 @@ public void basicTest() throws UnsupportedEncodingException { @Test public void emptyStringTest() { - assertEquals(fromString(""), EMPTY_STRING); - assertEquals(fromBytes(new byte[0]), EMPTY_STRING); + assertEquals(fromString(""), EMPTY_UTF8); + assertEquals(fromBytes(new byte[0]), EMPTY_UTF8); + assertEquals(0, EMPTY_UTF8.numChars()); + assertEquals(0, EMPTY_UTF8.numBytes()); } @Test @@ -94,21 +96,21 @@ public void upperAndLower() { @Test public void concatTest() { - assertEquals(concat(), EMPTY_STRING); - assertEquals(concat(null), EMPTY_STRING); - assertEquals(concat(EMPTY_STRING), EMPTY_STRING); + assertEquals(concat(), EMPTY_UTF8); + assertEquals(concat(null), EMPTY_UTF8); + assertEquals(concat(EMPTY_UTF8), EMPTY_UTF8); assertEquals(concat(fromString("ab")), fromString("ab")); assertEquals(concat(fromString("a"), fromString("b")), fromString("ab")); assertEquals(concat(fromString("a"), fromString("b"), fromString("c")), fromString("abc")); assertEquals(concat(fromString("a"), null, fromString("c")), fromString("ac")); assertEquals(concat(fromString("a"), null, null), fromString("a")); - assertEquals(concat(null, null, null), EMPTY_STRING); + assertEquals(concat(null, null, null), EMPTY_UTF8); assertEquals(concat(fromString("数据"), fromString("砖头")), fromString("数据砖头")); } @Test public void contains() { - assertTrue(EMPTY_STRING.contains(EMPTY_STRING)); + assertTrue(EMPTY_UTF8.contains(EMPTY_UTF8)); assertTrue(fromString("hello").contains(fromString("ello"))); assertFalse(fromString("hello").contains(fromString("vello"))); assertFalse(fromString("hello").contains(fromString("hellooo"))); @@ -119,7 +121,7 @@ public void contains() { @Test public void startsWith() { - assertTrue(EMPTY_STRING.startsWith(EMPTY_STRING)); + assertTrue(EMPTY_UTF8.startsWith(EMPTY_UTF8)); assertTrue(fromString("hello").startsWith(fromString("hell"))); assertFalse(fromString("hello").startsWith(fromString("ell"))); assertFalse(fromString("hello").startsWith(fromString("hellooo"))); @@ -130,7 +132,7 @@ public void startsWith() { @Test public void endsWith() { - assertTrue(EMPTY_STRING.endsWith(EMPTY_STRING)); + assertTrue(EMPTY_UTF8.endsWith(EMPTY_UTF8)); assertTrue(fromString("hello").endsWith(fromString("ello"))); assertFalse(fromString("hello").endsWith(fromString("ellov"))); assertFalse(fromString("hello").endsWith(fromString("hhhello"))); @@ -141,7 +143,7 @@ public void endsWith() { @Test public void substring() { - assertEquals(EMPTY_STRING, fromString("hello").substring(0, 0)); + assertEquals(EMPTY_UTF8, fromString("hello").substring(0, 0)); assertEquals(fromString("el"), fromString("hello").substring(1, 3)); assertEquals(fromString("数"), fromString("数据砖头").substring(0, 1)); assertEquals(fromString("据砖"), fromString("数据砖头").substring(1, 3)); @@ -155,9 +157,9 @@ public void trims() { assertEquals(fromString("hello "), fromString(" hello ").trimLeft()); assertEquals(fromString(" hello"), fromString(" hello ").trimRight()); - assertEquals(EMPTY_STRING, fromString(" ").trim()); - assertEquals(EMPTY_STRING, fromString(" ").trimLeft()); - assertEquals(EMPTY_STRING, fromString(" ").trimRight()); + assertEquals(EMPTY_UTF8, fromString(" ").trim()); + assertEquals(EMPTY_UTF8, fromString(" ").trimLeft()); + assertEquals(EMPTY_UTF8, fromString(" ").trimRight()); assertEquals(fromString("数据砖头"), fromString(" 数据砖头 ").trim()); assertEquals(fromString("数据砖头 "), fromString(" 数据砖头 ").trimLeft()); @@ -170,9 +172,9 @@ public void trims() { @Test public void indexOf() { - assertEquals(0, EMPTY_STRING.indexOf(EMPTY_STRING, 0)); - assertEquals(-1, EMPTY_STRING.indexOf(fromString("l"), 0)); - assertEquals(0, fromString("hello").indexOf(EMPTY_STRING, 0)); + assertEquals(0, EMPTY_UTF8.indexOf(EMPTY_UTF8, 0)); + assertEquals(-1, EMPTY_UTF8.indexOf(fromString("l"), 0)); + assertEquals(0, fromString("hello").indexOf(EMPTY_UTF8, 0)); assertEquals(2, fromString("hello").indexOf(fromString("l"), 0)); assertEquals(3, fromString("hello").indexOf(fromString("l"), 3)); assertEquals(-1, fromString("hello").indexOf(fromString("a"), 0)); @@ -187,7 +189,7 @@ public void indexOf() { @Test public void reverse() { assertEquals(fromString("olleh"), fromString("hello").reverse()); - assertEquals(EMPTY_STRING, EMPTY_STRING.reverse()); + assertEquals(EMPTY_UTF8, EMPTY_UTF8.reverse()); assertEquals(fromString("者行孙"), fromString("孙行者").reverse()); assertEquals(fromString("者行孙 olleh"), fromString("hello 孙行者").reverse()); } @@ -196,7 +198,7 @@ public void reverse() { public void repeat() { assertEquals(fromString("数d数d数d数d数d"), fromString("数d").repeat(5)); assertEquals(fromString("数d"), fromString("数d").repeat(1)); - assertEquals(EMPTY_STRING, fromString("数d").repeat(-1)); + assertEquals(EMPTY_UTF8, fromString("数d").repeat(-1)); } @Test @@ -206,14 +208,14 @@ public void pad() { assertEquals(fromString("?hello"), fromString("hello").lpad(6, fromString("????"))); assertEquals(fromString("???????hello"), fromString("hello").lpad(12, fromString("????"))); assertEquals(fromString("?????hello"), fromString("hello").lpad(10, fromString("?????"))); - assertEquals(fromString("???????"), EMPTY_STRING.lpad(7, fromString("?????"))); + assertEquals(fromString("???????"), EMPTY_UTF8.lpad(7, fromString("?????"))); assertEquals(fromString("hel"), fromString("hello").rpad(3, fromString("????"))); assertEquals(fromString("hello"), fromString("hello").rpad(5, fromString("????"))); assertEquals(fromString("hello?"), fromString("hello").rpad(6, fromString("????"))); assertEquals(fromString("hello???????"), fromString("hello").rpad(12, fromString("????"))); assertEquals(fromString("hello?????"), fromString("hello").rpad(10, fromString("?????"))); - assertEquals(fromString("???????"), EMPTY_STRING.rpad(7, fromString("?????"))); + assertEquals(fromString("???????"), EMPTY_UTF8.rpad(7, fromString("?????"))); assertEquals(fromString("数据砖"), fromString("数据砖头").lpad(3, fromString("????"))); @@ -233,9 +235,9 @@ public void pad() { @Test public void levenshteinDistance() { - assertEquals(EMPTY_STRING.levenshteinDistance(EMPTY_STRING), 0); - assertEquals(EMPTY_STRING.levenshteinDistance(fromString("a")), 1); - assertEquals(fromString("aaapppp").levenshteinDistance(EMPTY_STRING), 7); + assertEquals(EMPTY_UTF8.levenshteinDistance(EMPTY_UTF8), 0); + assertEquals(EMPTY_UTF8.levenshteinDistance(fromString("a")), 1); + assertEquals(fromString("aaapppp").levenshteinDistance(EMPTY_UTF8), 7); assertEquals(fromString("frog").levenshteinDistance(fromString("fog")), 1); assertEquals(fromString("fly").levenshteinDistance(fromString("ant")),3); assertEquals(fromString("elephant").levenshteinDistance(fromString("hippo")), 7); From 3f5fbf5a1d92e5cc6621bf65c5c140efec2aacc3 Mon Sep 17 00:00:00 2001 From: Tarek Auel Date: Sun, 19 Jul 2015 18:49:57 -0700 Subject: [PATCH 3/5] [SPARK-9178] rebase and add final to UTF8String.EMPTY_UTF8 --- .../org/apache/spark/unsafe/types/UTF8String.java | 2 +- .../apache/spark/unsafe/types/UTF8StringSuite.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java b/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java index 5ae66c0d29c03..a24c2fd7fcd38 100644 --- a/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java +++ b/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java @@ -49,7 +49,7 @@ public final class UTF8String implements Comparable, Serializable { 5, 5, 5, 5, 6, 6, 6, 6}; - public static UTF8String EMPTY_UTF8 = UTF8String.fromString(""); + public static final UTF8String EMPTY_UTF8 = UTF8String.fromString(""); /** * Creates an UTF8String from byte array, which should be encoded in UTF-8. diff --git a/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java b/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java index dc17e28d40946..721a0ede03ac4 100644 --- a/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java +++ b/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java @@ -96,15 +96,15 @@ public void upperAndLower() { @Test public void concatTest() { - assertEquals(concat(), fromString("")); - assertEquals(concat(null), fromString("")); - assertEquals(concat(fromString("")), fromString("")); + assertEquals(concat(), EMPTY_UTF8); + assertEquals(concat(null), EMPTY_UTF8); + assertEquals(concat(EMPTY_UTF8), EMPTY_UTF8); assertEquals(concat(fromString("ab")), fromString("ab")); assertEquals(concat(fromString("a"), fromString("b")), fromString("ab")); assertEquals(concat(fromString("a"), fromString("b"), fromString("c")), fromString("abc")); assertEquals(concat(fromString("a"), null, fromString("c")), fromString("ac")); assertEquals(concat(fromString("a"), null, null), fromString("a")); - assertEquals(concat(null, null, null), fromString("")); + assertEquals(concat(null, null, null), EMPTY_UTF8); assertEquals(concat(fromString("数据"), fromString("砖头")), fromString("数据砖头")); } @@ -117,8 +117,8 @@ public void concatWsTest() { // If separator is null, concatWs should skip all null inputs and never return null. UTF8String sep = fromString("哈哈"); assertEquals( - fromString(""), - concatWs(sep, fromString(""))); + EMPTY_UTF8, + concatWs(sep, EMPTY_UTF8)); assertEquals( fromString("ab"), concatWs(sep, fromString("ab"))); @@ -135,7 +135,7 @@ public void concatWsTest() { fromString("a"), concatWs(sep, fromString("a"), null, null)); assertEquals( - fromString(""), + EMPTY_UTF8, concatWs(sep, null, null, null)); assertEquals( fromString("数据哈哈砖头"), From 3627b8093bb832491fd4678cd9fa191bb5676053 Mon Sep 17 00:00:00 2001 From: Tarek Auel Date: Sun, 19 Jul 2015 23:13:42 -0700 Subject: [PATCH 4/5] [SPARK-9178] revert concat tests changes --- .../spark/unsafe/types/UTF8StringSuite.java | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java b/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java index 721a0ede03ac4..8097b40a478c5 100644 --- a/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java +++ b/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java @@ -96,16 +96,16 @@ public void upperAndLower() { @Test public void concatTest() { - assertEquals(concat(), EMPTY_UTF8); - assertEquals(concat(null), EMPTY_UTF8); - assertEquals(concat(EMPTY_UTF8), EMPTY_UTF8); - assertEquals(concat(fromString("ab")), fromString("ab")); - assertEquals(concat(fromString("a"), fromString("b")), fromString("ab")); - assertEquals(concat(fromString("a"), fromString("b"), fromString("c")), fromString("abc")); - assertEquals(concat(fromString("a"), null, fromString("c")), fromString("ac")); - assertEquals(concat(fromString("a"), null, null), fromString("a")); - assertEquals(concat(null, null, null), EMPTY_UTF8); - assertEquals(concat(fromString("数据"), fromString("砖头")), fromString("数据砖头")); + assertEquals(EMPTY_UTF8, concat()); + assertEquals(null, concat((UTF8String) null)); + assertEquals(EMPTY_UTF8, concat(EMPTY_UTF8)); + assertEquals(fromString("ab"), concat(fromString("ab"))); + assertEquals(fromString("ab"), concat(fromString("a"), fromString("b"))); + assertEquals(fromString("abc"), concat(fromString("a"), fromString("b"), fromString("c"))); + assertEquals(null, concat(fromString("a"), null, fromString("c"))); + assertEquals(null, concat(fromString("a"), null, null)); + assertEquals(null, concat(null, null, null)); + assertEquals(fromString("数据砖头"), concat(fromString("数据"), fromString("砖头"))); } @Test @@ -120,26 +120,26 @@ public void concatWsTest() { EMPTY_UTF8, concatWs(sep, EMPTY_UTF8)); assertEquals( - fromString("ab"), - concatWs(sep, fromString("ab"))); + fromString("ab"), + concatWs(sep, fromString("ab"))); assertEquals( - fromString("a哈哈b"), - concatWs(sep, fromString("a"), fromString("b"))); + fromString("a哈哈b"), + concatWs(sep, fromString("a"), fromString("b"))); assertEquals( - fromString("a哈哈b哈哈c"), - concatWs(sep, fromString("a"), fromString("b"), fromString("c"))); + fromString("a哈哈b哈哈c"), + concatWs(sep, fromString("a"), fromString("b"), fromString("c"))); assertEquals( - fromString("a哈哈c"), - concatWs(sep, fromString("a"), null, fromString("c"))); + fromString("a哈哈c"), + concatWs(sep, fromString("a"), null, fromString("c"))); assertEquals( - fromString("a"), - concatWs(sep, fromString("a"), null, null)); + fromString("a"), + concatWs(sep, fromString("a"), null, null)); assertEquals( - EMPTY_UTF8, - concatWs(sep, null, null, null)); + EMPTY_UTF8, + concatWs(sep, null, null, null)); assertEquals( - fromString("数据哈哈砖头"), - concatWs(sep, fromString("数据"), fromString("砖头"))); + fromString("数据哈哈砖头"), + concatWs(sep, fromString("数据"), fromString("砖头"))); } @Test From 8d6c405ca13315196a815563a51479e305747d5d Mon Sep 17 00:00:00 2001 From: Tarek Auel Date: Sun, 19 Jul 2015 23:14:51 -0700 Subject: [PATCH 5/5] [SPARK-9178] revert intellij indents --- .../spark/unsafe/types/UTF8StringSuite.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java b/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java index 8097b40a478c5..2dd80de57feed 100644 --- a/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java +++ b/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java @@ -120,26 +120,26 @@ public void concatWsTest() { EMPTY_UTF8, concatWs(sep, EMPTY_UTF8)); assertEquals( - fromString("ab"), - concatWs(sep, fromString("ab"))); + fromString("ab"), + concatWs(sep, fromString("ab"))); assertEquals( - fromString("a哈哈b"), - concatWs(sep, fromString("a"), fromString("b"))); + fromString("a哈哈b"), + concatWs(sep, fromString("a"), fromString("b"))); assertEquals( - fromString("a哈哈b哈哈c"), - concatWs(sep, fromString("a"), fromString("b"), fromString("c"))); + fromString("a哈哈b哈哈c"), + concatWs(sep, fromString("a"), fromString("b"), fromString("c"))); assertEquals( - fromString("a哈哈c"), - concatWs(sep, fromString("a"), null, fromString("c"))); + fromString("a哈哈c"), + concatWs(sep, fromString("a"), null, fromString("c"))); assertEquals( - fromString("a"), - concatWs(sep, fromString("a"), null, null)); + fromString("a"), + concatWs(sep, fromString("a"), null, null)); assertEquals( - EMPTY_UTF8, - concatWs(sep, null, null, null)); + EMPTY_UTF8, + concatWs(sep, null, null, null)); assertEquals( - fromString("数据哈哈砖头"), - concatWs(sep, fromString("数据"), fromString("砖头"))); + fromString("数据哈哈砖头"), + concatWs(sep, fromString("数据"), fromString("砖头"))); } @Test