SONAR-5249 Merge measure_data and project_measure tables

19 files changed, 38 insertions, 93 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/measure/db/MeasureDataDto.java b/sonar-core/src/main/java/org/sonar/core/measure/db/MeasureDataDto.java
index 474aee60f7a..c2003a9796e 100644
--- a/sonar-core/src/main/java/org/sonar/core/measure/db/MeasureDataDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/measure/db/MeasureDataDto.java
@@ -28,8 +28,6 @@ public class MeasureDataDto {
 
   private Integer id;
 
-  private Long measureId;
-
   private Integer snapshotId;
 
   private byte[] data;
@@ -43,15 +41,6 @@ public class MeasureDataDto {
     return this;
   }
 
-  public Long getMeasureId() {
-    return measureId;
-  }
-
-  public MeasureDataDto setMeasureId(Long measureId) {
-    this.measureId = measureId;
-    return this;
-  }
-
   public Integer getSnapshotId() {
     return snapshotId;
   }
diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
index d815836f613..41ca1b31a1e 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
@@ -33,7 +33,7 @@ import java.util.List;
  */
 public class DatabaseVersion implements BatchComponent, ServerComponent {
 
-  public static final int LAST_VERSION = 526;
+  public static final int LAST_VERSION = 530;
 
   public static enum Status {
     UP_TO_DATE, REQUIRES_UPGRADE, REQUIRES_DOWNGRADE, FRESH_INSTALL
@@ -67,7 +67,6 @@ public class DatabaseVersion implements BatchComponent, ServerComponent {
     "issue_filter_favourites",
     "loaded_templates",
     "manual_measures",
-    "measure_data",
     "measure_filters",
     "measure_filter_favourites",
     "metrics",
diff --git a/sonar-core/src/main/java/org/sonar/core/purge/PurgeCommands.java b/sonar-core/src/main/java/org/sonar/core/purge/PurgeCommands.java
index 765f8e2a7bf..3a4e0ac18e6 100644
--- a/sonar-core/src/main/java/org/sonar/core/purge/PurgeCommands.java
+++ b/sonar-core/src/main/java/org/sonar/core/purge/PurgeCommands.java
@@ -173,13 +173,6 @@ class PurgeCommands {
     session.commit();
     profiler.stop();
 
-    profiler.start("deleteSnapshotMeasureData (measure_data)");
-    for (List<Long> partSnapshotIds : snapshotIdsPartition) {
-      purgeMapper.deleteSnapshotMeasureData(partSnapshotIds);
-    }
-    session.commit();
-    profiler.stop();
-
     profiler.start("deleteSnapshotMeasures (project_measures)");
     for (List<Long> partSnapshotIds : snapshotIdsPartition) {
       purgeMapper.deleteSnapshotMeasures(partSnapshotIds);
@@ -276,7 +269,8 @@ class PurgeCommands {
     profiler.start("deleteSnapshotDependencies (dependencies)");
     for (List<Long> partSnapshotIds : snapshotIdsPartition) {
       // SONAR-4586
-      // On MsSQL, the maximum number of parameters allowed in a query is 2000, so we have to execute 3 queries instead of one with 3 or inside
+      // On MsSQL, the maximum number of parameters allowed in a query is 2000, so we have to execute 3 queries instead of one with 3 or
+      // inside
       purgeMapper.deleteSnapshotDependenciesFromSnapshotId(partSnapshotIds);
       purgeMapper.deleteSnapshotDependenciesToSnapshotId(partSnapshotIds);
       purgeMapper.deleteSnapshotDependenciesProjectSnapshotId(partSnapshotIds);
diff --git a/sonar-core/src/main/java/org/sonar/core/purge/PurgeMapper.java b/sonar-core/src/main/java/org/sonar/core/purge/PurgeMapper.java
index ff7d36d2d04..684c8d6500e 100644
--- a/sonar-core/src/main/java/org/sonar/core/purge/PurgeMapper.java
+++ b/sonar-core/src/main/java/org/sonar/core/purge/PurgeMapper.java
@@ -48,8 +48,6 @@ public interface PurgeMapper {
 
   void deleteSnapshotMeasures(@Param("snapshotIds") List<Long> snapshotIds);
 
-  void deleteSnapshotMeasureData(@Param("snapshotIds") List<Long> snapshotIds);
-
   void deleteSnapshotSource(@Param("snapshotIds") List<Long> snapshotIds);
 
   void deleteSnapshotGraphs(@Param("snapshotIds") List<Long> snapshotIds);
diff --git a/sonar-core/src/main/resources/META-INF/persistence.xml b/sonar-core/src/main/resources/META-INF/persistence.xml
index 034e3dffd10..4caafcf45ed 100644
--- a/sonar-core/src/main/resources/META-INF/persistence.xml
+++ b/sonar-core/src/main/resources/META-INF/persistence.xml
@@ -12,7 +12,6 @@
     <class>org.sonar.api.database.model.User</class>
     <class>org.sonar.api.database.model.Snapshot</class>
     <class>org.sonar.api.database.model.MeasureModel</class>
-    <class>org.sonar.api.database.model.MeasureData</class>
     <class>org.sonar.api.design.DependencyDto</class>
     <class>org.sonar.api.measures.Metric</class>
     <class>org.sonar.api.database.model.ResourceModel</class>
diff --git a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureDataMapper.xml b/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureDataMapper.xml
index 2ee23a30df0..b908ad21cd1 100644
--- a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureDataMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureDataMapper.xml
@@ -4,17 +4,15 @@
 <mapper namespace="org.sonar.core.measure.db.MeasureDataMapper">
 
   <sql id="measureDataColumns">
-    m.id,
-    m.measure_id as measureId,
-    m.snapshot_id as snapshotId,
-    m.data as data
+    pm.id,
+    pm.snapshot_id as snapshotId,
+    pm.measure_data as data
   </sql>
 
   <select id="findByComponentKeyAndMetricKey" parameterType="map" resultType="MeasureData">
     SELECT
     <include refid="measureDataColumns"/>
-    FROM measure_data m
-    INNER JOIN project_measures pm ON pm.id=m.measure_id
+    FROM project_measures pm
     INNER JOIN snapshots s ON s.id=pm.snapshot_id AND s.islast=${_true}
     INNER JOIN projects p ON p.id=s.project_id AND p.enabled=${_true}
     INNER JOIN metrics metric ON metric.id=pm.metric_id
diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
index 0c06c24b650..968d26bed97 100644
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
@@ -225,6 +225,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('523');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('524');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('525');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('526');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('530');
 
 INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '2011-09-26 22:27:48.0', '2011-09-26 22:27:48.0', null, null);
 ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;
diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
index 78504f74af3..4b1234367c9 100644
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
@@ -72,13 +72,6 @@ CREATE TABLE "WIDGETS" (
   "RESOURCE_ID" INTEGER
 );
 
-CREATE TABLE "MEASURE_DATA" (
-  "ID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1),
-  "MEASURE_ID" BIGINT,
-  "SNAPSHOT_ID" INTEGER,
-  "DATA" BINARY(167772150)
-);
-
 CREATE TABLE "GROUPS" (
   "ID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1),
   "NAME" VARCHAR(255),
@@ -277,7 +270,8 @@ CREATE TABLE "PROJECT_MEASURES" (
   "VARIATION_VALUE_2" DOUBLE,
   "VARIATION_VALUE_3" DOUBLE,
   "VARIATION_VALUE_4" DOUBLE,
-  "VARIATION_VALUE_5" DOUBLE
+  "VARIATION_VALUE_5" DOUBLE,
+  "MEASURE_DATA" BINARY(167772150)
 );
 
 CREATE TABLE "SNAPSHOT_SOURCES" (
@@ -612,10 +606,6 @@ CREATE UNIQUE INDEX "METRICS_UNIQUE_NAME" ON "METRICS" ("NAME");
 
 CREATE INDEX "ACTIVE_RULE_PARAM_CHANGES_CID" ON "ACTIVE_RULE_PARAM_CHANGES" ("ACTIVE_RULE_CHANGE_ID");
 
-CREATE INDEX "M_DATA_SID" ON "MEASURE_DATA" ("SNAPSHOT_ID");
-
-CREATE INDEX "MEASURE_DATA_MEASURE_ID" ON "MEASURE_DATA" ("MEASURE_ID");
-
 CREATE INDEX "EVENTS_SNAPSHOT_ID" ON "EVENTS" ("SNAPSHOT_ID");
 
 CREATE INDEX "EVENTS_RESOURCE_ID" ON "EVENTS" ("RESOURCE_ID");
diff --git a/sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml b/sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml
index cd4dc492f89..6b204d180a3 100644
--- a/sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/purge/PurgeMapper.xml
@@ -97,13 +97,6 @@
     </foreach>
   </delete>
 
-  <delete id="deleteSnapshotMeasureData" parameterType="map">
-    delete from measure_data where snapshot_id in
-    <foreach collection="snapshotIds" open="(" close=")" item="snapshotId" separator=",">
-        #{snapshotId}
-    </foreach>
-  </delete>
-
   <delete id="deleteSnapshotSource" parameterType="map">
     delete from snapshot_sources where snapshot_id in
     <foreach collection="snapshotIds" open="(" close=")" item="snapshotId" separator=",">
diff --git a/sonar-core/src/test/java/org/sonar/core/measure/db/MeasureDataDaoTest.java b/sonar-core/src/test/java/org/sonar/core/measure/db/MeasureDataDaoTest.java
index d83e09ad37b..507facc96db 100644
--- a/sonar-core/src/test/java/org/sonar/core/measure/db/MeasureDataDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/measure/db/MeasureDataDaoTest.java
@@ -40,14 +40,12 @@ public class MeasureDataDaoTest extends AbstractDaoTestCase {
     setupData("shared");
 
     MeasureDataDto result = dao.findByComponentKeyAndMetricKey("org.sonar.core.measure.db.MeasureData", "authors_by_line");
-    assertThat(result.getId()).isEqualTo(30);
-    assertThat(result.getMeasureId()).isEqualTo(20);
+    assertThat(result.getId()).isEqualTo(20);
     assertThat(result.getSnapshotId()).isEqualTo(5);
     assertThat(result.getText()).isNotNull();
     assertThat(result.getData()).isNotNull();
 
-    // FIXME failing because data is returned in wrong format
-//    assertThat(result.getText()).isEqualTo("test");
+    assertThat(result.getText()).isEqualTo("0123456789012345678901234567890123456789");
   }
 
   @Test
@@ -55,8 +53,7 @@ public class MeasureDataDaoTest extends AbstractDaoTestCase {
     setupData("find_by_component_key_and_metric_key_without_text");
 
     MeasureDataDto result = dao.findByComponentKeyAndMetricKey("org.sonar.core.measure.db.MeasureData", "authors_by_line");
-    assertThat(result.getId()).isEqualTo(30);
-    assertThat(result.getMeasureId()).isEqualTo(20);
+    assertThat(result.getId()).isEqualTo(20);
     assertThat(result.getSnapshotId()).isEqualTo(5);
     assertThat(result.getText()).isNull();
     assertThat(result.getData()).isNull();
diff --git a/sonar-core/src/test/java/org/sonar/core/purge/PurgeCommandsTest.java b/sonar-core/src/test/java/org/sonar/core/purge/PurgeCommandsTest.java
index 7d57347f425..8bf37632966 100644
--- a/sonar-core/src/test/java/org/sonar/core/purge/PurgeCommandsTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/purge/PurgeCommandsTest.java
@@ -53,7 +53,7 @@ public class PurgeCommandsTest extends AbstractDaoTestCase {
       MyBatis.closeQuietly(session);
     }
     checkTables("shouldDeleteSnapshot",
-        "snapshots", "project_measures", "measure_data", "snapshot_sources", "duplications_index", "events", "dependencies", "snapshot_data");
+      "snapshots", "project_measures", "snapshot_sources", "duplications_index", "events", "dependencies", "snapshot_data");
   }
 
   /**
@@ -84,7 +84,7 @@ public class PurgeCommandsTest extends AbstractDaoTestCase {
       MyBatis.closeQuietly(session);
     }
     checkTables("shouldPurgeSnapshot",
-        "snapshots", "project_measures", "measure_data", "snapshot_sources", "duplications_index", "events", "dependencies", "snapshot_data");
+      "snapshots", "project_measures", "snapshot_sources", "duplications_index", "events", "dependencies", "snapshot_data");
   }
 
   @Test
@@ -140,9 +140,9 @@ public class PurgeCommandsTest extends AbstractDaoTestCase {
     // The goal of this test is only to check that the query do no fail, not to check result
   }
 
-  private List<Long> getHugeNumberOfIds(){
+  private List<Long> getHugeNumberOfIds() {
     List<Long> hugeNbOfSnapshotIds = newArrayList();
-    for (long i=0; i<4500; i++) {
+    for (long i = 0; i < 4500; i++) {
       hugeNbOfSnapshotIds.add(i);
     }
     return hugeNbOfSnapshotIds;
diff --git a/sonar-core/src/test/resources/org/sonar/core/measure/db/MeasureDataDaoTest/find_by_component_key_and_metric_key_without_text.xml b/sonar-core/src/test/resources/org/sonar/core/measure/db/MeasureDataDaoTest/find_by_component_key_and_metric_key_without_text.xml
index 0d9b98c4fcd..a4092fddc22 100644
--- a/sonar-core/src/test/resources/org/sonar/core/measure/db/MeasureDataDaoTest/find_by_component_key_and_metric_key_without_text.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/measure/db/MeasureDataDaoTest/find_by_component_key_and_metric_key_without_text.xml
@@ -4,7 +4,6 @@
   <projects id="1" kee="org.sonar.core.measure.db.MeasureData" enabled="[true]"/>
   <snapshots id="5" project_id="1" islast="[true]" />
 
-  <project_measures id="20" snapshot_id="5" metric_id="10"/>
-  <measure_data id="30" measure_id="20" snapshot_id="5" data="[null]"/>
+  <project_measures id="20" snapshot_id="5" metric_id="10" measure_data="[null]"/>
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/measure/db/MeasureDataDaoTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/measure/db/MeasureDataDaoTest/shared.xml
index 7fd1781b05b..57fb0e395d1 100644
--- a/sonar-core/src/test/resources/org/sonar/core/measure/db/MeasureDataDaoTest/shared.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/measure/db/MeasureDataDaoTest/shared.xml
@@ -4,7 +4,6 @@
   <projects id="1" kee="org.sonar.core.measure.db.MeasureData" enabled="[true]"/>
   <snapshots id="5" project_id="1" islast="[true]" />
 
-  <project_measures id="20" snapshot_id="5" metric_id="10"/>
-  <measure_data id="30" measure_id="20" snapshot_id="5" data="test"/>
+  <project_measures id="20" snapshot_id="5" metric_id="10" measure_data="MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OQ=="/>
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot-result.xml
index 028d67e409d..dbbab34b4f9 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot-result.xml
@@ -22,8 +22,7 @@
                     RULE_ID="1"
                     person_id="[null]"
                     text_value="[null]" tendency="[null]" measure_date="[null]" project_id="[null]"
-                    alert_status="[null]" description="[null]"/>
-  <measure_data id="1" measure_id="1" snapshot_id="1" data="[null]"/>
+                    alert_status="[null]" description="[null]" measure_data="[null]"/>
   <dependencies id="1" from_resource_id="1" from_snapshot_id="1" to_resource_id="30" to_snapshot_id="30"
                 parent_dependency_id="[null]" project_snapshot_id="1"
                 dep_usage="USES" dep_weight="1" from_scope="PRJ" to_scope="LIB"/>
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot.xml
index 69ee6858e9b..bfdbc9c5f63 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot.xml
@@ -20,8 +20,7 @@
                     RULE_ID="1"
                     person_id="[null]"
                     text_value="[null]" tendency="[null]" measure_date="[null]" project_id="[null]"
-                    alert_status="[null]" description="[null]"/>
-  <measure_data id="1" measure_id="1" snapshot_id="1" data="[null]"/>
+                    alert_status="[null]" description="[null]" measure_data="[null]"/>
   <dependencies id="1" from_resource_id="1" from_snapshot_id="1" to_resource_id="30" to_snapshot_id="30"
                 parent_dependency_id="[null]" project_snapshot_id="1"
                 dep_usage="USES" dep_weight="1" from_scope="PRJ" to_scope="LIB"/>
@@ -51,8 +50,7 @@
                     RULE_ID="1"
                     person_id="[null]"
                     text_value="[null]" tendency="[null]" measure_date="[null]" project_id="[null]"
-                    alert_status="[null]" description="[null]"/>
-  <measure_data id="2" measure_id="2" snapshot_id="5" data="[null]"/>
+                    alert_status="[null]" description="[null]" measure_data="[null]"/>
   <dependencies id="2" from_resource_id="10" from_snapshot_id="10" to_resource_id="5" to_snapshot_id="5"
                 parent_dependency_id="[null]" project_snapshot_id="5"
                 dep_usage="USES" dep_weight="1" from_scope="PRJ" to_scope="LIB"/>
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot-result.xml
index 81249826cc2..1234157d512 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot-result.xml
@@ -33,7 +33,7 @@
                     rules_category_id="[null]"
                     person_id="[null]"
                     text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]"
-                    description="[null]"/>
+                    description="[null]" measure_data="[null]"/>
 
   <!-- delete measure on rule -->
   <!--<project_measures ID="2" project_id="1" SNAPSHOT_ID="1" RULE_ID="33" characteristic_id="[null]" METRIC_ID="1"
@@ -43,7 +43,7 @@
                     rules_category_id="[null]"
                     person_id="[null]"
                     text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]"
-                    description="[null]"/>-->
+                    description="[null]" measure_data="[null]"/>-->
 
   <!-- do not delete measure on characteristic -->
   <project_measures id="3" project_id="1" snapshot_id="1" rule_id="[null]" characteristic_id="1" metric_id="1"
@@ -53,7 +53,7 @@
                     rules_category_id="[null]"
                     person_id="[null]"
                     text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]"
-                    description="[null]"/>
+                    description="[null]" measure_data="[null]"/>
 
   <!-- do not delete measure on characteristic -->
   <project_measures id="4" project_id="1" snapshot_id="1" rule_id="[null]" characteristic_id="2" metric_id="1"
@@ -63,7 +63,7 @@
                     rules_category_id="[null]"
                     person_id="[null]"
                     text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]"
-                    description="[null]"/>
+                    description="[null]" measure_data="[null]"/>
 
   <!-- delete measure on metrics that are flagged with delete_historical_data=true -->
   <!--<project_measures ID="6" project_id="1" SNAPSHOT_ID="1" RULE_ID="[null]" characteristic_id="[null]" METRIC_ID="2"
@@ -73,7 +73,7 @@
                     rules_category_id="[null]"
                     person_id="[null]"
                     text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]"
-                    description="[null]"/>-->
+                    description="[null]" measure_data="[null]"/>-->
 
   <!-- delete measure on developers -->
   <!--<project_measures id="7" project_id="1" snapshot_id="1" rule_id="[null]" characteristic_id="[null]" metric_id="2"
@@ -83,5 +83,5 @@
                       variation_value_5="[null]" rule_priority="[null]" alert_text="[null]" value="10.0"
                       rules_category_id="[null]"
                       text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]"
-                      description="[null]"/>-->
+                      description="[null]" measure_data="[null]"/>-->
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot.xml
index 83204ee61d6..cb1197cc1eb 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot.xml
@@ -33,7 +33,7 @@
                     rules_category_id="[null]"
                     person_id="[null]"
                     text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]"
-                    description="[null]"/>
+                    description="[null]" measure_data="[null]"/>
 
   <!-- delete measure on rule -->
   <project_measures id="2" project_id="1" snapshot_id="1" rule_id="33" characteristic_id="[null]" metric_id="1"
@@ -43,7 +43,7 @@
                     rules_category_id="[null]"
                     person_id="[null]"
                     text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]"
-                    description="[null]"/>
+                    description="[null]" measure_data="[null]"/>
 
   <!-- do not delete measure on root characteristic -->
   <project_measures id="3" project_id="1" snapshot_id="1" rule_id="[null]" characteristic_id="1" metric_id="1"
@@ -53,7 +53,7 @@
                     rules_category_id="[null]"
                     person_id="[null]"
                     text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]"
-                    description="[null]"/>
+                    description="[null]" measure_data="[null]"/>
 
   <!-- do not delete measure on characteristic -->
   <project_measures id="4" project_id="1" snapshot_id="1" rule_id="[null]" characteristic_id="2" metric_id="1"
@@ -63,7 +63,7 @@
                     rules_category_id="[null]"
                     person_id="[null]"
                     text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]"
-                    description="[null]"/>
+                    description="[null]" measure_data="[null]"/>
 
   <!-- delete measure on metrics that are flagged with delete_historical_data=true -->
   <project_measures id="6" project_id="1" snapshot_id="1" rule_id="[null]" characteristic_id="[null]" metric_id="2"
@@ -73,7 +73,7 @@
                     rules_category_id="[null]"
                     person_id="[null]"
                     text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]"
-                    description="[null]"/>
+                    description="[null]" measure_data="[null]"/>
 
   <!-- delete measure on developers -->
   <project_measures id="7" project_id="1" snapshot_id="1" rule_id="[null]" characteristic_id="[null]" metric_id="2"
@@ -83,5 +83,5 @@
                     variation_value_5="[null]" rule_priority="[null]" alert_text="[null]" value="10.0"
                     rules_category_id="[null]"
                     text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]"
-                    description="[null]"/>
+                    description="[null]" measure_data="[null]"/>
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot-result.xml
index 382e60aa518..54257ab7f5d 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot-result.xml
@@ -29,9 +29,7 @@ Note that measures, events and reviews are not deleted.
                     url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]"
                     variation_value_5="[null]" rule_priority="[null]" alert_text="[null]" VALUE="10.0" METRIC_ID="1" rules_category_id="[null]"
                     person_id="[null]"
-                    text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]" description="[null]"/>
-
-  <measure_data id="1" measure_id="1" snapshot_id="1" data="[null]"/>
+                    text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]" description="[null]" measure_data="[null]"/>
 
   <!--<dependencies id="1" from_resource_id="1" from_snapshot_id="1" to_resource_id="2" to_snapshot_id="2"-->
   <!--parent_dependency_id="[null]" project_snapshot_id="[null]"-->
@@ -65,9 +63,7 @@ Note that measures, events and reviews are not deleted.
                     url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]"
                     variation_value_5="[null]" rule_priority="[null]" alert_text="[null]" VALUE="10.0" METRIC_ID="1" rules_category_id="[null]"
                     person_id="[null]"
-                    text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]" description="[null]"/>
-
-  <measure_data id="2" measure_id="2" snapshot_id="2" data="[null]"/>
+                    text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]" description="[null]" measure_data="[null]"/>
 
   <dependencies id="3" from_resource_id="33" from_snapshot_id="33" to_resource_id="44" to_snapshot_id="44"
                 parent_dependency_id="[null]" project_snapshot_id="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot.xml
index 065d64d23cc..4a2123e1412 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot.xml
@@ -16,9 +16,7 @@
                     url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]"
                     variation_value_5="[null]" rule_priority="[null]" alert_text="[null]" VALUE="10.0" METRIC_ID="1" rules_category_id="[null]"
                     person_id="[null]"
-                    text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]" description="[null]"/>
-
-  <measure_data id="1" measure_id="1" snapshot_id="1" data="[null]"/>
+                    text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]" description="[null]" measure_data="[null]"/>
 
   <dependencies id="1" from_resource_id="1" from_snapshot_id="1" to_resource_id="2" to_snapshot_id="2"
                 parent_dependency_id="[null]" project_snapshot_id="[null]"
@@ -54,9 +52,7 @@
                       url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]"
                       variation_value_5="[null]" rule_priority="[null]" alert_text="[null]" VALUE="10.0" METRIC_ID="1" rules_category_id="[null]"
                       person_id="[null]"
-                      text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]" description="[null]"/>
-
-    <measure_data id="2" measure_id="2" snapshot_id="2" data="[null]"/>
+                      text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]" description="[null]" measure_data="[null]"/>
 
     <dependencies id="3" from_resource_id="33" from_snapshot_id="33" to_resource_id="44" to_snapshot_id="44"
                   parent_dependency_id="[null]" project_snapshot_id="[null]"