aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml3
-rw-r--r--server/sonar-db-dao/src/main/resources/org/sonar/db/measure/LiveMeasureMapper.xml11
-rw-r--r--server/sonar-db-dao/src/main/resources/org/sonar/db/purge/PurgeMapper.xml8
3 files changed, 0 insertions, 22 deletions
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml
index f0c7c129f09..ef48daaf913 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml
@@ -213,9 +213,6 @@
<when test="_databaseId == 'mssql'">
p.module_uuid_path LIKE module.module_uuid_path + '%'
</when>
- <when test="_databaseId == 'mysql'">
- p.module_uuid_path LIKE concat(module.module_uuid_path, '%')
- </when>
<otherwise>
p.module_uuid_path LIKE module.module_uuid_path || '%'
</otherwise>
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/measure/LiveMeasureMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/measure/LiveMeasureMapper.xml
index 8c08e03cfeb..49a4b93babf 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/measure/LiveMeasureMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/measure/LiveMeasureMapper.xml
@@ -149,17 +149,6 @@
<include refid="sql_deleteByComponentUuidExcludingMetricIds"/>
</delete>
- <!--
- best practice on MySQL : order the rows to be locked in order
- to minimize risk of deadlock.
- https://stackoverflow.com/a/2423921/229031
- https://jira.sonarsource.com/browse/SONAR-10117?focusedCommentId=153555&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-153555
- -->
- <delete id="deleteByComponentUuidExcludingMetricIds" parameterType="map" databaseId="mysql">
- <include refid="sql_deleteByComponentUuidExcludingMetricIds"/>
- order by uuid
- </delete>
-
<sql id="sql_deleteByComponentUuidExcludingMetricIds">
delete from live_measures
where
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/purge/PurgeMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/purge/PurgeMapper.xml
index 3c521ac55e8..1b6aad991c9 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/purge/PurgeMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/purge/PurgeMapper.xml
@@ -310,14 +310,6 @@
issues.project_uuid = #{projectUuid,jdbcType=VARCHAR}
</delete>
- <!-- Mysql -->
- <delete id="deleteIssueChangesByProjectUuid" databaseId="mysql" parameterType="map">
- delete ic from issue_changes as ic, issues as i
- where
- ic.issue_key=i.kee
- and i.component_uuid = #{projectUuid,jdbcType=VARCHAR}
- </delete>
-
<delete id="deleteIssuesByProjectUuid" parameterType="map">
delete from issues
where project_uuid = #{projectUuid,jdbcType=VARCHAR}