Skip to content

[BEAM-3527] Adding a comment for ZERO element of DistributionResult. #4538

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
kennknowles merged 1 commit into from
Feb 6, 2018
Merged

[BEAM-3527] Adding a comment for ZERO element of DistributionResult. #4538

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
3 changes: 2 additions & 1 deletion ...-java/src/test/java/org/apache/beam/runners/core/metrics/MetricsContainerStepMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ public void testDistributionCommittedUnsupportedInAttemptedAccumulatedMetricResu
thrown.expect(UnsupportedOperationException.class);
thrown.expectMessage("This runner does not currently support committed metrics results.");

assertDistribution(DISTRIBUTION_NAME, step1res, STEP1, DistributionResult.ZERO, true);
assertDistribution(
DISTRIBUTION_NAME, step1res, STEP1, DistributionResult.IDENTITY_ELEMENT, true);
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion runners/direct-java/src/test/java/org/apache/beam/runners/direct/DirectMetricsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public void testApplyCommittedNoFilter() {
committedMetricsResult("ns1", "name2", "step1", 12L),
committedMetricsResult("ns1", "name1", "step2", 7L)));
assertThat(results.distributions(), contains(
attemptedMetricsResult("ns1", "name1", "step1", DistributionResult.ZERO)));
attemptedMetricsResult("ns1", "name1", "step1", DistributionResult.IDENTITY_ELEMENT)));
assertThat(results.distributions(), contains(
committedMetricsResult("ns1", "name1", "step1", DistributionResult.create(12, 3, 3, 5))));
assertThat(results.gauges(), contains(
Expand Down
2 changes: 1 addition & 1 deletion ...e-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ private Long getCounterValue(com.google.api.services.dataflow.model.MetricUpdate
private DistributionResult getDistributionValue(
com.google.api.services.dataflow.model.MetricUpdate metricUpdate) {
if (metricUpdate.getDistribution() == null) {
return DistributionResult.ZERO;
return DistributionResult.IDENTITY_ELEMENT;
}
ArrayMap distributionMap = (ArrayMap) metricUpdate.getDistribution();
Long count = ((Number) distributionMap.get("count")).longValue();
Expand Down
4 changes: 3 additions & 1 deletion sdks/java/core/src/main/java/org/apache/beam/sdk/metrics/DistributionResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ public double mean() {
return (1.0 * sum()) / count();
}

public static final DistributionResult ZERO = create(0, 0, Long.MAX_VALUE, Long.MIN_VALUE);
/** The IDENTITY_ELEMENT is used to start accumulating distributions. */
public static final DistributionResult IDENTITY_ELEMENT =
create(0, 0, Long.MAX_VALUE, Long.MIN_VALUE);

public static DistributionResult create(long sum, long count, long min, long max) {
return new AutoValue_DistributionResult(sum, count, min, max);
Expand Down