mirror of https://github.com/apache/druid.git
Merge branch 'master' into igalDruid
This commit is contained in:
Igal Levy
commit
b35dd98015
2
build.sh
2
build.sh
|
|
@ -30,4 +30,4 @@ echo "For examples, see: "
|
|||
echo " "
|
||||
ls -1 examples/*/*sh
|
||||
echo " "
|
||||
echo "See also http://druid.io/docs/0.6.0/Home.html"
|
||||
echo "See also http://druid.io/docs/0.6.1/Home.html"
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<parent>
|
||||
<groupId>io.druid</groupId>
|
||||
<artifactId>druid</artifactId>
|
||||
<version>0.6.1-SNAPSHOT</version>
|
||||
<version>0.6.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<parent>
|
||||
<groupId>io.druid</groupId>
|
||||
<artifactId>druid</artifactId>
|
||||
<version>0.6.1-SNAPSHOT</version>
|
||||
<version>0.6.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
#! /bin/bash -e
|
||||
|
||||
SCRIPT_DIR=`dirname $0`
|
||||
pushd $SCRIPT_DIR
|
||||
SCRIPT_DIR=`pwd`
|
||||
popd
|
||||
SCRIPT_DIR=$(cd $(dirname "$0") && pwd)
|
||||
|
||||
if [ -z ${1} ]; then
|
||||
pushd $SCRIPT_DIR
|
||||
VERSION=`cat ../../pom.xml | grep version | head -4 | tail -1 | sed 's_.*<version>\([^<]*\)</version>.*_\1_'`
|
||||
popd
|
||||
VERSION=$(cat $SCRIPT_DIR/../../pom.xml | grep version | head -4 | tail -1 | sed 's_.*<version>\([^<]*\)</version>.*_\1_')
|
||||
else
|
||||
VERSION=${1}
|
||||
fi
|
||||
|
||||
WORKING_DIR=/tmp/docs-deploy
|
||||
#if [ -z "$(git tag -l "druid-$VERSION")" ]
|
||||
if [ -z "$(git tag -l "druid-$VERSION")" ] && [ "$VERSION" != "latest" ]; then
|
||||
echo "Version tag does not exist: druid-$VERSION"
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
echo Using Version[${VERSION}]
|
||||
WORKING_DIR=$(mktemp -d -t druid-docs-deploy)
|
||||
|
||||
echo Using Version [${VERSION}]
|
||||
echo Script in [${SCRIPT_DIR}]
|
||||
echo Deploying to [${WORKING_DIR}]
|
||||
|
||||
|
|
@ -28,7 +28,6 @@ git clone git@github.com:druid-io/druid-io.github.io.git ${WORKING_DIR}
|
|||
|
||||
DOC_DIR=${WORKING_DIR}/docs/${VERSION}/
|
||||
|
||||
cp ${SCRIPT_DIR}/../_layouts/doc* ${WORKING_DIR}/_layouts/
|
||||
mkdir -p ${DOC_DIR}
|
||||
cp -r ${SCRIPT_DIR}/../content/* ${DOC_DIR}
|
||||
|
||||
|
|
@ -37,11 +36,8 @@ BRANCH=docs-${VERSION}
|
|||
pushd ${WORKING_DIR}
|
||||
git checkout -b ${BRANCH}
|
||||
git add .
|
||||
git commit -m "Deploy new docs version ${VERSION}"
|
||||
git commit -m "Deploy ${VERSION} docs"
|
||||
git push origin ${BRANCH}
|
||||
popd
|
||||
|
||||
rm -rf ${WORKING_DIR}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ layout: doc_page
|
|||
---
|
||||
# Booting a Single Node Cluster #
|
||||
|
||||
[Loading Your Data](Tutorial%3A-Loading-Your-Data-Part-2.html) and [All About Queries](Tutorial%3A-All-About-Queries.html) contain recipes to boot a small druid cluster on localhost. Here we will boot a small cluster on EC2. You can checkout the code, or download a tarball from [here](http://static.druid.io/artifacts/druid-services-0.6.0-bin.tar.gz).
|
||||
[Loading Your Data](Tutorial%3A-Loading-Your-Data-Part-2.html) and [All About Queries](Tutorial%3A-All-About-Queries.html) contain recipes to boot a small druid cluster on localhost. Here we will boot a small cluster on EC2. You can checkout the code, or download a tarball from [here](http://static.druid.io/artifacts/druid-services-0.6.1-bin.tar.gz).
|
||||
|
||||
The [ec2 run script](https://github.com/metamx/druid/blob/master/examples/bin/run_ec2.sh), run_ec2.sh, is located at 'examples/bin' if you have checked out the code, or at the root of the project if you've downloaded a tarball. The scripts rely on the [Amazon EC2 API Tools](http://aws.amazon.com/developertools/351), and you will need to set three environment variables:
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ There are three JVM parameters that we set on all of our processes:
|
|||
Modules
|
||||
=======
|
||||
|
||||
As of Druid v0.6.0, most core Druid functionality has been compartmentalized into modules. There are a set of default modules that may apply to any node type, and there are specific modules for the different node types. Default modules are __lazily instantiated__. Each module has its own set of configuration. This page will describe the configuration of the default modules.
|
||||
As of Druid v0.6.1, most core Druid functionality has been compartmentalized into modules. There are a set of default modules that may apply to any node type, and there are specific modules for the different node types. Default modules are __lazily instantiated__. Each module has its own set of configuration. This page will describe the configuration of the default modules.
|
||||
|
||||
Configuration of the various modules is done via Java properties. These can either be provided as `-D` system properties on the java command line or they can be passed in via a file called `runtime.properties` that exists on the classpath.
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ A version may be declared as a release candidate if it has been deployed to a si
|
|||
Release Candidate
|
||||
-----------------
|
||||
|
||||
The current release candidate is tagged at version [0.6.0](https://github.com/metamx/druid/tree/druid-0.6.0).
|
||||
The current release candidate is tagged at version [0.6.1](https://github.com/metamx/druid/tree/druid-0.6.1).
|
||||
|
||||
Stable Release
|
||||
--------------
|
||||
|
|
|
|||
|
|
@ -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.0
|
||||
git checkout druid-0.6.1
|
||||
./build.sh
|
||||
```
|
||||
|
||||
### Downloading the DSK (Druid Standalone Kit)
|
||||
|
||||
[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.0-bin.tar.gz) a stand-alone tarball and run it:
|
||||
[Download](http://static.druid.io/artifacts/releases/druid-services-0.6.1-bin.tar.gz) a stand-alone tarball and run it:
|
||||
|
||||
``` bash
|
||||
tar -xzf druid-services-0.X.X-bin.tar.gz
|
||||
|
|
|
|||
|
|
@ -36,8 +36,11 @@ If you want to take advantage of the maven-based classloader isolation but you a
|
|||
The trick to doing this is
|
||||
|
||||
1) Specify a local directory for `druid.extensions.localRepository`
|
||||
|
||||
2) Run the `tools pull-deps` command to pull all the specified dependencies down into your local repository
|
||||
|
||||
3) Bundle up the local repository along with your other Druid stuff into whatever you use for a deployable artifact
|
||||
|
||||
4) Run Your druid processes with `druid.extensions.remoteRepositories=[]` and a local repository set to wherever your bundled "local" repository is located
|
||||
|
||||
The Druid processes will then only load up jars from the local repository and will not try to go out onto the internet to find the maven dependencies.
|
||||
|
|
|
|||
|
|
@ -187,8 +187,8 @@ Extending the code
|
|||
|
||||
Realtime integration is intended to be extended in two ways:
|
||||
|
||||
1. Connect to data streams from varied systems ([Firehose](https://github.com/metamx/druid/blob/druid-0.6.0/realtime/src/main/java/com/metamx/druid/realtime/firehose/FirehoseFactory.java))
|
||||
2. Adjust the publishing strategy to match your needs ([Plumber](https://github.com/metamx/druid/blob/druid-0.6.0/realtime/src/main/java/com/metamx/druid/realtime/plumber/PlumberSchool.java))
|
||||
1. Connect to data streams from varied systems ([Firehose](https://github.com/metamx/druid/blob/druid-0.6.1/realtime/src/main/java/com/metamx/druid/realtime/firehose/FirehoseFactory.java))
|
||||
2. Adjust the publishing strategy to match your needs ([Plumber](https://github.com/metamx/druid/blob/druid-0.6.1/realtime/src/main/java/com/metamx/druid/realtime/plumber/PlumberSchool.java))
|
||||
|
||||
The expectations are that the former will be very common and something that users of Druid will do on a fairly regular basis. Most users will probably never have to deal with the latter form of customization. Indeed, we hope that all potential use cases can be packaged up as part of Druid proper without requiring proprietary customization.
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,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.0-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.1-bin.tar.gz). Download this file to a directory of your choosing.
|
||||
|
||||
You can extract the awesomeness within by issuing:
|
||||
|
||||
|
|
@ -58,7 +58,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.0
|
||||
cd druid-services-0.6.1
|
||||
```
|
||||
|
||||
You should see a bunch of files:
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ With real-world data, we recommend having a message bus such as [Apache Kafka](h
|
|||
|
||||
#### Setting up Kafka
|
||||
|
||||
[KafkaFirehoseFactory](https://github.com/metamx/druid/blob/druid-0.6.0/realtime/src/main/java/com/metamx/druid/realtime/firehose/KafkaFirehoseFactory.java) is how druid communicates with Kafka. Using this [Firehose](Firehose.html) with the right configuration, we can import data into Druid in real-time without writing any code. To load data to a real-time node via Kafka, we'll first need to initialize Zookeeper and Kafka, and then configure and initialize a [Realtime](Realtime.html) node.
|
||||
[KafkaFirehoseFactory](https://github.com/metamx/druid/blob/druid-0.6.1/realtime/src/main/java/com/metamx/druid/realtime/firehose/KafkaFirehoseFactory.java) is how druid communicates with Kafka. Using this [Firehose](Firehose.html) with the right configuration, we can import data into Druid in real-time without writing any code. To load data to a real-time node via Kafka, we'll first need to initialize Zookeeper and Kafka, and then configure and initialize a [Realtime](Realtime.html) node.
|
||||
|
||||
Instructions for booting a Zookeeper and then Kafka cluster are available [here](http://kafka.apache.org/07/quickstart.html).
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ In this tutorial, we will set up other types of Druid nodes as well as and exter
|
|||
|
||||
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.0-bin.tar.gz)
|
||||
You can download the latest version of druid [here](http://static.druid.io/artifacts/releases/druid-services-0.6.1-bin.tar.gz)
|
||||
|
||||
and untar the contents within by issuing:
|
||||
|
||||
|
|
|
|||
|
|
@ -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.0-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.1-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.0
|
||||
cd druid-services-0.6.1
|
||||
```
|
||||
|
||||
You should see a bunch of files:
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ There are two ways to setup Druid: download a tarball, or build it from source.
|
|||
|
||||
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.0-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.1-bin.tar.gz.
|
||||
Download this bad boy to a directory of your choosing.
|
||||
|
||||
You can extract the awesomeness within by issuing:
|
||||
|
|
|
|||
|
|
@ -1,78 +0,0 @@
|
|||
---
|
||||
---
|
||||
|
||||
* [Introduction|Home](Introduction|Home.html)
|
||||
* [Download](Download.html)
|
||||
* [Support](Support.html)
|
||||
* [Contribute](Contribute.html)
|
||||
========================
|
||||
|
||||
Getting Started
|
||||
* [Tutorial: A First Look at Druid](Tutorial:-A-First-Look-at-Druid.html)
|
||||
* [Tutorial: The Druid Cluster](Tutorial:-The-Druid-Cluster.html)
|
||||
* [Tutorial: Loading Your Data Part 1](Tutorial:-Loading-Your-Data-Part-1.html)
|
||||
* [Tutorial: Loading Your Data Part 2](Tutorial:-Loading-Your-Data-Part-2.html)
|
||||
* [Tutorial: All About Queries](Tutorial:-All-About-Queries.html)
|
||||
--------------------------------------
|
||||
|
||||
Evaluate Druid
|
||||
* [Cluster Setup](Cluster-setup.html)
|
||||
* [Booting a Production Cluster](Booting-a-production-cluster.html)
|
||||
--------------------------------------
|
||||
|
||||
Configuration
|
||||
* [Configuration](Configuration.html)
|
||||
-------------------------------------
|
||||
|
||||
Data Ingestion
|
||||
* [Realtime](Realtime.html)
|
||||
* [Batch Ingestion](Batch-ingestion.html)
|
||||
* [Indexing Service](Indexing-Service.html)
|
||||
*** ]
|
||||
*** [Tasks](Tasks.html)
|
||||
----------------------------
|
||||
|
||||
Querying
|
||||
* [Querying](Querying.html)
|
||||
*** ]
|
||||
*** [Aggregations](Aggregations.html)
|
||||
*** ]
|
||||
*** [Granularities](Granularities.html)
|
||||
* Query Types
|
||||
*** ]
|
||||
***** ]
|
||||
***** ]
|
||||
*** [SearchQuery](SearchQuery.html)
|
||||
*** ]
|
||||
** [SegmentMetadataQuery](SegmentMetadataQuery.html)
|
||||
*** ]
|
||||
*** [TimeseriesQuery](TimeseriesQuery.html)
|
||||
---------------------------
|
||||
|
||||
Architecture
|
||||
* [Design](Design.html)
|
||||
* [Segments](Segments.html)
|
||||
* Node Types
|
||||
*** ]
|
||||
*** [Broker](Broker.html)
|
||||
*** ]
|
||||
***** ]
|
||||
*** [Realtime](Realtime.html)
|
||||
*** ]
|
||||
*** [Plumber](Plumber.html)
|
||||
* External Dependencies
|
||||
*** ]
|
||||
*** [MySQL](MySQL.html)
|
||||
*** ]
|
||||
** [Concepts and Terminology](Concepts-and-Terminology.html)
|
||||
-------------------------------
|
||||
|
||||
Development
|
||||
* [Versioning](Versioning.html)
|
||||
* [Build From Source](Build-From-Source.html)
|
||||
* [Libraries](Libraries.html)
|
||||
------------------------
|
||||
|
||||
Misc
|
||||
* [Thanks](Thanks.html)
|
||||
-------------
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
<link rel="stylesheet" href="css/toc.css">
|
||||
|
||||
h1. Contents
|
||||
* "Introduction":./Home.html
|
||||
* "Introduction":./
|
||||
* "Download":./Download.html
|
||||
* "Support":./Support.html
|
||||
* "Contribute":./Contribute.html
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
<meta http-equiv="refresh" content="0;url=/content/Home.html" />
|
||||
<meta http-equiv="refresh" content="0;url=/content/" />
|
||||
</head>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<parent>
|
||||
<groupId>io.druid</groupId>
|
||||
<artifactId>druid</artifactId>
|
||||
<version>0.6.1-SNAPSHOT</version>
|
||||
<version>0.6.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<parent>
|
||||
<groupId>io.druid</groupId>
|
||||
<artifactId>druid</artifactId>
|
||||
<version>0.6.1-SNAPSHOT</version>
|
||||
<version>0.6.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<parent>
|
||||
<groupId>io.druid</groupId>
|
||||
<artifactId>druid</artifactId>
|
||||
<version>0.6.1-SNAPSHOT</version>
|
||||
<version>0.6.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<parent>
|
||||
<groupId>io.druid</groupId>
|
||||
<artifactId>druid</artifactId>
|
||||
<version>0.6.1-SNAPSHOT</version>
|
||||
<version>0.6.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
|
|
|||
5
pom.xml
5
pom.xml
|
|
@ -23,14 +23,15 @@
|
|||
<groupId>io.druid</groupId>
|
||||
<artifactId>druid</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>0.6.1-SNAPSHOT</version>
|
||||
<version>0.6.2-SNAPSHOT</version>
|
||||
<name>druid</name>
|
||||
<description>druid</description>
|
||||
<scm>
|
||||
<connection>scm:git:ssh://git@github.com/metamx/druid.git</connection>
|
||||
<developerConnection>scm:git:ssh://git@github.com/metamx/druid.git</developerConnection>
|
||||
<url>http://www.github.com/metamx/druid</url>
|
||||
</scm>
|
||||
<tag>HEAD</tag>
|
||||
</scm>
|
||||
|
||||
<prerequisites>
|
||||
<maven>3.0.3</maven>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<parent>
|
||||
<groupId>io.druid</groupId>
|
||||
<artifactId>druid</artifactId>
|
||||
<version>0.6.1-SNAPSHOT</version>
|
||||
<version>0.6.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<parent>
|
||||
<groupId>io.druid</groupId>
|
||||
<artifactId>druid</artifactId>
|
||||
<version>0.6.1-SNAPSHOT</version>
|
||||
<version>0.6.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<parent>
|
||||
<groupId>io.druid</groupId>
|
||||
<artifactId>druid</artifactId>
|
||||
<version>0.6.1-SNAPSHOT</version>
|
||||
<version>0.6.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@ public class ServerManagerTest
|
|||
)
|
||||
);
|
||||
|
||||
queryNotifyLatch.await(25, TimeUnit.MILLISECONDS);
|
||||
Assert.assertTrue("Operation must complete within 100ms", queryNotifyLatch.await(100, TimeUnit.MILLISECONDS));
|
||||
|
||||
Assert.assertEquals(1, factory.getSegmentReferences().size());
|
||||
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
<artifactId>druid-services</artifactId>
|
||||
<name>druid-services</name>
|
||||
<description>druid-services</description>
|
||||
<version>0.6.1-SNAPSHOT</version>
|
||||
<version>0.6.2-SNAPSHOT</version>
|
||||
<parent>
|
||||
<groupId>io.druid</groupId>
|
||||
<artifactId>druid</artifactId>
|
||||
<version>0.6.1-SNAPSHOT</version>
|
||||
<version>0.6.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ import java.util.List;
|
|||
*/
|
||||
@Command(
|
||||
name = "coordinator",
|
||||
description = "Runs the Coordinator, see http://druid.io/docs/0.6.0/Coordinator.html for a description."
|
||||
description = "Runs the Coordinator, see http://druid.io/docs/0.6.1/Coordinator.html for a description."
|
||||
)
|
||||
public class CliCoordinator extends ServerRunnable
|
||||
{
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ import java.util.List;
|
|||
*/
|
||||
@Command(
|
||||
name = "hadoop",
|
||||
description = "Runs the batch Hadoop Druid Indexer, see http://druid.io/docs/0.6.0/Batch-ingestion.html for a description."
|
||||
description = "Runs the batch Hadoop Druid Indexer, see http://druid.io/docs/0.6.1/Batch-ingestion.html for a description."
|
||||
)
|
||||
public class CliHadoopIndexer implements Runnable
|
||||
{
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ import java.util.List;
|
|||
*/
|
||||
@Command(
|
||||
name = "historical",
|
||||
description = "Runs a Historical node, see http://druid.io/docs/0.6.0/Historical.html for a description"
|
||||
description = "Runs a Historical node, see http://druid.io/docs/0.6.1/Historical.html for a description"
|
||||
)
|
||||
public class CliHistorical extends ServerRunnable
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue