From ca2ce921e33bd93a02e7088747b8dc6fb6f53e38 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Thu, 9 Jan 2014 08:24:41 +0100
Subject: [PATCH] SONAR-4923 Share session when searching for profile ancestors

---
 .../qualityprofile/db/QualityProfileDao.java  |  7 ++++++-
 .../db/QualityProfileMapper.xml               |  2 +-
 .../server/qualityprofile/QProfileSearch.java | 20 ++++++++++++++-----
 .../qualityprofile/QProfileSearchTest.java    | 18 +++++++++++++----
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDao.java b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDao.java
index b4fb64c40fa..090283b56dc 100644
--- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDao.java
@@ -118,11 +118,16 @@ public class QualityProfileDao implements ServerComponent {
     }
   }
 
+  @CheckForNull
+  public QualityProfileDto selectParent(Integer childId, SqlSession session) {
+    return session.getMapper(QualityProfileMapper.class).selectParent(childId);
+  }
+
   @CheckForNull
   public QualityProfileDto selectParent(Integer childId) {
     SqlSession session = mybatis.openSession();
     try {
-      return session.getMapper(QualityProfileMapper.class).selectParent(childId);
+      return selectParent(childId, session);
     } finally {
       MyBatis.closeQuietly(session);
     }
diff --git a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/QualityProfileMapper.xml b/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/QualityProfileMapper.xml
index 2d833b76faf..9bf019e41d6 100644
--- a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/QualityProfileMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/QualityProfileMapper.xml
@@ -47,7 +47,7 @@
   </select>
 
   <select id="selectByLanguage" parameterType="String" resultType="QualityProfile">
-    SELECT DISTINCT <include refid="profilesColumns"/>
+    SELECT <include refid="profilesColumns"/>
     FROM rules_profiles p
     <where>
       AND p.language=#{language}
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileSearch.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileSearch.java
index 60370762bc2..d9cb28a88c0 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileSearch.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileSearch.java
@@ -22,7 +22,9 @@ package org.sonar.server.qualityprofile;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
+import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.ServerComponent;
+import org.sonar.core.persistence.MyBatis;
 import org.sonar.core.qualityprofile.db.QualityProfileDao;
 import org.sonar.core.qualityprofile.db.QualityProfileDto;
 
@@ -34,9 +36,11 @@ import static com.google.common.collect.Lists.newArrayList;
 
 public class QProfileSearch implements ServerComponent {
 
+  private final MyBatis myBatis;
   private final QualityProfileDao dao;
 
-  public QProfileSearch(QualityProfileDao dao) {
+  public QProfileSearch(MyBatis myBatis, QualityProfileDao dao) {
+    this.myBatis = myBatis;
     this.dao = dao;
   }
 
@@ -63,19 +67,25 @@ public class QProfileSearch implements ServerComponent {
 
   public List<QProfile> ancestors(QProfile profile) {
     List<QProfile> ancestors = newArrayList();
-    incrementAncestors(profile, ancestors);
+    SqlSession session = myBatis.openSession();
+    try {
+      incrementAncestors(profile, ancestors, session);
+    } finally {
+      MyBatis.closeQuietly(session);
+    }
     return ancestors;
   }
 
-  private void incrementAncestors(QProfile profile, List<QProfile> ancestors){
+  private void incrementAncestors(QProfile profile, List<QProfile> ancestors, SqlSession session){
     if (profile.parent() != null) {
-      QualityProfileDto parentDto = dao.selectParent(profile.id());
+      // TODO reuse same session
+      QualityProfileDto parentDto = dao.selectParent(profile.id(), session);
       if (parentDto == null) {
         throw new IllegalStateException("Cannot find parent of profile : "+ profile.id());
       }
       QProfile parent = QProfile.from(parentDto);
       ancestors.add(parent);
-      incrementAncestors(parent, ancestors);
+      incrementAncestors(parent, ancestors, session);
     }
   }
 
diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileSearchTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileSearchTest.java
index 966a4b65210..4b9093a5472 100644
--- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileSearchTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileSearchTest.java
@@ -20,11 +20,13 @@
 
 package org.sonar.server.qualityprofile;
 
+import org.apache.ibatis.session.SqlSession;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.sonar.core.persistence.MyBatis;
 import org.sonar.core.qualityprofile.db.QualityProfileDao;
 import org.sonar.core.qualityprofile.db.QualityProfileDto;
 
@@ -32,12 +34,19 @@ import java.util.List;
 
 import static com.google.common.collect.Lists.newArrayList;
 import static org.fest.assertions.Assertions.assertThat;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class QProfileSearchTest {
 
+  @Mock
+  MyBatis myBatis;
+
+  @Mock
+  SqlSession session;
+
   @Mock
   QualityProfileDao dao;
 
@@ -45,7 +54,8 @@ public class QProfileSearchTest {
 
   @Before
   public void setUp() throws Exception {
-    search = new QProfileSearch(dao);
+    when(myBatis.openSession()).thenReturn(session);
+    search = new QProfileSearch(myBatis, dao);
   }
 
   @Test
@@ -102,9 +112,9 @@ public class QProfileSearchTest {
 
   @Test
   public void search_ancestors() throws Exception {
-    when(dao.selectParent(3)).thenReturn(new QualityProfileDto().setId(2).setName("Child").setLanguage("java").setParent("Parent"));
-    when(dao.selectParent(2)).thenReturn(new QualityProfileDto().setId(1).setName("Parent").setLanguage("java"));
-    when(dao.selectParent(1)).thenReturn(null);
+    when(dao.selectParent(eq(3), eq(session))).thenReturn(new QualityProfileDto().setId(2).setName("Child").setLanguage("java").setParent("Parent"));
+    when(dao.selectParent(eq(2), eq(session))).thenReturn(new QualityProfileDto().setId(1).setName("Parent").setLanguage("java"));
+    when(dao.selectParent(eq(1), eq(session))).thenReturn(null);
 
     List<QProfile> result = search.ancestors(new QProfile().setId(3).setName("Grandchild").setLanguage("java").setParent("Child"));
     assertThat(result).hasSize(2);
-- 
2.39.5