This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new 3a6db61bb change from label_id to id (#4007)
3a6db61bb is described below
commit 3a6db61bbc5ef74944757673ee8aa4d48a24ddab
Author: 人生有如两个橘子 <[email protected]>
AuthorDate: Thu Dec 15 20:23:40 2022 +0800
change from label_id to id (#4007)
---
.../apache/linkis/instance/label/dao/impl/InsLabelRelationMapper.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InsLabelRelationMapper.xml
b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InsLabelRelationMapper.xml
index e18684023..2a5d8a3d4 100644
---
a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InsLabelRelationMapper.xml
+++
b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/impl/InsLabelRelationMapper.xml
@@ -90,7 +90,7 @@
<![CDATA[SELECT ]]>
<include refid="search_ins_columns"/>
<![CDATA[ FROM `linkis_ps_instance_info` s INNER JOIN
`linkis_ps_instance_label_relation` l ON s.`instance` = l.`service_instance`
AND l.`label_id` IN
- (SELECT `label_id` FROM `linkis_ps_instance_label` WHERE
(`label_key`, `label_value`) IN
+ (SELECT `id` FROM `linkis_ps_instance_label` WHERE (`label_key`,
`label_value`) IN
]]>
<foreach collection="list" item="item" open="(" close=")"
separator=",">
<![CDATA[(#{item.labelKey}, #{item.stringValue})]]>
@@ -184,7 +184,7 @@
<![CDATA[SELECT ]]>
<include refid="search_ins_columns"/>
<![CDATA[ FROM `linkis_ps_instance_info` s INNER JOIN
`linkis_ps_instance_label_relation` l ON s.`instance` = l.`service_instance`
AND l.`label_id` IN
- (SELECT `label_id` FROM `linkis_ps_instance_label` WHERE
(`label_key`, `label_value`) IN
+ (SELECT `id` FROM `linkis_ps_instance_label` WHERE (`label_key`,
`label_value`) IN
]]>
<foreach collection="list" item="item" open="(" close=")"
separator=",">
<![CDATA[(#{item.labelKey}, #{item.stringValue})]]>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
