Skip to content
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.

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

try to avoid passing around infinite values #14

Merged
merged 1 commit into from
Oct 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,17 @@ public DataPoint getDataPoint(final long timestamp, final JsonElement json) thro
final TreeMap<Double, Integer> binValues = new TreeMap<>();

final JsonObject object = json.getAsJsonObject();
final double min = object.get("min").getAsDouble();
final double max = object.get("max").getAsDouble();
final double mean = object.get("mean").getAsDouble();
final double sum = object.get("sum").getAsDouble();
final double min = getFiniteDouble(object, "min");
final double max = getFiniteDouble(object, "max");
final double mean = getFiniteDouble(object, "mean");
final double sum = getFiniteDouble(object, "sum");
final JsonObject bins = object.get("bins").getAsJsonObject();

for (Map.Entry<String, JsonElement> entry : bins.entrySet()) {
binValues.put(Double.parseDouble(entry.getKey()), entry.getValue().getAsInt());
binValues.put(
ensureFinite(Double.parseDouble(entry.getKey()), "bucket"),
entry.getValue().getAsInt()
);
}

return new HistogramDataPointImpl(timestamp, binValues, min, max, mean, sum);
Expand All @@ -73,14 +76,28 @@ public DataPoint getDataPoint(final long timestamp, final DataInput buffer) thro
final TreeMap<Double, Integer> bins = new TreeMap<>();
final int binCount = buffer.readInt();
for (int i = 0; i < binCount; i++) {
bins.put(buffer.readDouble(), buffer.readInt());
bins.put(
ensureFinite(buffer.readDouble(), "bucket"),
buffer.readInt()
);
}

final double min = buffer.readDouble();
final double max = buffer.readDouble();
final double mean = buffer.readDouble();
final double sum = buffer.readDouble();
final double min = ensureFinite(buffer.readDouble(), "min");
final double max = ensureFinite(buffer.readDouble(), "max");
final double mean = ensureFinite(buffer.readDouble(), "mean");
final double sum = ensureFinite(buffer.readDouble(), "sum");

return new HistogramDataPointImpl(timestamp, bins, min, max, mean, sum);
}

private double ensureFinite(final double x, final String name) {
if (!Double.isFinite(x)) {
throw new IllegalArgumentException(String.format("%s has non-finite value %s", name, Double.toString(x)));
}
return x;
}

private double getFiniteDouble(final JsonObject object, final String key) {
return ensureFinite(object.get(key).getAsDouble(), key);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ public Iterable<DataPoint> getNextDataPoints(final long returnTime, final Iterat
}
}

if (count == 0) {
return Collections.emptyList();
}
return Collections.singletonList(dataPointFactory.createDataPoint(returnTime, sum / count));
}
}
Expand Down