From 2a8069cae5ebb74f45604b4889985fcd05d7cd65 Mon Sep 17 00:00:00 2001 From: Himanshu Gupta Date: Mon, 21 Nov 2016 16:40:56 -0600 Subject: [PATCH] upgrade skeches-core to version 0.8.3 --- extensions-core/datasketches/pom.xml | 2 +- .../datasketches/theta/SketchBufferAggregator.java | 6 +++--- .../aggregation/datasketches/theta/SketchHolder.java | 4 ++-- .../datasketches/theta/SketchObjectStrategy.java | 4 ++-- .../aggregation/datasketches/theta/SynchronizedUnion.java | 8 +++++++- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/extensions-core/datasketches/pom.xml b/extensions-core/datasketches/pom.xml index a24ef61fb652..bc3b6f80b181 100644 --- a/extensions-core/datasketches/pom.xml +++ b/extensions-core/datasketches/pom.xml @@ -38,7 +38,7 @@ com.yahoo.datasketches sketches-core - 0.4.1 + 0.8.3 io.druid diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchBufferAggregator.java b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchBufferAggregator.java index 7f8f6000cbfb..03dc9d6372ca 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchBufferAggregator.java +++ b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchBufferAggregator.java @@ -19,10 +19,10 @@ package io.druid.query.aggregation.datasketches.theta; +import com.yahoo.memory.Memory; +import com.yahoo.memory.MemoryRegion; +import com.yahoo.memory.NativeMemory; import com.yahoo.sketches.Family; -import com.yahoo.sketches.memory.Memory; -import com.yahoo.sketches.memory.MemoryRegion; -import com.yahoo.sketches.memory.NativeMemory; import com.yahoo.sketches.theta.SetOperation; import com.yahoo.sketches.theta.Union; import io.druid.query.aggregation.BufferAggregator; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchHolder.java b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchHolder.java index 7752c3c20716..5f65e8a2e74f 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchHolder.java +++ b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchHolder.java @@ -24,9 +24,9 @@ import com.google.common.collect.Ordering; import com.google.common.primitives.Doubles; import com.google.common.primitives.Longs; +import com.yahoo.memory.Memory; +import com.yahoo.memory.NativeMemory; import com.yahoo.sketches.Family; -import com.yahoo.sketches.memory.Memory; -import com.yahoo.sketches.memory.NativeMemory; import com.yahoo.sketches.theta.AnotB; import com.yahoo.sketches.theta.Intersection; import com.yahoo.sketches.theta.SetOperation; diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchObjectStrategy.java b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchObjectStrategy.java index 8e7b1f04638d..2e2550a0b3b4 100644 --- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchObjectStrategy.java +++ b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchObjectStrategy.java @@ -19,8 +19,8 @@ package io.druid.query.aggregation.datasketches.theta; -import com.yahoo.sketches.memory.MemoryRegion; -import com.yahoo.sketches.memory.NativeMemory; +import com.yahoo.memory.MemoryRegion; +import com.yahoo.memory.NativeMemory; import com.yahoo.sketches.theta.Sketch; import io.druid.java.util.common.IAE; import io.druid.segment.data.ObjectStrategy; 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..819c68b8481a 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 @@ -19,7 +19,7 @@ package io.druid.query.aggregation.datasketches.theta; -import com.yahoo.sketches.memory.Memory; +import com.yahoo.memory.Memory; import com.yahoo.sketches.theta.CompactSketch; import com.yahoo.sketches.theta.Sketch; import com.yahoo.sketches.theta.Union; @@ -77,6 +77,12 @@ public synchronized void update(int[] data) delegate.update(data); } + @Override + public void update(char[] chars) + { + delegate.update(chars); + } + @Override public synchronized void update(long[] data) {