You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/08/31 10:11:00 UTC
[incubator-linkis] branch dev-1.3.1 updated: feat:Scala code format alarm clear in linkis-jobhistory (#3138)
This is an automated email from the ASF dual-hosted git repository.
peacewong 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 9897d8251 feat:Scala code format alarm clear in linkis-jobhistory (#3138)
9897d8251 is described below
commit 9897d8251c8cb9cd894b92b169de7445cb3b2f21
Author: ruY <43...@users.noreply.github.com>
AuthorDate: Wed Aug 31 18:10:54 2022 +0800
feat:Scala code format alarm clear in linkis-jobhistory (#3138)
---
.../jobhistory/conversions/TaskConversions.scala | 31 +++++++++++++---------
.../impl/JobHistoryDetailQueryServiceImpl.scala | 14 +++++-----
.../service/impl/JobHistoryQueryServiceImpl.scala | 11 ++++----
.../apache/linkis/jobhistory/util/QueryUtils.scala | 4 ++-
4 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conversions/TaskConversions.scala b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conversions/TaskConversions.scala
index 7900d4b3c..77c1f03ff 100644
--- a/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conversions/TaskConversions.scala
+++ b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conversions/TaskConversions.scala
@@ -45,18 +45,19 @@ object TaskConversions extends Logging {
lazy private val labelBuilderFactory = LabelBuilderFactoryContext.getLabelBuilderFactory
- @Deprecated
+ @deprecated
def requestQueryTask2QueryTask(requestQueryTask: RequestQueryTask): QueryTask = {
val task: QueryTask = new QueryTask
BeanUtils.copyProperties(requestQueryTask, task)
- if (requestQueryTask.getParams != null)
+ if (requestQueryTask.getParams != null) {
task.setParamsJson(BDPJettyServerHelper.gson.toJson(requestQueryTask.getParams))
- else
+ } else {
task.setParamsJson(null)
+ }
task
}
- /*@Deprecated
+ /* @deprecated
def queryTask2RequestPersistTask(queryTask: QueryTask): RequestPersistTask = {
QueryUtils.exchangeExecutionCode(queryTask)
val task = new RequestPersistTask
@@ -64,9 +65,9 @@ object TaskConversions extends Logging {
task.setSource(BDPJettyServerHelper.gson.fromJson(queryTask.getSourceJson, classOf[java.util.HashMap[String, String]]))
task.setParams(BDPJettyServerHelper.gson.fromJson(queryTask.getParamsJson, classOf[java.util.HashMap[String, Object]]))
task
- }*/
+ } */
- /*@Deprecated
+ /* @deprecated
def requestPersistTaskTask2QueryTask(requestPersistTask: RequestPersistTask): QueryTask = {
val task: QueryTask = new QueryTask
BeanUtils.copyProperties(requestPersistTask, task)
@@ -75,9 +76,9 @@ object TaskConversions extends Logging {
else
task.setParamsJson(null)
task
- }*/
+ } */
- /*def queryTask2QueryTaskVO(queryTask: QueryTask): QueryTaskVO = {
+ /* def queryTask2QueryTaskVO(queryTask: QueryTask): QueryTaskVO = {
QueryUtils.exchangeExecutionCode(queryTask)
val taskVO = new QueryTaskVO
BeanUtils.copyProperties(queryTask, taskVO)
@@ -102,7 +103,7 @@ object TaskConversions extends Logging {
taskVO.setCostTime(System.currentTimeMillis() - queryTask.getCreatedTime().getTime());
}
taskVO
- }*/
+ } */
def isJobFinished(status: String): Boolean = {
TaskStatus.Succeed.toString.equals(status) ||
@@ -128,10 +129,11 @@ object TaskConversions extends Logging {
// jobReq.setPriority(job.getPriority)
jobReq.setSubmitUser(job.getSubmitUser)
jobReq.setExecuteUser(job.getExecuteUser)
- if (null != job.getSource)
+ if (null != job.getSource) {
jobReq.setSource(
BDPJettyServerHelper.gson.fromJson(job.getSource, classOf[util.Map[String, Object]])
)
+ }
if (null != job.getLabels) jobReq.setLabels(getLabelListFromJson(job.getLabels))
jobReq.setParams(
BDPJettyServerHelper.gson.fromJson(job.getParams, classOf[util.Map[String, Object]])
@@ -169,22 +171,25 @@ object TaskConversions extends Logging {
.foreach(kv => labelMap.put(kv._1, kv._2))
jobHistory.setLabels(BDPJettyServerHelper.gson.toJson(labelMap))
}
- if (null != jobReq.getParams)
+ if (null != jobReq.getParams) {
jobHistory.setParams(BDPJettyServerHelper.gson.toJson(jobReq.getParams))
+ }
jobHistory.setProgress(jobReq.getProgress)
jobHistory.setStatus(jobReq.getStatus)
jobHistory.setLogPath(jobReq.getLogPath)
jobHistory.setErrorCode(jobReq.getErrorCode)
jobHistory.setErrorDesc(jobReq.getErrorDesc)
jobHistory.setResultLocation(jobReq.getResultLocation)
- if (null != jobReq.getCreatedTime)
+ if (null != jobReq.getCreatedTime) {
jobHistory.setCreatedTime(new Date(jobReq.getCreatedTime.getTime))
+ }
if (null != jobReq.getUpdatedTime) {
jobHistory.setUpdatedTime(new Date(jobReq.getUpdatedTime.getTime))
}
jobHistory.setInstances(jobReq.getInstances)
- if (null != jobReq.getMetrics)
+ if (null != jobReq.getMetrics) {
jobHistory.setMetrics(BDPJettyServerHelper.gson.toJson(jobReq.getMetrics))
+ }
val engineType = LabelUtil.getEngineType(jobReq.getLabels)
jobHistory.setEngineType(engineType)
jobHistory.setExecutionCode(jobReq.getExecutionCode)
diff --git a/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryDetailQueryServiceImpl.scala b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryDetailQueryServiceImpl.scala
index 7369efd44..1b5241834 100644
--- a/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryDetailQueryServiceImpl.scala
+++ b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryDetailQueryServiceImpl.scala
@@ -88,11 +88,12 @@ class JobHistoryDetailQueryServiceImpl extends JobHistoryDetailQueryService with
if (jobDetail.getStatus != null) {
val oldStatus: String =
jobDetailMapper.selectJobDetailStatusForUpdateByJobDetailId(jobDetail.getId)
- if (oldStatus != null && !shouldUpdate(oldStatus, jobDetail.getStatus))
+ if (oldStatus != null && !shouldUpdate(oldStatus, jobDetail.getStatus)) {
throw new QueryException(
120001,
s"${jobDetail.getId}数据库中的task状态为：${oldStatus}更新的task状态为：${jobDetail.getStatus}更新失败！"
)
+ }
}
jobDetail.setExecutionContent(null)
val jobUpdate = subjobDetail2JobDetail(jobDetail)
@@ -102,12 +103,12 @@ class JobHistoryDetailQueryServiceImpl extends JobHistoryDetailQueryService with
jobDetailMapper.updateJobDetail(jobUpdate)
// todo
- /*// to write cache
+ /* // to write cache
if (TaskStatus.Succeed.toString.equals(jobReq.getStatus) && queryCacheService.needCache(jobReq)) {
info("Write cache for task: " + jobReq.getId)
jobReq.setExecutionCode(executionCode)
queryCacheService.writeCache(jobReq)
- }*/
+ } */
val map = new util.HashMap[String, Object]
map.put(JobRequestConstants.JOB_ID, jobDetail.getId.asInstanceOf[Object])
@@ -147,11 +148,12 @@ class JobHistoryDetailQueryServiceImpl extends JobHistoryDetailQueryService with
if (jobDetail.getStatus != null) {
val oldStatus: String =
jobDetailMapper.selectJobDetailStatusForUpdateByJobDetailId(jobDetail.getId)
- if (oldStatus != null && !shouldUpdate(oldStatus, jobDetail.getStatus))
+ if (oldStatus != null && !shouldUpdate(oldStatus, jobDetail.getStatus)) {
throw new QueryException(
120001,
s"${jobDetail.getId}数据库中的task状态为：${oldStatus}更新的task状态为：${jobDetail.getStatus}更新失败！"
)
+ }
}
jobDetail.setExecutionContent(null)
val jobUpdate = subjobDetail2JobDetail(jobDetail)
@@ -161,12 +163,12 @@ class JobHistoryDetailQueryServiceImpl extends JobHistoryDetailQueryService with
jobDetailMapper.updateJobDetail(jobUpdate)
// todo
- /*//to write cache
+ /* //to write cache
if (TaskStatus.Succeed.toString.equals(jobReq.getStatus) && queryCacheService.needCache(jobReq)) {
info("Write cache for task: " + jobReq.getId)
jobReq.setExecutionCode(executionCode)
queryCacheService.writeCache(jobReq)
- }*/
+ } */
val map = new util.HashMap[String, Object]
map.put(JobRequestConstants.JOB_ID, jobDetail.getId.asInstanceOf[Object])
diff --git a/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala
index c073ca2b5..73e58b3ea 100644
--- a/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala
+++ b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala
@@ -171,23 +171,24 @@ class JobHistoryQueryServiceImpl extends JobHistoryQueryService with Logging {
}
if (jobReq.getStatus != null) {
val oldStatus: String = jobHistoryMapper.selectJobHistoryStatusForUpdate(jobReq.getId)
- if (oldStatus != null && !shouldUpdate(oldStatus, jobReq.getStatus))
+ if (oldStatus != null && !shouldUpdate(oldStatus, jobReq.getStatus)) {
throw new QueryException(
120001,
s"jobId:${jobReq.getId}，在数据库中的task状态为：${oldStatus}，更新的task状态为：${jobReq.getStatus}，更新失败！"
)
+ }
}
val jobUpdate = jobRequest2JobHistory(jobReq)
jobUpdate.setUpdatedTime(new Timestamp(System.currentTimeMillis()))
jobHistoryMapper.updateJobHistory(jobUpdate)
// todo
- /*//to write cache
+ /* //to write cache
if (TaskStatus.Succeed.toString.equals(jobReq.getStatus) && queryCacheService.needCache(jobReq)) {
info("Write cache for task: " + jobReq.getId)
jobReq.setExecutionCode(executionCode)
queryCacheService.writeCache(jobReq)
- }*/
+ } */
val map = new util.HashMap[String, Object]
map.put(JobRequestConstants.JOB_ID, jobReq.getId.asInstanceOf[Object])
@@ -236,13 +237,13 @@ class JobHistoryQueryServiceImpl extends JobHistoryQueryService with Logging {
jobResp
}
- /*private def queryTaskList2RequestPersistTaskList(queryTask: java.util.List[QueryTask]): java.util.List[RequestPersistTask] = {
+ /* private def queryTaskList2RequestPersistTaskList(queryTask: java.util.List[QueryTask]): java.util.List[RequestPersistTask] = {
import scala.collection.JavaConversions._
val tasks = new util.ArrayList[RequestPersistTask]
import org.apache.linkis.jobhistory.conversions.TaskConversions.queryTask2RequestPersistTask
queryTask.foreach(f => tasks.add(f))
tasks
- }*/
+ } */
override def getJobHistoryByIdAndName(jobId: java.lang.Long, userName: String): JobHistory = {
val jobReq = new JobHistory
diff --git a/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryUtils.scala b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryUtils.scala
index ea1969e9d..5a10a1d39 100644
--- a/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryUtils.scala
+++ b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/util/QueryUtils.scala
@@ -103,7 +103,9 @@ object QueryUtils extends Logging {
queryTask.getExecutionCode == null || !queryTask.getExecutionCode.startsWith(
StorageUtils.HDFS_SCHEMA
)
- ) return
+ ) {
+ return
+ }
val codePath = queryTask.getExecutionCode
val path = codePath.substring(0, codePath.lastIndexOf(CODE_SPLIT))
val codeInfo = codePath.substring(codePath.lastIndexOf(CODE_SPLIT) + 1)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org