Remove breakable usage

apache · Oct 13, 2019 · 48364a7 · 48364a7
1 parent bdf6ac4
commit 48364a7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 23 deletions.
diff --git a/...hriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala b/...hriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala
@@ -23,7 +23,6 @@ import java.util.{ArrayList => JArrayList, List => JList, Locale}
 import java.util.concurrent.TimeUnit
 
 import scala.collection.JavaConverters._
-import scala.util.control.Breaks._
 
 import jline.console.ConsoleReader
 import jline.console.history.FileHistory
@@ -475,32 +474,24 @@ private[hive] class SparkSQLCLIDriver extends CliDriver with Logging {
 
     try {
       var lastRet: Int = 0
-      var ret: Int = 0
 
       // we can not use "split" function directly as ";" may be quoted
       val commands = splitSemiColon(line).asScala
-
       var command: String = ""
       for (oneCmd <- commands) {
-
-        breakable {
-          if (StringUtils.endsWith(oneCmd, "\\")) {
-            command += StringUtils.chop(oneCmd) + ";"
-            break
-          } else {
-            command += oneCmd
-          }
-          if (StringUtils.isBlank(command)) {
-            break
-          }
-
-          ret = processCmd(command)
-          command = ""
-          lastRet = ret
-          val ignoreErrors = HiveConf.getBoolVar(conf, HiveConf.ConfVars.CLIIGNOREERRORS)
-          if (ret != 0 && !ignoreErrors) {
-            CommandProcessorFactory.clean(conf.asInstanceOf[HiveConf])
-            return ret
+        if (StringUtils.endsWith(oneCmd, "\\")) {
+          command += StringUtils.chop(oneCmd) + ";"
+        } else {
+          command += oneCmd
+          if (!StringUtils.isBlank(command)) {
+            val ret = processCmd(command)
+            command = ""
+            lastRet = ret
+            val ignoreErrors = HiveConf.getBoolVar(conf, HiveConf.ConfVars.CLIIGNOREERRORS)
+            if (ret != 0 && !ignoreErrors) {
+              CommandProcessorFactory.clean(conf.asInstanceOf[HiveConf])
+              ret
+            }
           }
         }
       }

diff --git a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala
@@ -385,7 +385,7 @@ class CliSuite extends SparkFunSuite with BeforeAndAfterAll with Logging {
     )
   }
 
-  test("Should not split semicolon within quoted string literals") {
+  test("SPARK-26321 Should not split semicolon within quoted string literals") {
     runCliWithin(3.minute)(
       """select 'Test1', "^;^";""" -> "Test1\t^;^",
       """select 'Test2', "\";";""" -> "Test2\t\";",