From 1e9faaca4a1f427688f1d8751c38033695e96fcd Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@sonarsource.com>
Date: Mon, 8 Sep 2014 16:14:04 +0200
Subject: [PATCH] SONAR-5560 - enabled scrolling for synchronizer

---
 .../main/java/org/sonar/server/issue/index/IssueIndex.java | 6 +++---
 sonar-application/src/main/assembly/conf/sonar.properties  | 2 +-
 .../main/java/org/sonar/core/persistence/DbSession.java    | 2 +-
 .../main/resources/org/sonar/core/issue/db/IssueMapper.xml | 7 +++++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
index d3de841ef22..5819181b2f1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
@@ -190,9 +190,9 @@ public class IssueIndex extends BaseIndex<IssueDoc, IssueDto, String> {
         .field(IssueNormalizer.IssueField.ACTION_PLAN.field()));
     }
 
-    // Execute Function aggregation
-    esSearch.addAggregation(AggregationBuilders.sum("totalDuration")
-      .field(IssueNormalizer.IssueField.DEBT.field()));
+    // Sample Functional aggregation
+    // esSearch.addAggregation(AggregationBuilders.sum("totalDuration")
+    // .field(IssueNormalizer.IssueField.DEBT.field()));
 
     return getClient().execute(esSearch);
   }
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 8cae11e3cca..283d23abbf8 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -28,7 +28,7 @@
 
 
 #----- MySQL 5.x
-#sonar.jdbc.url=jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useConfigs=maxPerformance
+#sonar.jdbc.url=jdbc:mysql://localhost:3306/sonar?useCursorFetch=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useConfigs=maxPerformance
 
 
 #----- Oracle 10g/11g
diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DbSession.java b/sonar-core/src/main/java/org/sonar/core/persistence/DbSession.java
index b663b22e35e..5e4560c24c0 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DbSession.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DbSession.java
@@ -34,7 +34,7 @@ import java.util.Map;
 
 public class DbSession implements SqlSession {
 
-  private static final Integer IMPLICIT_COMMIT_SIZE = 1000;
+  private static final Integer IMPLICIT_COMMIT_SIZE = 2000;
   private List<ClusterAction> actions;
 
   private WorkQueue queue;
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 7ec31980008..9d22edf886e 100644
--- 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
@@ -135,8 +135,11 @@
     where i.kee=#{kee}
   </select>
 
-  <select id="selectAfterDate" resultType="Issue" resultSetType="FORWARD_ONLY" fetchSize="200">
-    select
+  <select id="selectAfterDate" resultType="Issue" timeout="10000"
+          fetchSize="2000"
+          statementType="PREPARED"
+          resultSetType="FORWARD_ONLY">
+  select
     <include refid="issueColumns"/>
     from issues i
     inner join rules r on r.id=i.rule_id
-- 
2.39.5