Remove fetchSize in issues SQL and reactivate previously deactivated unit test

diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
index 3f1d11dd81b12ec350811eb6de5a6e7acccba229..f407ec3289a20654de0b98c12b1f043abe2a28dd 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
@@ -201,72 +201,37 @@
     </where>
   </select>
 
-  <select id="selectIssues" parameterType="map" resultType="Issue" fetchSize="100000">
-    select
-    <choose>
-      <when test="returnOnlyIdAndSortColumns == true">
-        i.id
-        <include refid="sortColumn"/>
-        from issues i
-      </when>
-      <otherwise>
-        <include refid="issueColumns"/>
-        from issues i
-        inner join rules r on r.id=i.rule_id
-        inner join projects p on p.id=i.component_id
-        inner join projects root on root.id=i.root_component_id
-      </otherwise>
-    </choose>
+  <select id="selectIssues" parameterType="map" resultType="Issue">
+    select <include refid="issueColumns"/>
+    from issues i
+    inner join rules r on r.id=i.rule_id
+    inner join projects p on p.id=i.component_id
+    inner join projects root on root.id=i.root_component_id
     <include refid="selectQueryConditions"/>
-    <if test="maxResults != null">
-      limit #{maxResults}
-    </if>
+  </select>
+
+  <select id="selectIssueIds" parameterType="map" resultType="Issue">
+    select i.id <include refid="sortColumn"/>
+    from issues i
+    <include refid="selectQueryConditions"/>
+    limit #{maxResults}
   </select>
 
   <!-- SQL Server -->
-  <select id="selectIssues" parameterType="map" resultType="Issue" fetchSize="100000" databaseId="mssql">
-    select
-    <if test="maxResults != null">
-      top (#{maxResults})
-    </if>
-    <choose>
-      <when test="returnOnlyIdAndSortColumns == true">
-        i.id
-        <include refid="sortColumn"/>
-        from issues i
-      </when>
-      <otherwise>
-        <include refid="issueColumns"/>
-        from issues i
-        inner join rules r on r.id=i.rule_id
-        inner join projects p on p.id=i.component_id
-        inner join projects root on root.id=i.root_component_id
-      </otherwise>
-    </choose>
+  <select id="selectIssueIds" parameterType="map" resultType="Issue" databaseId="mssql">
+    select top (#{maxResults}) i.id <include refid="sortColumn"/>
+    from issues i
     <include refid="selectQueryConditions"/>
   </select>
 
   <!-- Oracle -->
-  <select id="selectIssues" parameterType="map" resultType="Issue" fetchSize="100000" databaseId="oracle">
+  <select id="selectIssueIds" parameterType="map" resultType="Issue" databaseId="oracle">
     select * from (select
-    <choose>
-      <when test="returnOnlyIdAndSortColumns == true">
-        i.id
-        <include refid="sortColumn"/>
-      </when>
-      <otherwise>
-        <include refid="issueColumns"/>
-        from issues i
-        inner join rules r on r.id=i.rule_id
-        inner join projects p on p.id=i.component_id
-        inner join projects root on root.id=i.root_component_id
-      </otherwise>
-    </choose>
-    <include refid="selectQueryConditions"/>
+      i.id <include refid="sortColumn"/>
+      from issues i
+      <include refid="selectQueryConditions"/>
     )
-    <if test="maxResults != null">
-      where rownum &lt;= #{maxResults}
-    </if>
+    where rownum &lt;= #{maxResults}
   </select>
 
   <sql id="selectQueryConditions">

diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueStatsMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueStatsMapper.xml
index accae5e1b88fb2b8f7c43f24e4802b462f9c5022..5369af451489ac0837ef4f61b78b7b0c08e3a1cf 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueStatsMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueStatsMapper.xml
@@ -4,7 +4,7 @@
 
 <mapper namespace="org.sonar.core.issue.db.IssueStatsMapper">
 
-  <select id="selectIssuesColumn" parameterType="map" resultType="Object" fetchSize="100000">
+  <select id="selectIssuesColumn" parameterType="map" resultType="Object">
     select
     <if test="'ASSIGNEE'.equals(column)">
       i.assignee