From bb4105ed1afdb2435d9de4da8a73fa0a2f5d4e37 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Jun 2014 09:23:46 -0700 Subject: [PATCH 01/19] fix broken standalone hadoop ingestion --- .../io/druid/indexer/HadoopDruidIndexerConfig.java | 13 +++++++++++-- .../java/io/druid/indexer/HadoopIngestionSpec.java | 2 +- .../java/io/druid/cli/CliInternalHadoopIndexer.java | 5 ++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java b/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java index 5956287f5d0..f761e34be7f 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java +++ b/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java @@ -37,7 +37,6 @@ import com.google.inject.Module; import com.metamx.common.ISE; import com.metamx.common.guava.FunctionalIterable; import com.metamx.common.logger.Logger; -import com.metamx.common.parsers.TimestampParser; import io.druid.common.utils.JodaUtils; import io.druid.data.input.InputRow; import io.druid.data.input.impl.StringInputRowParser; @@ -111,7 +110,17 @@ public class HadoopDruidIndexerConfig public static HadoopDruidIndexerConfig fromMap(Map argSpec) { - return HadoopDruidIndexerConfig.jsonMapper.convertValue(argSpec, HadoopDruidIndexerConfig.class); + //backwards compatibility + if (argSpec.containsKey("schema")) { + return HadoopDruidIndexerConfig.jsonMapper.convertValue(argSpec, HadoopDruidIndexerConfig.class); + } else { + return new HadoopDruidIndexerConfig( + HadoopDruidIndexerConfig.jsonMapper.convertValue( + argSpec, + HadoopIngestionSpec.class + ) + ); + } } @SuppressWarnings("unchecked") diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopIngestionSpec.java b/indexing-hadoop/src/main/java/io/druid/indexer/HadoopIngestionSpec.java index 2ebd1b73b6b..9c447ac53e8 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopIngestionSpec.java +++ b/indexing-hadoop/src/main/java/io/druid/indexer/HadoopIngestionSpec.java @@ -138,7 +138,7 @@ public class HadoopIngestionSpec extends IngestionSpec Date: Wed, 4 Jun 2014 09:34:29 -0700 Subject: [PATCH 02/19] prepare for next release --- docs/content/Examples.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 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/content/Examples.md b/docs/content/Examples.md index ca1e15fa078..8544f80a75a 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.116 +git checkout druid-0.6.117 ./build.sh ``` ### Downloading the DSK (Druid Standalone Kit) -[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.116-bin.tar.gz) a stand-alone tarball and run it: +[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.117-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/Production-Cluster-Configuration.md b/docs/content/Production-Cluster-Configuration.md index 21dda2c3a92..d636e983ade 100644 --- a/docs/content/Production-Cluster-Configuration.md +++ b/docs/content/Production-Cluster-Configuration.md @@ -55,7 +55,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.116"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.117"] druid.zk.service.host=#{ZK_IPs} druid.zk.paths.base=/druid/prod @@ -137,7 +137,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.116","io.druid.extensions:druid-kafka-seven:0.6.116"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.117","io.druid.extensions:druid-kafka-seven:0.6.117"] druid.zk.service.host=#{ZK_IPs} druid.zk.paths.base=/druid/prod @@ -285,7 +285,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.116"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.117"] 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 c252ed13da5..c3ffe1c354f 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.116"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.117"] 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.116","io.druid.extensions:druid-kafka-seven:0.6.116"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.117","io.druid.extensions:druid-kafka-seven:0.6.117"] 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 f941031861c..d428ba93354 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.116"] +-Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.117"] -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 970e504c25b..552cd9231cf 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.116-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.117-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.116 +cd druid-services-0.6.117 ``` 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 0d06e94aa8b..432454f6b90 100644 --- a/docs/content/Tutorial:-Loading-Your-Data-Part-1.md +++ b/docs/content/Tutorial:-Loading-Your-Data-Part-1.md @@ -96,7 +96,7 @@ The configurations for the overlord node are as follows: -Ddruid.zk.service.host=localhost --Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.116"] +-Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.117"] -Ddruid.db.connector.connectURI=jdbc:mysql://localhost:3306/druid -Ddruid.db.connector.user=druid diff --git a/docs/content/Tutorial:-The-Druid-Cluster.md b/docs/content/Tutorial:-The-Druid-Cluster.md index 23edc085c57..16261c36720 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.116-bin.tar.gz) +You can download the latest version of druid [here](http://static.druid.io/artifacts/releases/druid-services-0.6.117-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.116"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.117"] # 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.116","io.druid.extensions:druid-kafka-seven:0.6.116"] +druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.117","io.druid.extensions:druid-kafka-seven:0.6.117"] # 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 18257ab78b4..08f0e55a7ad 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.116-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.117-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.116 +cd druid-services-0.6.117 ``` You should see a bunch of files: diff --git a/docs/content/Twitter-Tutorial.md b/docs/content/Twitter-Tutorial.md index e3b1bdddd9d..f836011ccca 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.116-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.117-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 51d19e89af6..d91f59e313c 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.116"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.117"] # 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 24745c3147f..07b4d554a63 100644 --- a/examples/config/overlord/runtime.properties +++ b/examples/config/overlord/runtime.properties @@ -9,7 +9,7 @@ -Ddruid.zk.service.host=localhost --Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.116"] +-Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.117"] -Ddruid.db.connector.connectURI=jdbc:mysql://localhost:3306/druid -Ddruid.db.connector.user=druid diff --git a/examples/config/realtime/runtime.properties b/examples/config/realtime/runtime.properties index b78547fe8ab..c545bbc9b58 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.116","io.druid.extensions:druid-kafka-seven:0.6.116","io.druid.extensions:druid-rabbitmq:0.6.116"] +druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.117","io.druid.extensions:druid-kafka-seven:0.6.117","io.druid.extensions:druid-rabbitmq:0.6.117"] # Change this config to db to hand off to the rest of the Druid cluster druid.publish.type=noop From 30ce0ab99c049464be0d6a75e081ad83e4d4c7ba Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Jun 2014 09:45:06 -0700 Subject: [PATCH 03/19] [maven-release-plugin] prepare release druid-0.6.117 --- cassandra-storage/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- hdfs-storage/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 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml index cb2de923923..a093e009804 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117-SNAPSHOT + 0.6.117 diff --git a/common/pom.xml b/common/pom.xml index 4d05afd6443..200d01a6d35 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117-SNAPSHOT + 0.6.117 diff --git a/examples/pom.xml b/examples/pom.xml index a7d6f87c1d0..5f980079e60 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117-SNAPSHOT + 0.6.117 diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index 23a1294395d..c87fc897634 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117-SNAPSHOT + 0.6.117 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 81c4f32d85f..2cf1dd780e8 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117-SNAPSHOT + 0.6.117 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 810d82e3e63..3e65c2de41e 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117-SNAPSHOT + 0.6.117 diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index c1eef6906a3..3855815e001 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117-SNAPSHOT + 0.6.117 diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index 699f6e0a3fd..3d5731b2251 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117-SNAPSHOT + 0.6.117 diff --git a/pom.xml b/pom.xml index fd02b96820e..8775f3b09f9 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.117-SNAPSHOT + 0.6.117 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.107-SNAPSHOT + druid-0.6.117 diff --git a/processing/pom.xml b/processing/pom.xml index 7a105c1d656..ee9fd5e79d2 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117-SNAPSHOT + 0.6.117 diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index e1195c91435..6ba98347eac 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.117-SNAPSHOT + 0.6.117 diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index 36ae75e9398..955f1db35fc 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117-SNAPSHOT + 0.6.117 diff --git a/server/pom.xml b/server/pom.xml index 36251f38664..a8ae30d580f 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117-SNAPSHOT + 0.6.117 diff --git a/services/pom.xml b/services/pom.xml index 749acffb75c..29c726b802d 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.117-SNAPSHOT + 0.6.117 From 2d95780d12532feb7b37e23e4d9c714e4a0b0ac4 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Jun 2014 09:45:11 -0700 Subject: [PATCH 04/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 +- 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 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml index a093e009804..709e1f28a3c 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117 + 0.6.118-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 200d01a6d35..fac89e6f8e9 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117 + 0.6.118-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 5f980079e60..94bb67fcae0 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117 + 0.6.118-SNAPSHOT diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index c87fc897634..6e2eb6d3374 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117 + 0.6.118-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 2cf1dd780e8..b820735f09e 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117 + 0.6.118-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 3e65c2de41e..d0db877569b 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117 + 0.6.118-SNAPSHOT diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index 3855815e001..be2842080fa 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117 + 0.6.118-SNAPSHOT diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index 3d5731b2251..03c89df9c50 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117 + 0.6.118-SNAPSHOT diff --git a/pom.xml b/pom.xml index 8775f3b09f9..b21e2b20f60 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.117 + 0.6.118-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.117 + druid-0.6.107-SNAPSHOT diff --git a/processing/pom.xml b/processing/pom.xml index ee9fd5e79d2..93fd845dd39 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117 + 0.6.118-SNAPSHOT diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index 6ba98347eac..fa4e4475d2f 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.117 + 0.6.118-SNAPSHOT diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index 955f1db35fc..ae4901f9a92 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117 + 0.6.118-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index a8ae30d580f..22c1f7271dc 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.117 + 0.6.118-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 29c726b802d..be11a14a5a4 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.117 + 0.6.118-SNAPSHOT From 22c62cc17689b24ad32dea23cc9e366cb42ca326 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Jun 2014 10:09:17 -0700 Subject: [PATCH 05/19] update performance FAQ --- docs/content/Performance-FAQ.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content/Performance-FAQ.md b/docs/content/Performance-FAQ.md index 8bc696d6825..95ef716797d 100644 --- a/docs/content/Performance-FAQ.md +++ b/docs/content/Performance-FAQ.md @@ -5,9 +5,9 @@ layout: doc_page ## What should I set my JVM heap? The size of the JVM heap really depends on the type of Druid node you are running. Below are a few considerations. -[Broker nodes](Broker.html) can use the JVM heap as a query cache and thus, the size of the heap will affect on the number of results that can be cached. Broker nodes do not require off-heap memory and generally, heap sizes can be set to be close to the maximum memory on the machine (leaving some room for JVM overhead). The heap is used to merge results from different real-time and historical nodes, along with other computational processing. +[Broker nodes](Broker.html) uses the JVM heap mainly to merge results from historicals and real-times. Brokers also use off-heap memory and processing threads for groupBy queries. -[Historical nodes](Historical.html) use off-heap memory to store intermediate results, and by default, all segments are memory mapped before they can be queried. The more off-heap memory is available, the more segments can be served without the possibility of data being paged onto disk. On historicals, the JVM heap is used for [GroupBy queries](GroupByQuery.html), some data structures used for intermediate computation, and general processing. +[Historical nodes](Historical.html) use off-heap memory to store intermediate results, and by default, all segments are memory mapped before they can be queried. The more off-heap memory is available, the more segments can be served without the possibility of data being paged onto disk. On historicals, the JVM heap is used for [GroupBy queries](GroupByQuery.html), some data structures used for intermediate computation, and general processing. One way to calculate how much space there is for segments is: memory_for_segments = total_memory - heap - direct_memory - jvm_overhead. [Coordinator nodes](Coordinator nodes) do not require off-heap memory and the heap is used for loading information about all segments to determine what segments need to be loaded, dropped, moved, or replicated. From 8f657686c579394f3fc0c9f37157497a7f084167 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Jun 2014 10:14:39 -0700 Subject: [PATCH 06/19] fix typos --- docs/content/Performance-FAQ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/Performance-FAQ.md b/docs/content/Performance-FAQ.md index 95ef716797d..c4bd7363a87 100644 --- a/docs/content/Performance-FAQ.md +++ b/docs/content/Performance-FAQ.md @@ -7,7 +7,7 @@ The size of the JVM heap really depends on the type of Druid node you are runnin [Broker nodes](Broker.html) uses the JVM heap mainly to merge results from historicals and real-times. Brokers also use off-heap memory and processing threads for groupBy queries. -[Historical nodes](Historical.html) use off-heap memory to store intermediate results, and by default, all segments are memory mapped before they can be queried. The more off-heap memory is available, the more segments can be served without the possibility of data being paged onto disk. On historicals, the JVM heap is used for [GroupBy queries](GroupByQuery.html), some data structures used for intermediate computation, and general processing. One way to calculate how much space there is for segments is: memory_for_segments = total_memory - heap - direct_memory - jvm_overhead. +[Historical nodes](Historical.html) use off-heap memory to store intermediate results, and by default, all segments are memory mapped before they can be queried. Typically, the more memory is available on a historical node, the more segments can be served without the possibility of data being paged on to disk. On historicals, the JVM heap is used for [GroupBy queries](GroupByQuery.html), some data structures used for intermediate computation, and general processing. One way to calculate how much space there is for segments is: memory_for_segments = total_memory - heap - direct_memory - jvm_overhead. [Coordinator nodes](Coordinator nodes) do not require off-heap memory and the heap is used for loading information about all segments to determine what segments need to be loaded, dropped, moved, or replicated. From c506d014bf390a053f7cb9f94eabe1e808e3508c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Wed, 4 Jun 2014 12:55:39 -0700 Subject: [PATCH 07/19] fix link to docs --- .../src/main/java/io/druid/cli/CliInternalHadoopIndexer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java b/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java index ae7803eedda..007b56fc076 100644 --- a/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java +++ b/services/src/main/java/io/druid/cli/CliInternalHadoopIndexer.java @@ -38,7 +38,7 @@ import java.util.List; */ @Command( name = "hadoop-indexer", - description = "Runs the batch Hadoop Druid Indexer, see https://github.com/metamx/druid/wiki/Batch-ingestion for a description." + description = "Runs the batch Hadoop Druid Indexer, see http://druid.io/docs/latest/Batch-ingestion.html for a description." ) public class CliInternalHadoopIndexer implements Runnable { @@ -76,4 +76,4 @@ public class CliInternalHadoopIndexer implements Runnable throw Throwables.propagate(e); } } -} \ No newline at end of file +} From adc00f2bcfe2bfec5acb5239f87f519ec4194bb2 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Jun 2014 16:24:56 -0700 Subject: [PATCH 08/19] make combine text configurable --- .../indexer/DetermineHashedPartitionsJob.java | 10 +++++--- .../indexer/HadoopDruidIndexerConfig.java | 5 ++++ .../io/druid/indexer/HadoopIngestionSpec.java | 7 +++++- .../io/druid/indexer/HadoopTuningConfig.java | 23 +++++++++++++++---- 4 files changed, 36 insertions(+), 9 deletions(-) diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java b/indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java index 82643065123..4bc9cb9f35a 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java +++ b/indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java @@ -33,8 +33,8 @@ import com.metamx.common.logger.Logger; import io.druid.data.input.InputRow; import io.druid.data.input.Rows; import io.druid.granularity.QueryGranularity; -import io.druid.segment.indexing.granularity.UniformGranularitySpec; import io.druid.query.aggregation.hyperloglog.HyperLogLogCollector; +import io.druid.segment.indexing.granularity.UniformGranularitySpec; import io.druid.timeline.partition.HashBasedNumberedShardSpec; import io.druid.timeline.partition.NoneShardSpec; import org.apache.hadoop.conf.Configurable; @@ -48,8 +48,8 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.Partitioner; import org.apache.hadoop.mapreduce.Reducer; -import org.apache.hadoop.mapreduce.lib.input.TextInputFormat; import org.apache.hadoop.mapreduce.lib.input.CombineTextInputFormat; +import org.apache.hadoop.mapreduce.lib.input.TextInputFormat; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat; import org.joda.time.DateTime; @@ -92,7 +92,11 @@ public class DetermineHashedPartitionsJob implements Jobby ); JobHelper.injectSystemProperties(groupByJob); - groupByJob.setInputFormatClass(CombineTextInputFormat.class); + if (config.isCombineText()) { + groupByJob.setInputFormatClass(CombineTextInputFormat.class); + } else { + groupByJob.setInputFormatClass(TextInputFormat.class); + } groupByJob.setMapperClass(DetermineCardinalityMapper.class); groupByJob.setMapOutputKeyClass(LongWritable.class); groupByJob.setMapOutputValueClass(BytesWritable.class); diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java b/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java index f761e34be7f..0a863b78c13 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java +++ b/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java @@ -255,6 +255,11 @@ public class HadoopDruidIndexerConfig return (schema.getIOConfig().getMetadataUpdateSpec() != null); } + public boolean isCombineText() + { + return schema.getTuningConfig().isCombineText(); + } + public StringInputRowParser getParser() { return (StringInputRowParser) schema.getDataSchema().getParser(); diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopIngestionSpec.java b/indexing-hadoop/src/main/java/io/druid/indexer/HadoopIngestionSpec.java index 9c447ac53e8..b9947e81fe9 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopIngestionSpec.java +++ b/indexing-hadoop/src/main/java/io/druid/indexer/HadoopIngestionSpec.java @@ -73,6 +73,7 @@ public class HadoopIngestionSpec extends IngestionSpec jobProperties, + final @JsonProperty("combineText") boolean combineText, // These fields are deprecated and will be removed in the future final @JsonProperty("timestampColumn") String timestampColumn, final @JsonProperty("timestampFormat") String timestampFormat, @@ -163,7 +164,8 @@ public class HadoopIngestionSpec extends IngestionSpec jobProperties; + private final boolean combineText; @JsonCreator public HadoopTuningConfig( @@ -78,7 +80,8 @@ public class HadoopTuningConfig implements TuningConfig final @JsonProperty("cleanupOnFailure") Boolean cleanupOnFailure, final @JsonProperty("overwriteFiles") boolean overwriteFiles, final @JsonProperty("ignoreInvalidRows") boolean ignoreInvalidRows, - final @JsonProperty("jobProperties") Map jobProperties + final @JsonProperty("jobProperties") Map jobProperties, + final @JsonProperty("combineText") boolean combineText ) { this.workingPath = workingPath == null ? null : workingPath; @@ -93,6 +96,7 @@ public class HadoopTuningConfig implements TuningConfig this.jobProperties = (jobProperties == null ? ImmutableMap.of() : ImmutableMap.copyOf(jobProperties)); + this.combineText = combineText; } @JsonProperty @@ -155,6 +159,12 @@ public class HadoopTuningConfig implements TuningConfig return jobProperties; } + @JsonProperty + public boolean isCombineText() + { + return combineText; + } + public HadoopTuningConfig withWorkingPath(String path) { return new HadoopTuningConfig( @@ -167,7 +177,8 @@ public class HadoopTuningConfig implements TuningConfig cleanupOnFailure, overwriteFiles, ignoreInvalidRows, - jobProperties + jobProperties, + combineText ); } @@ -183,7 +194,8 @@ public class HadoopTuningConfig implements TuningConfig cleanupOnFailure, overwriteFiles, ignoreInvalidRows, - jobProperties + jobProperties, + combineText ); } @@ -199,7 +211,8 @@ public class HadoopTuningConfig implements TuningConfig cleanupOnFailure, overwriteFiles, ignoreInvalidRows, - jobProperties + jobProperties, + combineText ); } } From 9f4cc5ca1fd3834d04fc47fd00d452d81d6c176c Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Jun 2014 16:29:20 -0700 Subject: [PATCH 09/19] fix test --- .../test/java/io/druid/indexing/common/task/TaskSerdeTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java b/indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java index f0feae9490a..00407381afc 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java @@ -422,6 +422,7 @@ public class TaskSerdeTest null, false, ImmutableMap.of("foo", "bar"), + false, null, null, null, From 612624fb89aa3cd98015ffe6d51df00d450a35ff Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Jun 2014 16:47:54 -0700 Subject: [PATCH 10/19] prepare for next release --- docs/content/Examples.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 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/content/Examples.md b/docs/content/Examples.md index 8544f80a75a..bd64ca11e5f 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.117 +git checkout druid-0.6.118 ./build.sh ``` ### Downloading the DSK (Druid Standalone Kit) -[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.117-bin.tar.gz) a stand-alone tarball and run it: +[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.118-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/Production-Cluster-Configuration.md b/docs/content/Production-Cluster-Configuration.md index d636e983ade..966713ee049 100644 --- a/docs/content/Production-Cluster-Configuration.md +++ b/docs/content/Production-Cluster-Configuration.md @@ -55,7 +55,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.117"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.118"] druid.zk.service.host=#{ZK_IPs} druid.zk.paths.base=/druid/prod @@ -137,7 +137,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.117","io.druid.extensions:druid-kafka-seven:0.6.117"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.118","io.druid.extensions:druid-kafka-seven:0.6.118"] druid.zk.service.host=#{ZK_IPs} druid.zk.paths.base=/druid/prod @@ -285,7 +285,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.117"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.118"] 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 c3ffe1c354f..820e76c53bd 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.117"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.118"] 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.117","io.druid.extensions:druid-kafka-seven:0.6.117"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.118","io.druid.extensions:druid-kafka-seven:0.6.118"] 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 d428ba93354..281b7186b2b 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.117"] +-Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.118"] -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 552cd9231cf..0ab33f563d5 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.117-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.118-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.117 +cd druid-services-0.6.118 ``` 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 432454f6b90..f4f3bcdca6d 100644 --- a/docs/content/Tutorial:-Loading-Your-Data-Part-1.md +++ b/docs/content/Tutorial:-Loading-Your-Data-Part-1.md @@ -96,7 +96,7 @@ The configurations for the overlord node are as follows: -Ddruid.zk.service.host=localhost --Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.117"] +-Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.118"] -Ddruid.db.connector.connectURI=jdbc:mysql://localhost:3306/druid -Ddruid.db.connector.user=druid diff --git a/docs/content/Tutorial:-The-Druid-Cluster.md b/docs/content/Tutorial:-The-Druid-Cluster.md index 16261c36720..874a2228034 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.117-bin.tar.gz) +You can download the latest version of druid [here](http://static.druid.io/artifacts/releases/druid-services-0.6.118-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.117"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.118"] # 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.117","io.druid.extensions:druid-kafka-seven:0.6.117"] +druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.118","io.druid.extensions:druid-kafka-seven:0.6.118"] # 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 08f0e55a7ad..85c21d674c9 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.117-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.118-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.117 +cd druid-services-0.6.118 ``` You should see a bunch of files: diff --git a/docs/content/Twitter-Tutorial.md b/docs/content/Twitter-Tutorial.md index f836011ccca..7eb2dba97af 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.117-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.118-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 d91f59e313c..3ab5c02b5f0 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.117"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.118"] # 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 07b4d554a63..b45ef259722 100644 --- a/examples/config/overlord/runtime.properties +++ b/examples/config/overlord/runtime.properties @@ -9,7 +9,7 @@ -Ddruid.zk.service.host=localhost --Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.117"] +-Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.118"] -Ddruid.db.connector.connectURI=jdbc:mysql://localhost:3306/druid -Ddruid.db.connector.user=druid diff --git a/examples/config/realtime/runtime.properties b/examples/config/realtime/runtime.properties index c545bbc9b58..0a04a5deeb3 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.117","io.druid.extensions:druid-kafka-seven:0.6.117","io.druid.extensions:druid-rabbitmq:0.6.117"] +druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.118","io.druid.extensions:druid-kafka-seven:0.6.118","io.druid.extensions:druid-rabbitmq:0.6.118"] # Change this config to db to hand off to the rest of the Druid cluster druid.publish.type=noop From 37c6ece1508d39197e1407f2704e597ac93673d8 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Jun 2014 16:49:44 -0700 Subject: [PATCH 11/19] [maven-release-plugin] prepare release druid-0.6.118 --- cassandra-storage/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- hdfs-storage/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 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml index 709e1f28a3c..01e4c998b71 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118-SNAPSHOT + 0.6.118 diff --git a/common/pom.xml b/common/pom.xml index fac89e6f8e9..63a3e17f47e 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118-SNAPSHOT + 0.6.118 diff --git a/examples/pom.xml b/examples/pom.xml index 94bb67fcae0..27d114b2531 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118-SNAPSHOT + 0.6.118 diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index 6e2eb6d3374..e6f1fd27a67 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118-SNAPSHOT + 0.6.118 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index b820735f09e..2d54c529ddb 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118-SNAPSHOT + 0.6.118 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index d0db877569b..72b4a4a16f5 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118-SNAPSHOT + 0.6.118 diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index be2842080fa..f32336f4616 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118-SNAPSHOT + 0.6.118 diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index 03c89df9c50..641953e79a3 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118-SNAPSHOT + 0.6.118 diff --git a/pom.xml b/pom.xml index b21e2b20f60..1ed420da3d9 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.118-SNAPSHOT + 0.6.118 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.107-SNAPSHOT + druid-0.6.118 diff --git a/processing/pom.xml b/processing/pom.xml index 93fd845dd39..9fe87c205ee 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118-SNAPSHOT + 0.6.118 diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index fa4e4475d2f..cdf1f3bb96c 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.118-SNAPSHOT + 0.6.118 diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index ae4901f9a92..aa8236726b3 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118-SNAPSHOT + 0.6.118 diff --git a/server/pom.xml b/server/pom.xml index 22c1f7271dc..51510c239eb 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118-SNAPSHOT + 0.6.118 diff --git a/services/pom.xml b/services/pom.xml index be11a14a5a4..0c836dd2238 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.118-SNAPSHOT + 0.6.118 From 4524863db17d17310d45fc43c982ba3035489e13 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Jun 2014 16:49:49 -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 +- 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 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml index 01e4c998b71..89ba2b2df98 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118 + 0.6.119-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 63a3e17f47e..aae78c932d8 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118 + 0.6.119-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 27d114b2531..579d4118564 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118 + 0.6.119-SNAPSHOT diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index e6f1fd27a67..f840fdbe818 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118 + 0.6.119-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 2d54c529ddb..510fe69bcef 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118 + 0.6.119-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 72b4a4a16f5..b2e5e5c2a8d 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118 + 0.6.119-SNAPSHOT diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index f32336f4616..7a6be212fc9 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118 + 0.6.119-SNAPSHOT diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index 641953e79a3..e994df96848 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118 + 0.6.119-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1ed420da3d9..163c39ffd0b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.118 + 0.6.119-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.118 + druid-0.6.107-SNAPSHOT diff --git a/processing/pom.xml b/processing/pom.xml index 9fe87c205ee..d1eee1ab30c 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118 + 0.6.119-SNAPSHOT diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index cdf1f3bb96c..0f0ec53ba19 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.118 + 0.6.119-SNAPSHOT diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index aa8236726b3..533f7c679c7 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118 + 0.6.119-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 51510c239eb..b37fb8ca09e 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.118 + 0.6.119-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 0c836dd2238..bcdcd7ec4e5 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.118 + 0.6.119-SNAPSHOT From 1ca7bf03b818ae4a03eb25fbe404c3e72752805d Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Wed, 4 Jun 2014 17:54:31 -0700 Subject: [PATCH 13/19] IndexGeneratorJob needs to respect isCombineText, too. --- .../src/main/java/io/druid/indexer/IndexGeneratorJob.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/IndexGeneratorJob.java b/indexing-hadoop/src/main/java/io/druid/indexer/IndexGeneratorJob.java index b2f1dfda129..e06b63871e3 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/IndexGeneratorJob.java +++ b/indexing-hadoop/src/main/java/io/druid/indexer/IndexGeneratorJob.java @@ -61,6 +61,7 @@ import org.apache.hadoop.mapreduce.JobContext; import org.apache.hadoop.mapreduce.Partitioner; import org.apache.hadoop.mapreduce.Reducer; import org.apache.hadoop.mapreduce.lib.input.CombineTextInputFormat; +import org.apache.hadoop.mapreduce.lib.input.TextInputFormat; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat; import org.joda.time.DateTime; @@ -145,7 +146,11 @@ public class IndexGeneratorJob implements Jobby JobHelper.injectSystemProperties(job); - job.setInputFormatClass(CombineTextInputFormat.class); + if (config.isCombineText()) { + job.setInputFormatClass(CombineTextInputFormat.class); + } else { + job.setInputFormatClass(TextInputFormat.class); + } job.setMapperClass(IndexGeneratorMapper.class); job.setMapOutputValueClass(Text.class); From 6309ab197368d4a02e11461999689b0e4094ee2c Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Wed, 4 Jun 2014 17:56:15 -0700 Subject: [PATCH 14/19] [maven-release-plugin] prepare release druid-0.6.119 --- cassandra-storage/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- hdfs-storage/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 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml index 89ba2b2df98..0c258d23a3b 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119-SNAPSHOT + 0.6.119 diff --git a/common/pom.xml b/common/pom.xml index aae78c932d8..4bb2203f846 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119-SNAPSHOT + 0.6.119 diff --git a/examples/pom.xml b/examples/pom.xml index 579d4118564..96d7f48ed58 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119-SNAPSHOT + 0.6.119 diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index f840fdbe818..2bea6213a00 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119-SNAPSHOT + 0.6.119 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 510fe69bcef..ff9cb44a002 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119-SNAPSHOT + 0.6.119 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index b2e5e5c2a8d..daa9e776b1f 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119-SNAPSHOT + 0.6.119 diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index 7a6be212fc9..d0d91af126f 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119-SNAPSHOT + 0.6.119 diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index e994df96848..65bee6d02b4 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119-SNAPSHOT + 0.6.119 diff --git a/pom.xml b/pom.xml index 163c39ffd0b..7ce8d50ff88 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.119-SNAPSHOT + 0.6.119 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.107-SNAPSHOT + druid-0.6.119 diff --git a/processing/pom.xml b/processing/pom.xml index d1eee1ab30c..f27f4917263 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119-SNAPSHOT + 0.6.119 diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index 0f0ec53ba19..c0e56544acc 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.119-SNAPSHOT + 0.6.119 diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index 533f7c679c7..335fbfca948 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119-SNAPSHOT + 0.6.119 diff --git a/server/pom.xml b/server/pom.xml index b37fb8ca09e..555cf09d1e8 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119-SNAPSHOT + 0.6.119 diff --git a/services/pom.xml b/services/pom.xml index bcdcd7ec4e5..84bd4dd606d 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.119-SNAPSHOT + 0.6.119 From 3325f6d6ede8fdb4236e4f8f780729a63f5690c5 Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Wed, 4 Jun 2014 17:56:20 -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 +- 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 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml index 0c258d23a3b..c15d97e8450 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119 + 0.6.120-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 4bb2203f846..798823a7b40 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119 + 0.6.120-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 96d7f48ed58..853c99a31be 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119 + 0.6.120-SNAPSHOT diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index 2bea6213a00..73502288f65 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119 + 0.6.120-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index ff9cb44a002..1da7d6aa670 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119 + 0.6.120-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index daa9e776b1f..dd617488da2 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119 + 0.6.120-SNAPSHOT diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index d0d91af126f..b5fcd089a50 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119 + 0.6.120-SNAPSHOT diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index 65bee6d02b4..95a4749c6ce 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119 + 0.6.120-SNAPSHOT diff --git a/pom.xml b/pom.xml index 7ce8d50ff88..9d7ff74b301 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.119 + 0.6.120-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.119 + druid-0.6.107-SNAPSHOT diff --git a/processing/pom.xml b/processing/pom.xml index f27f4917263..b3aac0930ad 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119 + 0.6.120-SNAPSHOT diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index c0e56544acc..968e5bdc3b8 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.119 + 0.6.120-SNAPSHOT diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index 335fbfca948..b2b4d5cc007 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119 + 0.6.120-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 555cf09d1e8..73c5135fadf 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.119 + 0.6.120-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 84bd4dd606d..91bc8bf420c 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.119 + 0.6.120-SNAPSHOT From e3941a2890a6433ed02716771ec3ad8c8b8cdf21 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Jun 2014 20:19:50 -0700 Subject: [PATCH 16/19] prepare for next rel --- docs/content/Examples.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 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/content/Examples.md b/docs/content/Examples.md index bd64ca11e5f..268f655bc05 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.118 +git checkout druid-0.6.119 ./build.sh ``` ### Downloading the DSK (Druid Standalone Kit) -[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.118-bin.tar.gz) a stand-alone tarball and run it: +[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.119-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/Production-Cluster-Configuration.md b/docs/content/Production-Cluster-Configuration.md index 966713ee049..413cfd597c4 100644 --- a/docs/content/Production-Cluster-Configuration.md +++ b/docs/content/Production-Cluster-Configuration.md @@ -55,7 +55,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.118"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.119"] druid.zk.service.host=#{ZK_IPs} druid.zk.paths.base=/druid/prod @@ -137,7 +137,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.118","io.druid.extensions:druid-kafka-seven:0.6.118"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.119","io.druid.extensions:druid-kafka-seven:0.6.119"] druid.zk.service.host=#{ZK_IPs} druid.zk.paths.base=/druid/prod @@ -285,7 +285,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.118"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.119"] 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 820e76c53bd..62dfcf4a21f 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.118"] +druid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.119"] 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.118","io.druid.extensions:druid-kafka-seven:0.6.118"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.119","io.druid.extensions:druid-kafka-seven:0.6.119"] 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 281b7186b2b..3ea9f9b20a7 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.118"] +-Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.119"] -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 0ab33f563d5..a27d7277e2d 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.118-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.119-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.118 +cd druid-services-0.6.119 ``` 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 f4f3bcdca6d..0427550eeed 100644 --- a/docs/content/Tutorial:-Loading-Your-Data-Part-1.md +++ b/docs/content/Tutorial:-Loading-Your-Data-Part-1.md @@ -96,7 +96,7 @@ The configurations for the overlord node are as follows: -Ddruid.zk.service.host=localhost --Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.118"] +-Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.119"] -Ddruid.db.connector.connectURI=jdbc:mysql://localhost:3306/druid -Ddruid.db.connector.user=druid diff --git a/docs/content/Tutorial:-The-Druid-Cluster.md b/docs/content/Tutorial:-The-Druid-Cluster.md index 874a2228034..d63f7d70e6f 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.118-bin.tar.gz) +You can download the latest version of druid [here](http://static.druid.io/artifacts/releases/druid-services-0.6.119-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.118"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.119"] # 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.118","io.druid.extensions:druid-kafka-seven:0.6.118"] +druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.119","io.druid.extensions:druid-kafka-seven:0.6.119"] # 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 85c21d674c9..abd0edda56f 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.118-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.119-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.118 +cd druid-services-0.6.119 ``` You should see a bunch of files: diff --git a/docs/content/Twitter-Tutorial.md b/docs/content/Twitter-Tutorial.md index 7eb2dba97af..857c32f6256 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.118-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.119-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 3ab5c02b5f0..f86944fd020 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.118"] +druid.extensions.coordinates=["io.druid.extensions:druid-s3-extensions:0.6.119"] # 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 b45ef259722..7a8582ed4d3 100644 --- a/examples/config/overlord/runtime.properties +++ b/examples/config/overlord/runtime.properties @@ -9,7 +9,7 @@ -Ddruid.zk.service.host=localhost --Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.118"] +-Ddruid.extensions.coordinates=["io.druid.extensions:druid-kafka-seven:0.6.119"] -Ddruid.db.connector.connectURI=jdbc:mysql://localhost:3306/druid -Ddruid.db.connector.user=druid diff --git a/examples/config/realtime/runtime.properties b/examples/config/realtime/runtime.properties index 0a04a5deeb3..43e96fbe086 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.118","io.druid.extensions:druid-kafka-seven:0.6.118","io.druid.extensions:druid-rabbitmq:0.6.118"] +druid.extensions.coordinates=["io.druid.extensions:druid-examples:0.6.119","io.druid.extensions:druid-kafka-seven:0.6.119","io.druid.extensions:druid-rabbitmq:0.6.119"] # Change this config to db to hand off to the rest of the Druid cluster druid.publish.type=noop From 033f81ca6443adb647f9d0ee3ccb8f61cffc83bf Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Jun 2014 20:22:14 -0700 Subject: [PATCH 17/19] [maven-release-plugin] prepare release druid-0.6.120 --- cassandra-storage/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- hdfs-storage/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 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml index c15d97e8450..e9ab32a3d28 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120-SNAPSHOT + 0.6.120 diff --git a/common/pom.xml b/common/pom.xml index 798823a7b40..86f5b599d3a 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120-SNAPSHOT + 0.6.120 diff --git a/examples/pom.xml b/examples/pom.xml index 853c99a31be..87e924762ef 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120-SNAPSHOT + 0.6.120 diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index 73502288f65..ff0758ae42b 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120-SNAPSHOT + 0.6.120 diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index 1da7d6aa670..e7fcb0a65eb 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120-SNAPSHOT + 0.6.120 diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index dd617488da2..61111af249c 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120-SNAPSHOT + 0.6.120 diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index b5fcd089a50..566b858196e 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120-SNAPSHOT + 0.6.120 diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index 95a4749c6ce..d3fe68c5609 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120-SNAPSHOT + 0.6.120 diff --git a/pom.xml b/pom.xml index 9d7ff74b301..2020826a6b0 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.120-SNAPSHOT + 0.6.120 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.107-SNAPSHOT + druid-0.6.120 diff --git a/processing/pom.xml b/processing/pom.xml index b3aac0930ad..9372cb999fd 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120-SNAPSHOT + 0.6.120 diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index 968e5bdc3b8..3cb7f03e7d2 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.120-SNAPSHOT + 0.6.120 diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index b2b4d5cc007..c0959ea2d4c 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120-SNAPSHOT + 0.6.120 diff --git a/server/pom.xml b/server/pom.xml index 73c5135fadf..a0ed14a3a2d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120-SNAPSHOT + 0.6.120 diff --git a/services/pom.xml b/services/pom.xml index 91bc8bf420c..4191f81b3ab 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.120-SNAPSHOT + 0.6.120 From e8aef8645852d17c39dd514cbcb5b3d7c6ea24b7 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 4 Jun 2014 20:22:31 -0700 Subject: [PATCH 18/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 +- 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 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml index e9ab32a3d28..754e227b4c1 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120 + 0.6.121-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 86f5b599d3a..e76f3945f2e 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120 + 0.6.121-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 87e924762ef..7a240100744 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120 + 0.6.121-SNAPSHOT diff --git a/hdfs-storage/pom.xml b/hdfs-storage/pom.xml index ff0758ae42b..9de4f7a5b97 100644 --- a/hdfs-storage/pom.xml +++ b/hdfs-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120 + 0.6.121-SNAPSHOT diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml index e7fcb0a65eb..7b04b613762 100644 --- a/indexing-hadoop/pom.xml +++ b/indexing-hadoop/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120 + 0.6.121-SNAPSHOT diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index 61111af249c..5b83d487159 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120 + 0.6.121-SNAPSHOT diff --git a/kafka-eight/pom.xml b/kafka-eight/pom.xml index 566b858196e..9ed51e530bd 100644 --- a/kafka-eight/pom.xml +++ b/kafka-eight/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120 + 0.6.121-SNAPSHOT diff --git a/kafka-seven/pom.xml b/kafka-seven/pom.xml index d3fe68c5609..dff8aada79d 100644 --- a/kafka-seven/pom.xml +++ b/kafka-seven/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120 + 0.6.121-SNAPSHOT diff --git a/pom.xml b/pom.xml index 2020826a6b0..12bfd8df636 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ io.druid druid pom - 0.6.120 + 0.6.121-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.120 + druid-0.6.107-SNAPSHOT diff --git a/processing/pom.xml b/processing/pom.xml index 9372cb999fd..e714babd8cf 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120 + 0.6.121-SNAPSHOT diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index 3cb7f03e7d2..8345cfc1007 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -9,7 +9,7 @@ io.druid druid - 0.6.120 + 0.6.121-SNAPSHOT diff --git a/s3-extensions/pom.xml b/s3-extensions/pom.xml index c0959ea2d4c..967c9f70422 100644 --- a/s3-extensions/pom.xml +++ b/s3-extensions/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120 + 0.6.121-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index a0ed14a3a2d..e097487ea02 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.120 + 0.6.121-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 4191f81b3ab..3787e7a6b96 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ io.druid druid - 0.6.120 + 0.6.121-SNAPSHOT From 6e23ea457bb375d1d63c270b2f79e0902eb3a17e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Wed, 4 Jun 2014 23:54:37 -0700 Subject: [PATCH 19/19] fix memory issues in FilteredServerView --- .../java/io/druid/client/BatchServerInventoryView.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/io/druid/client/BatchServerInventoryView.java b/server/src/main/java/io/druid/client/BatchServerInventoryView.java index 509c4a5c793..a2a3c422aa1 100644 --- a/server/src/main/java/io/druid/client/BatchServerInventoryView.java +++ b/server/src/main/java/io/druid/client/BatchServerInventoryView.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.api.client.repackaged.com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import com.google.common.collect.Iterables; import com.google.common.collect.MapMaker; import com.google.common.collect.Sets; import com.google.inject.Inject; @@ -79,7 +80,8 @@ public class BatchServerInventoryView extends ServerInventoryView predicate = Predicates.or(defaultFilter, Predicates.or(segmentPredicates.values())); - Set filteredInventory = Sets.filter(inventory, predicate); + // make a copy of the set and not just a filtered view, in order to not keep all the segment data in memory + Set filteredInventory = Sets.newHashSet(Iterables.filter(inventory, predicate)); zNodes.put(inventoryKey, filteredInventory); for (DataSegment segment : filteredInventory) { @@ -94,7 +96,8 @@ public class BatchServerInventoryView extends ServerInventoryView predicate = Predicates.or(defaultFilter, Predicates.or(segmentPredicates.values())); - Set filteredInventory = Sets.filter(inventory, predicate); + // make a copy of the set and not just a filtered view, in order to not keep all the segment data in memory + Set filteredInventory = Sets.newHashSet(Iterables.filter(inventory, predicate)); Set existing = zNodes.get(inventoryKey); if (existing == null) {