From ddcea18631782b140e600d6a9afa55174dc5627a Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 8 Aug 2014 14:02:14 -0700 Subject: [PATCH 01/19] fix dependencies --- 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 +- processing/pom.xml | 2 +- rabbitmq/pom.xml | 2 +- s3-extensions/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml index e8ebb570a86..c8fec800e3e 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.7.0-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 0b57dcf484e..03e902df7c5 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.7.0-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 321e4a226e8..896b772738e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.7.0-SNAPSHOT diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index 1fe657ba77a..ac2c29b7405 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.7.0-SNAPSHOT diff --git a/histogram/pom.xml b/histogram/pom.xml index 24e9937621a..a520de6725b 100644 --- a/histogram/pom.xml +++ b/histogram/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.7.0-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 22fb248bf9b..f23382b6de9 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.7.0-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 09368b7c105..81260ba3295 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.7.0-SNAPSHOT diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index 7c09c218cc7..e0c5fb43ebe 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.7.0-SNAPSHOT diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index cbd3a85f0e0..a5e6ef4b806 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.7.0-SNAPSHOT diff --git a/processing/pom.xml b/processing/pom.xml index 312b9b408cd..8b04ea52763 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.7.0-SNAPSHOT diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index fd953df211a..4a7866d1030 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.7.0-SNAPSHOT diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index 586529ab49f..bdd0d117b2c 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.7.0-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index d752f9a1811..0b9726a61b5 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.7.0-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index f0f3090e198..0c45dc6c753 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.7.0-SNAPSHOT From d198959c606cdd0613760c407e914c269ccacb97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Fri, 8 Aug 2014 14:05:10 -0700 Subject: [PATCH 02/19] fix test harness --- .../segment/data/CompressedLongsIndexedSupplierTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/processing/src/test/java/io/druid/segment/data/CompressedLongsIndexedSupplierTest.java b/processing/src/test/java/io/druid/segment/data/CompressedLongsIndexedSupplierTest.java index fc29e284443..b251134ddc7 100644 --- a/processing/src/test/java/io/druid/segment/data/CompressedLongsIndexedSupplierTest.java +++ b/processing/src/test/java/io/druid/segment/data/CompressedLongsIndexedSupplierTest.java @@ -25,6 +25,8 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -36,8 +38,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -/** - */ +@RunWith(Parameterized.class) public class CompressedLongsIndexedSupplierTest extends CompressionStrategyTest { public CompressedLongsIndexedSupplierTest(CompressedObjectStrategy.CompressionStrategy compressionStrategy) From 48b99e43fca1306ba54dad61bdacd4259673552b Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 8 Aug 2014 14:34:54 -0700 Subject: [PATCH 03/19] fix LQP register callback --- .../main/java/io/druid/server/coordinator/LoadQueuePeon.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java b/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java index da0fd0066a3..f5965358f2e 100644 --- a/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java +++ b/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java @@ -174,7 +174,7 @@ public class LoadQueuePeon synchronized (lock) { if (segmentsToLoad.contains(holder)) { if ((callback != null)) { - currentlyProcessing.addCallback(callback); + holder.addCallback(callback); } return; } @@ -206,7 +206,7 @@ public class LoadQueuePeon synchronized (lock) { if (segmentsToDrop.contains(holder)) { if (callback != null) { - currentlyProcessing.addCallback(callback); + holder.addCallback(callback); } return; } From 35937132a77576916eebade4e0e63082d7ae3eb9 Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 8 Aug 2014 14:35:22 -0700 Subject: [PATCH 04/19] prep 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 2d0759abc57..101b609e844 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.139 +git checkout druid-0.6.140 ./build.sh ``` ### Downloading the DSK (Druid Standalone Kit) -[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.139-bin.tar.gz) a stand-alone tarball and run it: +[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.140-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 240bf31fefe..e8e81a15082 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.139",...]` + - `druid.extensions.coordinates=[...,"io.druid.extensions:druid-kafka-seven:0.6.140",...]` - becomes - - `druid.extensions.coordinates=[...,"io.druid.extensions:druid-kafka-eight:0.6.139",...]` + - `druid.extensions.coordinates=[...,"io.druid.extensions:druid-kafka-eight:0.6.140",...]` - 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 2b2328b2d95..598cd3e5a12 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.139"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.140"] 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.139","io.druid.extensions:druid-kafka-seven:0.6.139"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.140","io.druid.extensions:druid-kafka-seven:0.6.140"] 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.139"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.140"] 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 80d67c3ffad..c38ce0f8c2c 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.139"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.140"] 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.139","io.druid.extensions:druid-kafka-seven:0.6.139"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.140","io.druid.extensions:druid-kafka-seven:0.6.140"] 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 820fb0e9d6b..6cdc35ca507 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.139"] +-Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.140"] -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 a60942f8544..ae3d5c850b5 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.139-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.140-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.139 +cd druid-services-0.6.140 ``` 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 9ef08aedda3..3a011851fae 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.139"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.140"] 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 095c175a719..d3074015b33 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.139-bin.tar.gz) +You can download the latest version of druid [here](http://static.druid.io/artifacts/releases/druid-services-0.6.140-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.139"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.140"] # 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.139","io.druid.extensions:druid-kafka-seven:0.6.139"] +druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.140","io.druid.extensions:druid-kafka-seven:0.6.140"] # 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 2a23fde861f..d121d2d54ab 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.139-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.140-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.139 +cd druid-services-0.6.140 ``` You should see a bunch of files: diff --git a/docs/content/Twitter-Tutorial.md b/docs/content/Twitter-Tutorial.md index 9f8c80ad8ad..73435927885 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.139-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.140-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 22073a9a444..fe63e5667ea 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.139"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.140"] # 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 feb006eaba6..d81a80cf06e 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.139"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.140"] 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 93bd99bf749..93fae6342d8 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.139","io.druid.extensions:druid-kafka-seven:0.6.139","io.druid.extensions:druid-rabbitmq:0.6.139"] +druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.140","io.druid.extensions:druid-kafka-seven:0.6.140","io.druid.extensions:druid-rabbitmq:0.6.140"] # Change this config to db to hand off to the rest of the Druid cluster druid.publish.type=noop From 68827ff88be57aadaae5a15be601c8c20afe98bd Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 8 Aug 2014 15:06:03 -0700 Subject: [PATCH 05/19] fix another bug in LQP with concurrency --- .../server/coordinator/LoadQueuePeon.java | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java b/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java index f5965358f2e..0a3337f0ff0 100644 --- a/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java +++ b/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java @@ -44,6 +44,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.List; import java.util.Set; +import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; @@ -80,10 +81,10 @@ public class LoadQueuePeon private final AtomicLong queuedSize = new AtomicLong(0); private final AtomicInteger failedAssignCount = new AtomicInteger(0); - private final ConcurrentSkipListSet segmentsToLoad = new ConcurrentSkipListSet( + private final ConcurrentSkipListMap segmentsToLoad = new ConcurrentSkipListMap<>( segmentHolderComparator ); - private final ConcurrentSkipListSet segmentsToDrop = new ConcurrentSkipListSet( + private final ConcurrentSkipListMap segmentsToDrop = new ConcurrentSkipListMap<>( segmentHolderComparator ); @@ -111,9 +112,9 @@ public class LoadQueuePeon @JsonProperty public Set getSegmentsToLoad() { - return new ConcurrentSkipListSet( + return new ConcurrentSkipListSet<>( Collections2.transform( - segmentsToLoad, + segmentsToLoad.keySet(), new Function() { @Override @@ -129,9 +130,9 @@ public class LoadQueuePeon @JsonProperty public Set getSegmentsToDrop() { - return new ConcurrentSkipListSet( + return new ConcurrentSkipListSet<>( Collections2.transform( - segmentsToDrop, + segmentsToDrop.keySet(), new Function() { @Override @@ -169,12 +170,13 @@ public class LoadQueuePeon } } - SegmentHolder holder = new SegmentHolder(segment, LOAD, Arrays.asList(callback)); + final SegmentHolder holder = new SegmentHolder(segment, LOAD, Arrays.asList(callback)); synchronized (lock) { - if (segmentsToLoad.contains(holder)) { + final SegmentHolder existingHolder = segmentsToLoad.get(holder); + if (existingHolder != null) { if ((callback != null)) { - holder.addCallback(callback); + existingHolder.addCallback(callback); } return; } @@ -182,7 +184,7 @@ public class LoadQueuePeon log.info("Asking server peon[%s] to load segment[%s]", basePath, segment.getIdentifier()); queuedSize.addAndGet(segment.getSize()); - segmentsToLoad.add(holder); + segmentsToLoad.put(holder, holder); doNext(); } @@ -204,16 +206,17 @@ public class LoadQueuePeon SegmentHolder holder = new SegmentHolder(segment, DROP, Arrays.asList(callback)); synchronized (lock) { - if (segmentsToDrop.contains(holder)) { + final SegmentHolder existingHolder = segmentsToDrop.get(holder); + if (existingHolder != null) { if (callback != null) { - holder.addCallback(callback); + existingHolder.addCallback(callback); } return; } } log.info("Asking server peon[%s] to drop segment[%s]", basePath, segment.getIdentifier()); - segmentsToDrop.add(holder); + segmentsToDrop.put(holder, holder); doNext(); } @@ -222,10 +225,10 @@ public class LoadQueuePeon synchronized (lock) { if (currentlyProcessing == null) { if (!segmentsToDrop.isEmpty()) { - currentlyProcessing = segmentsToDrop.first(); + currentlyProcessing = segmentsToDrop.firstKey(); log.info("Server[%s] dropping [%s]", basePath, currentlyProcessing.getSegmentIdentifier()); } else if (!segmentsToLoad.isEmpty()) { - currentlyProcessing = segmentsToLoad.first(); + currentlyProcessing = segmentsToLoad.firstKey(); log.info("Server[%s] loading [%s]", basePath, currentlyProcessing.getSegmentIdentifier()); } else { return; @@ -337,7 +340,7 @@ public class LoadQueuePeon default: throw new UnsupportedOperationException(); } - + callBackExecutor.execute( new Runnable() { @@ -361,14 +364,14 @@ public class LoadQueuePeon } if (!segmentsToDrop.isEmpty()) { - for (SegmentHolder holder : segmentsToDrop) { + for (SegmentHolder holder : segmentsToDrop.keySet()) { holder.executeCallbacks(); } } segmentsToDrop.clear(); if (!segmentsToLoad.isEmpty()) { - for (SegmentHolder holder : segmentsToLoad) { + for (SegmentHolder holder : segmentsToLoad.keySet()) { holder.executeCallbacks(); } } From 3826b1d976627d2f1673a2cb2d91a15c046fb272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Fri, 8 Aug 2014 15:11:35 -0700 Subject: [PATCH 06/19] fix missing queryGranularity in ArbitraryGranularitySpec --- .../granularity/ArbitraryGranularitySpec.java | 14 +++++++++++--- .../granularity/UniformGranularitySpec.java | 2 +- .../granularity/ArbitraryGranularityTest.java | 11 +++++++---- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/server/src/main/java/io/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java b/server/src/main/java/io/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java index dd1a5b4bbde..807764e515c 100644 --- a/server/src/main/java/io/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java +++ b/server/src/main/java/io/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java @@ -21,6 +21,7 @@ package io.druid.segment.indexing.granularity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.api.client.util.Lists; import com.google.common.base.Optional; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; @@ -38,13 +39,16 @@ import java.util.TreeSet; public class ArbitraryGranularitySpec implements GranularitySpec { private final TreeSet intervals; + private final QueryGranularity queryGranularity; @JsonCreator public ArbitraryGranularitySpec( + @JsonProperty("queryGranularity") QueryGranularity queryGranularity, @JsonProperty("intervals") List inputIntervals ) { - intervals = Sets.newTreeSet(Comparators.intervalsByStartThenEnd()); + this.queryGranularity = queryGranularity; + this.intervals = Sets.newTreeSet(Comparators.intervalsByStartThenEnd()); // Insert all intervals for (final Interval inputInterval : inputIntervals) { @@ -98,14 +102,18 @@ public class ArbitraryGranularitySpec implements GranularitySpec } @Override + @JsonProperty("queryGranularity") public QueryGranularity getQueryGranularity() { - throw new UnsupportedOperationException(); + return queryGranularity; } @Override public GranularitySpec withQueryGranularity(QueryGranularity queryGranularity) { - throw new UnsupportedOperationException(); + return new ArbitraryGranularitySpec( + queryGranularity, + Lists.newArrayList(intervals) + ); } } diff --git a/server/src/main/java/io/druid/segment/indexing/granularity/UniformGranularitySpec.java b/server/src/main/java/io/druid/segment/indexing/granularity/UniformGranularitySpec.java index d494eb2ee47..d83f824366e 100644 --- a/server/src/main/java/io/druid/segment/indexing/granularity/UniformGranularitySpec.java +++ b/server/src/main/java/io/druid/segment/indexing/granularity/UniformGranularitySpec.java @@ -68,7 +68,7 @@ public class UniformGranularitySpec implements GranularitySpec Iterables.addAll(granularIntervals, this.segmentGranularity.getIterable(inputInterval)); } this.inputIntervals = ImmutableList.copyOf(inputIntervals); - this.wrappedSpec = new ArbitraryGranularitySpec(granularIntervals); + this.wrappedSpec = new ArbitraryGranularitySpec(queryGranularity, granularIntervals); } else { this.inputIntervals = null; this.wrappedSpec = null; diff --git a/server/src/test/java/io/druid/segment/indexing/granularity/ArbitraryGranularityTest.java b/server/src/test/java/io/druid/segment/indexing/granularity/ArbitraryGranularityTest.java index 910bdfe0df8..ad8f4c721db 100644 --- a/server/src/test/java/io/druid/segment/indexing/granularity/ArbitraryGranularityTest.java +++ b/server/src/test/java/io/druid/segment/indexing/granularity/ArbitraryGranularityTest.java @@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Optional; import com.google.common.base.Throwables; import com.google.common.collect.Lists; +import io.druid.granularity.QueryGranularity; import io.druid.jackson.DefaultObjectMapper; import org.joda.time.DateTime; import org.joda.time.Interval; @@ -38,7 +39,9 @@ public class ArbitraryGranularityTest @Test public void testSimple() { - final GranularitySpec spec = new ArbitraryGranularitySpec(Lists.newArrayList( + final GranularitySpec spec = new ArbitraryGranularitySpec( + QueryGranularity.NONE, + Lists.newArrayList( new Interval("2012-01-08T00Z/2012-01-11T00Z"), new Interval("2012-02-01T00Z/2012-03-01T00Z"), new Interval("2012-01-07T00Z/2012-01-08T00Z"), @@ -111,7 +114,7 @@ public class ArbitraryGranularityTest boolean thrown = false; try { - final GranularitySpec spec = new ArbitraryGranularitySpec(intervals); + final GranularitySpec spec = new ArbitraryGranularitySpec(QueryGranularity.NONE, intervals); } catch(IllegalArgumentException e) { thrown = true; } @@ -129,7 +132,7 @@ public class ArbitraryGranularityTest boolean thrown = false; try { - final GranularitySpec spec = new ArbitraryGranularitySpec(intervals); + final GranularitySpec spec = new ArbitraryGranularitySpec(QueryGranularity.NONE, intervals); } catch(IllegalArgumentException e) { thrown = true; } @@ -140,7 +143,7 @@ public class ArbitraryGranularityTest @Test public void testJson() { - final GranularitySpec spec = new ArbitraryGranularitySpec(Lists.newArrayList( + final GranularitySpec spec = new ArbitraryGranularitySpec(QueryGranularity.NONE, Lists.newArrayList( new Interval("2012-01-08T00Z/2012-01-11T00Z"), new Interval("2012-02-01T00Z/2012-03-01T00Z"), new Interval("2012-01-07T00Z/2012-01-08T00Z"), From 4482e1b7d8ae6cbff4dac686f09f4cbb083de90f Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 8 Aug 2014 15:16:34 -0700 Subject: [PATCH 07/19] [maven-release-plugin] prepare release druid-0.6.140 --- 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 e8ebb570a86..48aa89dee92 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.6.140 diff --git a/common/pom.xml b/common/pom.xml index 0b57dcf484e..4a742f961cd 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.6.140 diff --git a/examples/pom.xml b/examples/pom.xml index 321e4a226e8..2e68b96aa3c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.6.140 diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index 1fe657ba77a..1ee47693133 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.6.140 diff --git a/histogram/pom.xml b/histogram/pom.xml index 24e9937621a..3cb63c10e3d 100644 --- a/histogram/pom.xml +++ b/histogram/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.6.140 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 22fb248bf9b..2b3fbcbeb76 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.6.140 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 09368b7c105..9e4f6017aba 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.6.140 diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index 7c09c218cc7..62707079c64 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.6.140 diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index cbd3a85f0e0..1051f722920 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.6.140 diff --git a/pom.xml b/pom.xml index 31bd84a4f63..28f6d8d1d69 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.140-SNAPSHOT + 0.6.140 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.140 diff --git a/processing/pom.xml b/processing/pom.xml index a92d70564ee..a0d8640ae2a 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.6.140 diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index fd953df211a..7bfa49d8b56 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.6.140 diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index 586529ab49f..356bac88e63 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.6.140 diff --git a/server/pom.xml b/server/pom.xml index d752f9a1811..e204fd31292 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.6.140 diff --git a/services/pom.xml b/services/pom.xml index f0f3090e198..6aac0758d98 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.140-SNAPSHOT + 0.6.140 From 958792db5c3b7846b2e62f02bf8eb39163bc7002 Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 8 Aug 2014 15:16:38 -0700 Subject: [PATCH 08/19] [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 48aa89dee92..3f675c2adba 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140 + 0.6.141-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 4a742f961cd..801ba180f73 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140 + 0.6.141-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 2e68b96aa3c..cb037ae886c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140 + 0.6.141-SNAPSHOT diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index 1ee47693133..96d6d5bf5d8 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140 + 0.6.141-SNAPSHOT diff --git a/histogram/pom.xml b/histogram/pom.xml index 3cb63c10e3d..2cda0e97f09 100644 --- a/histogram/pom.xml +++ b/histogram/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.140 + 0.6.141-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 2b3fbcbeb76..183ff689dcc 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140 + 0.6.141-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 9e4f6017aba..2ba3582ccd7 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140 + 0.6.141-SNAPSHOT diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index 62707079c64..3bd70a39efe 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140 + 0.6.141-SNAPSHOT diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index 1051f722920..3362715d922 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140 + 0.6.141-SNAPSHOT diff --git a/pom.xml b/pom.xml index 28f6d8d1d69..46fb84b4fbc 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.140 + 0.6.141-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.140 + druid-0.6.131-SNAPSHOT diff --git a/processing/pom.xml b/processing/pom.xml index a0d8640ae2a..a4bb415034c 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140 + 0.6.141-SNAPSHOT diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index 7bfa49d8b56..67c9482aca2 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.140 + 0.6.141-SNAPSHOT diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index 356bac88e63..f98fb76fbef 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140 + 0.6.141-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index e204fd31292..12d2c8b50fd 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.140 + 0.6.141-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 6aac0758d98..f524468ada6 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.140 + 0.6.141-SNAPSHOT From e5896f486393e1940ba4d3c9218bce194ca1abc5 Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 8 Aug 2014 15:50:57 -0700 Subject: [PATCH 09/19] fix yet another bug with LQP --- .../server/coordinator/LoadQueuePeon.java | 62 ++++--------------- 1 file changed, 13 insertions(+), 49 deletions(-) diff --git a/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java b/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java index 0a3337f0ff0..6341aaee2cc 100644 --- a/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java +++ b/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java @@ -21,8 +21,6 @@ package io.druid.server.coordinator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.base.Function; -import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import com.metamx.common.ISE; import com.metamx.common.guava.Comparators; @@ -45,7 +43,6 @@ import java.util.Comparator; import java.util.List; import java.util.Set; import java.util.concurrent.ConcurrentSkipListMap; -import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -60,16 +57,7 @@ public class LoadQueuePeon private static final int DROP = 0; private static final int LOAD = 1; - private static Comparator segmentHolderComparator = new Comparator() - { - private Comparator comparator = Comparators.inverse(DataSegment.bucketMonthComparator()); - - @Override - public int compare(SegmentHolder lhs, SegmentHolder rhs) - { - return comparator.compare(lhs.getSegment(), rhs.getSegment()); - } - }; + private static Comparator segmentHolderComparator = Comparators.inverse(DataSegment.bucketMonthComparator()); private final CuratorFramework curator; private final String basePath; @@ -81,10 +69,10 @@ public class LoadQueuePeon private final AtomicLong queuedSize = new AtomicLong(0); private final AtomicInteger failedAssignCount = new AtomicInteger(0); - private final ConcurrentSkipListMap segmentsToLoad = new ConcurrentSkipListMap<>( + private final ConcurrentSkipListMap segmentsToLoad = new ConcurrentSkipListMap<>( segmentHolderComparator ); - private final ConcurrentSkipListMap segmentsToDrop = new ConcurrentSkipListMap<>( + private final ConcurrentSkipListMap segmentsToDrop = new ConcurrentSkipListMap<>( segmentHolderComparator ); @@ -112,37 +100,13 @@ public class LoadQueuePeon @JsonProperty public Set getSegmentsToLoad() { - return new ConcurrentSkipListSet<>( - Collections2.transform( - segmentsToLoad.keySet(), - new Function() - { - @Override - public DataSegment apply(SegmentHolder input) - { - return input.getSegment(); - } - } - ) - ); + return segmentsToLoad.keySet(); } @JsonProperty public Set getSegmentsToDrop() { - return new ConcurrentSkipListSet<>( - Collections2.transform( - segmentsToDrop.keySet(), - new Function() - { - @Override - public DataSegment apply(SegmentHolder input) - { - return input.getSegment(); - } - } - ) - ); + return segmentsToDrop.keySet(); } public long getLoadQueueSize() @@ -173,7 +137,7 @@ public class LoadQueuePeon final SegmentHolder holder = new SegmentHolder(segment, LOAD, Arrays.asList(callback)); synchronized (lock) { - final SegmentHolder existingHolder = segmentsToLoad.get(holder); + final SegmentHolder existingHolder = segmentsToLoad.get(segment); if (existingHolder != null) { if ((callback != null)) { existingHolder.addCallback(callback); @@ -184,7 +148,7 @@ public class LoadQueuePeon log.info("Asking server peon[%s] to load segment[%s]", basePath, segment.getIdentifier()); queuedSize.addAndGet(segment.getSize()); - segmentsToLoad.put(holder, holder); + segmentsToLoad.put(segment, holder); doNext(); } @@ -206,7 +170,7 @@ public class LoadQueuePeon SegmentHolder holder = new SegmentHolder(segment, DROP, Arrays.asList(callback)); synchronized (lock) { - final SegmentHolder existingHolder = segmentsToDrop.get(holder); + final SegmentHolder existingHolder = segmentsToDrop.get(segment); if (existingHolder != null) { if (callback != null) { existingHolder.addCallback(callback); @@ -216,7 +180,7 @@ public class LoadQueuePeon } log.info("Asking server peon[%s] to drop segment[%s]", basePath, segment.getIdentifier()); - segmentsToDrop.put(holder, holder); + segmentsToDrop.put(segment, holder); doNext(); } @@ -225,10 +189,10 @@ public class LoadQueuePeon synchronized (lock) { if (currentlyProcessing == null) { if (!segmentsToDrop.isEmpty()) { - currentlyProcessing = segmentsToDrop.firstKey(); + currentlyProcessing = segmentsToDrop.firstEntry().getValue(); log.info("Server[%s] dropping [%s]", basePath, currentlyProcessing.getSegmentIdentifier()); } else if (!segmentsToLoad.isEmpty()) { - currentlyProcessing = segmentsToLoad.firstKey(); + currentlyProcessing = segmentsToLoad.firstEntry().getValue(); log.info("Server[%s] loading [%s]", basePath, currentlyProcessing.getSegmentIdentifier()); } else { return; @@ -364,14 +328,14 @@ public class LoadQueuePeon } if (!segmentsToDrop.isEmpty()) { - for (SegmentHolder holder : segmentsToDrop.keySet()) { + for (SegmentHolder holder : segmentsToDrop.values()) { holder.executeCallbacks(); } } segmentsToDrop.clear(); if (!segmentsToLoad.isEmpty()) { - for (SegmentHolder holder : segmentsToLoad.keySet()) { + for (SegmentHolder holder : segmentsToLoad.values()) { holder.executeCallbacks(); } } From 8e87cae990ef2f1b24fc69b685bb120408625a61 Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 8 Aug 2014 15:51:22 -0700 Subject: [PATCH 10/19] prepare for next rel --- 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 101b609e844..5aebe5c2d97 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.140 +git checkout druid-0.6.141 ./build.sh ``` ### Downloading the DSK (Druid Standalone Kit) -[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.140-bin.tar.gz) a stand-alone tarball and run it: +[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.141-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 e8e81a15082..9e862a23cf5 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.140",...]` + - `druid.extensions.coordinates=[...,"io.druid.extensions:druid-kafka-seven:0.6.141",...]` - becomes - - `druid.extensions.coordinates=[...,"io.druid.extensions:druid-kafka-eight:0.6.140",...]` + - `druid.extensions.coordinates=[...,"io.druid.extensions:druid-kafka-eight:0.6.141",...]` - 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 598cd3e5a12..cdc807ae355 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.140"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.141"] 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.140","io.druid.extensions:druid-kafka-seven:0.6.140"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.141","io.druid.extensions:druid-kafka-seven:0.6.141"] 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.140"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.141"] 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 c38ce0f8c2c..d189cdd3708 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.140"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.141"] 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.140","io.druid.extensions:druid-kafka-seven:0.6.140"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.141","io.druid.extensions:druid-kafka-seven:0.6.141"] 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 6cdc35ca507..4015d270de5 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.140"] +-Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.141"] -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 ae3d5c850b5..55599df0185 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.140-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.141-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.140 +cd druid-services-0.6.141 ``` 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 3a011851fae..ae917cf258a 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.140"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.141"] 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 d3074015b33..98ca33770ad 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.140-bin.tar.gz) +You can download the latest version of druid [here](http://static.druid.io/artifacts/releases/druid-services-0.6.141-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.140"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.141"] # 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.140","io.druid.extensions:druid-kafka-seven:0.6.140"] +druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.141","io.druid.extensions:druid-kafka-seven:0.6.141"] # 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 d121d2d54ab..117e62ea054 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.140-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.141-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.140 +cd druid-services-0.6.141 ``` You should see a bunch of files: diff --git a/docs/content/Twitter-Tutorial.md b/docs/content/Twitter-Tutorial.md index 73435927885..add8d286395 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.140-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.141-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 fe63e5667ea..b1d289258ed 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.140"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.141"] # 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 d81a80cf06e..2babfa4c1dc 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.140"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.141"] 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 93fae6342d8..97ab8d15d12 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.140","io.druid.extensions:druid-kafka-seven:0.6.140","io.druid.extensions:druid-rabbitmq:0.6.140"] +druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.141","io.druid.extensions:druid-kafka-seven:0.6.141","io.druid.extensions:druid-rabbitmq:0.6.141"] # Change this config to db to hand off to the rest of the Druid cluster druid.publish.type=noop From 29a077d893e795f7f4ca32b94080de65d6ff2d80 Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 8 Aug 2014 15:53:49 -0700 Subject: [PATCH 11/19] [maven-release-plugin] prepare release druid-0.6.141 --- 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 3f675c2adba..e44679ae44d 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141-SNAPSHOT + 0.6.141 diff --git a/common/pom.xml b/common/pom.xml index 801ba180f73..987b3bf84d5 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141-SNAPSHOT + 0.6.141 diff --git a/examples/pom.xml b/examples/pom.xml index cb037ae886c..c65745b4f82 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141-SNAPSHOT + 0.6.141 diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index 96d6d5bf5d8..9b73b7d8c82 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141-SNAPSHOT + 0.6.141 diff --git a/histogram/pom.xml b/histogram/pom.xml index 2cda0e97f09..f3f1553a915 100644 --- a/histogram/pom.xml +++ b/histogram/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.141-SNAPSHOT + 0.6.141 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 183ff689dcc..80051ad4b9e 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141-SNAPSHOT + 0.6.141 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 2ba3582ccd7..e3f3a554a81 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141-SNAPSHOT + 0.6.141 diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index 3bd70a39efe..20cb715de32 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141-SNAPSHOT + 0.6.141 diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index 3362715d922..00290ff9f6e 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141-SNAPSHOT + 0.6.141 diff --git a/pom.xml b/pom.xml index 46fb84b4fbc..85e2b2a5152 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.141-SNAPSHOT + 0.6.141 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.141 diff --git a/processing/pom.xml b/processing/pom.xml index a4bb415034c..51c6c2243e2 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141-SNAPSHOT + 0.6.141 diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index 67c9482aca2..618e13406cf 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.141-SNAPSHOT + 0.6.141 diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index f98fb76fbef..5cf70991722 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141-SNAPSHOT + 0.6.141 diff --git a/server/pom.xml b/server/pom.xml index 12d2c8b50fd..acdb0a25b55 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141-SNAPSHOT + 0.6.141 diff --git a/services/pom.xml b/services/pom.xml index f524468ada6..f923887b9ad 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.141-SNAPSHOT + 0.6.141 From 199f2b1683a9f7f31f78e9bf1a9fd845dbb023bf Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 8 Aug 2014 15:53:53 -0700 Subject: [PATCH 12/19] [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 e44679ae44d..f3825c1e75c 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141 + 0.6.142-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 987b3bf84d5..385b57dedb7 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141 + 0.6.142-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index c65745b4f82..d135f86df8e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141 + 0.6.142-SNAPSHOT diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index 9b73b7d8c82..a7bbe800e06 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141 + 0.6.142-SNAPSHOT diff --git a/histogram/pom.xml b/histogram/pom.xml index f3f1553a915..a4889779eb7 100644 --- a/histogram/pom.xml +++ b/histogram/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.141 + 0.6.142-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 80051ad4b9e..6c00442d2ff 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141 + 0.6.142-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index e3f3a554a81..a47f1c48593 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141 + 0.6.142-SNAPSHOT diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index 20cb715de32..db06f91688b 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141 + 0.6.142-SNAPSHOT diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index 00290ff9f6e..fc86f3393e8 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141 + 0.6.142-SNAPSHOT diff --git a/pom.xml b/pom.xml index 85e2b2a5152..eb6987ac3ba 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.141 + 0.6.142-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.141 + druid-0.6.131-SNAPSHOT diff --git a/processing/pom.xml b/processing/pom.xml index 51c6c2243e2..f013b3941da 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141 + 0.6.142-SNAPSHOT diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index 618e13406cf..24af4e60db5 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.141 + 0.6.142-SNAPSHOT diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index 5cf70991722..b33b001363a 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141 + 0.6.142-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index acdb0a25b55..cc38754c1a5 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.141 + 0.6.142-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index f923887b9ad..b428ba5dbe2 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.141 + 0.6.142-SNAPSHOT From 8998700760327ae89c1bab85f6f4519e425ad506 Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 8 Aug 2014 16:19:45 -0700 Subject: [PATCH 13/19] prepare for next release --- docs/content/Examples.md | 4 +-- docs/content/Kafka-Eight.md | 4 +-- .../Production-Cluster-Configuration.md | 6 ++-- docs/content/Realtime-Config.md | 4 +-- docs/content/Simple-Cluster-Configuration.md | 2 +- .../Tutorial:-A-First-Look-at-Druid.md | 4 +-- .../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 +- .../main/java/io/druid/query/BaseQuery.java | 1 + .../src/main/java/io/druid/query/Query.java | 2 ++ .../server/AsyncQueryForwardingServlet.java | 32 +++++++++++-------- .../java/io/druid/server/QueryResource.java | 8 ++++- .../server/coordinator/LoadQueuePeon.java | 4 +-- 18 files changed, 53 insertions(+), 38 deletions(-) diff --git a/docs/content/Examples.md b/docs/content/Examples.md index 5aebe5c2d97..38c23b8b8cd 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.141 +git checkout druid-0.6.142 ./build.sh ``` ### Downloading the DSK (Druid Standalone Kit) -[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.141-bin.tar.gz) a stand-alone tarball and run it: +[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.142-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 9e862a23cf5..31a7a7c7e8b 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.141",...]` + - `druid.extensions.coordinates=[...,"io.druid.extensions:druid-kafka-seven:0.6.142",...]` - becomes - - `druid.extensions.coordinates=[...,"io.druid.extensions:druid-kafka-eight:0.6.141",...]` + - `druid.extensions.coordinates=[...,"io.druid.extensions:druid-kafka-eight:0.6.142",...]` - 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 cdc807ae355..fcb0a5eb1c2 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.141"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.142"] 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.141","io.druid.extensions:druid-kafka-seven:0.6.141"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.142","io.druid.extensions:druid-kafka-seven:0.6.142"] 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.141"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.142"] 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 d189cdd3708..b710c357419 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.141"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.142"] 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.141","io.druid.extensions:druid-kafka-seven:0.6.141"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.142","io.druid.extensions:druid-kafka-seven:0.6.142"] 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 4015d270de5..c212a0228c0 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.141"] +-Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.142"] -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 55599df0185..6494eb96e1a 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.141-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.142-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.141 +cd druid-services-0.6.142 ``` 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 ae917cf258a..aea2d9d851e 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.141"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.142"] 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 98ca33770ad..fd1c41fa4a2 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.141-bin.tar.gz) +You can download the latest version of druid [here](http://static.druid.io/artifacts/releases/druid-services-0.6.142-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.141"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.142"] # 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.141","io.druid.extensions:druid-kafka-seven:0.6.141"] +druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.142","io.druid.extensions:druid-kafka-seven:0.6.142"] # 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 117e62ea054..a0023f6a0f6 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.141-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.142-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.141 +cd druid-services-0.6.142 ``` You should see a bunch of files: diff --git a/docs/content/Twitter-Tutorial.md b/docs/content/Twitter-Tutorial.md index add8d286395..f394059071c 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.141-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.142-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 b1d289258ed..7aa4bd28593 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.141"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.142"] # 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 2babfa4c1dc..7ea91b4f4ef 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.141"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.142"] 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 97ab8d15d12..893317a5315 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.141","io.druid.extensions:druid-kafka-seven:0.6.141","io.druid.extensions:druid-rabbitmq:0.6.141"] +druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.142","io.druid.extensions:druid-kafka-seven:0.6.142","io.druid.extensions:druid-rabbitmq:0.6.142"] # Change this config to db to hand off to the rest of the Druid cluster druid.publish.type=noop diff --git a/processing/src/main/java/io/druid/query/BaseQuery.java b/processing/src/main/java/io/druid/query/BaseQuery.java index 32d9c3256f4..e2052f3ba64 100644 --- a/processing/src/main/java/io/druid/query/BaseQuery.java +++ b/processing/src/main/java/io/druid/query/BaseQuery.java @@ -102,6 +102,7 @@ public abstract class BaseQuery implements Query return duration; } + @Override @JsonProperty public Map getContext() { diff --git a/processing/src/main/java/io/druid/query/Query.java b/processing/src/main/java/io/druid/query/Query.java index 04c581152ad..8c34be7ec28 100644 --- a/processing/src/main/java/io/druid/query/Query.java +++ b/processing/src/main/java/io/druid/query/Query.java @@ -70,6 +70,8 @@ public interface Query public Duration getDuration(); + public Map getContext(); + public ContextType getContextValue(String key); public ContextType getContextValue(String key, ContextType defaultValue); diff --git a/server/src/main/java/io/druid/server/AsyncQueryForwardingServlet.java b/server/src/main/java/io/druid/server/AsyncQueryForwardingServlet.java index 91f90d37f91..624d52e1b36 100644 --- a/server/src/main/java/io/druid/server/AsyncQueryForwardingServlet.java +++ b/server/src/main/java/io/druid/server/AsyncQueryForwardingServlet.java @@ -259,20 +259,26 @@ public class AsyncQueryForwardingServlet extends AsyncProxyServlet public void onComplete(Result result) { final long requestTime = System.currentTimeMillis() - start; - emitter.emit( - new ServiceMetricEvent.Builder() - .setUser2(DataSourceUtil.getMetricName(query.getDataSource())) - .setUser3(String.valueOf(query.getContextPriority(0))) - .setUser4(query.getType()) - .setUser5(DataSourceUtil.COMMA_JOIN.join(query.getIntervals())) - .setUser6(String.valueOf(query.hasFilters())) - .setUser7(req.getRemoteAddr()) - .setUser8(query.getId()) - .setUser9(query.getDuration().toPeriod().toStandardMinutes().toString()) - .build("request/time", requestTime) - ); - try { + emitter.emit( + new ServiceMetricEvent.Builder() + .setUser2(DataSourceUtil.getMetricName(query.getDataSource())) + .setUser3( + jsonMapper.writeValueAsString( + query.getContext() == null + ? ImmutableMap.of() + : query.getContext() + ) + ) + .setUser4(query.getType()) + .setUser5(DataSourceUtil.COMMA_JOIN.join(query.getIntervals())) + .setUser6(String.valueOf(query.hasFilters())) + .setUser7(req.getRemoteAddr()) + .setUser8(query.getId()) + .setUser9(query.getDuration().toPeriod().toStandardMinutes().toString()) + .build("request/time", requestTime) + ); + requestLogger.log( new RequestLogLine( new DateTime(), diff --git a/server/src/main/java/io/druid/server/QueryResource.java b/server/src/main/java/io/druid/server/QueryResource.java index 18ba190393f..7cef7893280 100644 --- a/server/src/main/java/io/druid/server/QueryResource.java +++ b/server/src/main/java/io/druid/server/QueryResource.java @@ -178,7 +178,13 @@ public class QueryResource emitter.emit( new ServiceMetricEvent.Builder() .setUser2(DataSourceUtil.getMetricName(query.getDataSource())) - .setUser3(String.valueOf(query.getContextPriority(0))) + .setUser3( + jsonMapper.writeValueAsString( + query.getContext() == null + ? ImmutableMap.of() + : query.getContext() + ) + ) .setUser4(query.getType()) .setUser5(COMMA_JOIN.join(query.getIntervals())) .setUser6(String.valueOf(query.hasFilters())) diff --git a/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java b/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java index 6341aaee2cc..41ca280d200 100644 --- a/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java +++ b/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java @@ -295,11 +295,11 @@ public class LoadQueuePeon if (currentlyProcessing != null) { switch (currentlyProcessing.getType()) { case LOAD: - segmentsToLoad.remove(currentlyProcessing); + segmentsToLoad.remove(currentlyProcessing.getSegment()); queuedSize.addAndGet(-currentlyProcessing.getSegmentSize()); break; case DROP: - segmentsToDrop.remove(currentlyProcessing); + segmentsToDrop.remove(currentlyProcessing.getSegment()); break; default: throw new UnsupportedOperationException(); From d2404791330a3a5637b95e7a696e03bb8e1efaab Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 8 Aug 2014 16:22:34 -0700 Subject: [PATCH 14/19] [maven-release-plugin] prepare release druid-0.6.142 --- 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 f3825c1e75c..96ad9cc72ac 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142-SNAPSHOT + 0.6.142 diff --git a/common/pom.xml b/common/pom.xml index 385b57dedb7..a722463d1a5 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142-SNAPSHOT + 0.6.142 diff --git a/examples/pom.xml b/examples/pom.xml index d135f86df8e..e92571e3be7 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142-SNAPSHOT + 0.6.142 diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index a7bbe800e06..3b4c5e357c3 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142-SNAPSHOT + 0.6.142 diff --git a/histogram/pom.xml b/histogram/pom.xml index a4889779eb7..a568a37cb67 100644 --- a/histogram/pom.xml +++ b/histogram/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.142-SNAPSHOT + 0.6.142 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 6c00442d2ff..6ebc8ebfee5 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142-SNAPSHOT + 0.6.142 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index a47f1c48593..26f8a952617 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142-SNAPSHOT + 0.6.142 diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index db06f91688b..11571100a06 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142-SNAPSHOT + 0.6.142 diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index fc86f3393e8..4b8b576bfcd 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142-SNAPSHOT + 0.6.142 diff --git a/pom.xml b/pom.xml index eb6987ac3ba..8f7214dba37 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.142-SNAPSHOT + 0.6.142 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.142 diff --git a/processing/pom.xml b/processing/pom.xml index f013b3941da..dd9f7f028d1 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142-SNAPSHOT + 0.6.142 diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index 24af4e60db5..e1936a9cd7c 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.142-SNAPSHOT + 0.6.142 diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index b33b001363a..719d2bc2522 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142-SNAPSHOT + 0.6.142 diff --git a/server/pom.xml b/server/pom.xml index cc38754c1a5..79668439768 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142-SNAPSHOT + 0.6.142 diff --git a/services/pom.xml b/services/pom.xml index b428ba5dbe2..a3c1e8d34b1 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.142-SNAPSHOT + 0.6.142 From d58ae945a4d64d6b33b9a6a46c02fd90eb3a5a7e Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 8 Aug 2014 16:22:38 -0700 Subject: [PATCH 15/19] [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 96ad9cc72ac..62d285847de 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142 + 0.6.143-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index a722463d1a5..0d35cc11f1b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142 + 0.6.143-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index e92571e3be7..c5218bf31ca 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142 + 0.6.143-SNAPSHOT diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index 3b4c5e357c3..bca2b222838 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142 + 0.6.143-SNAPSHOT diff --git a/histogram/pom.xml b/histogram/pom.xml index a568a37cb67..9c485c2077b 100644 --- a/histogram/pom.xml +++ b/histogram/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.142 + 0.6.143-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 6ebc8ebfee5..8a49654645f 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142 + 0.6.143-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 26f8a952617..d3ba35f5d58 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142 + 0.6.143-SNAPSHOT diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index 11571100a06..9be41f30cb4 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142 + 0.6.143-SNAPSHOT diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index 4b8b576bfcd..676eedc8d0d 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142 + 0.6.143-SNAPSHOT diff --git a/pom.xml b/pom.xml index 8f7214dba37..0a093952156 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.142 + 0.6.143-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.142 + druid-0.6.131-SNAPSHOT diff --git a/processing/pom.xml b/processing/pom.xml index dd9f7f028d1..9af4ad05392 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142 + 0.6.143-SNAPSHOT diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index e1936a9cd7c..17578c151cc 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.142 + 0.6.143-SNAPSHOT diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index 719d2bc2522..4e64e7d4e9a 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142 + 0.6.143-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 79668439768..6f5e575ec10 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.142 + 0.6.143-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index a3c1e8d34b1..920c4264151 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.142 + 0.6.143-SNAPSHOT From 0e1a8f6f02a9afafc6d58143c6a963b5e4f556a1 Mon Sep 17 00:00:00 2001 From: fjy Date: Sat, 9 Aug 2014 19:33:07 -0700 Subject: [PATCH 16/19] concurrency my old foe, we meet again --- .../server/coordinator/LoadQueuePeon.java | 51 ++++++++++--------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java b/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java index 41ca280d200..7a591862d11 100644 --- a/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java +++ b/server/src/main/java/io/druid/server/coordinator/LoadQueuePeon.java @@ -57,7 +57,16 @@ public class LoadQueuePeon private static final int DROP = 0; private static final int LOAD = 1; - private static Comparator segmentHolderComparator = Comparators.inverse(DataSegment.bucketMonthComparator()); + private static Comparator segmentComparator = Comparators.inverse(DataSegment.bucketMonthComparator()); + + private static void executeCallbacks(List callbacks) + { + for (LoadPeonCallback callback : callbacks) { + if (callback != null) { + callback.execute(); + } + } + } private final CuratorFramework curator; private final String basePath; @@ -70,10 +79,10 @@ public class LoadQueuePeon private final AtomicInteger failedAssignCount = new AtomicInteger(0); private final ConcurrentSkipListMap segmentsToLoad = new ConcurrentSkipListMap<>( - segmentHolderComparator + segmentComparator ); private final ConcurrentSkipListMap segmentsToDrop = new ConcurrentSkipListMap<>( - segmentHolderComparator + segmentComparator ); private final Object lock = new Object(); @@ -120,8 +129,8 @@ public class LoadQueuePeon } public void loadSegment( - DataSegment segment, - LoadPeonCallback callback + final DataSegment segment, + final LoadPeonCallback callback ) { synchronized (lock) { @@ -134,8 +143,6 @@ public class LoadQueuePeon } } - final SegmentHolder holder = new SegmentHolder(segment, LOAD, Arrays.asList(callback)); - synchronized (lock) { final SegmentHolder existingHolder = segmentsToLoad.get(segment); if (existingHolder != null) { @@ -148,13 +155,13 @@ public class LoadQueuePeon log.info("Asking server peon[%s] to load segment[%s]", basePath, segment.getIdentifier()); queuedSize.addAndGet(segment.getSize()); - segmentsToLoad.put(segment, holder); + segmentsToLoad.put(segment, new SegmentHolder(segment, LOAD, Arrays.asList(callback))); doNext(); } public void dropSegment( - DataSegment segment, - LoadPeonCallback callback + final DataSegment segment, + final LoadPeonCallback callback ) { synchronized (lock) { @@ -167,8 +174,6 @@ public class LoadQueuePeon } } - SegmentHolder holder = new SegmentHolder(segment, DROP, Arrays.asList(callback)); - synchronized (lock) { final SegmentHolder existingHolder = segmentsToDrop.get(segment); if (existingHolder != null) { @@ -180,7 +185,7 @@ public class LoadQueuePeon } log.info("Asking server peon[%s] to drop segment[%s]", basePath, segment.getIdentifier()); - segmentsToDrop.put(segment, holder); + segmentsToDrop.put(segment, new SegmentHolder(segment, DROP, Arrays.asList(callback))); doNext(); } @@ -305,14 +310,15 @@ public class LoadQueuePeon throw new UnsupportedOperationException(); } + final List callbacks = currentlyProcessing.getCallbacks(); + currentlyProcessing = null; callBackExecutor.execute( new Runnable() { @Override public void run() { - currentlyProcessing.executeCallbacks(); - currentlyProcessing = null; + executeCallbacks(callbacks); } } ); @@ -323,20 +329,20 @@ public class LoadQueuePeon { synchronized (lock) { if (currentlyProcessing != null) { - currentlyProcessing.executeCallbacks(); + executeCallbacks(currentlyProcessing.getCallbacks()); currentlyProcessing = null; } if (!segmentsToDrop.isEmpty()) { for (SegmentHolder holder : segmentsToDrop.values()) { - holder.executeCallbacks(); + executeCallbacks(holder.getCallbacks()); } } segmentsToDrop.clear(); if (!segmentsToLoad.isEmpty()) { for (SegmentHolder holder : segmentsToLoad.values()) { - holder.executeCallbacks(); + executeCallbacks(holder.getCallbacks()); } } segmentsToLoad.clear(); @@ -433,15 +439,10 @@ public class LoadQueuePeon } } - public void executeCallbacks() + public List getCallbacks() { synchronized (callbacks) { - for (LoadPeonCallback callback : callbacks) { - if (callback != null) { - callback.execute(); - } - } - callbacks.clear(); + return callbacks; } } From bd98e0dd29273e3df9c0daa5cf0c71d914866e05 Mon Sep 17 00:00:00 2001 From: fjy Date: Sat, 9 Aug 2014 19:33:31 -0700 Subject: [PATCH 17/19] prep 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 38c23b8b8cd..a0e27d6248c 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.142 +git checkout druid-0.6.143 ./build.sh ``` ### Downloading the DSK (Druid Standalone Kit) -[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.142-bin.tar.gz) a stand-alone tarball and run it: +[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.143-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 31a7a7c7e8b..8ce8213af19 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.142",...]` + - `druid.extensions.coordinates=[...,"io.druid.extensions:druid-kafka-seven:0.6.143",...]` - becomes - - `druid.extensions.coordinates=[...,"io.druid.extensions:druid-kafka-eight:0.6.142",...]` + - `druid.extensions.coordinates=[...,"io.druid.extensions:druid-kafka-eight:0.6.143",...]` - 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 fcb0a5eb1c2..743a0b17f3c 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.142"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.143"] 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.142","io.druid.extensions:druid-kafka-seven:0.6.142"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.143","io.druid.extensions:druid-kafka-seven:0.6.143"] 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.142"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.143"] 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 b710c357419..06758bd0696 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.142"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.143"] 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.142","io.druid.extensions:druid-kafka-seven:0.6.142"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.143","io.druid.extensions:druid-kafka-seven:0.6.143"] 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 c212a0228c0..f5955b4f6da 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.142"] +-Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.143"] -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 6494eb96e1a..acfbdd82236 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.142-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.143-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.142 +cd druid-services-0.6.143 ``` 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 aea2d9d851e..3a638ecf9e3 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.142"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.143"] 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 fd1c41fa4a2..23713218db2 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.142-bin.tar.gz) +You can download the latest version of druid [here](http://static.druid.io/artifacts/releases/druid-services-0.6.143-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.142"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.143"] # 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.142","io.druid.extensions:druid-kafka-seven:0.6.142"] +druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.143","io.druid.extensions:druid-kafka-seven:0.6.143"] # 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 a0023f6a0f6..af8d16524f0 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.142-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.143-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.142 +cd druid-services-0.6.143 ``` You should see a bunch of files: diff --git a/docs/content/Twitter-Tutorial.md b/docs/content/Twitter-Tutorial.md index f394059071c..04588de4c40 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.142-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.143-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 7aa4bd28593..24d26883167 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.142"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.143"] # 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 7ea91b4f4ef..9d2b650911f 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.142"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.143"] 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 893317a5315..dca7e853f40 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.142","io.druid.extensions:druid-kafka-seven:0.6.142","io.druid.extensions:druid-rabbitmq:0.6.142"] +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"] # Change this config to db to hand off to the rest of the Druid cluster druid.publish.type=noop From 724562b18106479d7a9e31c6df455dfd9daac7f8 Mon Sep 17 00:00:00 2001 From: fjy Date: Sat, 9 Aug 2014 19:36:05 -0700 Subject: [PATCH 18/19] [maven-release-plugin] prepare release druid-0.6.143 --- 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 62d285847de..86e917e9a61 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143-SNAPSHOT + 0.6.143 diff --git a/common/pom.xml b/common/pom.xml index 0d35cc11f1b..c687446a93f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143-SNAPSHOT + 0.6.143 diff --git a/examples/pom.xml b/examples/pom.xml index c5218bf31ca..0e59489f728 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143-SNAPSHOT + 0.6.143 diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index bca2b222838..1bf70aff758 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143-SNAPSHOT + 0.6.143 diff --git a/histogram/pom.xml b/histogram/pom.xml index 9c485c2077b..1dd7593ed09 100644 --- a/histogram/pom.xml +++ b/histogram/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.143-SNAPSHOT + 0.6.143 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 8a49654645f..a9cc8858597 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143-SNAPSHOT + 0.6.143 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index d3ba35f5d58..c201557a132 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143-SNAPSHOT + 0.6.143 diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index 9be41f30cb4..ae50f761917 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143-SNAPSHOT + 0.6.143 diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index 676eedc8d0d..e85e35949d0 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143-SNAPSHOT + 0.6.143 diff --git a/pom.xml b/pom.xml index 0a093952156..7760382a1ba 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.143-SNAPSHOT + 0.6.143 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.143 diff --git a/processing/pom.xml b/processing/pom.xml index 9af4ad05392..3a211b95c9d 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143-SNAPSHOT + 0.6.143 diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index 17578c151cc..6c4d81a57d2 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.143-SNAPSHOT + 0.6.143 diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index 4e64e7d4e9a..2d9a0e599ab 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143-SNAPSHOT + 0.6.143 diff --git a/server/pom.xml b/server/pom.xml index 6f5e575ec10..1244223cd9f 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143-SNAPSHOT + 0.6.143 diff --git a/services/pom.xml b/services/pom.xml index 920c4264151..e5c451acd41 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.143-SNAPSHOT + 0.6.143 From 0cff63c7c61725d0a0aa784cbfcbf20000be8887 Mon Sep 17 00:00:00 2001 From: fjy Date: Sat, 9 Aug 2014 19:36:11 -0700 Subject: [PATCH 19/19] [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 86e917e9a61..8631027aabd 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143 + 0.6.144-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index c687446a93f..cee8a80d97f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143 + 0.6.144-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 0e59489f728..4df85ce6ce9 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143 + 0.6.144-SNAPSHOT diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index 1bf70aff758..ef442cbefe4 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143 + 0.6.144-SNAPSHOT diff --git a/histogram/pom.xml b/histogram/pom.xml index 1dd7593ed09..f5ec4c9219a 100644 --- a/histogram/pom.xml +++ b/histogram/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.143 + 0.6.144-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index a9cc8858597..7b31347a67a 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143 + 0.6.144-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index c201557a132..636f2009962 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143 + 0.6.144-SNAPSHOT diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index ae50f761917..5e1a89f0707 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143 + 0.6.144-SNAPSHOT diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index e85e35949d0..83fcc475fb6 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143 + 0.6.144-SNAPSHOT diff --git a/pom.xml b/pom.xml index 7760382a1ba..70f8bc5c838 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.143 + 0.6.144-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.143 + druid-0.6.131-SNAPSHOT diff --git a/processing/pom.xml b/processing/pom.xml index 3a211b95c9d..bd1a472acb9 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143 + 0.6.144-SNAPSHOT diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index 6c4d81a57d2..74573581835 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.143 + 0.6.144-SNAPSHOT diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index 2d9a0e599ab..47b469f83d9 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143 + 0.6.144-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 1244223cd9f..5344ff7481d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.143 + 0.6.144-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index e5c451acd41..6a763a40eaf 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.143 + 0.6.144-SNAPSHOT