diff --git a/CodeStyle.jar b/CodeStyle.jar new file mode 100644 index 00000000000..78ffcc07d4f Binary files /dev/null and b/CodeStyle.jar differ diff --git a/README b/README deleted file mode 100644 index c976deda70b..00000000000 --- a/README +++ /dev/null @@ -1,7 +0,0 @@ -The best place for more Druid resources is at: http://www.druid.io - -Looking for docs? http://druid.io/docs/latest/ - -Build with build.sh - -Want to get started? http://druid.io/docs/latest/Tutorial:-A-First-Look-at-Druid.html diff --git a/README.md b/README.md new file mode 100644 index 00000000000..e2a7a230285 --- /dev/null +++ b/README.md @@ -0,0 +1,20 @@ +## Druid + +Druid is a distributed, column-oriented, real-time analytics data store that is +commonly used to power exploratory dashboards in multi-tenant environments. +Druid excels as a data warehousing solution for fast aggregate queries on +petabyte sized data sets. Druid supports a variety of flexible filters, exact +calculations, approximate algorithms, and other useful calculations Druid can +load both streaming and batch data and integrates with Storm and Hadoop. + +### More Information +Much more information about Druid can be found on our [website](http://www.druid.io). + +### Documentation +We host documentation on our [website](http://druid.io/docs/latest/). If you want to contribute documentation changes, please submit a pull request to this repository. + +### Tutorials +We have a series of tutorials to get started with Druid, starting with this [one](http://druid.io/docs/latest/Tutorial:-A-First-Look-at-Druid.html). + +### Support +Contact us through our [forum](https://groups.google.com/forum/#!forum/druid-development) or on IRC in #druid-dev on irc.freenode.net. diff --git a/build.sh b/build.sh index cc8e409cfa6..c27ee0b3d78 100755 --- a/build.sh +++ b/build.sh @@ -25,9 +25,3 @@ echo " " echo " The following self-contained jars (and more) have been built:" echo " " find . -name '*-selfcontained.jar' -echo " " -echo "For examples, see: " -echo " " -ls -1 examples/*/*sh -echo " " -echo "See also http://druid.io/docs/latest" diff --git a/cassandra-storage/pom.xml b/cassandra-storage/pom.xml index 86ecc759553..cf28bf6f200 100644 --- a/cassandra-storage/pom.xml +++ b/cassandra-storage/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.122-SNAPSHOT + 0.6.139-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 4e828108927..ebdb531c35b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ io.druid druid - 0.6.122-SNAPSHOT + 0.6.139-SNAPSHOT diff --git a/common/src/main/java/io/druid/collections/OrderedMergeSequence.java b/common/src/main/java/io/druid/collections/OrderedMergeSequence.java index 1b076c4c299..cfc29682d0d 100644 --- a/common/src/main/java/io/druid/collections/OrderedMergeSequence.java +++ b/common/src/main/java/io/druid/collections/OrderedMergeSequence.java @@ -24,6 +24,7 @@ import com.google.common.base.Throwables; import com.google.common.collect.Ordering; import com.google.common.io.Closeables; import com.metamx.common.guava.Accumulator; +import com.metamx.common.guava.CloseQuietly; import com.metamx.common.guava.Sequence; import com.metamx.common.guava.Yielder; import com.metamx.common.guava.Yielders; @@ -70,7 +71,7 @@ public class OrderedMergeSequence implements Sequence return yielder.get(); } finally { - Closeables.closeQuietly(yielder); + CloseQuietly.close(yielder); } } diff --git a/common/src/main/java/io/druid/common/utils/SerializerUtils.java b/common/src/main/java/io/druid/common/utils/SerializerUtils.java index 28cdf7629a3..b5dc650de5c 100644 --- a/common/src/main/java/io/druid/common/utils/SerializerUtils.java +++ b/common/src/main/java/io/druid/common/utils/SerializerUtils.java @@ -46,14 +46,9 @@ public class SerializerUtils public void writeString(OutputSupplier supplier, String name) throws IOException { - OutputStream out = null; - try { - out = supplier.getOutput(); + try (OutputStream out = supplier.getOutput()) { writeString(out, name); } - finally { - Closeables.closeQuietly(out); - } } public void writeString(WritableByteChannel out, String name) throws IOException diff --git a/server/src/main/java/io/druid/server/VMUtils.java b/common/src/main/java/io/druid/common/utils/VMUtils.java similarity index 98% rename from server/src/main/java/io/druid/server/VMUtils.java rename to common/src/main/java/io/druid/common/utils/VMUtils.java index bc694f59355..60fa4a01f8f 100644 --- a/server/src/main/java/io/druid/server/VMUtils.java +++ b/common/src/main/java/io/druid/common/utils/VMUtils.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package io.druid.server; +package io.druid.common.utils; import java.lang.reflect.InvocationTargetException; diff --git a/docs/_bin/deploy-docs.sh b/docs/_bin/deploy-docs.sh index 0051a4f1a18..592ab4ff378 100755 --- a/docs/_bin/deploy-docs.sh +++ b/docs/_bin/deploy-docs.sh @@ -1,43 +1,55 @@ #! /bin/bash -e -SCRIPT_DIR=$(cd $(dirname "$0") && pwd) -if [ -z ${1} ]; then - VERSION=$(cat $SCRIPT_DIR/../../pom.xml | grep version | head -4 | tail -1 | sed 's_.*\([^<]*\).*_\1_') +if [ -z "$1" ]; then + version="latest" else - VERSION=${1} + version=$1 fi -#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" +docs=$(git -C "$(dirname "$0")" rev-parse --show-toplevel)/docs + +if [ -n "$(git -C "$docs" status --porcelain --untracked-files=no content)" ]; then + echo "Docs directory is not clean, aborting" + exit 1 +fi + +if [ -z "$(git tag -l "druid-$version")" ] && [ "$version" != "latest" ]; then + echo "Version tag does not exist: druid-$version" exit 1; fi -WORKING_DIR=$(mktemp -d -t druid-docs-deploy) +tmp=$(mktemp -d -t druid-docs-deploy) -echo Using Version [${VERSION}] -echo Script in [${SCRIPT_DIR}] -echo Deploying to [${WORKING_DIR}] +echo "Using Version [$version]" +echo "Working directory [$tmp]" -if [ -d ${WORKING_DIR} ]; then - echo DELETING ${WORKING_DIR} - rm -rf ${WORKING_DIR} +git clone git@github.com:druid-io/druid-io.github.io.git "$tmp" + +target=$tmp/docs/$version + +mkdir -p $target +rsync -a --delete "$docs/content/" $target + +branch=update-docs-$version + +git -C $tmp checkout -b $branch +git -C $tmp add -A . +git -C $tmp commit -m "Update $version docs" +git -C $tmp push origin $branch + +if [ -n "$GIT_TOKEN" ]; then +curl -u "$GIT_TOKEN:x-oauth-basic" -XPOST -d@- \ + https://api.github.com/repos/druid-io/druid-io.github.io/pulls <
+
- - diff --git a/docs/_includes/page_header.html b/docs/_includes/page_header.html index df3d7e1e5a4..623f5e1afc7 100644 --- a/docs/_includes/page_header.html +++ b/docs/_includes/page_header.html @@ -1,25 +1,16 @@ - -