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 7562e899d [ISSUE-3750]Fix ec history list query results are inaccurate
(#3752)
7562e899d is described below
commit 7562e899d2ef6912d7a0e85f2f6efc92b59cef45
Author: Casion <[email protected]>
AuthorDate: Wed Nov 2 12:16:51 2022 +0800
[ISSUE-3750]Fix ec history list query results are inaccurate (#3752)
* fix:EC query results are inaccurate
* format code
---
.../scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala | 6 ++++--
.../org/apache/linkis/manager/label/entity/engine/EngineType.scala | 3 ---
.../org/apache/linkis/manager/dao/impl/ECResourceRecordMapper.xml | 3 ++-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala
index ef7bf3378..b0430d022 100644
---
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala
+++
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala
@@ -60,7 +60,7 @@ import org.springframework.web.bind.annotation._
import javax.servlet.http.HttpServletRequest
-import java.text.SimpleDateFormat
+import java.text.{MessageFormat, SimpleDateFormat}
import java.util
import java.util.{Comparator, TimeZone}
@@ -277,8 +277,10 @@ class RMMonitorRest extends Logging {
val searchUsername = if (StringUtils.isEmpty(username)) "" else username
val searchCreator = if (StringUtils.isEmpty(creator)) "" else creator
val searchEngineType = if (StringUtils.isEmpty(engineType)) "" else
engineType
+ // label value in db as
:{"creator":"nodeexecution","user":"hadoop","engineType":"appconn","version":"1"}
val labelValuePattern =
- "%" + searchCreator + "%" + "," + "%" + searchUsername + "%" + "," + "%"
+ searchEngineType + "%" + "," + "%"
+ MessageFormat.format("%{0}%,%{1}%,%{2}%,%", searchCreator,
searchUsername, searchEngineType)
+
if (COMBINED_USERCREATOR_ENGINETYPE == null) {
val userCreatorLabel =
labelFactory.createLabel(classOf[UserCreatorLabel])
val engineTypeLabel = labelFactory.createLabel(classOf[EngineTypeLabel])
diff --git
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineType.scala
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineType.scala
index 6ef1cc45a..3550d3185 100644
---
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineType.scala
+++
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineType.scala
@@ -43,8 +43,6 @@ object EngineType extends Enumeration with Logging {
val PIPELINE = Value("pipeline")
- val ES = Value("es")
-
val PRESTO = Value("presto")
val FLINK = Value("flink")
@@ -86,7 +84,6 @@ object EngineType extends Enumeration with Logging {
case _ if IO_ENGINE_FILE.toString.equalsIgnoreCase(str) => IO_ENGINE_FILE
case _ if IO_ENGINE_HDFS.toString.equalsIgnoreCase(str) => IO_ENGINE_HDFS
case _ if PIPELINE.toString.equalsIgnoreCase(str) => PIPELINE
- case _ if ES.toString.equalsIgnoreCase(str) => ES
case _ if PRESTO.toString.equalsIgnoreCase(str) => PRESTO
case _ if FLINK.toString.equalsIgnoreCase(str) => FLINK
case _ if APPCONN.toString.equals(str) => APPCONN
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ECResourceRecordMapper.xml
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ECResourceRecordMapper.xml
index 90d3165dc..a05d5ea22 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ECResourceRecordMapper.xml
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ECResourceRecordMapper.xml
@@ -71,7 +71,8 @@
<where>
<if test="instance != null"> service_instance = #{instance}</if>
<if test="username != null"> and create_user = #{username}</if>
- <if test="engineType !=null">and label_value like
concat('%',#{engineType},'%')</if>
+<!-- label_value in db eg：`hadoop-spark,spark-2.4.3`-->
+ <if test="engineType !=null">and label_value like
concat('%,',#{engineType},'%')</if>
<if test="startDate != null">and create_time BETWEEN #{startDate}
AND #{endDate}</if>
</where>
ORDER BY linkis_cg_ec_resource_info_record.create_time DESC
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
