Merge branch 'master' of github.com:metamx/druid

publications/whitepaper/druid.tex

@@ -1,6 +1,17 @@
 \documentclass{sig-alternate-2013}
 
-\input{sig-license.tex}
+\newfont{\mycrnotice}{ptmr8t at 7pt}
+\newfont{\myconfname}{ptmri8t at 7pt}
+\let\crnotice\mycrnotice%
+\let\confname\myconfname%
+\permission{Permission to make digital or hard copies of all or part of this work for personal or classroom use is granted without fee provided that copies are not made or distributed for profit or commercial advantage and that copies bear this notice and the full citation on the first page. Copyrights for components of this work owned by others than the author(s) must be honored. Abstracting with credit is permitted. To copy otherwise, or republish, to post on servers or to redistribute to lists, requires prior specific permission and/or a fee. Request permissions from permissions@acm.org.}
+\conferenceinfo{SIGMOD/PODS'14,}{June 22--27, 2014, Salt Lake City, UT, USA. \\
+{\mycrnotice{Copyright is held by the owner/author(s). Publication rights licensed to ACM.}}}
+\copyrightetc{ACM \the\acmcopyr}
+\crdata{978-1-4503-2376-5/14/06\ ...\$15.00.\\
+\href{http://dx.doi.org/10.1145/2588555.2595631}{http://dx.doi.org/10.1145/2588555.2595631}}
+\clubpenalty=10000
+\widowpenalty = 10000
 
 \usepackage{graphicx}
 \usepackage{balance}
@@ -216,7 +227,7 @@ Figure~\ref{fig:cluster}.
 
 \begin{figure*}
 \centering
-\includegraphics[width = 4.5in]{cluster}
+\includegraphics[width = 4.51in]{cluster}
 \caption{An overview of a Druid cluster and the flow of data through the cluster.}
 \label{fig:cluster}
 \end{figure*}
@@ -900,6 +911,7 @@ well.
 \begin{figure}
 \centering
 \includegraphics[width = 2.3in]{tpch_scaling}
+\includegraphics[width = 2.3in]{tpch_scaling_factor}
 \caption{Druid scaling benchmarks -- 100GB TPC-H data.}
 \label{fig:tpch_scaling}
 \end{figure}

publications/whitepaper/sig-license.tex

@@ -1,12 +0,0 @@
-\newfont{\mycrnotice}{ptmr8t at 7pt}
-\newfont{\myconfname}{ptmri8t at 7pt}
-\let\crnotice\mycrnotice%
-\let\confname\myconfname%
-\permission{Permission to make digital or hard copies of all or part of this work for personal or classroom use is granted without fee provided that copies are not made or distributed for profit or commercial advantage and that copies bear this notice and the full citation on the first page. Copyrights for components of this work owned by others than the author(s) must be honored. Abstracting with credit is permitted. To copy otherwise, or republish, to post on servers or to redistribute to lists, requires prior specific permission and/or a fee. Request permissions from permissions@acm.org.}
-\conferenceinfo{SIGMOD'14,}{June 22--27, 2014, Snowbird, UT, USA. \\
-{\mycrnotice{Copyright is held by the owner/author(s). Publication rights licensed to ACM.}}}
-\copyrightetc{ACM \the\acmcopyr}
-\crdata{978-1-4503-2376-5/14/06\ ...\$15.00.\\
-Include the http://DOI string/url which is specific for your submission and included in the ACM rightsreview confirmation email upon completing your ACM form}
-\clubpenalty=10000
-\widowpenalty = 10000