From aecf4491be8663d10c67881ae055d7b1daffa2a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Mon, 11 Aug 2014 15:25:14 -0700 Subject: [PATCH 01/10] reduce object count overhead of column cache --- .../io/druid/segment/data/GenericIndexed.java | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/processing/src/main/java/io/druid/segment/data/GenericIndexed.java b/processing/src/main/java/io/druid/segment/data/GenericIndexed.java index 551f5a29f23..84c66f03c33 100644 --- a/processing/src/main/java/io/druid/segment/data/GenericIndexed.java +++ b/processing/src/main/java/io/druid/segment/data/GenericIndexed.java @@ -24,7 +24,9 @@ import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.common.primitives.Ints; import com.metamx.common.IAE; +import com.metamx.common.Pair; import com.metamx.common.guava.CloseQuietly; +import com.metamx.common.logger.Logger; import java.io.ByteArrayOutputStream; import java.io.Closeable; @@ -51,6 +53,8 @@ import java.util.Map; */ public class GenericIndexed implements Indexed, Closeable { + private final Logger log = new Logger(GenericIndexed.class); + private static final byte version = 0x1; public static final int INITIAL_CACHE_CAPACITY = 16384; @@ -121,11 +125,10 @@ public class GenericIndexed implements Indexed, Closeable return new GenericIndexed(theBuffer.asReadOnlyBuffer(), strategy, allowReverseLookup); } - private static class SizedLRUMap extends LinkedHashMap + private static class SizedLRUMap extends LinkedHashMap> { - final Map sizes = Maps.newHashMap(); - int numBytes = 0; - int maxBytes = 0; + private final int maxBytes; + private int numBytes = 0; public SizedLRUMap(int initialCapacity, int maxBytes) { @@ -134,20 +137,25 @@ public class GenericIndexed implements Indexed, Closeable } @Override - protected boolean removeEldestEntry(Map.Entry eldest) + protected boolean removeEldestEntry(Map.Entry> eldest) { if (numBytes > maxBytes) { - numBytes -= sizes.remove(eldest.getKey()); + numBytes -= eldest.getValue().lhs; return true; } return false; } - public V put(K key, V value, int size) + public void put(K key, V value, int size) { numBytes += size; - sizes.put(key, size); - return super.put(key, value); + super.put(key, new Pair(size, value)); + } + + public V getValue(Object key) + { + final Pair sizeValuePair = super.get(key); + return sizeValuePair == null ? null : sizeValuePair.rhs; } } @@ -206,6 +214,7 @@ public class GenericIndexed implements Indexed, Closeable @Override protected SizedLRUMap initialValue() { + log.debug("Allocating column cache of max size[%d]", maxBytes); return new SizedLRUMap<>(INITIAL_CACHE_CAPACITY, maxBytes); } }; @@ -236,7 +245,7 @@ public class GenericIndexed implements Indexed, Closeable } if(cacheable) { - final T cached = cachedValues.get().get(index); + final T cached = cachedValues.get().getValue(index); if (cached != null) { return cached; } @@ -329,6 +338,7 @@ public class GenericIndexed implements Indexed, Closeable public void close() throws IOException { if(cacheable) { + log.debug("Closing column cache"); cachedValues.get().clear(); cachedValues.remove(); } From da399724ebf9d4a3752b8f5d0f94e84f2cd1f954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Mon, 11 Aug 2014 17:05:41 -0700 Subject: [PATCH 02/10] add approximate object overhead --- .../main/java/io/druid/segment/data/GenericIndexed.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/processing/src/main/java/io/druid/segment/data/GenericIndexed.java b/processing/src/main/java/io/druid/segment/data/GenericIndexed.java index 84c66f03c33..f8826b4d653 100644 --- a/processing/src/main/java/io/druid/segment/data/GenericIndexed.java +++ b/processing/src/main/java/io/druid/segment/data/GenericIndexed.java @@ -53,7 +53,7 @@ import java.util.Map; */ public class GenericIndexed implements Indexed, Closeable { - private final Logger log = new Logger(GenericIndexed.class); + private static final Logger log = new Logger(GenericIndexed.class); private static final byte version = 0x1; @@ -148,8 +148,9 @@ public class GenericIndexed implements Indexed, Closeable public void put(K key, V value, int size) { - numBytes += size; - super.put(key, new Pair(size, value)); + final int totalSize = size + 48; // add approximate object overhead + numBytes += totalSize; + super.put(key, new Pair(totalSize, value)); } public V getValue(Object key) From 69f4c2677f8a461d101ce1080e101478e8b61109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Mon, 11 Aug 2014 18:10:19 -0700 Subject: [PATCH 03/10] formatting --- .../src/main/java/io/druid/segment/data/GenericIndexed.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processing/src/main/java/io/druid/segment/data/GenericIndexed.java b/processing/src/main/java/io/druid/segment/data/GenericIndexed.java index f8826b4d653..3bb29f16d53 100644 --- a/processing/src/main/java/io/druid/segment/data/GenericIndexed.java +++ b/processing/src/main/java/io/druid/segment/data/GenericIndexed.java @@ -150,7 +150,7 @@ public class GenericIndexed implements Indexed, Closeable { final int totalSize = size + 48; // add approximate object overhead numBytes += totalSize; - super.put(key, new Pair(totalSize, value)); + super.put(key, new Pair<>(totalSize, value)); } public V getValue(Object key) From a1bcff49c5404676210d02b9cec1035ed5d101d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Mon, 11 Aug 2014 18:10:33 -0700 Subject: [PATCH 04/10] disable column cache by default --- .../src/main/java/io/druid/query/DruidProcessingConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processing/src/main/java/io/druid/query/DruidProcessingConfig.java b/processing/src/main/java/io/druid/query/DruidProcessingConfig.java index 208cd345805..f05e8a3ca70 100644 --- a/processing/src/main/java/io/druid/query/DruidProcessingConfig.java +++ b/processing/src/main/java/io/druid/query/DruidProcessingConfig.java @@ -42,6 +42,6 @@ public abstract class DruidProcessingConfig extends ExecutorServiceConfig implem @Config(value = "${base_path}.columnCache.sizeBytes") public int columnCacheSizeBytes() { - return 1024 * 1024; + return 0; } } From 1c244c8be837e76905c8175fc6c6f6ecc7d47387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 12 Aug 2014 10:40:09 -0700 Subject: [PATCH 05/10] add column cache docs --- docs/content/Configuration.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/content/Configuration.md b/docs/content/Configuration.md index 264efb91ecd..267d43c7025 100644 --- a/docs/content/Configuration.md +++ b/docs/content/Configuration.md @@ -106,6 +106,7 @@ This module contains query processing functionality. |`druid.processing.buffer.sizeBytes`|This specifies a buffer size for the storage of intermediate results. The computation engine in both the Historical and Realtime nodes will use a scratch buffer of this size to do all of their intermediate computations off-heap. Larger values allow for more aggregations in a single pass over the data while smaller values can require more passes depending on the query that is being executed.|1073741824 (1GB)| |`druid.processing.formatString`|Realtime and historical nodes use this format string to name their processing threads.|processing-%s| |`druid.processing.numThreads`|The number of processing threads to have available for parallel processing of segments. Our rule of thumb is `num_cores - 1`, which means that even under heavy load there will still be one core available to do background tasks like talking with ZooKeeper and pulling down segments. If only one core is available, this property defaults to the value `1`.|Number of cores - 1 (or 1)| +|`druid.processing.columnCache.sizeBytes`|Maximum size in bytes for the dimension value lookup cache. Any value greater than `0` enables the cache. It is currently disabled by default. Enabling the lookup cache can significantly improve the performance of aggregators operating on dimension values, such as the JavaScript aggregator, or cardinality aggregator, but can slow things down if the cache hit rate is low (i.e. dimensions with few repeating values). Enabling it may also require additional garbage collection tuning to avoid long GC pauses.|`0` (disabled)| ### Metrics Module From 578e0b4fb65dd6676a5bb3982e888ff020740d81 Mon Sep 17 00:00:00 2001 From: fjy Date: Tue, 12 Aug 2014 12:35:39 -0700 Subject: [PATCH 06/10] add more logging for groupby caching --- .../java/io/druid/query/FinalizeResultsQueryRunner.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/processing/src/main/java/io/druid/query/FinalizeResultsQueryRunner.java b/processing/src/main/java/io/druid/query/FinalizeResultsQueryRunner.java index eb5bf466daf..b56cba75f11 100644 --- a/processing/src/main/java/io/druid/query/FinalizeResultsQueryRunner.java +++ b/processing/src/main/java/io/druid/query/FinalizeResultsQueryRunner.java @@ -22,6 +22,7 @@ package io.druid.query; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; +import com.metamx.common.ISE; import com.metamx.common.guava.Sequence; import com.metamx.common.guava.Sequences; import io.druid.query.aggregation.MetricManipulationFn; @@ -73,9 +74,14 @@ public class FinalizeResultsQueryRunner implements QueryRunner @Override @SuppressWarnings("unchecked") - public T apply(@Nullable T input) + public T apply(T input) { Result> result = (Result>) input; + + if (input == null) { + throw new ISE("Cannot have a null result!"); + } + BySegmentResultValueClass resultsClass = result.getValue(); return (T) new Result( From 79f6486b88bc19b0bb0e9d0e2dda49e8b627b171 Mon Sep 17 00:00:00 2001 From: fjy Date: Tue, 12 Aug 2014 13:22:23 -0700 Subject: [PATCH 07/10] prepare for next release --- docs/content/Examples.md | 4 ++-- docs/content/Kafka-Eight.md | 4 ++-- docs/content/Production-Cluster-Configuration.md | 6 +++--- docs/content/Realtime-Config.md | 4 ++-- docs/content/Simple-Cluster-Configuration.md | 2 +- docs/content/Tutorial:-A-First-Look-at-Druid.md | 4 ++-- docs/content/Tutorial:-Loading-Your-Data-Part-1.md | 2 +- docs/content/Tutorial:-The-Druid-Cluster.md | 6 +++--- docs/content/Tutorial:-Webstream.md | 4 ++-- docs/content/Twitter-Tutorial.md | 2 +- examples/config/historical/runtime.properties | 2 +- examples/config/overlord/runtime.properties | 2 +- examples/config/realtime/runtime.properties | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/content/Examples.md b/docs/content/Examples.md index a0e27d6248c..7722ab2fb33 100644 --- a/docs/content/Examples.md +++ b/docs/content/Examples.md @@ -19,13 +19,13 @@ Clone Druid and build it: git clone https://github.com/metamx/druid.git druid cd druid git fetch --tags -git checkout druid-0.6.143 +git checkout druid-0.6.144 ./build.sh ``` ### Downloading the DSK (Druid Standalone Kit) -[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.143-bin.tar.gz) a stand-alone tarball and run it: +[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.144-bin.tar.gz) a stand-alone tarball and run it: ``` bash tar -xzf druid-services-0.X.X-bin.tar.gz diff --git a/docs/content/Kafka-Eight.md b/docs/content/Kafka-Eight.md index 8ce8213af19..4ad813eced6 100644 --- a/docs/content/Kafka-Eight.md +++ b/docs/content/Kafka-Eight.md @@ -8,9 +8,9 @@ The previous examples are for Kafka 7. To support Kafka 8, a couple changes need - Update realtime node's configs for Kafka 8 extensions - e.g. - - `druid.extensions.coordinates=[...,"io.druid.extensions:druid-kafka-seven:0.6.143",...]` + - `druid.extensions.coordinates=[...,"io.druid.extensions:druid-kafka-seven:0.6.144",...]` - becomes - - `druid.extensions.coordinates=[...,"io.druid.extensions:druid-kafka-eight:0.6.143",...]` + - `druid.extensions.coordinates=[...,"io.druid.extensions:druid-kafka-eight:0.6.144",...]` - Update realtime task config for changed keys - `firehose.type`, `plumber.rejectionPolicyFactory`, and all of `firehose.consumerProps` changes. diff --git a/docs/content/Production-Cluster-Configuration.md b/docs/content/Production-Cluster-Configuration.md index 743a0b17f3c..0e53f03c34d 100644 --- a/docs/content/Production-Cluster-Configuration.md +++ b/docs/content/Production-Cluster-Configuration.md @@ -57,7 +57,7 @@ druid.host=#{IP_ADDR}:8080 druid.port=8080 druid.service=druid/prod/overlord -druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.143"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.144"] druid.zk.service.host=#{ZK_IPs} druid.zk.paths.base=/druid/prod @@ -139,7 +139,7 @@ druid.host=#{IP_ADDR}:8080 druid.port=8080 druid.service=druid/prod/middlemanager -druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.143","io.druid.extensions:druid-kafka-seven:0.6.143"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.144","io.druid.extensions:druid-kafka-seven:0.6.144"] druid.zk.service.host=#{ZK_IPs} druid.zk.paths.base=/druid/prod @@ -286,7 +286,7 @@ druid.host=#{IP_ADDR}:8080 druid.port=8080 druid.service=druid/prod/historical -druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.143"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.144"] druid.zk.service.host=#{ZK_IPs} druid.zk.paths.base=/druid/prod diff --git a/docs/content/Realtime-Config.md b/docs/content/Realtime-Config.md index 06758bd0696..6eabd1e5e7d 100644 --- a/docs/content/Realtime-Config.md +++ b/docs/content/Realtime-Config.md @@ -27,7 +27,7 @@ druid.host=localhost druid.service=realtime druid.port=8083 -druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.143"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.144"] druid.zk.service.host=localhost @@ -76,7 +76,7 @@ druid.host=#{IP_ADDR}:8080 druid.port=8080 druid.service=druid/prod/realtime -druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.143","io.druid.extensions:druid-kafka-seven:0.6.143"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.144","io.druid.extensions:druid-kafka-seven:0.6.144"] druid.zk.service.host=#{ZK_IPs} druid.zk.paths.base=/druid/prod diff --git a/docs/content/Simple-Cluster-Configuration.md b/docs/content/Simple-Cluster-Configuration.md index f5955b4f6da..15658f9fcd4 100644 --- a/docs/content/Simple-Cluster-Configuration.md +++ b/docs/content/Simple-Cluster-Configuration.md @@ -28,7 +28,7 @@ Configuration: -Ddruid.zk.service.host=localhost --Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.143"] +-Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.144"] -Ddruid.db.connector.connectURI=jdbc:mysql://localhost:3306/druid -Ddruid.db.connector.user=druid diff --git a/docs/content/Tutorial:-A-First-Look-at-Druid.md b/docs/content/Tutorial:-A-First-Look-at-Druid.md index acfbdd82236..53eeccb3937 100644 --- a/docs/content/Tutorial:-A-First-Look-at-Druid.md +++ b/docs/content/Tutorial:-A-First-Look-at-Druid.md @@ -49,7 +49,7 @@ There are two ways to setup Druid: download a tarball, or [Build From Source](Bu ### Download a Tarball -We've built a tarball that contains everything you'll need. You'll find it [here](http://static.druid.io/artifacts/releases/druid-services-0.6.143-bin.tar.gz). Download this file to a directory of your choosing. +We've built a tarball that contains everything you'll need. You'll find it [here](http://static.druid.io/artifacts/releases/druid-services-0.6.144-bin.tar.gz). Download this file to a directory of your choosing. You can extract the awesomeness within by issuing: @@ -60,7 +60,7 @@ tar -zxvf druid-services-*-bin.tar.gz Not too lost so far right? That's great! If you cd into the directory: ``` -cd druid-services-0.6.143 +cd druid-services-0.6.144 ``` You should see a bunch of files: diff --git a/docs/content/Tutorial:-Loading-Your-Data-Part-1.md b/docs/content/Tutorial:-Loading-Your-Data-Part-1.md index 3a638ecf9e3..daa6d2e4a63 100644 --- a/docs/content/Tutorial:-Loading-Your-Data-Part-1.md +++ b/docs/content/Tutorial:-Loading-Your-Data-Part-1.md @@ -91,7 +91,7 @@ druid.service=overlord druid.zk.service.host=localhost -druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.143"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.144"] druid.db.connector.connectURI=jdbc:mysql://localhost:3306/druid druid.db.connector.user=druid diff --git a/docs/content/Tutorial:-The-Druid-Cluster.md b/docs/content/Tutorial:-The-Druid-Cluster.md index 23713218db2..334c280ae1d 100644 --- a/docs/content/Tutorial:-The-Druid-Cluster.md +++ b/docs/content/Tutorial:-The-Druid-Cluster.md @@ -13,7 +13,7 @@ In this tutorial, we will set up other types of Druid nodes and external depende If you followed the first tutorial, you should already have Druid downloaded. If not, let's go back and do that first. -You can download the latest version of druid [here](http://static.druid.io/artifacts/releases/druid-services-0.6.143-bin.tar.gz) +You can download the latest version of druid [here](http://static.druid.io/artifacts/releases/druid-services-0.6.144-bin.tar.gz) and untar the contents within by issuing: @@ -149,7 +149,7 @@ druid.port=8081 druid.zk.service.host=localhost -druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.143"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.144"] # Dummy read only AWS account (used to download example data) druid.s3.secretKey=QyyfVZ7llSiRg6Qcrql1eEUG7buFpAK6T6engr1b @@ -240,7 +240,7 @@ druid.port=8083 druid.zk.service.host=localhost -druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.143","io.druid.extensions:druid-kafka-seven:0.6.143"] +druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.144","io.druid.extensions:druid-kafka-seven:0.6.144"] # Change this config to db to hand off to the rest of the Druid cluster druid.publish.type=noop diff --git a/docs/content/Tutorial:-Webstream.md b/docs/content/Tutorial:-Webstream.md index af8d16524f0..a526e879367 100644 --- a/docs/content/Tutorial:-Webstream.md +++ b/docs/content/Tutorial:-Webstream.md @@ -37,7 +37,7 @@ There are two ways to setup Druid: download a tarball, or [Build From Source](Bu h3. Download a Tarball -We've built a tarball that contains everything you'll need. You'll find it [here](http://static.druid.io/artifacts/releases/druid-services-0.6.143-bin.tar.gz) +We've built a tarball that contains everything you'll need. You'll find it [here](http://static.druid.io/artifacts/releases/druid-services-0.6.144-bin.tar.gz) Download this file to a directory of your choosing. You can extract the awesomeness within by issuing: @@ -48,7 +48,7 @@ tar zxvf druid-services-*-bin.tar.gz Not too lost so far right? That's great! If you cd into the directory: ``` -cd druid-services-0.6.143 +cd druid-services-0.6.144 ``` You should see a bunch of files: diff --git a/docs/content/Twitter-Tutorial.md b/docs/content/Twitter-Tutorial.md index 04588de4c40..7016cb84381 100644 --- a/docs/content/Twitter-Tutorial.md +++ b/docs/content/Twitter-Tutorial.md @@ -9,7 +9,7 @@ There are two ways to setup Druid: download a tarball, or build it from source. # Download a Tarball -We've built a tarball that contains everything you'll need. You'll find it [here](http://static.druid.io/artifacts/releases/druid-services-0.6.143-bin.tar.gz). +We've built a tarball that contains everything you'll need. You'll find it [here](http://static.druid.io/artifacts/releases/druid-services-0.6.144-bin.tar.gz). Download this bad boy to a directory of your choosing. You can extract the awesomeness within by issuing: diff --git a/examples/config/historical/runtime.properties b/examples/config/historical/runtime.properties index 24d26883167..5c21d260b18 100644 --- a/examples/config/historical/runtime.properties +++ b/examples/config/historical/runtime.properties @@ -4,7 +4,7 @@ druid.port=8081 druid.zk.service.host=localhost -druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.143"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.144"] # Dummy read only AWS account (used to download example data) druid.s3.secretKey=QyyfVZ7llSiRg6Qcrql1eEUG7buFpAK6T6engr1b diff --git a/examples/config/overlord/runtime.properties b/examples/config/overlord/runtime.properties index 9d2b650911f..3c947558614 100644 --- a/examples/config/overlord/runtime.properties +++ b/examples/config/overlord/runtime.properties @@ -4,7 +4,7 @@ druid.service=overlord druid.zk.service.host=localhost -druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.143"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.144"] druid.db.connector.connectURI=jdbc:mysql://localhost:3306/druid druid.db.connector.user=druid diff --git a/examples/config/realtime/runtime.properties b/examples/config/realtime/runtime.properties index dca7e853f40..68c6a234e43 100644 --- a/examples/config/realtime/runtime.properties +++ b/examples/config/realtime/runtime.properties @@ -4,7 +4,7 @@ druid.port=8083 druid.zk.service.host=localhost -druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.143","io.druid.extensions:druid-kafka-seven:0.6.143","io.druid.extensions:druid-rabbitmq:0.6.143"] +druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.144","io.druid.extensions:druid-kafka-seven:0.6.144","io.druid.extensions:druid-rabbitmq:0.6.144"] # Change this config to db to hand off to the rest of the Druid cluster druid.publish.type=noop From f3aafc246c4b920eec384e328085a35f26e5f0ac Mon Sep 17 00:00:00 2001 From: fjy Date: Tue, 12 Aug 2014 13:24:50 -0700 Subject: [PATCH 08/10] [maven-release-plugin] prepare release druid-0.6.144 --- cassandra-storage/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- hdfs-storage/pom.xml | 2 +- histogram/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- kafka-eight/pom.xml | 2 +- kafka-seven/pom.xml | 2 +- pom.xml | 4 ++-- processing/pom.xml | 2 +- rabbitmq/pom.xml | 2 +- s3-extensions/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml index 8631027aabd..a4b344ae840 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144-SNAPSHOT + 0.6.144 diff --git a/common/pom.xml b/common/pom.xml index cee8a80d97f..99f871d3af4 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144-SNAPSHOT + 0.6.144 diff --git a/examples/pom.xml b/examples/pom.xml index 4df85ce6ce9..aef668f37ae 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144-SNAPSHOT + 0.6.144 diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index ef442cbefe4..033c0f2e96e 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144-SNAPSHOT + 0.6.144 diff --git a/histogram/pom.xml b/histogram/pom.xml index f5ec4c9219a..a98a07e186a 100644 --- a/histogram/pom.xml +++ b/histogram/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.144-SNAPSHOT + 0.6.144 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 7b31347a67a..37829280a61 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144-SNAPSHOT + 0.6.144 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 636f2009962..232150e0222 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144-SNAPSHOT + 0.6.144 diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index 5e1a89f0707..1dca1feb09b 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144-SNAPSHOT + 0.6.144 diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index 83fcc475fb6..8da795dd80a 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144-SNAPSHOT + 0.6.144 diff --git a/pom.xml b/pom.xml index 70f8bc5c838..3c1f54ab533 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.144-SNAPSHOT + 0.6.144 druid druid scm:git:ssh://git@github.com/metamx/druid.git scm:git:ssh://git@github.com/metamx/druid.git http://www.github.com/metamx/druid - druid-0.6.131-SNAPSHOT + druid-0.6.144 diff --git a/processing/pom.xml b/processing/pom.xml index bd1a472acb9..b9df5095371 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144-SNAPSHOT + 0.6.144 diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index 74573581835..a4ac1a4e103 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.144-SNAPSHOT + 0.6.144 diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index 47b469f83d9..ff2711a9a86 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144-SNAPSHOT + 0.6.144 diff --git a/server/pom.xml b/server/pom.xml index 5344ff7481d..ffdbd648376 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144-SNAPSHOT + 0.6.144 diff --git a/services/pom.xml b/services/pom.xml index 6a763a40eaf..c753e1b6266 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.144-SNAPSHOT + 0.6.144 From 4e3f4fbc22ff7d1ca535089b17aa04cef19c3ae0 Mon Sep 17 00:00:00 2001 From: fjy Date: Tue, 12 Aug 2014 13:24:55 -0700 Subject: [PATCH 09/10] [maven-release-plugin] prepare for next development iteration --- cassandra-storage/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- hdfs-storage/pom.xml | 2 +- histogram/pom.xml | 2 +- indexing-hadoop/pom.xml | 2 +- indexing-service/pom.xml | 2 +- kafka-eight/pom.xml | 2 +- kafka-seven/pom.xml | 2 +- pom.xml | 4 ++-- processing/pom.xml | 2 +- rabbitmq/pom.xml | 2 +- s3-extensions/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml index a4b344ae840..e54166a4b82 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144 + 0.6.145-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 99f871d3af4..15951f51a1d 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144 + 0.6.145-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index aef668f37ae..8a58070a380 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144 + 0.6.145-SNAPSHOT diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index 033c0f2e96e..5a64e2458b7 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144 + 0.6.145-SNAPSHOT diff --git a/histogram/pom.xml b/histogram/pom.xml index a98a07e186a..34a9ceb62c0 100644 --- a/histogram/pom.xml +++ b/histogram/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.144 + 0.6.145-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 37829280a61..efb41df4ed0 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144 + 0.6.145-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 232150e0222..50b6541c218 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144 + 0.6.145-SNAPSHOT diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index 1dca1feb09b..1438dce5a1d 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144 + 0.6.145-SNAPSHOT diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index 8da795dd80a..28a00d41882 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144 + 0.6.145-SNAPSHOT diff --git a/pom.xml b/pom.xml index 3c1f54ab533..9f5b400a754 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.144 + 0.6.145-SNAPSHOT druid druid scm:git:ssh://git@github.com/metamx/druid.git scm:git:ssh://git@github.com/metamx/druid.git http://www.github.com/metamx/druid - druid-0.6.144 + druid-0.6.131-SNAPSHOT diff --git a/processing/pom.xml b/processing/pom.xml index b9df5095371..9437ae22c85 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144 + 0.6.145-SNAPSHOT diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index a4ac1a4e103..3b438cf6c8b 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.144 + 0.6.145-SNAPSHOT diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index ff2711a9a86..e7c635459f1 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144 + 0.6.145-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index ffdbd648376..ded09ea5c86 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.144 + 0.6.145-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index c753e1b6266..7a930077066 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.144 + 0.6.145-SNAPSHOT From b448deeca0ada385e5ae8af374dd0ce08e126ad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 12 Aug 2014 14:02:08 -0700 Subject: [PATCH 10/10] fix compilation with Java 8 --- .../src/test/java/io/druid/query/RetryQueryRunnerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/processing/src/test/java/io/druid/query/RetryQueryRunnerTest.java b/processing/src/test/java/io/druid/query/RetryQueryRunnerTest.java index 16c8a51504a..9c6329a3df4 100644 --- a/processing/src/test/java/io/druid/query/RetryQueryRunnerTest.java +++ b/processing/src/test/java/io/druid/query/RetryQueryRunnerTest.java @@ -131,7 +131,7 @@ public class RetryQueryRunnerTest @Override public Sequence run(Query query, Map context) { - if (context.get("count") == 0) { + if ((int)context.get("count") == 0) { ((List) context.get(RetryQueryRunner.missingSegments)).add( new SegmentDescriptor( new Interval( @@ -368,4 +368,4 @@ public class RetryQueryRunnerTest Assert.assertTrue("Should have one entry in the list of missing segments", ((List) context.get(RetryQueryRunner.missingSegments)).size() == 1); } -} \ No newline at end of file +}