data-aggregator: fix alphabetic resulttype sorting

Depending on SQL-statement nesting, some scripts already correctly sorted
resulttypes alphabetically, but some sorted along the numeric ENUM value
behind the resulttype name.  This change explicitly converts the resulttype
to a string before sorting.

Change-Id: Ia18aa4e75b94a6a9f7bb125953bc85b86b3cbd6e

tools/analysis/data-aggregator/fail-analysis-common.inc.sh

@@ -34,3 +34,4 @@ if [ -n "$BENCHMARK" ]; then
 		FILTER="$FILTER AND v.variant = '$VARIANT'"
 	fi
 fi
+FILTER="($FILTER)"

tools/analysis/data-aggregator/function-occurrences-onwrite.sh

@@ -44,6 +44,6 @@ JOIN result_GenericExperimentMessage r
 	ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY s.variant_id, s.address, r.resulttype
-ORDER BY s.address, r.resulttype
+ORDER BY s.address, CONCAT(r.resulttype)
 ;
 EOT

tools/analysis/data-aggregator/function-occurrences.sh

@@ -17,6 +17,6 @@ JOIN result_GenericExperimentMessage r
   ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY s.variant_id, s.address, r.resulttype
-ORDER BY s.address, r.resulttype
+ORDER BY s.address, CONCAT(r.resulttype)
 ;
 EOT

tools/analysis/data-aggregator/resulttype-occurrences-onwrite.sh

@@ -37,5 +37,6 @@ INNER JOIN variant v
 	ON t.variant_id = v.id
 WHERE $FILTER
 GROUP BY v.id, r.resulttype
-ORDER BY v.benchmark, v.variant, r.resulttype;
+ORDER BY v.benchmark, v.variant, CONCAT(r.resulttype)
+;
 EOT

tools/analysis/data-aggregator/resulttype-occurrences-onwrite_coverage.sh

@@ -55,6 +55,6 @@ INNER JOIN variant v
 	ON t.variant_id = v.id
 WHERE $FILTER
 GROUP BY v.id, r.resulttype
-ORDER BY v.benchmark, v.variant, r.resulttype
+ORDER BY v.benchmark, v.variant, CONCAT(r.resulttype)
 ;
 EOT

tools/analysis/data-aggregator/resulttype-occurrences.sh

@@ -17,5 +17,6 @@ INNER JOIN variant v
 	ON t.variant_id=v.id
 WHERE $FILTER
 GROUP BY v.id, r.resulttype
-ORDER BY v.benchmark, v.variant, r.resulttype ASC;
+ORDER BY v.benchmark, v.variant, CONCAT(r.resulttype)
+;
 EOT

tools/analysis/data-aggregator/resulttype-occurrences_coverage.sh

@@ -30,5 +30,6 @@ INNER JOIN variant v
 	ON t.variant_id = v.id
 WHERE $FILTER
 GROUP BY v.id, r.resulttype
-ORDER BY v.benchmark, v.variant, r.resulttype;
+ORDER BY v.benchmark, v.variant, CONCAT(r.resulttype)
+;
 EOT

tools/analysis/data-aggregator/symbol-occurrences-onwrite.sh

@@ -34,6 +34,6 @@ JOIN result_GenericExperimentMessage r
 	ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY v.id, s.name, r.resulttype
-ORDER BY v.benchmark, v.variant, s.name, r.resulttype
+ORDER BY v.benchmark, v.variant, s.name, CONCAT(r.resulttype)
 ;
 EOT

tools/analysis/data-aggregator/symbol-occurrences-onwrite_coverage.sh

@@ -45,5 +45,6 @@ JOIN result_GenericExperimentMessage r
 	ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY v.id, s.name, r.resulttype
-ORDER BY v.benchmark, v.variant, s.name, r.resulttype;
+ORDER BY v.benchmark, v.variant, s.name, CONCAT(r.resulttype)
+;
 EOT

tools/analysis/data-aggregator/symbol-occurrences.sh

@@ -12,5 +12,6 @@ INNER JOIN fspgroup g ON t.variant_id = g.variant_id AND t.data_address = g.data
 INNER JOIN result_GenericExperimentMessage r ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY v.id, s.name, r.resulttype
-ORDER BY v.benchmark, v.variant, s.name, r.resulttype;
+ORDER BY v.benchmark, v.variant, s.name, CONCAT(r.resulttype)
+;
 EOT

tools/analysis/data-aggregator/symbol-occurrences_coverage.sh

@@ -22,5 +22,6 @@ INNER JOIN fspgroup g ON t.variant_id = g.variant_id AND t.data_address = g.data
 INNER JOIN result_GenericExperimentMessage r ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY v.id, s.name, r.resulttype
-ORDER BY v.benchmark, v.variant, s.name, r.resulttype;
+ORDER BY v.benchmark, v.variant, s.name, CONCAT(r.resulttype)
+;
 EOT

tools/analysis/data-aggregator/translation-unit-occurrences-onwrite.sh

@@ -36,6 +36,6 @@ JOIN result_GenericExperimentMessage r
 	ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY v.id, f.file_id, r.resulttype
-ORDER BY v.benchmark, v.variant, f.path, r.resulttype
+ORDER BY v.benchmark, v.variant, f.path, CONCAT(r.resulttype)
 ;
 EOT

tools/analysis/data-aggregator/translation-unit-occurrences.sh

@@ -22,6 +22,6 @@ JOIN result_GenericExperimentMessage r
 	ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY v.id, f.file_id, r.resulttype
-ORDER BY v.benchmark, v.variant, f.path, r.resulttype
+ORDER BY v.benchmark, v.variant, f.path, CONCAT(r.resulttype)
 ;
 EOT