result db: Migrate javaVersion from field to tag

Author: retronym

infrastructure/src/main/java/scala/bench/DataMigrator.java

@@ -0,0 +1,67 @@
+package scala.bench;
+
+import org.influxdb.InfluxDB;
+import org.influxdb.dto.BatchPoints;
+import org.influxdb.dto.Point;
+import org.influxdb.dto.Query;
+import org.influxdb.dto.QueryResult;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+import static scala.bench.Database.connectDb;
+
+public class DataMigrator {
+
+    public static final String JAVA_VERSION_TAG_NAME = "javaVersion";
+
+    public static void main(String[] args) {
+
+        InfluxDB influxDB = connectDb();
+        try {
+            BatchPoints batchPoints = BatchPoints
+                    .database("scala_benchmark")
+                    .retentionPolicy("autogen")
+                    .consistency(InfluxDB.ConsistencyLevel.ALL)
+                    .build();
+            influxDB.enableBatch(100, 10, TimeUnit.MILLISECONDS);
+            // > SELECT * INTO result_backup_20210519  FROM result GROUP BY *
+            //name: result
+            //time written
+            //---- -------
+            //0    14076
+            String oldMeasure = "result_backup_20210519";
+            String newMeasure = "result";
+
+            QueryResult queryResult = influxDB.query(new Query("select * from " + oldMeasure + " group by *", "scala_benchmark"));
+            for (QueryResult.Result result : queryResult.getResults()) {
+                for (QueryResult.Series series : result.getSeries()) {
+                    List<String> newFieldNames = new ArrayList<>(series.getColumns());
+                    int javaVersionIndex = newFieldNames.indexOf(JAVA_VERSION_TAG_NAME);
+                    newFieldNames.remove(javaVersionIndex);
+                    Point.Builder builder = Point.measurement(newMeasure);
+                    Map<String, String> newTags = new HashMap<>(series.getTags());
+                    List<Object> newValues = new ArrayList<>(series.getValues().get(0));
+                    Object removed = newValues.remove(javaVersionIndex);
+                    newTags.put(JAVA_VERSION_TAG_NAME, (String) removed);
+                    newTags.entrySet().removeIf(x -> x.getValue() == null || x.getValue().equals(""));
+                    builder.tag(newTags);
+                    LinkedHashMap<String, Object> newFieldsMap = new LinkedHashMap<>();
+                    assert (newFieldNames.size() == newValues.size());
+                    for (int i = 0; i < newFieldNames.size(); i++) {
+                        newFieldsMap.put(newFieldNames.get(i), newValues.get(i));
+                    }
+                    builder.fields(newFieldsMap);
+                    Point point = builder.build();
+                    batchPoints.point(point);
+                }
+            }
+
+            influxDB.write(batchPoints);
+        } finally {
+            influxDB.close();
+        }
+    }
+}
+

infrastructure/src/main/java/scala/bench/UploadingOutputFormat.java

@@ -104,7 +104,7 @@ private void uploadResult(BenchmarkResult result) {
                 pointBuilder.tag("branch", "<none>");
             }
             pointBuilder.tag("hostId", getHostId());
-            pointBuilder.addField("javaVersion", System.getProperty("java.runtime.version"));
+            pointBuilder.tag("javaVersion", params.getJdkVersion());
             pointBuilder.addField("inputArguments", inputArguments.stream().collect(Collectors.joining(" ")));
             pointBuilder.tag("scalaVersion", scalaVersion);