From 2cbc4b9fe781b77f7b0cd9b200b919f73a832f5d Mon Sep 17 00:00:00 2001 From: saydakov Date: Thu, 8 Sep 2016 14:40:59 -0700 Subject: [PATCH 1/2] updated dependency on sketches-core to 0.7.0 --- extensions-core/datasketches/pom.xml | 2 +- .../aggregation/datasketches/theta/SynchronizedUnion.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/extensions-core/datasketches/pom.xml b/extensions-core/datasketches/pom.xml index 474ab59fb25a..3c30c71d5622 100644 --- a/extensions-core/datasketches/pom.xml +++ b/extensions-core/datasketches/pom.xml @@ -38,7 +38,7 @@ com.yahoo.datasketches sketches-core - 0.2.2 + 0.7.0 io.druid diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SynchronizedUnion.java b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SynchronizedUnion.java index 1bcbf4ea07fe..36eb5fb6d5c6 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SynchronizedUnion.java +++ b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SynchronizedUnion.java @@ -83,6 +83,12 @@ public synchronized void update(long[] data) delegate.update(data); } + @Override + public synchronized void update(char[] data) + { + delegate.update(data); + } + @Override public synchronized CompactSketch getResult(boolean b, Memory memory) { From 4d00f8cade276ae42518dd776d4375f011cb8e3b Mon Sep 17 00:00:00 2001 From: saydakov Date: Thu, 8 Sep 2016 16:22:35 -0700 Subject: [PATCH 2/2] Use sketches-core-0.4.1, which is the latest version still compatible with JDK7 --- extensions-core/datasketches/pom.xml | 2 +- .../aggregation/datasketches/theta/SynchronizedUnion.java | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/extensions-core/datasketches/pom.xml b/extensions-core/datasketches/pom.xml index 3c30c71d5622..d471e28480c1 100644 --- a/extensions-core/datasketches/pom.xml +++ b/extensions-core/datasketches/pom.xml @@ -38,7 +38,7 @@ com.yahoo.datasketches sketches-core - 0.7.0 + 0.4.1 io.druid diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SynchronizedUnion.java b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SynchronizedUnion.java index 36eb5fb6d5c6..1bcbf4ea07fe 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SynchronizedUnion.java +++ b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SynchronizedUnion.java @@ -83,12 +83,6 @@ public synchronized void update(long[] data) delegate.update(data); } - @Override - public synchronized void update(char[] data) - { - delegate.update(data); - } - @Override public synchronized CompactSketch getResult(boolean b, Memory memory) {