You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/09/03 05:21:32 UTC
[incubator-linkis] branch dev-1.3.1 updated: [linkis-engineplugin-jdbc] Modification of scala file floating red (#3215)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new ae26d5d26 [linkis-engineplugin-jdbc] Modification of scala file floating red (#3215)
ae26d5d26 is described below
commit ae26d5d261fa302a7b99f28d4d9bf0dcaec88b9c
Author: 成彬彬 <10...@users.noreply.github.com>
AuthorDate: Sat Sep 3 13:21:27 2022 +0800
[linkis-engineplugin-jdbc] Modification of scala file floating red (#3215)
---
.../jdbc/executer/JDBCMultiDatasourceParser.scala | 7 ++++---
.../engineplugin/jdbc/executer/JDBCSQLCodeParser.scala | 12 ++++++++----
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCMultiDatasourceParser.scala b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCMultiDatasourceParser.scala
index 0540b8cb2..25ecb13b4 100644
--- a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCMultiDatasourceParser.scala
+++ b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCMultiDatasourceParser.scala
@@ -29,7 +29,7 @@ import org.apache.commons.lang3.StringUtils
import java.util
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
object JDBCMultiDatasourceParser extends Logging {
@@ -127,13 +127,14 @@ object JDBCMultiDatasourceParser extends Logging {
else new util.HashMap[String, Object]()
if (!paramsMap.isEmpty) {
- val headConf = paramsMap.head
+ val headConf = paramsMap.asScala.head
jdbcUrl = s"$jdbcUrl?${headConf._1}=${headConf._2}"
paramsMap.remove(headConf._1)
}
if (!paramsMap.isEmpty) {
- val paramsJoin = for ((k, v) <- paramsMap) yield s"$k=${v.toString}".toList.mkString("&")
+ val paramsJoin =
+ for ((k, v) <- paramsMap.asScala) yield s"$k=${v.toString}".toList.mkString("&")
jdbcUrl = s"$jdbcUrl&$paramsJoin"
}
diff --git a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCSQLCodeParser.scala b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCSQLCodeParser.scala
index 2e9d9f7d2..ee4dec4d7 100644
--- a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCSQLCodeParser.scala
+++ b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executer/JDBCSQLCodeParser.scala
@@ -21,6 +21,8 @@ import org.apache.linkis.manager.engineplugin.jdbc.conf.JDBCConfiguration
import org.apache.commons.lang3.StringUtils
+import java.util.Locale
+
import scala.collection.mutable.ArrayBuffer
object JDBCSQLCodeParser {
@@ -55,18 +57,20 @@ object JDBCSQLCodeParser {
var code = cmd.trim
if (!cmd.split("\\s+")(0).equalsIgnoreCase("select")) return false
if (code.contains("limit")) code = code.substring(code.lastIndexOf("limit")).trim
- else if (code.contains("LIMIT"))
- code = code.substring(code.lastIndexOf("LIMIT")).trim.toLowerCase
- else return true
+ else if (code.contains("LIMIT")) {
+ // scalastyle:off caselocale
+ code = code.substring(code.lastIndexOf("LIMIT")).trim.toLowerCase(Locale.getDefault())
+ } else return true
val hasLimit = code.matches("limit\\s+\\d+\\s*;?")
if (hasLimit) {
if (code.indexOf(";") > 0) code = code.substring(5, code.length - 1).trim
else code = code.substring(5).trim
val limitNum = code.toInt
- if (limitNum > defaultLimit)
+ if (limitNum > defaultLimit) {
throw new IllegalArgumentException(
"We at most allowed to limit " + defaultLimit + ", but your SQL has been over the max rows."
)
+ }
}
!hasLimit
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org