From: Pierre <pierre.guillot@sonarsource.com>
Date: Thu, 28 Sep 2023 09:03:56 +0000 (+0200)
Subject: SONAR-20315 use pagination.offset in all paginated sql queries, and remove the concep... 
X-Git-Tag: 10.3.0.82913~316
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=52d5664842507687db6666cfbdc4d9c829b570f1;p=sonarqube.git

SONAR-20315 use pagination.offset in all paginated sql queries, and remove the concept of startRowNumber
---

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/OffsetBasedPagination.java b/server/sonar-db-dao/src/main/java/org/sonar/db/OffsetBasedPagination.java
index 3ba9042b683..fb50adafbc5 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/OffsetBasedPagination.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/OffsetBasedPagination.java
@@ -55,11 +55,6 @@ public class OffsetBasedPagination implements Pagineable {
     return new OffsetBasedPagination(startRowNumber - 1, pageSize);
   }
 
-  @Override
-  public int getStartRowNumber() {
-    return offset + 1;
-  }
-
   @Override
   public int getOffset() {
     return offset;
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/Pagination.java b/server/sonar-db-dao/src/main/java/org/sonar/db/Pagination.java
index 5ee079241a2..882c3a81bb9 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/Pagination.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/Pagination.java
@@ -63,11 +63,6 @@ public final class Pagination implements Pagineable {
     return (page - 1) * pageSize;
   }
 
-  @Override
-  public int getStartRowNumber() {
-    return getOffset() + 1;
-  }
-
   public int getEndRowNumber() {
     return page * pageSize;
   }
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/Pagineable.java b/server/sonar-db-dao/src/main/java/org/sonar/db/Pagineable.java
index 5bba0a4d0a3..e6517bdb125 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/Pagineable.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/Pagineable.java
@@ -21,8 +21,6 @@ package org.sonar.db;
 
 public interface Pagineable {
 
-  int getStartRowNumber();
-
   int getOffset();
 
   int getPageSize();
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/audit/AuditMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/audit/AuditMapper.xml
index a532172fc60..550789850eb 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/audit/AuditMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/audit/AuditMapper.xml
@@ -31,7 +31,7 @@
     from audits a
     where
       a.created_at &gt;= #{start} and a.created_at &lt; #{end}
-    limit #{pagination.pageSize,jdbcType=INTEGER} offset #{pagination.offset,jdbcType=INTEGER}
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
   <select id="selectByPeriodPaginated" parameterType="map" resultType="org.sonar.db.audit.AuditDto" databaseId="mssql">
@@ -43,7 +43,7 @@
         where created_at &gt;= #{start} and created_at &lt; #{end}
     ) as a
     where
-    a.row_number between #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
+    a.row_number between (#{pagination.offset,jdbcType=INTEGER}+1) and #{pagination.endRowNumber,jdbcType=INTEGER}
     order by a.row_number asc
   </select>
 
@@ -57,7 +57,7 @@
       ) t
     ) a
     where
-      a.rn between #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
+      a.rn between (#{pagination.offset,jdbcType=INTEGER}+1) and #{pagination.endRowNumber,jdbcType=INTEGER}
     order by a.rn asc
   </select>
 
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeActivityMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeActivityMapper.xml
index b7761f31771..a53f15d1d2b 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeActivityMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeActivityMapper.xml
@@ -85,7 +85,7 @@
   <sql id="sqlSelectByQuery">
     <include refid="sqlSelectByQueryWithoutPagination"/>
     order by ca.created_at desc, uuid desc
-    offset (#{pagination.startRowNumber,jdbcType=INTEGER}-1) rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </sql>
 
   <select id="countByQuery" parameterType="map" resultType="int">
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeQueueMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeQueueMapper.xml
index c98190ef524..88e1d5e5e13 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeQueueMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeQueueMapper.xml
@@ -110,7 +110,7 @@
   </select>
 
   <sql id="pagination">
-    offset (#{pagination.startRowNumber,jdbcType=INTEGER}-1) rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </sql>
 
   <select id="countByQuery" resultType="int">
@@ -148,32 +148,7 @@
     select cq.uuid as ceTaskUuid, cq.created_at as createdAt
     <include refid="sqlSelectEligibleForPeek"/>
     <include refid="orderBySelectEligibleForPeek"/>
-    limit #{pagination.pageSize,jdbcType=INTEGER} offset #{pagination.offset,jdbcType=INTEGER}
-  </select>
-
-  <select id="selectEligibleForPeek" parameterType="map" resultType="org.sonar.db.ce.CeTaskDtoLight" databaseId="mssql">
-    select query.uuid as ceTaskUuid, query.created_at as createdAt from (
-      select
-        row_number() over(<include refid="orderBySelectEligibleForPeek"/>) as number,
-        <include refid="columnsSelectEligibleForPeek"/>
-      <include refid="sqlSelectEligibleForPeek"/>
-    ) as query
-    where
-    query.number between #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
-    order by number asc
-  </select>
-
-  <select id="selectEligibleForPeek" parameterType="map" resultType="org.sonar.db.ce.CeTaskDtoLight" databaseId="oracle">
-    select taskuuid as ceTaskUuid, createdat as createdAt from (
-      select rownum as rn, t."uuid" as taskuuid, t."created_at" as createdat from (
-        select
-          <include refid="columnsSelectEligibleForPeek"/>
-          <include refid="sqlSelectEligibleForPeek"/>
-          <include refid="orderBySelectEligibleForPeek"/>
-      ) t
-    ) t
-    where
-      t.rn between #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
   <sql id="columnsSelectEligibleForPeek">
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 6dffe0b6848..ba9c732ea74 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
@@ -215,7 +215,7 @@
       <include refid="componentColumns"/>
     <include refid="sqlSelectByQuery"/>
     ORDER BY LOWER(p.name), p.name, p.created_at
-    offset (#{pagination.startRowNumber,jdbcType=INTEGER}-1) rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
   <select id="countByQuery" resultType="int">
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/SnapshotMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/SnapshotMapper.xml
index d66491e315d..79637cfad2c 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/SnapshotMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/SnapshotMapper.xml
@@ -188,7 +188,7 @@
   </select>
 
   <sql id="pagination">
-    offset (#{pagination.startRowNumber,jdbcType=INTEGER}-1) rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </sql>
 
   <select id="selectSnapshotBefore" resultType="ViewsSnapshot">
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/issue/IssueMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/issue/IssueMapper.xml
index 62b53297cf2..b9649d46bbf 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/issue/IssueMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/issue/IssueMapper.xml
@@ -547,77 +547,7 @@
           </foreach>
     </if>
     order by i.kee
-    limit #{pagination.pageSize,jdbcType=INTEGER} offset #{pagination.offset,jdbcType=INTEGER}
-  </select>
-
-  <select id="selectIssueKeysByComponentUuidWithFilters" parameterType="map" resultType="string" databaseId="mssql">
-   	select
-      i.kee
-    from
-    (select
-        row_number() over(order by i.kee ASC) as row_number,
-          i.kee
-        from rules r
-        inner join issues i on i.rule_uuid = r.uuid
-        where i.project_uuid=#{componentUuid,jdbcType=VARCHAR}
-        AND i.status &lt;&gt; 'CLOSED'
-        <if test="includingRepositories.size() > 0">
-            AND r.plugin_name IN
-              <foreach item="ruleRepository" index="index" collection="includingRepositories" open="(" separator="," close=")">
-                #{ruleRepository}
-              </foreach>
-        </if>
-        <if test="excludingRepositories.size() > 0">
-          AND r.plugin_name NOT IN
-            <foreach item="ruleRepository" index="index" collection="excludingRepositories" open="(" separator="," close=")">
-              #{ruleRepository}
-            </foreach>
-        </if>
-        <if test="languages.size() > 0">
-            AND r.language IN
-              <foreach item="language" index="index" collection="languages" open="(" separator="," close=")">
-                  #{language}
-              </foreach>
-        </if>
-      order by row_number asc
-      offset #{pagination.offset} rows
-      fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only)  i
-   </select>
-
-  <select id="selectIssueKeysByComponentUuidWithFilters" parameterType="map" resultType="string" databaseId="oracle">
-    select
-      i.kee
-    from (
-	      select rownum as rn, t.* from (
-	        select
-	         i.kee
-	        from rules r
-          inner join issues i on i.rule_uuid = r.uuid
-	        where i.project_uuid=#{componentUuid,jdbcType=VARCHAR}
-          AND i.status &lt;&gt; 'CLOSED'
-          <if test="includingRepositories.size() > 0">
-              AND r.plugin_name IN
-                <foreach item="ruleRepository" index="index" collection="includingRepositories" open="(" separator="," close=")">
-                  #{ruleRepository}
-                </foreach>
-          </if>
-          <if test="excludingRepositories.size() > 0">
-            AND r.plugin_name NOT IN
-              <foreach item="ruleRepository" index="index" collection="excludingRepositories" open="(" separator="," close=")">
-                #{ruleRepository}
-              </foreach>
-          </if>
-          <if test="languages.size() > 0">
-              AND r.language IN
-                <foreach item="language" index="index" collection="languages" open="(" separator="," close=")">
-                    #{language}
-                </foreach>
-          </if>
-          order by i.kee ASC
-	      ) t ) i
-	    where
-	      i.rn between #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
-	    order by i.rn asc
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
   <select id="selectIssueKeysByComponentUuidAndChangedSinceDate" parameterType="map" resultType="string">
@@ -648,80 +578,7 @@
         </foreach>
    </if>
     order by i.kee
-    limit #{pagination.pageSize,jdbcType=INTEGER} offset #{pagination.offset,jdbcType=INTEGER}
-  </select>
-
-  <select id="selectIssueKeysByComponentUuidAndChangedSinceDate" parameterType="map" resultType="string" databaseId="mssql">
-  	select
-      i.kee
-    from
-    (select
-        row_number() over(order by i.kee ASC) as row_number,
-         i.kee
-        from rules r
-        inner join issues i on i.rule_uuid = r.uuid
-        where i.project_uuid=#{componentUuid,jdbcType=VARCHAR}
-        AND i.issue_update_date &gt;= #{changedSince,jdbcType=BIGINT}
-        AND i.status &lt;&gt; 'CLOSED'
-        <if test="includingRepositories.size() > 0">
-            AND r.plugin_name IN
-              <foreach item="ruleRepository" index="index" collection="includingRepositories" open="(" separator="," close=")">
-                #{ruleRepository}
-              </foreach>
-        </if>
-        <if test="excludingRepositories.size() > 0">
-          AND r.plugin_name NOT IN
-            <foreach item="ruleRepository" index="index" collection="excludingRepositories" open="(" separator="," close=")">
-              #{ruleRepository}
-            </foreach>
-        </if>
-        <if test="languages.size() > 0">
-            AND r.language IN
-              <foreach item="language" index="index" collection="languages" open="(" separator="," close=")">
-                  #{language}
-              </foreach>
-        </if>
-        order by row_number asc
-        offset #{pagination.offset} rows
-        fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only)  i
-  </select>
-
-  <select id="selectIssueKeysByComponentUuidAndChangedSinceDate" parameterType="map" resultType="string" databaseId="oracle">
-    select
-      i.kee
-    from
-	  (select rownum as rn, t.* from (
-	        select
-	         i.kee
-	        from rules r
-          inner join issues i on i.rule_uuid = r.uuid
-	        where i.project_uuid=#{componentUuid,jdbcType=VARCHAR}
-          AND i.issue_update_date &gt;= #{changedSince,jdbcType=BIGINT}
-          AND i.status &lt;&gt; 'CLOSED'
-          <if test="includingRepositories.size() > 0">
-              AND r.plugin_name IN
-                <foreach item="ruleRepository" index="index" collection="includingRepositories" open="(" separator="," close=")">
-                  #{ruleRepository}
-                </foreach>
-          </if>
-          <if test="excludingRepositories.size() > 0">
-            AND r.plugin_name NOT IN
-              <foreach item="ruleRepository" index="index" collection="excludingRepositories" open="(" separator="," close=")">
-                #{ruleRepository}
-              </foreach>
-          </if>
-          <if test="languages.size() > 0">
-              AND r.language IN
-                <foreach item="language" index="index" collection="languages" open="(" separator="," close=")">
-                    #{language}
-                </foreach>
-          </if>
-          order by i.kee ASC
-	      ) t
-	    ) i
-	    where
-	      i.rn between #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
-	    order by i.rn asc
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
   <select id="selectByComponentUuidPaginated" parameterType="map" resultMap="issueResultMap">
@@ -738,55 +595,7 @@
     left outer join rules_default_impacts rdi on r.uuid = rdi.rule_uuid
     where i.project_uuid=#{componentUuid,jdbcType=VARCHAR}
     order by i.issue_creation_date ASC
-    limit #{pagination.pageSize,jdbcType=INTEGER} offset #{pagination.offset,jdbcType=INTEGER}
-  </select>
-
-  <select id="selectByComponentUuidPaginated" parameterType="map" resultMap="issueResultMap" databaseId="mssql">
-  	select
-    <include refid="issueColumns"/>,
-    u.login as assigneeLogin
-    from
-    (select
-        row_number() over(order by i.issue_creation_date ASC) as row_number,
-          <include refid="issueColumnsInInnerQuery"/>
-        from issues i
-        where i.project_uuid=#{componentUuid,jdbcType=VARCHAR}
-      order by row_number asc
-      offset #{pagination.offset} rows
-      fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only)  i
-    inner join rules r on r.uuid=i.rule_uuid
-    inner join components p on p.uuid=i.component_uuid
-    inner join components root on root.uuid=i.project_uuid
-    left join users u on i.assignee = u.uuid
-    left join new_code_reference_issues n on i.kee = n.issue_key
-    left outer join issues_impacts ii on i.kee = ii.issue_key
-    left outer join rules_default_impacts rdi on r.uuid = rdi.rule_uuid
-  </select>
-
-   <select id="selectByComponentUuidPaginated" parameterType="map" resultMap="issueResultMap" databaseId="oracle">
-    select
-    <include refid="issueColumns"/>,
-    u.login as assigneeLogin
-    from
-	  (select <include refid="issueColumnsInInnerQuery"/> from (
-	      select rownum as rn, t.* from (
-	        select
-	        <include refid="issueColumnsInInnerQuery"/>
-	        from issues i
-	        where i.project_uuid=#{componentUuid,jdbcType=VARCHAR}
-	        	order by i.issue_creation_date ASC
-	      ) t
-	    ) i
-	    where
-	      i.rn between #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
-	    order by i.rn asc) i
-    inner join rules r on r.uuid=i.rule_uuid
-    inner join components p on p.uuid=i.component_uuid
-    inner join components root on root.uuid=i.project_uuid
-    left join users u on i.assignee = u.uuid
-    left join new_code_reference_issues n on i.kee = n.issue_key
-    left outer join issues_impacts ii on i.kee = ii.issue_key
-    left outer join rules_default_impacts rdi on r.uuid = rdi.rule_uuid
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
   <sql id="selectByBranchColumns">
@@ -918,6 +727,6 @@
         <!--  order by clause is required if using offset rows fetch next on MSSQL Database   -->
         order by (select null)
       </if>
-    offset (#{pagination.startRowNumber,jdbcType=INTEGER}-1) rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 </mapper>
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/metric/MetricMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/metric/MetricMapper.xml
index c77a7c45a36..8afb81bd763 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/metric/MetricMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/metric/MetricMapper.xml
@@ -45,7 +45,7 @@
       m.enabled=${_true}
     </where>
     ORDER BY UPPER(m.short_name), m.short_name
-    offset (#{pagination.startRowNumber,jdbcType=INTEGER}-1) rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
   <select id="countEnabled" resultType="Integer">
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/GroupPermissionMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/GroupPermissionMapper.xml
index 3a214437939..49b60bfebb5 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/GroupPermissionMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/GroupPermissionMapper.xml
@@ -79,7 +79,7 @@
   </select>
 
   <sql id="pagination">
-    offset (#{pagination.startRowNumber,jdbcType=INTEGER}-1) rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </sql>
 
   <select id="countGroupsByQuery" parameterType="map" resultType="int">
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/template/PermissionTemplateMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/template/PermissionTemplateMapper.xml
index 73520e48809..2e122c5841a 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/template/PermissionTemplateMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/template/PermissionTemplateMapper.xml
@@ -139,7 +139,7 @@
   </select>
 
   <sql id="pagination">
-    offset (#{pagination.startRowNumber,jdbcType=INTEGER}-1) rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </sql>
 
   <sql id="groupNamesByQueryAndTemplate">
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/project/ProjectMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/project/ProjectMapper.xml
index dd94c2f4f37..f24ccb52809 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/project/ProjectMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/project/ProjectMapper.xml
@@ -50,7 +50,7 @@
         #{uuid,jdbcType=VARCHAR}
       </foreach>
       order by p.name, uuid desc
-      offset (#{pagination.startRowNumber,jdbcType=INTEGER}-1) rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
+      offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
   <select id="selectProjectsByKeys" resultType="Project">
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/QualityGateGroupPermissionsMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/QualityGateGroupPermissionsMapper.xml
index 33cd3600741..029701e6072 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/QualityGateGroupPermissionsMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/QualityGateGroupPermissionsMapper.xml
@@ -33,31 +33,7 @@
     SELECT g.uuid as groupUuid, g.name as name, qggp.uuid as uuid
     <include refid="sqlSelectByQuery"/>
     ORDER BY g.name ASC
-    LIMIT #{pagination.pageSize,jdbcType=INTEGER}
-    OFFSET #{pagination.offset,jdbcType=INTEGER}
-  </select>
-
-  <select id="selectByQuery" parameterType="map" resultType="org.sonar.db.user.SearchGroupMembershipDto" databaseId="mssql">
-    select * from (
-    select row_number() over(order by g.name asc) as number,
-      g.uuid as groupUuid, g.name as name, qggp.uuid as uuid
-      <include refid="sqlSelectByQuery" />
-    ) as query
-    where
-    query.number between #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
-    order by query.name asc
-  </select>
-
-  <select id="selectByQuery" parameterType="map" resultType="org.sonar.db.user.SearchGroupMembershipDto" databaseId="oracle">
-    select * from (
-      select rownum as rn, t.* from (
-        select g.uuid as groupUuid, g.name as name, qggp.uuid as uuid
-        <include refid="sqlSelectByQuery"/>
-        order by g.name ASC
-      ) t
-    ) t
-    where
-    t.rn between #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
    <select id="countByQuery" resultType="int">
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/QualityGateUserPermissionsMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/QualityGateUserPermissionsMapper.xml
index 149fc766cfb..9181c55b525 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/QualityGateUserPermissionsMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualitygate/QualityGateUserPermissionsMapper.xml
@@ -41,33 +41,7 @@
     SELECT u.uuid as userUuid, u.name as name, qup.uuid as uuid
     <include refid="sqlSelectByQuery"/>
     ORDER BY u.name ASC
-    LIMIT #{pagination.pageSize,jdbcType=INTEGER}
-    OFFSET #{pagination.offset,jdbcType=INTEGER}
-  </select>
-
-  <select id="selectByQuery" parameterType="map" resultType="org.sonar.db.user.SearchUserMembershipDto"
-          databaseId="mssql">
-    select * from (
-    select row_number() over(order by u.name asc) as number,
-    u.uuid as userUuid, u.name as name, qup.uuid as uuid
-    <include refid="sqlSelectByQuery"/>
-    ) as query
-    where
-    query.number between #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
-    order by query.name asc
-  </select>
-
-  <select id="selectByQuery" parameterType="map" resultType="org.sonar.db.user.SearchUserMembershipDto"
-          databaseId="oracle">
-    select * from (
-    select rownum as rn, t.* from (
-    select u.uuid as userUuid, u.name as name, qup.uuid as uuid
-    <include refid="sqlSelectByQuery"/>
-    order by u.name ASC
-    ) t
-    ) t
-    where
-    t.rn between #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
   <sql id="sqlSelectByQuery">
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QProfileEditGroupsMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QProfileEditGroupsMapper.xml
index 4314c7ac88a..acfd537f110 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QProfileEditGroupsMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QProfileEditGroupsMapper.xml
@@ -29,31 +29,7 @@
     SELECT g.uuid as groupUuid, g.name as name, qeg.uuid as uuid
     <include refid="sqlSelectByQuery"/>
     ORDER BY g.name ASC
-    LIMIT #{pagination.pageSize,jdbcType=INTEGER}
-    OFFSET #{pagination.offset,jdbcType=INTEGER}
-  </select>
-
-  <select id="selectByQuery" parameterType="map" resultType="org.sonar.db.user.SearchGroupMembershipDto" databaseId="mssql">
-    select * from (
-    select row_number() over(order by g.name asc) as number,
-      g.uuid as groupUuid, g.name as name, qeg.uuid as uuid
-      <include refid="sqlSelectByQuery" />
-    ) as query
-    where
-    query.number between #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
-    order by query.name asc
-  </select>
-
-  <select id="selectByQuery" parameterType="map" resultType="org.sonar.db.user.SearchGroupMembershipDto" databaseId="oracle">
-    select * from (
-      select rownum as rn, t.* from (
-        select g.uuid as groupUuid, g.name as name, qeg.uuid as uuid
-        <include refid="sqlSelectByQuery"/>
-        order by g.name ASC
-      ) t
-    ) t
-    where
-    t.rn between #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
   <sql id="sqlSelectByQuery">
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QProfileEditUsersMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QProfileEditUsersMapper.xml
index 74b3b512804..a8bbc1cd6d5 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QProfileEditUsersMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QProfileEditUsersMapper.xml
@@ -27,33 +27,7 @@
     SELECT u.uuid as userUuid, u.name as name, qeu.uuid as uuid
     <include refid="sqlSelectByQuery"/>
     ORDER BY u.name ASC
-    LIMIT #{pagination.pageSize,jdbcType=INTEGER}
-    OFFSET #{pagination.offset,jdbcType=INTEGER}
-  </select>
-
-  <select id="selectByQuery" parameterType="map" resultType="org.sonar.db.user.SearchUserMembershipDto"
-          databaseId="mssql">
-    select * from (
-    select row_number() over(order by u.name asc) as number,
-    u.uuid as userUuid, u.name as name, qeu.uuid as uuid
-    <include refid="sqlSelectByQuery"/>
-    ) as query
-    where
-    query.number between #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
-    order by query.name asc
-  </select>
-
-  <select id="selectByQuery" parameterType="map" resultType="org.sonar.db.user.SearchUserMembershipDto"
-          databaseId="oracle">
-    select * from (
-    select rownum as rn, t.* from (
-    select u.uuid as userUuid, u.name as name, qeu.uuid as uuid
-    <include refid="sqlSelectByQuery"/>
-    order by u.name ASC
-    ) t
-    ) t
-    where
-    t.rn between #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
   <sql id="sqlSelectByQuery">
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/user/GroupMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/user/GroupMapper.xml
index dfb733bea4f..ea9f0327977 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/user/GroupMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/user/GroupMapper.xml
@@ -99,7 +99,7 @@
   </select>
 
   <sql id="pagination">
-    offset (#{pagination.startRowNumber,jdbcType=INTEGER}-1) rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </sql>
 
   <select id="countByQuery" parameterType="map" resultType="int">
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/user/GroupMembershipMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/user/GroupMembershipMapper.xml
index 4812a9dfdca..7853f238363 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/user/GroupMembershipMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/user/GroupMembershipMapper.xml
@@ -25,7 +25,7 @@
     SELECT g.uuid as uuid, g.name as name, g.description as description, gu.user_uuid as userUuid
     <include refid="commonClauses"/>
     ORDER BY g.name
-    offset (#{pagination.startRowNumber,jdbcType=INTEGER}-1) rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
   <select id="countGroups" parameterType="map" resultType="int">
@@ -99,7 +99,7 @@
     SELECT u.uuid as uuid, u.login as login, u.name as name, gu.group_uuid as groupUuid
     <include refid="userCommonClauses"/>
     ORDER BY u.name ASC
-    offset (#{pagination.startRowNumber,jdbcType=INTEGER}-1) rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
   <select id="countMembers" parameterType="map" resultType="int">
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml
index fe46b569190..2420da17cac 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml
@@ -104,40 +104,7 @@
         <include refid="selectFromUsersAndJoinScmAccounts"/>
         <include refid="searchByQueryWhereClause"/>
         ORDER BY u.login
-        limit #{pagination.pageSize,jdbcType=INTEGER} offset #{pagination.offset,jdbcType=INTEGER}
-    </select>
-
-    <select id="selectUsers" parameterType="map" resultMap="userResultMap" databaseId="mssql">
-        SELECT
-            <include refid="usersAndScmAccountsColumns"/>
-        FROM
-            (SELECT
-                <include refid="searchByQueryInnerQueryColumns"/>
-            FROM users u
-            <include refid="searchByQueryWhereClause"/>
-            ORDER BY u.login
-            offset #{pagination.offset} rows
-            fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
-            ) u
-        <include refid="leftOuterJoinScmAccounts"/>
-    </select>
-
-    <select id="selectUsers" parameterType="map" resultMap="userResultMap" databaseId="oracle">
-        SELECT
-            <include refid="usersAndScmAccountsColumns"/>
-        FROM
-            (SELECT rownum as rn, t.* from (
-                SELECT
-                <include refid="searchByQueryInnerQueryColumns"/>
-                FROM users u
-                <include refid="searchByQueryWhereClause"/>
-                ORDER BY u.login ASC
-                ) t
-            ) u
-        <include refid="leftOuterJoinScmAccounts"/>
-        WHERE
-        u.rn BETWEEN #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
-	      ORDER BY u.rn ASC
+        offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
     </select>
 
     <select id="countByQuery" parameterType="map" resultType="int">
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/webhook/WebhookDeliveryMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/webhook/WebhookDeliveryMapper.xml
index fa7a2e09033..a115f936aed 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/webhook/WebhookDeliveryMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/webhook/WebhookDeliveryMapper.xml
@@ -38,7 +38,7 @@
     from webhook_deliveries
     where webhook_uuid = #{webhookUuid,jdbcType=VARCHAR}
     order by created_at desc
-    offset (#{pagination.startRowNumber,jdbcType=INTEGER}-1) rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
   <select id="countByProjectUuid" parameterType="String" resultType="int">
@@ -53,7 +53,7 @@
     from webhook_deliveries
     where project_uuid = #{projectUuid,jdbcType=VARCHAR}
     order by created_at desc
-    offset (#{pagination.startRowNumber,jdbcType=INTEGER}-1) rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
   <select id="selectOrderedByCeTaskUuid" resultType="org.sonar.db.webhook.WebhookDeliveryLiteDto">
@@ -61,7 +61,7 @@
     from webhook_deliveries
     where ce_task_uuid = #{ceTaskUuid,jdbcType=VARCHAR}
     order by created_at desc
-    offset (#{pagination.startRowNumber,jdbcType=INTEGER}-1) rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
+    offset #{pagination.offset,jdbcType=INTEGER} rows fetch next #{pagination.pageSize,jdbcType=INTEGER} rows only
   </select>
 
   <select id="countByCeTaskUuid" parameterType="String" resultType="int">
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/OffsetBasedPaginationTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/OffsetBasedPaginationTest.java
index 88c412aee32..52b1eafe129 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/OffsetBasedPaginationTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/OffsetBasedPaginationTest.java
@@ -49,10 +49,10 @@ public class OffsetBasedPaginationTest {
   }
 
   @Test
-  public void forOffset_whenZeroOffset_shouldStartRowNumberAtOne() {
+  public void forOffset_whenZeroOffset_shouldStartOffsetAtZero() {
     assertThat(OffsetBasedPagination.forOffset(0, 100))
-      .extracting(p -> p.getStartRowNumber(), p -> p.getOffset(), p -> p.getPageSize())
-      .containsExactly(1, 0, 100);
+      .extracting(p -> p.getOffset(), p -> p.getPageSize())
+      .containsExactly(0, 100);
   }
 
   @Test
@@ -76,13 +76,6 @@ public class OffsetBasedPaginationTest {
       .hasMessage("page size must be >= 1");
   }
 
-  @Test
-  public void forStartRowNumber_whenZeroOffset_shouldStartRowNumberAtOne() {
-    assertThat(OffsetBasedPagination.forStartRowNumber(1, 100))
-      .extracting(p -> p.getStartRowNumber(), p -> p.getOffset(), p -> p.getPageSize())
-      .containsExactly(1, 0, 100);
-  }
-
   @Test
   public void equals_whenSameParameters_shouldBeTrue() {
     Assertions.assertThat(OffsetBasedPagination.forStartRowNumber(15, 20))
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/PaginationTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/PaginationTest.java
index 5f85d87c18b..c0fc8c692d4 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/PaginationTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/PaginationTest.java
@@ -80,13 +80,6 @@ public class PaginationTest {
     assertThat(forPage(5).andSize(1).getOffset()).isEqualTo(4);
   }
 
-  @Test
-  public void startRowNumber_is_computed_from_page_and_size() {
-    assertThat(forPage(2).andSize(3).getStartRowNumber()).isEqualTo(4);
-    assertThat(forPage(5).andSize(3).getStartRowNumber()).isEqualTo(13);
-    assertThat(forPage(5).andSize(1).getStartRowNumber()).isEqualTo(5);
-  }
-
   @Test
   public void endRowNumber_is_computed_from_page_and_size() {
     assertThat(forPage(2).andSize(3).getEndRowNumber()).isEqualTo(6);