From 0415fb48dfaaef39af98a84ca3c8647985e6ae16 Mon Sep 17 00:00:00 2001 From: jon-wei Date: Wed, 13 Feb 2019 15:28:36 -0800 Subject: [PATCH 1/5] Fix momentsketch build issues --- extensions-contrib/momentsketch/pom.xml | 2 +- .../momentsketch/MomentSketchModule.java | 2 +- .../org.apache.druid.initialization.DruidModule | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 extensions-contrib/momentsketch/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule diff --git a/extensions-contrib/momentsketch/pom.xml b/extensions-contrib/momentsketch/pom.xml index b8926413a992..4649cc2f7cf5 100644 --- a/extensions-contrib/momentsketch/pom.xml +++ b/extensions-contrib/momentsketch/pom.xml @@ -24,7 +24,7 @@ druid org.apache.druid - 0.14.0-incubating-SNAPSHOT + 0.15.0-incubating-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/extensions-contrib/momentsketch/src/main/java/org/apache/druid/query/aggregation/momentsketch/MomentSketchModule.java b/extensions-contrib/momentsketch/src/main/java/org/apache/druid/query/aggregation/momentsketch/MomentSketchModule.java index 29f21355d26d..3f6a51f75f39 100644 --- a/extensions-contrib/momentsketch/src/main/java/org/apache/druid/query/aggregation/momentsketch/MomentSketchModule.java +++ b/extensions-contrib/momentsketch/src/main/java/org/apache/druid/query/aggregation/momentsketch/MomentSketchModule.java @@ -76,7 +76,7 @@ public void configure(Binder binder) { ComplexMetrics.registerSerde( MomentSketchAggregatorFactory.TYPE_NAME, - MomentSketchComplexMetricSerde::new + new MomentSketchComplexMetricSerde() ); } } diff --git a/extensions-contrib/momentsketch/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-contrib/momentsketch/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule new file mode 100644 index 000000000000..8fb117369b01 --- /dev/null +++ b/extensions-contrib/momentsketch/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +org.apache.druid.query.aggregation.momentsketch.MomentSketchModule From 16ded9a1a0550137a41c44aff7258ddfac30f1e8 Mon Sep 17 00:00:00 2001 From: jon-wei Date: Wed, 13 Feb 2019 15:40:29 -0800 Subject: [PATCH 2/5] Remove unused section in pom --- extensions-contrib/momentsketch/pom.xml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/extensions-contrib/momentsketch/pom.xml b/extensions-contrib/momentsketch/pom.xml index 4649cc2f7cf5..5c0db55acc30 100644 --- a/extensions-contrib/momentsketch/pom.xml +++ b/extensions-contrib/momentsketch/pom.xml @@ -33,13 +33,7 @@ druid-momentsketch druid-momentsketch Aggregators for the approximate quantile moment sketch - - - - UTF-8 - 0.12.2 - - + com.github.stanford-futuredata.momentsketch From 965549ce82d8513d1e658e526482049e58dbede4 Mon Sep 17 00:00:00 2001 From: jon-wei Date: Wed, 13 Feb 2019 16:39:27 -0800 Subject: [PATCH 3/5] Fix test --- extensions-contrib/momentsketch/pom.xml | 2 +- .../momentsketch/MomentSketchModule.java | 14 ++++++++++---- .../aggregator/MomentsSketchAggregatorTest.java | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/extensions-contrib/momentsketch/pom.xml b/extensions-contrib/momentsketch/pom.xml index 5c0db55acc30..1ec675689859 100644 --- a/extensions-contrib/momentsketch/pom.xml +++ b/extensions-contrib/momentsketch/pom.xml @@ -33,7 +33,7 @@ druid-momentsketch druid-momentsketch Aggregators for the approximate quantile moment sketch - + com.github.stanford-futuredata.momentsketch diff --git a/extensions-contrib/momentsketch/src/main/java/org/apache/druid/query/aggregation/momentsketch/MomentSketchModule.java b/extensions-contrib/momentsketch/src/main/java/org/apache/druid/query/aggregation/momentsketch/MomentSketchModule.java index 3f6a51f75f39..ece098e48ad1 100644 --- a/extensions-contrib/momentsketch/src/main/java/org/apache/druid/query/aggregation/momentsketch/MomentSketchModule.java +++ b/extensions-contrib/momentsketch/src/main/java/org/apache/druid/query/aggregation/momentsketch/MomentSketchModule.java @@ -22,6 +22,7 @@ import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; +import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.inject.Binder; import org.apache.druid.initialization.DruidModule; @@ -74,9 +75,14 @@ public List getJacksonModules() @Override public void configure(Binder binder) { - ComplexMetrics.registerSerde( - MomentSketchAggregatorFactory.TYPE_NAME, - new MomentSketchComplexMetricSerde() - ); + registerSerde(); + } + + @VisibleForTesting + public static void registerSerde() + { + if (ComplexMetrics.getSerdeForType(MomentSketchAggregatorFactory.TYPE_NAME) == null) { + ComplexMetrics.registerSerde(MomentSketchAggregatorFactory.TYPE_NAME, new MomentSketchComplexMetricSerde()); + } } } diff --git a/extensions-contrib/momentsketch/src/test/java/org/apache/druid/query/aggregation/momentsketch/aggregator/MomentsSketchAggregatorTest.java b/extensions-contrib/momentsketch/src/test/java/org/apache/druid/query/aggregation/momentsketch/aggregator/MomentsSketchAggregatorTest.java index 2d5293b71913..3927dd4ffe46 100644 --- a/extensions-contrib/momentsketch/src/test/java/org/apache/druid/query/aggregation/momentsketch/aggregator/MomentsSketchAggregatorTest.java +++ b/extensions-contrib/momentsketch/src/test/java/org/apache/druid/query/aggregation/momentsketch/aggregator/MomentsSketchAggregatorTest.java @@ -55,8 +55,8 @@ public class MomentsSketchAggregatorTest public MomentsSketchAggregatorTest(final GroupByQueryConfig config) { + MomentSketchModule.registerSerde(); DruidModule module = new MomentSketchModule(); - module.configure(null); helper = AggregationTestHelper.createGroupByQueryAggregationTestHelper( module.getJacksonModules(), config, tempFolder); } From c5cecdae7321e167e0715c0371d2b35d44364484 Mon Sep 17 00:00:00 2001 From: jon-wei Date: Wed, 13 Feb 2019 18:41:45 -0800 Subject: [PATCH 4/5] Remove unused method --- .../org/apache/druid/segment/serde/ComplexMetrics.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/processing/src/main/java/org/apache/druid/segment/serde/ComplexMetrics.java b/processing/src/main/java/org/apache/druid/segment/serde/ComplexMetrics.java index ba416d6593a0..9c96c48aefe3 100644 --- a/processing/src/main/java/org/apache/druid/segment/serde/ComplexMetrics.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/ComplexMetrics.java @@ -45,11 +45,4 @@ public static void registerSerde(String type, ComplexMetricSerde serde) } complexSerializers.put(type, serde); } - - public static void registerSerde(String type, Supplier serdeSupplier) - { - if (ComplexMetrics.getSerdeForType(type) == null) { - ComplexMetrics.registerSerde(type, serdeSupplier.get()); - } - } } From 5fc014ea0768085fd87874559212b8f7a59ff402 Mon Sep 17 00:00:00 2001 From: jon-wei Date: Wed, 13 Feb 2019 20:08:11 -0800 Subject: [PATCH 5/5] Checkstyle --- .../main/java/org/apache/druid/segment/serde/ComplexMetrics.java | 1 - 1 file changed, 1 deletion(-) diff --git a/processing/src/main/java/org/apache/druid/segment/serde/ComplexMetrics.java b/processing/src/main/java/org/apache/druid/segment/serde/ComplexMetrics.java index 9c96c48aefe3..64f37092a71d 100644 --- a/processing/src/main/java/org/apache/druid/segment/serde/ComplexMetrics.java +++ b/processing/src/main/java/org/apache/druid/segment/serde/ComplexMetrics.java @@ -24,7 +24,6 @@ import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; -import java.util.function.Supplier; /** */