Skip to content

Deduplicate historical Java version tag and upgrade client library #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 25, 2021
Merged

Deduplicate historical Java version tag and upgrade client library #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ lazy val infrastructure = addJmh(project).settings(
autoScalaLibrary := false,
crossPaths := false,
libraryDependencies ++= Seq(
"org.influxdb" % "influxdb-java" % "2.5", // TODO update to 2.6 when released for fix for https://github.com/influxdata/influxdb-java/issues/269
"org.influxdb" % "influxdb-java" % "2.21",
"org.eclipse.jgit" % "org.eclipse.jgit" % "4.6.0.201612231935-r",
"com.google.guava" % "guava" % "21.0",
"org.apache.commons" % "commons-lang3" % "3.5",
Expand Down
32 changes: 13 additions & 19 deletions infrastructure/src/main/java/scala/bench/DataMigrator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.influxdb.dto.Point;
import org.influxdb.dto.Query;
import org.influxdb.dto.QueryResult;
import org.influxdb.impl.TimeUtil;

import java.time.Instant;
import java.util.*;
Expand All @@ -31,39 +32,32 @@ public static void main(String[] args) {
//time written
//---- -------
//0 14076
String oldMeasure = "result_backup_20210519";
String oldMeasure = "result_backup_20210525";
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);
assert (newFieldNames.get(0).equals("time"));
newFieldNames.remove(0);
Point.Builder builder = Point.measurement(newMeasure);
Map<String, String> newTags = new HashMap<>(series.getTags());
String javaVersion = newTags.get(JAVA_VERSION_TAG_NAME);
if (javaVersion.equals("1.8.0_131-b11")) {
newTags.put(JAVA_VERSION_TAG_NAME, "1.8.0_131");
}

assert (series.getValues().size() == 1);
List<Object> newValues = new ArrayList<>(series.getValues().get(0));
Object removed = newValues.remove(javaVersionIndex);
String time = (String) newValues.remove(0);
newTags.put(JAVA_VERSION_TAG_NAME, (String) removed);
newTags.entrySet().removeIf(x -> x.getValue() == null || x.getValue().equals(""));
builder.tag(newTags);

List<String> newFieldNames = new ArrayList<>(series.getColumns());
LinkedHashMap<String, Object> newFieldsMap = new LinkedHashMap<>();
assert (newFieldNames.size() == newValues.size());
for (int i = 0; i < newFieldNames.size(); i++) {
String fieldName = newFieldNames.get(i);
boolean isLong = fieldName.equals("sampleCount");
if (isLong) {
newFieldsMap.put(fieldName, ((Number) newValues.get(i)).longValue());
} else {
newFieldsMap.put(fieldName, newValues.get(i));
}
newFieldsMap.put(fieldName, newValues.get(i));
}
builder.fields(newFieldsMap);
Instant parse = Instant.parse(time);
builder.time(parse.toEpochMilli(), TimeUnit.MILLISECONDS);
long epochMillis = (long) newValues.remove(0) / 1000L / 1000L;
builder.time(epochMillis, TimeUnit.MILLISECONDS);
Point point = builder.build();
batchPoints.point(point);
}
Expand Down
15 changes: 1 addition & 14 deletions infrastructure/src/main/java/scala/bench/Database.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,7 @@ public static InfluxDB connectDb() {
client.connectTimeout(10, TimeUnit.SECONDS);
client.readTimeout(120, TimeUnit.SECONDS);
client.writeTimeout(120, TimeUnit.SECONDS);

// workaround https://github.com/influxdata/influxdb-java/issues/268
client.addNetworkInterceptor(chain -> {
HttpUrl.Builder fixedUrl = chain.request().url().newBuilder().encodedPath("/influx/" + chain.request().url().encodedPath().replaceFirst("/influxdb", ""));
return chain.proceed(chain.request().newBuilder().url(fixedUrl.build()).build());
});

client.authenticator((route, response) -> {
String credential = Credentials.basic(influxUser, influxPassword);
return response.request().newBuilder()
.header("Authorization", credential)
.build();
});
InfluxDB influxDB = InfluxDBFactory.connect(influxUrl, influxUser, influxPassword, client);
InfluxDB influxDB = InfluxDBFactory.connect(influxUrl, influxUser, influxPassword, client, InfluxDB.ResponseFormat.MSGPACK);
// influxDB.setLogLevel(InfluxDB.LogLevel.FULL);
return influxDB;
}
Expand Down