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/02 03:56:36 UTC
[incubator-linkis] branch dev-1.3.1 updated: feat: scala code format alarm clear in linkis-computation-governance-common (#3204)
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 406cf256f feat: scala code format alarm clear in linkis-computation-governance-common (#3204)
406cf256f is described below
commit 406cf256fe50536a10e3e20781e5cbf2a60d78b7
Author: ruY <43...@users.noreply.github.com>
AuthorDate: Fri Sep 2 11:56:31 2022 +0800
feat: scala code format alarm clear in linkis-computation-governance-common (#3204)
---
.../linkis/governance/common/paser/CodeParser.scala | 21 +++++++++++----------
.../common/protocol/task/RequestTask.scala | 2 +-
.../common/utils/GovernanceConstant.scala | 2 +-
.../common/utils/OnceExecutorContentUtils.scala | 6 ++++--
4 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala
index 92de725ab..9baa2ee6c 100644
--- a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala
+++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala
@@ -24,6 +24,7 @@ import org.apache.linkis.governance.common.paser.CodeType.CodeType
import org.apache.commons.lang3.StringUtils
import java.util
+import java.util.Locale
import scala.collection.mutable
import scala.collection.mutable.ArrayBuffer
@@ -247,9 +248,9 @@ class SQLCodeParser extends SingleCodeParser with Logging {
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")) {
+ 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
@@ -285,7 +286,7 @@ class JsonCodeParser extends SingleCodeParser {
var status = 0
var isBegin = false
code.trim.toCharArray().foreach {
- case '{' => {
+ case '{' =>
if (status == 0) {
if (isBegin && !statementBuffer.isEmpty) {
codeBuffer.append(new String(statementBuffer.toArray))
@@ -296,11 +297,9 @@ class JsonCodeParser extends SingleCodeParser {
}
status -= 1
statementBuffer.append('{')
- }
- case '}' => {
+ case '}' =>
status += 1
statementBuffer.append('}')
- }
case char: Char =>
if (status == 0 && isBegin && !statementBuffer.isEmpty) {
codeBuffer.append(new String(statementBuffer.toArray))
@@ -327,11 +326,13 @@ object CodeType extends Enumeration {
CodeAndRunTypeUtils.getRunTypeAndCodeTypeRelationMap
if (
runTypeAndCodeTypeRelationMap.isEmpty || !runTypeAndCodeTypeRelationMap.contains(
- codeType.toLowerCase
+ codeType.toLowerCase(Locale.getDefault)
)
- ) return Other
+ ) {
+ return Other
+ }
- val runType = runTypeAndCodeTypeRelationMap(codeType.toLowerCase)
+ val runType = runTypeAndCodeTypeRelationMap(codeType.toLowerCase(Locale.getDefault))
runType match {
case CodeAndRunTypeUtils.RUN_TYPE_PYTHON => Python
case CodeAndRunTypeUtils.RUN_TYPE_SQL => SQL
diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/protocol/task/RequestTask.scala b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/protocol/task/RequestTask.scala
index a6c67cfa6..4d0b8952c 100644
--- a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/protocol/task/RequestTask.scala
+++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/protocol/task/RequestTask.scala
@@ -79,7 +79,7 @@ class RequestTaskExecute extends RequestTask with RequestProtocol {
}
}
- override def toString =
+ override def toString: String =
s"RequestTaskExecute(code=${getCodeByLimit()}, lock=$lock, properties=$properties, labels=$labels, sourceID=${getSourceID()})"
override def getSourceID(): String = sourceID
diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/GovernanceConstant.scala b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/GovernanceConstant.scala
index b02c57bc3..52e780216 100644
--- a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/GovernanceConstant.scala
+++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/GovernanceConstant.scala
@@ -31,5 +31,5 @@ object GovernanceConstant {
val REQUEST_ENGINE_STATUS_BATCH_LIMIT = 500
- def RESULTSET_INDEX = "resultsetIndex"
+ def RESULTSET_INDEX: String = "resultsetIndex"
}
diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/OnceExecutorContentUtils.scala b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/OnceExecutorContentUtils.scala
index 5c3ca65f4..dd4b9bcff 100644
--- a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/OnceExecutorContentUtils.scala
+++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/OnceExecutorContentUtils.scala
@@ -32,21 +32,23 @@ object OnceExecutorContentUtils {
def resourceToValue(bmlResource: BmlResource): String = {
val resourceId = bmlResource.getResourceId
val resourceIdLength = resourceId.length.toString.length
- if (resourceIdLength > LEN)
+ if (resourceIdLength > LEN) {
throw new GovernanceErrorException(
40108,
s"Invalid resourceId $resourceId, it is too length."
)
+ }
val len = if (resourceIdLength < LEN) "0" * (LEN - resourceIdLength) + resourceId.length
HEADER + len + resourceId + bmlResource.getVersion
}
def valueToResource(resource: String): BmlResource = {
- if (!resource.startsWith(HEADER))
+ if (!resource.startsWith(HEADER)) {
throw new GovernanceErrorException(
40108,
s"Invalid resource $resource, it doesn't contain $HEADER."
)
+ }
val value = resource.substring(HEADER.length)
val len = value.substring(0, LEN)
val resourceId = value.substring(LEN, len.toInt + LEN)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org