SONAR-249: extract persistence layer from data index + dump measures at the end of the batch instead of persisting them on the fly

2 files changed, 6 insertions, 6 deletions

diff --git a/sonar-core/src/main/java/org/sonar/jpa/dao/AsyncMeasuresDao.java b/sonar-core/src/main/java/org/sonar/jpa/dao/AsyncMeasuresDao.java
index 4e2ece885ab..4c8c71b0b72 100644
--- a/sonar-core/src/main/java/org/sonar/jpa/dao/AsyncMeasuresDao.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/dao/AsyncMeasuresDao.java
@@ -131,7 +131,7 @@ public class AsyncMeasuresDao extends BaseDao {
             "AND ams.snapshotDate>=:measureDate " +

             "ORDER BY ams.snapshotDate ASC ")

         .setParameter("projectId", asyncMeasure.getProjectId())

-        .setParameter("metricId", asyncMeasure.getMetric().getId())

+        .setParameter("metricId", asyncMeasure.getMetricId())

         .setParameter("measureDate", asyncMeasure.getMeasureDate());

     if (endDate != null) {

       query.setParameter("endDate", endDate);

diff --git a/sonar-core/src/main/java/org/sonar/jpa/dao/AsyncMeasuresService.java b/sonar-core/src/main/java/org/sonar/jpa/dao/AsyncMeasuresService.java
index ae296d1e356..26b1926b901 100644
--- a/sonar-core/src/main/java/org/sonar/jpa/dao/AsyncMeasuresService.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/dao/AsyncMeasuresService.java
@@ -90,7 +90,7 @@ public class AsyncMeasuresService {
     AsyncMeasuresDao dao = new AsyncMeasuresDao(session);
     MeasureModel measure = dao.getAsyncMeasure(id);
     AsyncMeasureSnapshot pastAsyncMeasureSnapshot = dao.getLastAsyncMeasureSnapshot(measure.getProjectId(),
-        measure.getMetric().getId(), measure.getMeasureDate());
+        measure.getMetricId(), measure.getMeasureDate());
     dao.deleteAsyncMeasure(measure);
     if (pastAsyncMeasureSnapshot != null) {
       MeasureModel pastAsyncMeasure = dao.getAsyncMeasure(pastAsyncMeasureSnapshot.getMeasureId());
@@ -102,7 +102,7 @@ public class AsyncMeasuresService {
 
   private void registerMeasure(MeasureModel measure, AsyncMeasuresDao dao) {
     AsyncMeasureSnapshot nextAsyncMeasureSnapshot = dao.getNextAsyncMeasureSnapshot(
-        measure.getProjectId(), measure.getMetric().getId(), measure.getMeasureDate());
+        measure.getProjectId(), measure.getMetricId(), measure.getMeasureDate());
     Date dateNextAsyncMeasure = (nextAsyncMeasureSnapshot != null) ? nextAsyncMeasureSnapshot.getMeasureDate() : null;
 
     List<AsyncMeasureSnapshot> nextAsyncMeasureSnapshots = dao.getNextAsyncMeasureSnapshotsUntilDate(
@@ -110,7 +110,7 @@ public class AsyncMeasuresService {
     if (!nextAsyncMeasureSnapshots.isEmpty()) {
       for (AsyncMeasureSnapshot asyncMeasureSnapshot : nextAsyncMeasureSnapshots) {
         dao.createAsyncMeasureSnapshot(measure.getId(), asyncMeasureSnapshot.getSnapshotId(), measure.getMeasureDate(),
-            asyncMeasureSnapshot.getSnapshotDate(), measure.getMetric().getId(), measure.getProjectId());
+            asyncMeasureSnapshot.getSnapshotDate(), measure.getMetricId(), measure.getProjectId());
         dao.removeSnapshotFromAsyncMeasureSnapshot(asyncMeasureSnapshot);
       }
     } else {
@@ -118,11 +118,11 @@ public class AsyncMeasuresService {
       if (!nextSnapshotsUntilDate.isEmpty()) {
         for (Snapshot nextSnapshot : nextSnapshotsUntilDate) {
           dao.createAsyncMeasureSnapshot(measure.getId(), nextSnapshot.getId(), measure.getMeasureDate(),
-              nextSnapshot.getCreatedAt(), measure.getMetric().getId(), measure.getProjectId());
+              nextSnapshot.getCreatedAt(), measure.getMetricId(), measure.getProjectId());
         }
       } else {
         dao.createAsyncMeasureSnapshot(measure.getId(), null, measure.getMeasureDate(),
-            null, measure.getMetric().getId(), measure.getProjectId());
+            null, measure.getMetricId(), measure.getProjectId());
       }
     }
   }