Merge pull request #170 from linkedin/yixzhang/bump-datasketches-6.1.1

Bump datasketches-java 3.0.0 -> 6.1.1 and fix incompatible DoublesUnion API

Author: Zhangyx39

buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy

@@ -587,7 +587,7 @@ class BeamModulePlugin implements Plugin<Project> {
         commons_lang3                               : "org.apache.commons:commons-lang3:3.9",
         commons_logging                             : "commons-logging:commons-logging:1.2",
         commons_math3                               : "org.apache.commons:commons-math3:3.6.1",
-        datasketches                                : "org.apache.datasketches:datasketches-java:3.0.0",
+        datasketches                                : "org.apache.datasketches:datasketches-java:6.1.1",
         dbcp2                                       : "org.apache.commons:commons-dbcp2:$dbcp2_version",
         error_prone_annotations                     : "com.google.errorprone:error_prone_annotations:$errorprone_version",
         flogger_system_backend                      : "com.google.flogger:flogger-system-backend:0.7.3",

runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/DistributionData.java

@@ -247,8 +247,10 @@ public DistributionData combine(DistributionData other) {
     try {
       if (sketch.isPresent() && otherSketch.isPresent() && sketch.get().getN() > 0) {
         final DoublesUnion union = new DoublesUnionBuilder().build();
-        union.update(sketch.get());
-        union.update(otherSketch.get());
+        // datasketches 6.x renamed DoublesUnion.update(DoublesSketch) to union(DoublesSketch);
+        // update(double) now adds a single value. Semantics of the merge are unchanged.
+        union.union(sketch.get());
+        union.union(otherSketch.get());
         sketch = Optional.of(union.getResult());
       } else if (otherSketch.isPresent()) {
         sketch = otherSketch;