From a1f3a5bc1f26117b5f76622d4cbe3d927b3904f1 Mon Sep 17 00:00:00 2001
From: Marco Gaido <marcogaido91@gmail.com>
Date: Tue, 15 May 2018 10:17:23 +0200
Subject: [PATCH] address comments

---
 .../expressions/maskExpressions.scala         | 22 +++++++++----------
 .../expressions/MaskExpressionsSuite.scala    | 12 +++++-----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/maskExpressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/maskExpressions.scala
index cdf788d8a5d0f..acbd0a13bba5f 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/maskExpressions.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/maskExpressions.scala
@@ -78,7 +78,7 @@ trait MaskLike {
      """.stripMargin
   }
 
-  def appendMaskedToStringBuffer(
+  def appendMaskedToStringBuilder(
       sb: java.lang.StringBuilder,
       inputString: String,
       startOffset: Int,
@@ -97,7 +97,7 @@ trait MaskLike {
     offset
   }
 
-  def appendUnchangedToStringBuffer(
+  def appendUnchangedToStringBuilder(
       sb: java.lang.StringBuilder,
       inputString: String,
       startOffset: Int,
@@ -174,7 +174,7 @@ case class Mask(child: Expression, upper: String, lower: String, digit: String)
     val str = input.asInstanceOf[UTF8String].toString
     val length = str.codePointCount(0, str.length())
     val sb = new java.lang.StringBuilder(length)
-    appendMaskedToStringBuffer(sb, str, 0, length)
+    appendMaskedToStringBuilder(sb, str, 0, length)
     UTF8String.fromString(sb.toString)
   }
 
@@ -250,8 +250,8 @@ case class MaskFirstN(
     val length = str.codePointCount(0, str.length())
     val endOfMask = if (charCount > length) length else charCount
     val sb = new java.lang.StringBuilder(length)
-    val offset = appendMaskedToStringBuffer(sb, str, 0, endOfMask)
-    appendUnchangedToStringBuffer(sb, str, offset, length - endOfMask)
+    val offset = appendMaskedToStringBuilder(sb, str, 0, endOfMask)
+    appendUnchangedToStringBuilder(sb, str, offset, length - endOfMask)
     UTF8String.fromString(sb.toString)
   }
 
@@ -333,8 +333,8 @@ case class MaskLastN(
     val length = str.codePointCount(0, str.length())
     val startOfMask = if (charCount >= length) 0 else length - charCount
     val sb = new java.lang.StringBuilder(length)
-    val offset = appendUnchangedToStringBuffer(sb, str, 0, startOfMask)
-    appendMaskedToStringBuffer(sb, str, offset, length - startOfMask)
+    val offset = appendUnchangedToStringBuilder(sb, str, 0, startOfMask)
+    appendMaskedToStringBuilder(sb, str, offset, length - startOfMask)
     UTF8String.fromString(sb.toString)
   }
 
@@ -417,8 +417,8 @@ case class MaskShowFirstN(
     val length = str.codePointCount(0, str.length())
     val startOfMask = if (charCount > length) length else charCount
     val sb = new java.lang.StringBuilder(length)
-    val offset = appendUnchangedToStringBuffer(sb, str, 0, startOfMask)
-    appendMaskedToStringBuffer(sb, str, offset, length - startOfMask)
+    val offset = appendUnchangedToStringBuilder(sb, str, 0, startOfMask)
+    appendMaskedToStringBuilder(sb, str, offset, length - startOfMask)
     UTF8String.fromString(sb.toString)
   }
 
@@ -500,8 +500,8 @@ case class MaskShowLastN(
     val length = str.codePointCount(0, str.length())
     val endOfMask = if (charCount >= length) 0 else length - charCount
     val sb = new java.lang.StringBuilder(length)
-    val offset = appendMaskedToStringBuffer(sb, str, 0, endOfMask)
-    appendUnchangedToStringBuffer(sb, str, offset, length - endOfMask)
+    val offset = appendMaskedToStringBuilder(sb, str, 0, endOfMask)
+    appendUnchangedToStringBuilder(sb, str, offset, length - endOfMask)
     UTF8String.fromString(sb.toString)
   }
 
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/MaskExpressionsSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/MaskExpressionsSuite.scala
index ae49488a9f0bc..4d69dc32ace82 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/MaskExpressionsSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/MaskExpressionsSuite.scala
@@ -97,8 +97,8 @@ class MaskExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
   }
 
   test("mask_last_n") {
-    checkEvaluation(MaskLastN(Literal("abcd-EFGH-8765"), 6, "U", "l", "#"),
-      "abcd-EFGU-####")
+    checkEvaluation(MaskLastN(Literal("abcd-EFGH-aB3d"), 6, "U", "l", "#"),
+      "abcd-EFGU-lU#l")
     checkEvaluation(new MaskLastN(
       Literal("abcd-EFGH-8765"), Literal(6), Literal("U"), Literal("l"), Literal("#")),
       "abcd-EFGU-####")
@@ -141,8 +141,8 @@ class MaskExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
   }
 
   test("mask_show_first_n") {
-    checkEvaluation(MaskShowFirstN(Literal("abcd-EFGH-8765-4321"), 6, "U", "l", "#"),
-      "abcd-EUUU-####-####")
+    checkEvaluation(MaskShowFirstN(Literal("abcd-EFGH-8765-aB3d"), 6, "U", "l", "#"),
+      "abcd-EUUU-####-lU#l")
     checkEvaluation(new MaskShowFirstN(
       Literal("abcd-EFGH-8765-4321"), Literal(6), Literal("U"), Literal("l"), Literal("#")),
       "abcd-EUUU-####-####")
@@ -184,8 +184,8 @@ class MaskExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
   }
 
   test("mask_show_last_n") {
-    checkEvaluation(MaskShowLastN(Literal("abcd-EFGH-8765"), 6, "U", "l", "#"),
-      "llll-UUUH-8765")
+    checkEvaluation(MaskShowLastN(Literal("aB3d-EFGH-8765"), 6, "U", "l", "#"),
+      "lU#l-UUUH-8765")
     checkEvaluation(new MaskShowLastN(
       Literal("abcd-EFGH-8765-4321"), Literal(6), Literal("U"), Literal("l"), Literal("#")),
       "llll-UUUU-###5-4321")