From 764185d9211229e5dcafe885cfdcbfbfadf54ce7 Mon Sep 17 00:00:00 2001
From: Eric Hartmann <hartmann.eric@gmail.com>
Date: Wed, 14 Jun 2017 13:24:39 +0200
Subject: SONAR-9427 Improve performance on quality profile changelog

---
 .../org/sonar/db/qualityprofile/QProfileChangeMapper.xml       | 10 +++++-----
 .../org/sonar/db/qualityprofile/QProfileChangeDaoTest.java     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'server/sonar-db-dao')

diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QProfileChangeMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QProfileChangeMapper.xml
index 77ebd8602b8..172b7c9a8ea 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QProfileChangeMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QProfileChangeMapper.xml
@@ -5,7 +5,7 @@
 
   <sql id="selectColumns">
     qpc.kee as "uuid",
-    qpc.qprofile_key as rulesProfileUuid,
+    qpc.rules_profile_uuid as rulesProfileUuid,
     qpc.created_at as createdAt,
     qpc.user_login as login,
     qpc.change_type as changeType,
@@ -16,7 +16,7 @@
     insert into qprofile_changes
     (
       kee,
-      qprofile_key,
+      rules_profile_uuid,
       created_at,
       user_login,
       change_type,
@@ -34,7 +34,7 @@
   <select id="countForQProfileUuid" resultType="int">
     select count(qpc.kee)
     from qprofile_changes qpc
-    inner join rules_profiles rp on rp.kee = qpc.qprofile_key
+    inner join rules_profiles rp on rp.kee = qpc.rules_profile_uuid
     inner join org_qprofiles oqp on oqp.rules_profile_uuid = rp.kee
     where
       oqp.uuid = #{qProfileUuid, jdbcType=VARCHAR}
@@ -65,7 +65,7 @@
   <sql id="sqlSelectByQuery">
     select <include refid="selectColumns" />
     from qprofile_changes qpc
-    inner join rules_profiles rp on rp.kee = qpc.qprofile_key
+    inner join rules_profiles rp on rp.kee = qpc.rules_profile_uuid
     inner join org_qprofiles oqp on oqp.rules_profile_uuid = rp.kee
     where
       oqp.uuid = #{query.profileUuid, jdbcType=VARCHAR}
@@ -80,7 +80,7 @@
 
   <delete id="deleteByRuleProfileUuids" parameterType="String">
     delete from qprofile_changes
-    where qprofile_key in
+    where rules_profile_uuid in
     <foreach collection="ruleProfileUuids" open="(" close=")" item="ruleProfileUuid" separator=",">
       #{ruleProfileUuid, jdbcType=VARCHAR}
     </foreach>
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QProfileChangeDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QProfileChangeDaoTest.java
index 944664e7263..3a2f026169b 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QProfileChangeDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QProfileChangeDaoTest.java
@@ -239,7 +239,7 @@ public class QProfileChangeDaoTest {
 
   private QProfileChangeDto selectChangeByUuid(String uuid) {
     Map<String, Object> map = db.selectFirst(dbSession,
-      "select kee as \"uuid\", qprofile_key as \"rulesProfileUuid\", created_at as \"createdAt\", user_login as \"login\", change_type as \"changeType\", change_data as \"changeData\" from qprofile_changes where kee='"
+      "select kee as \"uuid\", rules_profile_uuid as \"rulesProfileUuid\", created_at as \"createdAt\", user_login as \"login\", change_type as \"changeType\", change_data as \"changeData\" from qprofile_changes where kee='"
         + uuid + "'");
     return new QProfileChangeDto()
       .setUuid((String) map.get("uuid"))
-- 
cgit v1.2.3