From 3e9d2d497dde2212db6ba1cc7cde7250f8b4faf1 Mon Sep 17 00:00:00 2001 From: Russell Jurney Date: Thu, 29 Aug 2013 15:14:09 -0700 Subject: [PATCH 01/33] Changed port number for realtime server from 8080 to 8083 to make the exaxmples work with the new realtime config. --- examples/bin/run_example_client.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/bin/run_example_client.sh b/examples/bin/run_example_client.sh index a821934d2fd..316034bec48 100755 --- a/examples/bin/run_example_client.sh +++ b/examples/bin/run_example_client.sh @@ -45,7 +45,7 @@ for delay in 5 30 30 30 30 30 30 30 30 30 30 echo "sleep for $delay seconds..." echo " " sleep $delay - curl -X POST 'http://localhost:8080/druid/v2/?w' -H 'content-type: application/json' -d "`cat ${QUERY_FILE}`" + curl -X POST 'http://localhost:8083/druid/v2/?w' -H 'content-type: application/json' -d "`cat ${QUERY_FILE}`" echo " " echo " " done From 83e5e5434e7b1edd0142e9ad746efb07f7a30780 Mon Sep 17 00:00:00 2001 From: cheddar Date: Thu, 29 Aug 2013 17:20:05 -0500 Subject: [PATCH 02/33] [maven-release-plugin] prepare release druid-0.5.50 --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index b4a1eb30091..68813b8014e 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.50-SNAPSHOT + 0.5.50 diff --git a/common/pom.xml b/common/pom.xml index 483e75a9f49..ae611a00fae 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.50-SNAPSHOT + 0.5.50 diff --git a/examples/pom.xml b/examples/pom.xml index d8fa96762af..c28ca109b6a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.50-SNAPSHOT + 0.5.50 diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index 6bd76a53385..020a999e709 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.50-SNAPSHOT + 0.5.50 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 904945df81c..d06ec4dabf4 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.50-SNAPSHOT + 0.5.50 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index fbd0cf4e9b1..3a13a9f0642 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.50-SNAPSHOT + 0.5.50 diff --git a/pom.xml b/pom.xml index 892d2aa473d..de86ee51f2d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.50-SNAPSHOT + 0.5.50 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 5ca7c1123d3..b08827c3bca 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.50-SNAPSHOT + 0.5.50 diff --git a/server/pom.xml b/server/pom.xml index 16826075056..66fa996b7d8 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.50-SNAPSHOT + 0.5.50 diff --git a/services/pom.xml b/services/pom.xml index cda628e6da5..2602212ab5f 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.50-SNAPSHOT + 0.5.50 com.metamx druid - 0.5.50-SNAPSHOT + 0.5.50 From 386cc79420f7e4e441246ca1aa87fdd81eb9b349 Mon Sep 17 00:00:00 2001 From: cheddar Date: Thu, 29 Aug 2013 17:20:10 -0500 Subject: [PATCH 03/33] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 68813b8014e..fb240b39d19 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.50 + 0.5.51-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index ae611a00fae..59b574961f5 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.50 + 0.5.51-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index c28ca109b6a..75c9aa90126 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.50 + 0.5.51-SNAPSHOT diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index 020a999e709..319c8ddc089 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.50 + 0.5.51-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index d06ec4dabf4..9510826a766 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.50 + 0.5.51-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 3a13a9f0642..8018deb4ac5 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.50 + 0.5.51-SNAPSHOT diff --git a/pom.xml b/pom.xml index de86ee51f2d..15976d42de6 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.50 + 0.5.51-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index b08827c3bca..2899b18ccef 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.50 + 0.5.51-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 66fa996b7d8..cb6b984ea58 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.50 + 0.5.51-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 2602212ab5f..9f7f6060758 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.50 + 0.5.51-SNAPSHOT com.metamx druid - 0.5.50 + 0.5.51-SNAPSHOT From 7e4719fe51178e5c1449702f244c62af89a553f9 Mon Sep 17 00:00:00 2001 From: cheddar Date: Wed, 4 Sep 2013 14:43:42 -0500 Subject: [PATCH 04/33] 1) Add unit test for NoSuchElementException as seen by Pablo. 2) Fix unit test --- .../query/segment/LegacySegmentSpec.java | 5 +- .../v1/IncrementalIndexStorageAdapter.java | 4 +- .../druid/query/group/GroupByQueryEngine.java | 36 ++++-- .../IncrementalIndexStorageAdapterTest.java | 116 ++++++++++++++++++ 4 files changed, 147 insertions(+), 14 deletions(-) create mode 100644 server/src/test/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapterTest.java diff --git a/client/src/main/java/com/metamx/druid/query/segment/LegacySegmentSpec.java b/client/src/main/java/com/metamx/druid/query/segment/LegacySegmentSpec.java index f4e62ff77c2..c67094a285f 100644 --- a/client/src/main/java/com/metamx/druid/query/segment/LegacySegmentSpec.java +++ b/client/src/main/java/com/metamx/druid/query/segment/LegacySegmentSpec.java @@ -1,6 +1,6 @@ /* * Druid - a distributed column store. - * Copyright (C) 2012 Metamarkets Group Inc. + * Copyright (C) 2012, 2013 Metamarkets Group Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.google.common.base.Function; import com.google.common.collect.Lists; import com.metamx.common.IAE; - import org.joda.time.Interval; import java.util.Arrays; @@ -39,6 +38,8 @@ public class LegacySegmentSpec extends MultipleIntervalSegmentSpec final List intervalStringList; if (intervals instanceof String) { intervalStringList = Arrays.asList((((String) intervals).split(","))); + } else if (intervals instanceof Interval) { + intervalStringList = Arrays.asList(intervals.toString()); } else if (intervals instanceof Map) { intervalStringList = (List) ((Map) intervals).get("intervals"); } else if (intervals instanceof List) { diff --git a/server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapter.java b/server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapter.java index 695b116c5b0..62eba78ff61 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapter.java +++ b/server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapter.java @@ -1,6 +1,6 @@ /* * Druid - a distributed column store. - * Copyright (C) 2012 Metamarkets Group Inc. + * Copyright (C) 2012, 2013 Metamarkets Group Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -292,7 +292,7 @@ public class IncrementalIndexStorageAdapter implements StorageAdapter @Override public int getValueCardinality() { - return dimValLookup.size(); + return maxId; } @Override diff --git a/server/src/main/java/com/metamx/druid/query/group/GroupByQueryEngine.java b/server/src/main/java/com/metamx/druid/query/group/GroupByQueryEngine.java index 38bfced4d62..c2d46e54d45 100644 --- a/server/src/main/java/com/metamx/druid/query/group/GroupByQueryEngine.java +++ b/server/src/main/java/com/metamx/druid/query/group/GroupByQueryEngine.java @@ -1,6 +1,6 @@ /* * Druid - a distributed column store. - * Copyright (C) 2012 Metamarkets Group Inc. + * Copyright (C) 2012, 2013 Metamarkets Group Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -44,6 +44,7 @@ import com.metamx.druid.index.v1.processing.Cursor; import com.metamx.druid.index.v1.processing.DimensionSelector; import com.metamx.druid.input.MapBasedRow; import com.metamx.druid.input.Row; +import com.metamx.druid.kv.IndexedInts; import com.metamx.druid.query.dimension.DimensionSpec; import org.joda.time.DateTime; import org.joda.time.Interval; @@ -173,17 +174,28 @@ public class GroupByQueryEngine { if (dims.size() > 0) { List retVal = null; - for (Integer dimValue : dims.get(0).getRow()) { + List unaggregatedBuffers = null; + + final DimensionSelector dimSelector = dims.get(0); + final IndexedInts row = dimSelector.getRow(); + if (row.size() == 0) { ByteBuffer newKey = key.duplicate(); - newKey.putInt(dimValue); - final List unaggregatedBuffers = updateValues(newKey, dims.subList(1, dims.size())); - if (unaggregatedBuffers != null) { - if (retVal == null) { - retVal = Lists.newArrayList(); - } - retVal.addAll(unaggregatedBuffers); + newKey.putInt(dimSelector.getValueCardinality()); + unaggregatedBuffers = updateValues(newKey, dims.subList(1, dims.size())); + } + else { + for (Integer dimValue : row) { + ByteBuffer newKey = key.duplicate(); + newKey.putInt(dimValue); + unaggregatedBuffers = updateValues(newKey, dims.subList(1, dims.size())); } } + if (unaggregatedBuffers != null) { + if (retVal == null) { + retVal = Lists.newArrayList(); + } + retVal.addAll(unaggregatedBuffers); + } return retVal; } else { @@ -379,7 +391,11 @@ public class GroupByQueryEngine ByteBuffer keyBuffer = input.getKey().duplicate(); for (int i = 0; i < dimensions.size(); ++i) { - theEvent.put(dimNames.get(i), dimensions.get(i).lookupName(keyBuffer.getInt())); + final DimensionSelector dimSelector = dimensions.get(i); + final int dimVal = keyBuffer.getInt(); + if (dimSelector.getValueCardinality() != dimVal) { + theEvent.put(dimNames.get(i), dimSelector.lookupName(dimVal)); + } } int position = input.getValue(); diff --git a/server/src/test/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapterTest.java b/server/src/test/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapterTest.java new file mode 100644 index 00000000000..0072c27d73e --- /dev/null +++ b/server/src/test/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapterTest.java @@ -0,0 +1,116 @@ +/* + * Druid - a distributed column store. + * Copyright (C) 2012, 2013 Metamarkets Group Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package com.metamx.druid.index.v1; + +import com.google.common.base.Supplier; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; +import com.metamx.common.guava.Sequence; +import com.metamx.common.guava.Sequences; +import com.metamx.druid.QueryGranularity; +import com.metamx.druid.aggregation.AggregatorFactory; +import com.metamx.druid.aggregation.CountAggregatorFactory; +import com.metamx.druid.aggregation.LongSumAggregatorFactory; +import com.metamx.druid.collect.StupidPool; +import com.metamx.druid.input.MapBasedInputRow; +import com.metamx.druid.input.MapBasedRow; +import com.metamx.druid.input.Row; +import com.metamx.druid.query.group.GroupByQuery; +import com.metamx.druid.query.group.GroupByQueryEngine; +import com.metamx.druid.query.group.GroupByQueryEngineConfig; +import junit.framework.Assert; +import org.joda.time.DateTime; +import org.joda.time.Interval; +import org.junit.Test; + +import java.nio.ByteBuffer; +import java.util.ArrayList; + +/** + */ +public class IncrementalIndexStorageAdapterTest +{ + @Test + public void testSanity() throws Exception + { + IncrementalIndex index = new IncrementalIndex( + 0, QueryGranularity.MINUTE, new AggregatorFactory[]{new CountAggregatorFactory("cnt")} + ); + + index.add( + new MapBasedInputRow( + new DateTime().minus(1).getMillis(), + Lists.newArrayList("billy"), + ImmutableMap.of("billy", "hi") + ) + ); + index.add( + new MapBasedInputRow( + new DateTime().minus(1).getMillis(), + Lists.newArrayList("sally"), + ImmutableMap.of("sally", "bo") + ) + ); + + GroupByQueryEngine engine = new GroupByQueryEngine( + new GroupByQueryEngineConfig() + { + @Override + public int getMaxIntermediateRows() + { + return 5; + } + }, + new StupidPool( + new Supplier() + { + @Override + public ByteBuffer get() + { + return ByteBuffer.allocate(50000); + } + } + ) + ); + + final Sequence rows = engine.process( + GroupByQuery.builder() + .setDataSource("test") + .setGranularity(QueryGranularity.ALL) + .setInterval(new Interval(0, new DateTime().getMillis())) + .addDimension("billy") + .addDimension("sally") + .addAggregator(new LongSumAggregatorFactory("cnt", "cnt")) + .build(), + new IncrementalIndexStorageAdapter(index) + ); + + final ArrayList results = Sequences.toList(rows, Lists.newArrayList()); + + Assert.assertEquals(2, results.size()); + + MapBasedRow row = (MapBasedRow) results.get(0); + Assert.assertEquals(ImmutableMap.of("billy", "hi", "cnt", 1l), row.getEvent()); + + row = (MapBasedRow) results.get(1); + Assert.assertEquals(ImmutableMap.of("sally", "bo", "cnt", 1l), row.getEvent()); + } + +} From a11eae4144f46b2bf004e829f6c5b268672a1cb7 Mon Sep 17 00:00:00 2001 From: Russell Jurney Date: Wed, 4 Sep 2013 12:53:38 -0700 Subject: [PATCH 05/33] Edited assembly.xml to exclude the selfcontained jars, and edited path of run_example_server to use the lib/ directory instead of selfcontained jars, thus reducing the size of the assembly tarball from 150MB to 50MB. --- examples/bin/run_example_server.sh | 2 +- services/src/assembly/assembly.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/bin/run_example_server.sh b/examples/bin/run_example_server.sh index 163505659b6..38e372e3e3c 100755 --- a/examples/bin/run_example_server.sh +++ b/examples/bin/run_example_server.sh @@ -58,7 +58,7 @@ DRUID_CP=${EXAMPLE_LOC} DRUID_CP=${DRUID_CP}:`ls ${SCRIPT_DIR}/../target/druid-examples-*-selfcontained.jar` DRUID_CP=${DRUID_CP}:${SCRIPT_DIR}/../config/realtime #For the kit -DRUID_CP=${DRUID_CP}:`ls ${SCRIPT_DIR}/lib/druid-examples-*-selfcontained.jar` +DRUID_CP=${DRUID_CP}:${SCRIPT_DIR}/lib/* DRUID_CP=${DRUID_CP}:${SCRIPT_DIR}/config/realtime echo "Running command:" diff --git a/services/src/assembly/assembly.xml b/services/src/assembly/assembly.xml index 648416c35a2..537e2eeabd0 100644 --- a/services/src/assembly/assembly.xml +++ b/services/src/assembly/assembly.xml @@ -51,14 +51,14 @@ ../examples/target - druid-examples-*-selfcontained.jar + druid-examples-${project.version}.jar lib ../services/target - druid-services-*-selfcontained.jar + druid-services-${project.version}.jar lib From cf9038abb499931d16978f204afbbb5802f7bff1 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Sep 2013 13:22:11 -0700 Subject: [PATCH 06/33] [maven-release-plugin] prepare release druid-0.5.51 --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index fb240b39d19..0fd6e51dd50 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.51-SNAPSHOT + 0.5.51 diff --git a/common/pom.xml b/common/pom.xml index 59b574961f5..30a1e22f199 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.51-SNAPSHOT + 0.5.51 diff --git a/examples/pom.xml b/examples/pom.xml index 75c9aa90126..7d3ea1bfaaa 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.51-SNAPSHOT + 0.5.51 diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index 319c8ddc089..79449d0f96e 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.51-SNAPSHOT + 0.5.51 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 9510826a766..ef40fe25867 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.51-SNAPSHOT + 0.5.51 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 8018deb4ac5..57ee8b825bc 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.51-SNAPSHOT + 0.5.51 diff --git a/pom.xml b/pom.xml index 15976d42de6..c1e5e3a9636 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.51-SNAPSHOT + 0.5.51 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 2899b18ccef..663c5166653 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.51-SNAPSHOT + 0.5.51 diff --git a/server/pom.xml b/server/pom.xml index cb6b984ea58..b363f0426dd 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.51-SNAPSHOT + 0.5.51 diff --git a/services/pom.xml b/services/pom.xml index 9f7f6060758..a0654d856b1 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.51-SNAPSHOT + 0.5.51 com.metamx druid - 0.5.51-SNAPSHOT + 0.5.51 From f08b8287a43effc820056fec59547d0d959583e3 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Sep 2013 13:22:19 -0700 Subject: [PATCH 07/33] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 0fd6e51dd50..676e11827c0 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.51 + 0.5.52-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 30a1e22f199..1a91826cb0c 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.51 + 0.5.52-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 7d3ea1bfaaa..0c015644e58 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.51 + 0.5.52-SNAPSHOT diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index 79449d0f96e..8c022d5cc46 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.51 + 0.5.52-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index ef40fe25867..070d549b9ac 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.51 + 0.5.52-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 57ee8b825bc..1791c25cfb5 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.51 + 0.5.52-SNAPSHOT diff --git a/pom.xml b/pom.xml index c1e5e3a9636..f7783a71cd2 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.51 + 0.5.52-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 663c5166653..924b0c92aa0 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.51 + 0.5.52-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index b363f0426dd..e1dc0352681 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.51 + 0.5.52-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index a0654d856b1..11810fb92cd 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.51 + 0.5.52-SNAPSHOT com.metamx druid - 0.5.51 + 0.5.52-SNAPSHOT From 9f391c2bdd7bd7b166ac9602c355a35457a5bdba Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Sep 2013 13:59:23 -0700 Subject: [PATCH 08/33] update example wiki realtime spec to match publically avaiable segments --- examples/bin/examples/wikipedia/wikipedia_realtime.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/bin/examples/wikipedia/wikipedia_realtime.spec b/examples/bin/examples/wikipedia/wikipedia_realtime.spec index ae0949acd6d..3ed884ac9ea 100644 --- a/examples/bin/examples/wikipedia/wikipedia_realtime.spec +++ b/examples/bin/examples/wikipedia/wikipedia_realtime.spec @@ -2,7 +2,7 @@ "schema": { "dataSource": "wikipedia", "aggregators": [ - {"type": "count", "name": "edits"}, + {"type": "count", "name": "count"}, {"type": "longSum", "fieldName": "added", "name": "added"}, {"type": "longSum", "fieldName": "deleted", "name": "deleted"}, {"type": "longSum", "fieldName": "delta", "name": "delta"} From 39bda32b81e8c9ee96d6be3cf7520f2e193b7622 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Sep 2013 14:06:25 -0700 Subject: [PATCH 09/33] [maven-release-plugin] prepare release druid-0.5.52 --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 676e11827c0..b8a21ebb736 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.52-SNAPSHOT + 0.5.52 diff --git a/common/pom.xml b/common/pom.xml index 1a91826cb0c..4d982137092 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.52-SNAPSHOT + 0.5.52 diff --git a/examples/pom.xml b/examples/pom.xml index 0c015644e58..c1de07f5164 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.52-SNAPSHOT + 0.5.52 diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index 8c022d5cc46..9787aee6b9e 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.52-SNAPSHOT + 0.5.52 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 070d549b9ac..57193a84783 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.52-SNAPSHOT + 0.5.52 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 1791c25cfb5..cf032e21963 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.52-SNAPSHOT + 0.5.52 diff --git a/pom.xml b/pom.xml index f7783a71cd2..e5d8caf64b5 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.52-SNAPSHOT + 0.5.52 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 924b0c92aa0..3a626cee1c9 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.52-SNAPSHOT + 0.5.52 diff --git a/server/pom.xml b/server/pom.xml index e1dc0352681..489643e8d3b 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.52-SNAPSHOT + 0.5.52 diff --git a/services/pom.xml b/services/pom.xml index 11810fb92cd..803d0cf3411 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.52-SNAPSHOT + 0.5.52 com.metamx druid - 0.5.52-SNAPSHOT + 0.5.52 From 567168330bf8c1e0b63352836794afa4871c5f74 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Sep 2013 14:06:33 -0700 Subject: [PATCH 10/33] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index b8a21ebb736..3b7e8c968b5 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.52 + 0.5.53-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 4d982137092..573d02b52e1 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.52 + 0.5.53-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index c1de07f5164..c236b6eddef 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.52 + 0.5.53-SNAPSHOT diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index 9787aee6b9e..9b29ac4a9b8 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.52 + 0.5.53-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 57193a84783..303fc7cf2d1 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.52 + 0.5.53-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index cf032e21963..9a55e9d7511 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.52 + 0.5.53-SNAPSHOT diff --git a/pom.xml b/pom.xml index e5d8caf64b5..8f9592e3d38 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.52 + 0.5.53-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 3a626cee1c9..2017d523142 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.52 + 0.5.53-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 489643e8d3b..0884190528b 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.52 + 0.5.53-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 803d0cf3411..66946fb249c 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.52 + 0.5.53-SNAPSHOT com.metamx druid - 0.5.52 + 0.5.53-SNAPSHOT From 898f937f3c954cfe3a0c0d967593f6509f2cd895 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Sep 2013 14:20:25 -0700 Subject: [PATCH 11/33] also update wikipedia example query.body --- examples/bin/examples/wikipedia/query.body | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/bin/examples/wikipedia/query.body b/examples/bin/examples/wikipedia/query.body index 4407ccceaa8..fd37209b7df 100644 --- a/examples/bin/examples/wikipedia/query.body +++ b/examples/bin/examples/wikipedia/query.body @@ -12,8 +12,8 @@ }, { "type":"longSum", - "fieldName":"edits", - "name":"edits" + "fieldName":"edit_count", + "name":"count" } ], "filter":{ From 523355d00b764851ceaad35cfc19299c18b89c63 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Sep 2013 14:23:56 -0700 Subject: [PATCH 12/33] [maven-release-plugin] prepare release druid-0.5.53 --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 3b7e8c968b5..94b02dbcb4b 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.53-SNAPSHOT + 0.5.53 diff --git a/common/pom.xml b/common/pom.xml index 573d02b52e1..61c12697c8b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.53-SNAPSHOT + 0.5.53 diff --git a/examples/pom.xml b/examples/pom.xml index c236b6eddef..b5bc9971bca 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.53-SNAPSHOT + 0.5.53 diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index 9b29ac4a9b8..c3e27366ce3 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.53-SNAPSHOT + 0.5.53 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 303fc7cf2d1..a2992cd7b03 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.53-SNAPSHOT + 0.5.53 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 9a55e9d7511..caa0f949871 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.53-SNAPSHOT + 0.5.53 diff --git a/pom.xml b/pom.xml index 8f9592e3d38..fa96d842c58 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.53-SNAPSHOT + 0.5.53 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 2017d523142..67adabc0ccc 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.53-SNAPSHOT + 0.5.53 diff --git a/server/pom.xml b/server/pom.xml index 0884190528b..ca9401b6698 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.53-SNAPSHOT + 0.5.53 diff --git a/services/pom.xml b/services/pom.xml index 66946fb249c..38bbc2fb060 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.53-SNAPSHOT + 0.5.53 com.metamx druid - 0.5.53-SNAPSHOT + 0.5.53 From 5a64e2a64ab0b107b4829535f296f721cdc31c96 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Sep 2013 14:24:04 -0700 Subject: [PATCH 13/33] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 94b02dbcb4b..7f5034500b9 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.53 + 0.5.54-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 61c12697c8b..2b79296f1f9 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.53 + 0.5.54-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index b5bc9971bca..4aac8a05022 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.53 + 0.5.54-SNAPSHOT diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index c3e27366ce3..1d1c0305dfe 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.53 + 0.5.54-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index a2992cd7b03..7145cf85758 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.53 + 0.5.54-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index caa0f949871..aa6d1bb45f3 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.53 + 0.5.54-SNAPSHOT diff --git a/pom.xml b/pom.xml index fa96d842c58..8ae4e8eeae2 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.53 + 0.5.54-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 67adabc0ccc..e89dabb7e41 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.53 + 0.5.54-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index ca9401b6698..adf2a6a0531 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.53 + 0.5.54-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 38bbc2fb060..3a0126a6736 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.53 + 0.5.54-SNAPSHOT com.metamx druid - 0.5.53 + 0.5.54-SNAPSHOT From cd14e7fbcafcf124a7c059fa518f5e5fc7409e6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Thu, 5 Sep 2013 13:42:46 -0700 Subject: [PATCH 14/33] fix regex and assign random user ids --- .../metamx/druid/realtime/firehose/IrcFirehoseFactory.java | 7 ++++--- .../druid/realtime/firehose/WikipediaIrcDecoder.java | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcFirehoseFactory.java b/realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcFirehoseFactory.java index 5e3efa7af4e..b2bdab66e1d 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcFirehoseFactory.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcFirehoseFactory.java @@ -38,6 +38,7 @@ import org.joda.time.DateTime; import java.io.File; import java.io.IOException; import java.util.List; +import java.util.UUID; import java.util.concurrent.LinkedBlockingQueue; /** @@ -146,9 +147,9 @@ public class IrcFirehoseFactory implements FirehoseFactory @Override public List getAlternativeNicknames() { - return Lists.newArrayList(nick + "_", - nick + "__", - nick + "___"); + return Lists.newArrayList(nick + UUID.randomUUID(), + nick + UUID.randomUUID(), + nick + UUID.randomUUID()); } @Override diff --git a/realtime/src/main/java/com/metamx/druid/realtime/firehose/WikipediaIrcDecoder.java b/realtime/src/main/java/com/metamx/druid/realtime/firehose/WikipediaIrcDecoder.java index fc45f5f4e91..262be0c93df 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/firehose/WikipediaIrcDecoder.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/firehose/WikipediaIrcDecoder.java @@ -50,8 +50,10 @@ class WikipediaIrcDecoder implements IrcDecoder final DatabaseReader geoLookup; static final Pattern pattern = Pattern.compile( - "\\x0314\\[\\[\\x0307(.+?)\\x0314\\]\\]\\x034 (.*?)\\x0310.*\\x0302(http.+?)\\x03.+\\x0303(.+?)\\x03.+\\x03 (\\(([+-]\\d+)\\).*|.+) \\x0310(.+)\\x03" + ".*\\x0314\\[\\[\\x0307(.+?)\\x0314\\]\\]\\x034 (.*?)\\x0310.*\\x0302(http.+?)" + + "\\x03.+\\x0303(.+?)\\x03.+\\x03 (\\(([+-]\\d+)\\).*|.+) \\x0310(.+)\\x03.*" ); + static final Pattern ipPattern = Pattern.compile("\\d+.\\d+.\\d+.\\d+"); static final Pattern shortnamePattern = Pattern.compile("#(\\w\\w)\\..*"); From 552d0c061a57fca4fae2de1837fce1a034494285 Mon Sep 17 00:00:00 2001 From: fjy Date: Thu, 5 Sep 2013 13:48:11 -0700 Subject: [PATCH 15/33] [maven-release-plugin] prepare release druid-0.5.54 --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 7f5034500b9..01139e901bb 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.54-SNAPSHOT + 0.5.54 diff --git a/common/pom.xml b/common/pom.xml index 2b79296f1f9..f5fbd771da2 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.54-SNAPSHOT + 0.5.54 diff --git a/examples/pom.xml b/examples/pom.xml index 4aac8a05022..74048531768 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.54-SNAPSHOT + 0.5.54 diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index 1d1c0305dfe..937e7c0948f 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.54-SNAPSHOT + 0.5.54 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 7145cf85758..331a908fc22 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.54-SNAPSHOT + 0.5.54 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index aa6d1bb45f3..6e46209398d 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.54-SNAPSHOT + 0.5.54 diff --git a/pom.xml b/pom.xml index 8ae4e8eeae2..84e92086bf8 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.54-SNAPSHOT + 0.5.54 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index e89dabb7e41..6c778938640 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.54-SNAPSHOT + 0.5.54 diff --git a/server/pom.xml b/server/pom.xml index adf2a6a0531..d77921bf03c 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.54-SNAPSHOT + 0.5.54 diff --git a/services/pom.xml b/services/pom.xml index 3a0126a6736..667d74fe212 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.54-SNAPSHOT + 0.5.54 com.metamx druid - 0.5.54-SNAPSHOT + 0.5.54 From e03c623467c1143c605d381ddaba99db01261833 Mon Sep 17 00:00:00 2001 From: fjy Date: Thu, 5 Sep 2013 13:48:21 -0700 Subject: [PATCH 16/33] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 01139e901bb..5f7a55b6563 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.54 + 0.5.55-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index f5fbd771da2..f71b99b668e 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.54 + 0.5.55-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 74048531768..487db672ce7 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.54 + 0.5.55-SNAPSHOT diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index 937e7c0948f..dd72ef3c0ed 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.54 + 0.5.55-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 331a908fc22..ebd3b80dabe 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.54 + 0.5.55-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 6e46209398d..4cfdf6d5c03 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.54 + 0.5.55-SNAPSHOT diff --git a/pom.xml b/pom.xml index 84e92086bf8..d6851e94286 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.54 + 0.5.55-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 6c778938640..801ae5753d2 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.54 + 0.5.55-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index d77921bf03c..d63534ce597 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.54 + 0.5.55-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 667d74fe212..bc9f82d7d30 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.54 + 0.5.55-SNAPSHOT com.metamx druid - 0.5.54 + 0.5.55-SNAPSHOT From 1ec098c010a80a2ef8693a6c7d4da89381ecf840 Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 13 Sep 2013 13:54:41 -0700 Subject: [PATCH 17/33] use num processing threads for realtime query execution --- .../metamx/druid/realtime/RealtimeNode.java | 1 + .../plumber/RealtimePlumberSchool.java | 13 +++++-- .../java/com/metamx/druid/BaseServerNode.java | 39 +++++++++++++++++++ .../com/metamx/druid/http/ComputeNode.java | 19 +++------ 4 files changed, 54 insertions(+), 18 deletions(-) diff --git a/realtime/src/main/java/com/metamx/druid/realtime/RealtimeNode.java b/realtime/src/main/java/com/metamx/druid/realtime/RealtimeNode.java index 8865b3cb82e..c5677544236 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/RealtimeNode.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/RealtimeNode.java @@ -189,6 +189,7 @@ public class RealtimeNode extends BaseServerNode injectables.put("segmentPublisher", getSegmentPublisher()); injectables.put("serverView", getServerView()); injectables.put("serviceEmitter", getEmitter()); + injectables.put("queryExecutorService", getQueryExecutorService()); getJsonMapper().setInjectableValues( new InjectableValues() diff --git a/realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java b/realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java index 08383bc6456..d638596bef6 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java @@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; -import com.google.common.base.Predicates; import com.google.common.base.Throwables; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -92,7 +91,6 @@ import java.util.concurrent.ScheduledExecutorService; public class RealtimePlumberSchool implements PlumberSchool { private static final EmittingLogger log = new EmittingLogger(RealtimePlumberSchool.class); - private static final ListeningExecutorService EXEC = MoreExecutors.sameThreadExecutor(); private final Period windowPeriod; private final File basePersistDirectory; @@ -108,6 +106,7 @@ public class RealtimePlumberSchool implements PlumberSchool private volatile DataSegmentAnnouncer segmentAnnouncer = null; private volatile SegmentPublisher segmentPublisher = null; private volatile ServerView serverView = null; + private volatile ExecutorService queryExecutorService = null; @JsonCreator public RealtimePlumberSchool( @@ -175,6 +174,12 @@ public class RealtimePlumberSchool implements PlumberSchool this.emitter = emitter; } + @JacksonInject("queryExecutorService") + public void setQueryExecutorService(ExecutorService queryExecutorService) + { + this.queryExecutorService = queryExecutorService; + } + @Override public Plumber findPlumber(final Schema schema, final FireDepartmentMetrics metrics) { @@ -262,7 +267,7 @@ public class RealtimePlumberSchool implements PlumberSchool return toolchest.mergeResults( factory.mergeRunners( - EXEC, + queryExecutorService, FunctionalIterable .create(querySinks) .transform( @@ -277,7 +282,7 @@ public class RealtimePlumberSchool implements PlumberSchool emitter, builderFn, factory.mergeRunners( - EXEC, + MoreExecutors.sameThreadExecutor(), Iterables.transform( theSink, new Function>() diff --git a/server/src/main/java/com/metamx/druid/BaseServerNode.java b/server/src/main/java/com/metamx/druid/BaseServerNode.java index efe2f2a19c6..17eee84dc6e 100644 --- a/server/src/main/java/com/metamx/druid/BaseServerNode.java +++ b/server/src/main/java/com/metamx/druid/BaseServerNode.java @@ -23,19 +23,24 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; +import com.metamx.common.concurrent.ExecutorServiceConfig; import com.metamx.common.lifecycle.Lifecycle; import com.metamx.common.logger.Logger; import com.metamx.druid.collect.StupidPool; import com.metamx.druid.initialization.ServerInit; import com.metamx.druid.query.DefaultQueryRunnerFactoryConglomerate; +import com.metamx.druid.query.MetricsEmittingExecutorService; +import com.metamx.druid.query.PrioritizedExecutorService; import com.metamx.druid.query.QueryRunnerFactory; import com.metamx.druid.query.QueryRunnerFactoryConglomerate; +import com.metamx.emitter.service.ServiceMetricEvent; import org.skife.config.ConfigurationObjectFactory; import java.nio.ByteBuffer; import java.util.Map; import java.util.Properties; +import java.util.concurrent.ExecutorService; /** */ @@ -45,6 +50,7 @@ public abstract class BaseServerNode extends QueryableN private DruidProcessingConfig processingConfig = null; private QueryRunnerFactoryConglomerate conglomerate = null; private StupidPool computeScratchPool = null; + private ExecutorService queryExecutorService = null; public BaseServerNode( String nodeType, @@ -77,6 +83,12 @@ public abstract class BaseServerNode extends QueryableN return processingConfig; } + public ExecutorService getQueryExecutorService() + { + initializeQueryExecutorService(); + return queryExecutorService; + } + @SuppressWarnings("unchecked") public T setConglomerate(QueryRunnerFactoryConglomerate conglomerate) { @@ -98,6 +110,13 @@ public abstract class BaseServerNode extends QueryableN return (T) this; } + @SuppressWarnings("unchecked") + public T setQueryExecutorService(ExecutorService queryExecutorService) + { + checkFieldNotSetAndSet("queryExecutorService", queryExecutorService); + return (T) this; + } + @SuppressWarnings("unchecked") public T registerQueryRunnerFactory(Class queryClazz, QueryRunnerFactory factory) { @@ -144,4 +163,24 @@ public abstract class BaseServerNode extends QueryableN ); } } + + private void initializeQueryExecutorService() + { + if (queryExecutorService == null) { + final PrioritizedExecutorService innerExecutorService = PrioritizedExecutorService.create( + getLifecycle(), + getConfigFactory().buildWithReplacements( + ExecutorServiceConfig.class, ImmutableMap.of("base_path", "druid.processing") + ) + ); + + setQueryExecutorService( + new MetricsEmittingExecutorService( + innerExecutorService, + getEmitter(), + new ServiceMetricEvent.Builder() + ) + ); + } + } } diff --git a/server/src/main/java/com/metamx/druid/http/ComputeNode.java b/server/src/main/java/com/metamx/druid/http/ComputeNode.java index 7cd0990d392..e677db381e3 100644 --- a/server/src/main/java/com/metamx/druid/http/ComputeNode.java +++ b/server/src/main/java/com/metamx/druid/http/ComputeNode.java @@ -97,21 +97,13 @@ public class ComputeNode extends BaseServerNode final List monitors = getMonitors(); final QueryRunnerFactoryConglomerate conglomerate = getConglomerate(); - final PrioritizedExecutorService innerExecutorService = PrioritizedExecutorService.create( - getLifecycle(), - getConfigFactory().buildWithReplacements( - ExecutorServiceConfig.class, ImmutableMap.of("base_path", "druid.processing") - ) - ); - - final ExecutorService executorService = new MetricsEmittingExecutorService( - innerExecutorService, + final ServerManager serverManager = new ServerManager( + getSegmentLoader(), + conglomerate, emitter, - new ServiceMetricEvent.Builder() + getQueryExecutorService() ); - final ServerManager serverManager = new ServerManager(getSegmentLoader(), conglomerate, emitter, executorService); - final ZkCoordinator coordinator = new ZkCoordinator( getJsonMapper(), getConfigFactory().build(ZkCoordinatorConfig.class), @@ -206,5 +198,4 @@ public class ComputeNode extends BaseServerNode return new ComputeNode(props, lifecycle, jsonMapper, smileMapper, configFactory); } } - -} +} \ No newline at end of file From 24df6c482d15366a3dd9b614992f50961e95f268 Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Fri, 13 Sep 2013 14:19:42 -0700 Subject: [PATCH 18/33] Use shared query executor in indexing-service --- .../druid/indexing/common/TaskToolbox.java | 9 ++++++++ .../indexing/common/TaskToolboxFactory.java | 6 +++++ .../common/task/RealtimeIndexTask.java | 1 + .../worker/executor/ExecutorNode.java | 22 ++++--------------- .../coordinator/RemoteTaskRunnerTest.java | 2 +- .../coordinator/TaskLifecycleTest.java | 1 + .../indexing/coordinator/TaskQueueTest.java | 2 ++ 7 files changed, 24 insertions(+), 19 deletions(-) diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolbox.java b/indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolbox.java index 050a23cb5e0..914297d324c 100644 --- a/indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolbox.java +++ b/indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolbox.java @@ -43,6 +43,7 @@ import org.jets3t.service.impl.rest.httpclient.RestS3Service; import java.io.File; import java.util.List; import java.util.Map; +import java.util.concurrent.ExecutorService; /** * Stuff that may be needed by a Task in order to conduct its business. @@ -59,6 +60,7 @@ public class TaskToolbox private final DataSegmentAnnouncer segmentAnnouncer; private final ServerView newSegmentServerView; private final QueryRunnerFactoryConglomerate queryRunnerFactoryConglomerate; + private final ExecutorService queryExecutorService; private final MonitorScheduler monitorScheduler; private final ObjectMapper objectMapper; @@ -73,6 +75,7 @@ public class TaskToolbox DataSegmentAnnouncer segmentAnnouncer, ServerView newSegmentServerView, QueryRunnerFactoryConglomerate queryRunnerFactoryConglomerate, + ExecutorService queryExecutorService, MonitorScheduler monitorScheduler, ObjectMapper objectMapper ) @@ -87,6 +90,7 @@ public class TaskToolbox this.segmentAnnouncer = segmentAnnouncer; this.newSegmentServerView = newSegmentServerView; this.queryRunnerFactoryConglomerate = queryRunnerFactoryConglomerate; + this.queryExecutorService = queryExecutorService; this.monitorScheduler = monitorScheduler; this.objectMapper = objectMapper; } @@ -131,6 +135,11 @@ public class TaskToolbox return queryRunnerFactoryConglomerate; } + public ExecutorService getQueryExecutorService() + { + return queryExecutorService; + } + public MonitorScheduler getMonitorScheduler() { return monitorScheduler; diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolboxFactory.java b/indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolboxFactory.java index 91f5c99a333..ff90dfe9f3b 100644 --- a/indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolboxFactory.java +++ b/indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolboxFactory.java @@ -32,6 +32,8 @@ import com.metamx.emitter.service.ServiceEmitter; import com.metamx.metrics.MonitorScheduler; import org.jets3t.service.impl.rest.httpclient.RestS3Service; +import java.util.concurrent.ExecutorService; + /** * Stuff that may be needed by a Task in order to conduct its business. */ @@ -46,6 +48,7 @@ public class TaskToolboxFactory private final DataSegmentAnnouncer segmentAnnouncer; private final ServerView newSegmentServerView; private final QueryRunnerFactoryConglomerate queryRunnerFactoryConglomerate; + private final ExecutorService queryExecutorService; private final MonitorScheduler monitorScheduler; private final ObjectMapper objectMapper; @@ -59,6 +62,7 @@ public class TaskToolboxFactory DataSegmentAnnouncer segmentAnnouncer, ServerView newSegmentServerView, QueryRunnerFactoryConglomerate queryRunnerFactoryConglomerate, + ExecutorService queryExecutorService, MonitorScheduler monitorScheduler, ObjectMapper objectMapper ) @@ -72,6 +76,7 @@ public class TaskToolboxFactory this.segmentAnnouncer = segmentAnnouncer; this.newSegmentServerView = newSegmentServerView; this.queryRunnerFactoryConglomerate = queryRunnerFactoryConglomerate; + this.queryExecutorService = queryExecutorService; this.monitorScheduler = monitorScheduler; this.objectMapper = objectMapper; } @@ -89,6 +94,7 @@ public class TaskToolboxFactory segmentAnnouncer, newSegmentServerView, queryRunnerFactoryConglomerate, + queryExecutorService, monitorScheduler, objectMapper ); diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/RealtimeIndexTask.java b/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/RealtimeIndexTask.java index dc3ad87a9cb..2f6ec6eb563 100644 --- a/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/RealtimeIndexTask.java +++ b/indexing-service/src/main/java/com/metamx/druid/indexing/common/task/RealtimeIndexTask.java @@ -274,6 +274,7 @@ public class RealtimeIndexTask extends AbstractTask // NOTE: "same" segment. realtimePlumberSchool.setDataSegmentPusher(toolbox.getSegmentPusher()); realtimePlumberSchool.setConglomerate(toolbox.getQueryRunnerFactoryConglomerate()); + realtimePlumberSchool.setQueryExecutorService(toolbox.getQueryExecutorService()); realtimePlumberSchool.setVersioningPolicy(versioningPolicy); realtimePlumberSchool.setSegmentAnnouncer(lockingSegmentAnnouncer); realtimePlumberSchool.setSegmentPublisher(segmentPublisher); diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java b/indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java index 341a578d6de..4603d744f94 100644 --- a/indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java +++ b/indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java @@ -65,7 +65,6 @@ import com.metamx.druid.loading.DataSegmentPusher; import com.metamx.druid.loading.S3DataSegmentKiller; import com.metamx.druid.utils.PropUtils; import com.metamx.emitter.EmittingLogger; -import com.metamx.emitter.core.Emitters; import com.metamx.emitter.service.ServiceEmitter; import com.metamx.http.client.HttpClient; import com.metamx.http.client.HttpClientConfig; @@ -108,7 +107,6 @@ public class ExecutorNode extends BaseServerNode private RestS3Service s3Service = null; private MonitorScheduler monitorScheduler = null; private HttpClient httpClient = null; - private ServiceEmitter emitter = null; private TaskConfig taskConfig = null; private WorkerConfig workerConfig = null; private DataSegmentPusher segmentPusher = null; @@ -143,7 +141,6 @@ public class ExecutorNode extends BaseServerNode public void doInit() throws Exception { initializeHttpClient(); - initializeEmitter(); initializeS3Service(); initializeMergerConfig(); initializeServiceDiscovery(); @@ -173,7 +170,7 @@ public class ExecutorNode extends BaseServerNode root.addFilter(GuiceFilter.class, "/druid/worker/v1/*", 0); root.addServlet( new ServletHolder( - new QueryServlet(getJsonMapper(), getSmileMapper(), taskRunner, emitter, getRequestLogger()) + new QueryServlet(getJsonMapper(), getSmileMapper(), taskRunner, getEmitter(), getRequestLogger()) ), "/druid/v2/*" ); @@ -186,7 +183,7 @@ public class ExecutorNode extends BaseServerNode final ScheduledExecutorFactory scheduledExecutorFactory = ScheduledExecutors.createFactory(lifecycle); final ScheduledExecutorService globalScheduledExec = scheduledExecutorFactory.create(1, "Global--%d"); this.monitorScheduler = new MonitorScheduler( - configFactory.build(MonitorSchedulerConfig.class), globalScheduledExec, emitter, ImmutableList.of() + configFactory.build(MonitorSchedulerConfig.class), globalScheduledExec, getEmitter(), ImmutableList.of() ); lifecycle.addManagedInstance(monitorScheduler); } @@ -272,18 +269,6 @@ public class ExecutorNode extends BaseServerNode } } - private void initializeEmitter() - { - if (emitter == null) { - emitter = new ServiceEmitter( - PropUtils.getProperty(props, "druid.service"), - PropUtils.getProperty(props, "druid.host"), - Emitters.create(props, httpClient, getJsonMapper(), lifecycle) - ); - } - EmittingLogger.registerEmitter(emitter); - } - private void initializeS3Service() throws S3ServiceException { if (s3Service == null) { @@ -331,13 +316,14 @@ public class ExecutorNode extends BaseServerNode ), getJsonMapper() ), - emitter, + getEmitter(), s3Service, segmentPusher, dataSegmentKiller, getAnnouncer(), getServerView(), getConglomerate(), + getQueryExecutorService(), monitorScheduler, getJsonMapper() ); diff --git a/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java b/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java index a22664ec77b..8de8b106cea 100644 --- a/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java +++ b/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java @@ -385,7 +385,7 @@ public class RemoteTaskRunnerTest { return null; } - }, null, null, null, null, null, null, null, null, null, jsonMapper + }, null, null, null, null, null, null, null, null, null, null, jsonMapper ), Executors.newSingleThreadExecutor() ), Executors.newSingleThreadExecutor() diff --git a/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java b/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java index 17e718a8983..62010fc8c68 100644 --- a/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java +++ b/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java @@ -160,6 +160,7 @@ public class TaskLifecycleTest null, // segment announcer null, // new segment server view null, // query runner factory conglomerate corporation unionized collective + null, // query executor service null, // monitor scheduler new DefaultObjectMapper() ); diff --git a/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskQueueTest.java b/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskQueueTest.java index f421bee7f3c..e3b230ab233 100644 --- a/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskQueueTest.java +++ b/indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskQueueTest.java @@ -169,6 +169,7 @@ public class TaskQueueTest null, null, null, + null, null ); @@ -230,6 +231,7 @@ public class TaskQueueTest null, null, null, + null, null ); From 87dc839fb25b9ec5e1e1c255935edfb164469593 Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 13 Sep 2013 14:36:42 -0700 Subject: [PATCH 19/33] fix example properties for real time node --- examples/config/realtime/runtime.properties | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/examples/config/realtime/runtime.properties b/examples/config/realtime/runtime.properties index b7366c20595..95e73cc5d12 100644 --- a/examples/config/realtime/runtime.properties +++ b/examples/config/realtime/runtime.properties @@ -6,11 +6,16 @@ druid.service=realtime com.metamx.emitter.logging=true com.metamx.emitter.logging.level=info +# zk +druid.zk.service.host=localhost +druid.zk.paths.base=/druid +druid.zk.paths.discoveryPath=/druid/discoveryPath + # processing druid.processing.buffer.sizeBytes=10000000 # schema -druid.realtime.specFile=realtime.spec +druid.realtime.specFile=config/realtime/realtime.spec # aws (dummy user) com.metamx.aws.accessKey=AKIAIMKECRUYKDQGR6YQ From 542d564453ae9aa04ff996b53b6996e277df136e Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Fri, 13 Sep 2013 17:58:56 -0700 Subject: [PATCH 20/33] [maven-release-plugin] prepare release druid-0.5.55 --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 5f7a55b6563..34c366470b8 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.55-SNAPSHOT + 0.5.55 diff --git a/common/pom.xml b/common/pom.xml index f71b99b668e..efc56474a16 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.55-SNAPSHOT + 0.5.55 diff --git a/examples/pom.xml b/examples/pom.xml index 487db672ce7..80157c712f9 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.55-SNAPSHOT + 0.5.55 diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index dd72ef3c0ed..e8fde0026d2 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.55-SNAPSHOT + 0.5.55 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index ebd3b80dabe..d826099980e 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.55-SNAPSHOT + 0.5.55 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 4cfdf6d5c03..60506f69fb5 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.55-SNAPSHOT + 0.5.55 diff --git a/pom.xml b/pom.xml index d6851e94286..88d5202dfbd 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.55-SNAPSHOT + 0.5.55 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 801ae5753d2..341953f4af4 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.55-SNAPSHOT + 0.5.55 diff --git a/server/pom.xml b/server/pom.xml index d63534ce597..3a72f1016dc 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.55-SNAPSHOT + 0.5.55 diff --git a/services/pom.xml b/services/pom.xml index bc9f82d7d30..5556c215836 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.55-SNAPSHOT + 0.5.55 com.metamx druid - 0.5.55-SNAPSHOT + 0.5.55 From 22a99c7589488dbecf3cdd9cba2ea30816138c97 Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Fri, 13 Sep 2013 17:59:03 -0700 Subject: [PATCH 21/33] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 34c366470b8..912e4efb7ac 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.55 + 0.5.56-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index efc56474a16..32d3616b814 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.55 + 0.5.56-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 80157c712f9..6ffb2f4308b 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.55 + 0.5.56-SNAPSHOT diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index e8fde0026d2..04b0387d886 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.55 + 0.5.56-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index d826099980e..5a5dbb0f614 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.55 + 0.5.56-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 60506f69fb5..497ec45dcd4 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.55 + 0.5.56-SNAPSHOT diff --git a/pom.xml b/pom.xml index 88d5202dfbd..913b8871ca8 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.55 + 0.5.56-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 341953f4af4..4982b5170e9 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.55 + 0.5.56-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 3a72f1016dc..f70978ae2f6 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.55 + 0.5.56-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 5556c215836..3c4ab8d8966 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.55 + 0.5.56-SNAPSHOT com.metamx druid - 0.5.55 + 0.5.56-SNAPSHOT From 5a8b71ddecb3b9750759631abd3252b2dc27f2c5 Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 13 Sep 2013 18:41:33 -0700 Subject: [PATCH 22/33] fix how druid services is assembled --- services/pom.xml | 18 +++++++++++++++++- services/src/assembly/assembly.xml | 18 +++--------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/services/pom.xml b/services/pom.xml index bc9f82d7d30..a5e99a53ae1 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -17,7 +17,8 @@ ~ along with this program; if not, write to the Free Software ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx.druid @@ -32,6 +33,21 @@ + + com.metamx.druid + druid-examples + ${project.parent.version} + + + com.metamx.druid + druid-indexing-hadoop + ${project.parent.version} + + + com.metamx.druid + druid-indexing-service + ${project.parent.version} + com.metamx.druid druid-realtime diff --git a/services/src/assembly/assembly.xml b/services/src/assembly/assembly.xml index 537e2eeabd0..63c53ae50fa 100644 --- a/services/src/assembly/assembly.xml +++ b/services/src/assembly/assembly.xml @@ -1,5 +1,7 @@ - + bin tar.gz @@ -48,20 +50,6 @@ 744 / - - ../examples/target - - druid-examples-${project.version}.jar - - lib - - - ../services/target - - druid-services-${project.version}.jar - - lib - ../examples/bin/examples From b17f5c403b3167bb0f12316f18aa543e2a07d397 Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 13 Sep 2013 18:45:14 -0700 Subject: [PATCH 23/33] [maven-release-plugin] prepare release druid-0.5.56 --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 7 +++---- 10 files changed, 12 insertions(+), 13 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 912e4efb7ac..a873bec8aff 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.56-SNAPSHOT + 0.5.56 diff --git a/common/pom.xml b/common/pom.xml index 32d3616b814..5bde1ecacbf 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.56-SNAPSHOT + 0.5.56 diff --git a/examples/pom.xml b/examples/pom.xml index 6ffb2f4308b..3f289665b26 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.56-SNAPSHOT + 0.5.56 diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index 04b0387d886..369ea1000ca 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.56-SNAPSHOT + 0.5.56 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 5a5dbb0f614..4854ad125b4 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.56-SNAPSHOT + 0.5.56 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 497ec45dcd4..6d223c94296 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.56-SNAPSHOT + 0.5.56 diff --git a/pom.xml b/pom.xml index 913b8871ca8..8fe64e58399 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.56-SNAPSHOT + 0.5.56 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 4982b5170e9..b0cd64ae522 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.56-SNAPSHOT + 0.5.56 diff --git a/server/pom.xml b/server/pom.xml index f70978ae2f6..3f29a1c5107 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.56-SNAPSHOT + 0.5.56 diff --git a/services/pom.xml b/services/pom.xml index 60954684a9c..38ee73878f2 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -17,19 +17,18 @@ ~ along with this program; if not, write to the Free Software ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx.druid druid-services druid-services druid-services - 0.5.56-SNAPSHOT + 0.5.56 com.metamx druid - 0.5.56-SNAPSHOT + 0.5.56 From b0a09ba1f1dba02658b1fcc7fac9710507af739a Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 13 Sep 2013 18:45:20 -0700 Subject: [PATCH 24/33] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index a873bec8aff..7519f24cbbd 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.56 + 0.5.57-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 5bde1ecacbf..7387bbcf827 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.56 + 0.5.57-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 3f289665b26..5d8957f919f 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.56 + 0.5.57-SNAPSHOT diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index 369ea1000ca..7d6202f2a5a 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.56 + 0.5.57-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 4854ad125b4..94210a00cf1 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.56 + 0.5.57-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 6d223c94296..b302ee4c945 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.56 + 0.5.57-SNAPSHOT diff --git a/pom.xml b/pom.xml index 8fe64e58399..f43fd3a0f25 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.56 + 0.5.57-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index b0cd64ae522..ba81e5cb646 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.56 + 0.5.57-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 3f29a1c5107..186186e79ef 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.56 + 0.5.57-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 38ee73878f2..fe97dbaa078 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.56 + 0.5.57-SNAPSHOT com.metamx druid - 0.5.56 + 0.5.57-SNAPSHOT From 23c5fdb107478bb25ab523e635e90afaa3ac949f Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 13 Sep 2013 18:57:20 -0700 Subject: [PATCH 25/33] [maven-release-plugin] prepare release druid-0.5.57 --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 7519f24cbbd..5749946f0c6 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.57-SNAPSHOT + 0.5.57 diff --git a/common/pom.xml b/common/pom.xml index 7387bbcf827..02f625eacf6 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.57-SNAPSHOT + 0.5.57 diff --git a/examples/pom.xml b/examples/pom.xml index 5d8957f919f..063050b168a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.57-SNAPSHOT + 0.5.57 diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index 7d6202f2a5a..2f56d6a8032 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.57-SNAPSHOT + 0.5.57 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 94210a00cf1..f7a24561e01 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.57-SNAPSHOT + 0.5.57 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index b302ee4c945..0260468c551 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.57-SNAPSHOT + 0.5.57 diff --git a/pom.xml b/pom.xml index f43fd3a0f25..807d8c7269b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.57-SNAPSHOT + 0.5.57 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index ba81e5cb646..9ce25f19dbc 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.57-SNAPSHOT + 0.5.57 diff --git a/server/pom.xml b/server/pom.xml index 186186e79ef..5045c42502d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.57-SNAPSHOT + 0.5.57 diff --git a/services/pom.xml b/services/pom.xml index fe97dbaa078..54c39ff2fed 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.57-SNAPSHOT + 0.5.57 com.metamx druid - 0.5.57-SNAPSHOT + 0.5.57 From d0b0adbb68ac4dd2640b96a1d693a78241553cfa Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 13 Sep 2013 18:57:25 -0700 Subject: [PATCH 26/33] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 5749946f0c6..d344f8f915b 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.57 + 0.5.58-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 02f625eacf6..f8ecc24385d 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.57 + 0.5.58-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 063050b168a..a42bbc70522 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.57 + 0.5.58-SNAPSHOT diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index 2f56d6a8032..d57923d3011 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.57 + 0.5.58-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index f7a24561e01..9e32e8adebd 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.57 + 0.5.58-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 0260468c551..f848c20bb67 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.57 + 0.5.58-SNAPSHOT diff --git a/pom.xml b/pom.xml index 807d8c7269b..a5eacac6974 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.57 + 0.5.58-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 9ce25f19dbc..10edeadd34f 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.57 + 0.5.58-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 5045c42502d..133999129cc 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.57 + 0.5.58-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 54c39ff2fed..68459065c40 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.57 + 0.5.58-SNAPSHOT com.metamx druid - 0.5.57 + 0.5.58-SNAPSHOT From a20f3fc6dd73e0c65b711decebabf67431fcd999 Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Fri, 13 Sep 2013 19:02:40 -0700 Subject: [PATCH 27/33] [maven-release-plugin] prepare release druid-0.5.58 --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index d344f8f915b..099c29d3a4a 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.58-SNAPSHOT + 0.5.58 diff --git a/common/pom.xml b/common/pom.xml index f8ecc24385d..01f3b9343b5 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.58-SNAPSHOT + 0.5.58 diff --git a/examples/pom.xml b/examples/pom.xml index a42bbc70522..0c8b0b506d4 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.58-SNAPSHOT + 0.5.58 diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index d57923d3011..95cc19aa855 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.58-SNAPSHOT + 0.5.58 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 9e32e8adebd..b3596fef90e 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.58-SNAPSHOT + 0.5.58 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index f848c20bb67..b65c0881f98 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.58-SNAPSHOT + 0.5.58 diff --git a/pom.xml b/pom.xml index a5eacac6974..86e3a365931 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.58-SNAPSHOT + 0.5.58 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 10edeadd34f..760594be6f9 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.58-SNAPSHOT + 0.5.58 diff --git a/server/pom.xml b/server/pom.xml index 133999129cc..3037c29937e 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.58-SNAPSHOT + 0.5.58 diff --git a/services/pom.xml b/services/pom.xml index 68459065c40..6bbb41ef97a 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.58-SNAPSHOT + 0.5.58 com.metamx druid - 0.5.58-SNAPSHOT + 0.5.58 From 163fa14e62beee4643c95503f05ad4a053d8725a Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Fri, 13 Sep 2013 19:02:46 -0700 Subject: [PATCH 28/33] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- indexing-common/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 099c29d3a4a..d7ce942253a 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.58 + 0.5.59-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 01f3b9343b5..8d264bfb57e 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.58 + 0.5.59-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 0c8b0b506d4..83de1896523 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.5.58 + 0.5.59-SNAPSHOT diff --git a/indexing-common/pom.xml b/indexing-common/pom.xml index 95cc19aa855..aa63c90ded0 100644 --- a/indexing-common/pom.xml +++ b/indexing-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.58 + 0.5.59-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index b3596fef90e..460e9ab6e42 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.58 + 0.5.59-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index b65c0881f98..ed6da1032f0 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.58 + 0.5.59-SNAPSHOT diff --git a/pom.xml b/pom.xml index 86e3a365931..c70b7f27983 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.58 + 0.5.59-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 760594be6f9..6f0e0cf12d9 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.58 + 0.5.59-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 3037c29937e..87b681fc4a4 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.58 + 0.5.59-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 6bbb41ef97a..de247ffba4b 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.5.58 + 0.5.59-SNAPSHOT com.metamx druid - 0.5.58 + 0.5.59-SNAPSHOT From 949c52d48292110693018b9726e23c9843ea9f25 Mon Sep 17 00:00:00 2001 From: cheddar Date: Wed, 18 Sep 2013 15:42:30 -0500 Subject: [PATCH 29/33] 1) Remove snapshots --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 545e33c684d..0259dd62979 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ UTF-8 - 0.25.0-SNAPSHOT + 0.25.0 2.1.0-incubating @@ -65,7 +65,7 @@ com.metamx emitter - 0.2.5-SNAPSHOT + 0.2.5 com.metamx @@ -492,7 +492,7 @@ maven-shade-plugin - 1.7.1 + 2.1 maven-site-plugin From dc728b5721429e072d7ec5ada5084b6aa6746167 Mon Sep 17 00:00:00 2001 From: cheddar Date: Wed, 18 Sep 2013 17:01:03 -0500 Subject: [PATCH 30/33] Update versions of poms and make IncrementalIndexStorageAdapterTest compile --- common/pom.xml | 2 +- examples/pom.xml | 21 +++++++++++- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- pom.xml | 2 +- processing/pom.xml | 2 +- .../IncrementalIndexStorageAdapterTest.java | 32 +++++++++---------- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 6 ++-- 10 files changed, 46 insertions(+), 27 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index fea9e62020e..af29a79f989 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.59-SNAPSHOT + 0.6.0-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 0d39e670a6c..2a8310e92ba 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -1,4 +1,23 @@ + + 4.0.0 com.metamx.druid @@ -9,7 +28,7 @@ com.metamx druid - 0.5.59-SNAPSHOT + 0.6.0-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 339eb6aa12f..569a61db92b 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.59-SNAPSHOT + 0.6.0-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 8e3ad01b7f5..30c847821de 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.59-SNAPSHOT + 0.6.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 8c038c4a195..f416946ff99 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.5.59-SNAPSHOT + 0.6.0-SNAPSHOT druid druid diff --git a/processing/pom.xml b/processing/pom.xml index dbca7dfc46f..405c8997078 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.50-SNAPSHOT + 0.6.0-SNAPSHOT diff --git a/processing/src/test/java/io/druid/segment/incremental/IncrementalIndexStorageAdapterTest.java b/processing/src/test/java/io/druid/segment/incremental/IncrementalIndexStorageAdapterTest.java index e5ad1749c20..f4f089c92a4 100644 --- a/processing/src/test/java/io/druid/segment/incremental/IncrementalIndexStorageAdapterTest.java +++ b/processing/src/test/java/io/druid/segment/incremental/IncrementalIndexStorageAdapterTest.java @@ -20,23 +20,22 @@ package io.druid.segment.incremental; import com.google.common.base.Supplier; +import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.metamx.common.guava.Sequence; import com.metamx.common.guava.Sequences; -import com.metamx.druid.QueryGranularity; -import com.metamx.druid.aggregation.AggregatorFactory; -import com.metamx.druid.aggregation.CountAggregatorFactory; -import com.metamx.druid.aggregation.LongSumAggregatorFactory; -import com.metamx.druid.collect.StupidPool; -import com.metamx.druid.input.MapBasedInputRow; -import com.metamx.druid.input.MapBasedRow; -import com.metamx.druid.input.Row; -import com.metamx.druid.query.group.GroupByQuery; -import com.metamx.druid.query.group.GroupByQueryEngine; -import com.metamx.druid.query.group.GroupByQueryEngineConfig; -import io.druid.segment.incremental.IncrementalIndex; -import io.druid.segment.incremental.IncrementalIndexStorageAdapter; +import io.druid.collections.StupidPool; +import io.druid.data.input.MapBasedInputRow; +import io.druid.data.input.MapBasedRow; +import io.druid.data.input.Row; +import io.druid.granularity.QueryGranularity; +import io.druid.query.aggregation.AggregatorFactory; +import io.druid.query.aggregation.CountAggregatorFactory; +import io.druid.query.aggregation.LongSumAggregatorFactory; +import io.druid.query.groupby.GroupByQuery; +import io.druid.query.groupby.GroupByQueryConfig; +import io.druid.query.groupby.GroupByQueryEngine; import junit.framework.Assert; import org.joda.time.DateTime; import org.joda.time.Interval; @@ -72,15 +71,16 @@ public class IncrementalIndexStorageAdapterTest ); GroupByQueryEngine engine = new GroupByQueryEngine( - new GroupByQueryEngineConfig() + Suppliers.ofInstance(new GroupByQueryConfig() { + @Override public int getMaxIntermediateRows() { return 5; } - }, - new StupidPool( + }), + new StupidPool( new Supplier() { @Override diff --git a/realtime/pom.xml b/realtime/pom.xml index e621657ba53..9d8e461c631 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.5.59-SNAPSHOT + 0.6.0-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 87b087ee17f..9d8b333e50d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -29,7 +29,7 @@ com.metamx druid - 0.5.59-SNAPSHOT + 0.6.0-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index c0c31d426b4..0f202976a75 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -1,7 +1,7 @@