SONAR-5249 Merge measure_data and project_measure tables

8 files changed, 21 insertions, 34 deletions

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]"