SONAR-3825 improve performance of SQL request

* UNION is replaced by INNER JOINs
* sorting is done by Java but not by db

2 files changed, 6 insertions, 6 deletions

diff --git a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterConditionTest.java b/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterConditionTest.java
index 112975ff908..73b5cdb7c74 100644
--- a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterConditionTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterConditionTest.java
@@ -59,9 +59,9 @@ public class MeasureFilterConditionTest {
     assertThat(condition.operator()).isEqualTo(MeasureFilterCondition.Operator.GREATER);
     assertThat(condition.period()).isNull();
     assertThat(condition.value()).isEqualTo(10.0);
-    assertThat(condition.valueColumn()).isEqualTo("pm.value");
+    assertThat(condition.appendSqlColumn(new StringBuilder(), 1).toString()).isEqualTo("pmcond1.value");
     assertThat(condition.toString()).isNotEmpty();
-    assertThat(condition.appendSqlCondition(new StringBuilder()).toString()).isEqualTo(" pm.metric_id=123 AND pm.value>10.0");
+    assertThat(condition.appendSqlCondition(new StringBuilder(), 1).toString()).isEqualTo(" pmcond1.metric_id=123 AND pmcond1.value>10.0");
   }
 
   @Test
@@ -75,8 +75,8 @@ public class MeasureFilterConditionTest {
     assertThat(condition.operator()).isEqualTo(MeasureFilterCondition.Operator.LESS_OR_EQUALS);
     assertThat(condition.period()).isEqualTo(3);
     assertThat(condition.value()).isEqualTo(10.0);
-    assertThat(condition.valueColumn()).isEqualTo("pm.variation_value_3");
+    assertThat(condition.appendSqlColumn(new StringBuilder(), 2).toString()).isEqualTo("pmcond2.variation_value_3");
     assertThat(condition.toString()).isNotEmpty();
-    assertThat(condition.appendSqlCondition(new StringBuilder()).toString()).isEqualTo(" pm.metric_id=123 AND pm.variation_value_3<=10.0");
+    assertThat(condition.appendSqlCondition(new StringBuilder(), 2).toString()).isEqualTo(" pmcond2.metric_id=123 AND pmcond2.variation_value_3<=10.0");
   }
 }
diff --git a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterFactoryTest.java b/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterFactoryTest.java
index 936b3afff77..472976e65ca 100644
--- a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterFactoryTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterFactoryTest.java
@@ -43,7 +43,7 @@ public class MeasureFilterFactoryTest {
     Map<String, Object> props = ImmutableMap.<String, Object>of("sort", "metric:ncloc");
     MeasureFilter filter = factory.create(props);
 
-    assertThat(filter.sort().column()).isEqualTo("pm.value");
+    assertThat(filter.sort().column()).isEqualTo("pmsort.value");
     assertThat(filter.sort().metric().getKey()).isEqualTo("ncloc");
     assertThat(filter.sort().period()).isNull();
   }
@@ -54,7 +54,7 @@ public class MeasureFilterFactoryTest {
     Map<String, Object> props = ImmutableMap.<String, Object>of("sort", "metric:ncloc:3");
     MeasureFilter filter = factory.create(props);
 
-    assertThat(filter.sort().column()).isEqualTo("pm.variation_value_3");
+    assertThat(filter.sort().column()).isEqualTo("pmsort.variation_value_3");
     assertThat(filter.sort().metric().getKey()).isEqualTo("ncloc");
     assertThat(filter.sort().period()).isEqualTo(3);
   }