Re-run Autobuild to restore CSS (#176)
* Autobuild
* restore files
diff --git a/blog/2013/11/04/querying-your-data.html b/blog/2013/11/04/querying-your-data.html
index 7ff40e0..23b47ba 100644
--- a/blog/2013/11/04/querying-your-data.html
+++ b/blog/2013/11/04/querying-your-data.html
@@ -289,22 +289,22 @@
<span class="p">}]</span>
</code></pre></div>
<h3 id="datasource">dataSource</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSource"</span><span class="p">:</span><span class="s2">"druidtest"</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSource"</span><span class="err">:</span><span class="s2">"druidtest"</span>
</code></pre></div>
<p>Our dataSource tells us the name of the relation/table, or 'source of data', to query in both our realtime.spec and query.body!</p>
<h3 id="aggregations">aggregations</h3>
<p>Note the <a href="/docs/latest/Aggregations.html">aggregations</a> in our query:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"aggregations"</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"aggregations"</span><span class="err">:</span> <span class="p">[</span>
<span class="p">{</span><span class="nt">"type"</span><span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="s2">"rows"</span><span class="p">},</span>
<span class="p">{</span><span class="nt">"type"</span><span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="s2">"imps"</span><span class="p">,</span> <span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"impressions"</span><span class="p">},</span>
<span class="p">{</span><span class="nt">"type"</span><span class="p">:</span> <span class="s2">"doubleSum"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="s2">"wp"</span><span class="p">,</span> <span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"wp"</span><span class="p">}</span>
- <span class="p">],</span>
+ <span class="p">]</span><span class="err">,</span>
</code></pre></div>
<p>this matches up to the aggregators in the schema of our realtime.spec!</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"aggregators"</span><span class="p">:[</span> <span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span><span class="s2">"impressions"</span><span class="p">},</span>
- <span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"doubleSum"</span><span class="p">,</span><span class="nt">"name"</span><span class="p">:</span><span class="s2">"wp"</span><span class="p">,</span><span class="nt">"fieldName"</span><span class="p">:</span><span class="s2">"wp"</span><span class="p">}],</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"aggregators"</span><span class="err">:</span><span class="p">[</span> <span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span><span class="s2">"impressions"</span><span class="p">},</span>
+ <span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"doubleSum"</span><span class="p">,</span><span class="nt">"name"</span><span class="p">:</span><span class="s2">"wp"</span><span class="p">,</span><span class="nt">"fieldName"</span><span class="p">:</span><span class="s2">"wp"</span><span class="p">}]</span><span class="err">,</span>
</code></pre></div>
<h3 id="dimensions">dimensions</h3>
diff --git a/blog/2014/03/12/batch-ingestion.html b/blog/2014/03/12/batch-ingestion.html
index 972bbc4..bfd169b 100644
--- a/blog/2014/03/12/batch-ingestion.html
+++ b/blog/2014/03/12/batch-ingestion.html
@@ -154,11 +154,11 @@
<h2 id="extracting-the-streamflow-data">Extracting the Streamflow Data</h2>
<p>In R, load the waterData package, then run <code>importDVs()</code>:</p>
-<div class="highlight"><pre><code class="language-r" data-lang="r"><span></span><span class="o">></span> <span class="nf">install.packages</span><span class="p">(</span><span class="s">"waterData"</span><span class="p">)</span>
+<div class="highlight"><pre><code class="language-r" data-lang="r"><span></span><span class="o">></span> install.packages<span class="p">(</span><span class="s">"waterData"</span><span class="p">)</span>
<span class="kc">...</span>
-<span class="o">></span> <span class="nf">library</span><span class="p">(</span><span class="n">waterData</span><span class="p">)</span>
+<span class="o">></span> <span class="kn">library</span><span class="p">(</span>waterData<span class="p">)</span>
<span class="kc">...</span>
-<span class="o">></span> <span class="n">napa_flow</span> <span class="o"><-</span> <span class="nf">importDVs</span><span class="p">(</span><span class="s">"11458000"</span><span class="p">,</span> <span class="n">code</span><span class="o">=</span><span class="s">"00060"</span><span class="p">,</span> <span class="n">stat</span><span class="o">=</span><span class="s">"00003"</span><span class="p">,</span> <span class="n">sdate</span><span class="o">=</span><span class="s">"1963-01-01"</span><span class="p">,</span> <span class="n">edate</span><span class="o">=</span><span class="s">"2013-12-31"</span><span class="p">)</span>
+<span class="o">></span> napa_flow <span class="o"><-</span> importDVs<span class="p">(</span><span class="s">"11458000"</span><span class="p">,</span> code<span class="o">=</span><span class="s">"00060"</span><span class="p">,</span> stat<span class="o">=</span><span class="s">"00003"</span><span class="p">,</span> sdate<span class="o">=</span><span class="s">"1963-01-01"</span><span class="p">,</span> edate<span class="o">=</span><span class="s">"2013-12-31"</span><span class="p">)</span>
</code></pre></div>
<p>The last line uses the function <code>waterData.importDVs()</code> to get sensor (or "streamgage") data directly from the USGS datasource. This function has the following arguments:</p>
@@ -172,8 +172,8 @@
<p>The information on the specific site and sensor should provide information on the type of data available and the start-end dates for the full historical record.</p>
<p>You can now analyse and visualize the streamflow data. For example, we ran:</p>
-<div class="highlight"><pre><code class="language-r" data-lang="r"><span></span><span class="o">></span> <span class="n">myWater.plot</span> <span class="o"><-</span> <span class="nf">plotParam</span><span class="p">(</span><span class="n">napa_flow</span><span class="p">)</span>
-<span class="o">></span> <span class="nf">print</span><span class="p">(</span><span class="n">myWater.plot</span><span class="p">)</span>
+<div class="highlight"><pre><code class="language-r" data-lang="r"><span></span><span class="o">></span> myWater.plot <span class="o"><-</span> plotParam<span class="p">(</span>napa_flow<span class="p">)</span>
+<span class="o">></span> <span class="kp">print</span><span class="p">(</span>myWater.plot<span class="p">)</span>
</code></pre></div>
<p>to get:</p>
@@ -184,22 +184,22 @@
<h2 id="transforming-the-data-for-druid">Transforming the Data for Druid</h2>
<p>We first want to have a look at the content of the data frame:</p>
-<div class="highlight"><pre><code class="language-r" data-lang="r"><span></span><span class="o">></span> <span class="nf">head</span><span class="p">(</span><span class="n">napa_flow</span><span class="p">)</span>
- <span class="n">staid</span> <span class="n">val</span> <span class="n">dates</span> <span class="n">qualcode</span>
-<span class="m">1</span> <span class="m">11458000</span> <span class="m">90</span> <span class="m">1963-01-01</span> <span class="n">A</span>
-<span class="m">2</span> <span class="m">11458000</span> <span class="m">87</span> <span class="m">1963-01-02</span> <span class="n">A</span>
-<span class="m">3</span> <span class="m">11458000</span> <span class="m">85</span> <span class="m">1963-01-03</span> <span class="n">A</span>
-<span class="m">4</span> <span class="m">11458000</span> <span class="m">80</span> <span class="m">1963-01-04</span> <span class="n">A</span>
-<span class="m">5</span> <span class="m">11458000</span> <span class="m">76</span> <span class="m">1963-01-05</span> <span class="n">A</span>
-<span class="m">6</span> <span class="m">11458000</span> <span class="m">75</span> <span class="m">1963-01-06</span> <span class="n">A</span>
+<div class="highlight"><pre><code class="language-r" data-lang="r"><span></span><span class="o">></span> <span class="kp">head</span><span class="p">(</span>napa_flow<span class="p">)</span>
+ staid val dates qualcode
+<span class="m">1</span> <span class="m">11458000</span> <span class="m">90</span> <span class="m">1963-01-01</span> A
+<span class="m">2</span> <span class="m">11458000</span> <span class="m">87</span> <span class="m">1963-01-02</span> A
+<span class="m">3</span> <span class="m">11458000</span> <span class="m">85</span> <span class="m">1963-01-03</span> A
+<span class="m">4</span> <span class="m">11458000</span> <span class="m">80</span> <span class="m">1963-01-04</span> A
+<span class="m">5</span> <span class="m">11458000</span> <span class="m">76</span> <span class="m">1963-01-05</span> A
+<span class="m">6</span> <span class="m">11458000</span> <span class="m">75</span> <span class="m">1963-01-06</span> A
</code></pre></div>
<p>We don't have any use for the qualcode (the <a href="http://help.waterdata.usgs.gov/codes-and-parameters/daily-value-qualification-code-dv_rmk_cd">Daily Value Qualification Code</a>), column:</p>
-<div class="highlight"><pre><code class="language-r" data-lang="r"><span></span><span class="o">></span> <span class="n">napa_flow_subset</span> <span class="o"><-</span> <span class="n">napa_flow</span><span class="p">[,</span><span class="nf">c</span><span class="p">(</span><span class="m">1</span><span class="o">:</span><span class="m">3</span><span class="p">)]</span>
+<div class="highlight"><pre><code class="language-r" data-lang="r"><span></span><span class="o">></span> napa_flow_subset <span class="o"><-</span> napa_flow<span class="p">[,</span><span class="kt">c</span><span class="p">(</span><span class="m">1</span><span class="o">:</span><span class="m">3</span><span class="p">)]</span>
</code></pre></div>
<p>It may look like we also don't need the staid column, either, since it's all the same sensor ID. However, we'll keep it because at some later time we may want to load similar data from other sensors.</p>
<p>Now we can export the data to a file, removing the header and row names:</p>
-<div class="highlight"><pre><code class="language-r" data-lang="r"><span></span><span class="nf">write.table</span><span class="p">(</span><span class="n">napa_flow_subset</span><span class="p">,</span> <span class="n">file</span><span class="o">=</span><span class="s">"~/napa-flow.tsv"</span><span class="p">,</span> <span class="n">sep</span><span class="o">=</span><span class="s">"\t"</span><span class="p">,</span> <span class="n">col.names</span> <span class="o">=</span> <span class="bp">F</span><span class="p">,</span> <span class="n">row.names</span> <span class="o">=</span> <span class="bp">F</span><span class="p">)</span>
+<div class="highlight"><pre><code class="language-r" data-lang="r"><span></span>write.table<span class="p">(</span>napa_flow_subset<span class="p">,</span> file<span class="o">=</span><span class="s">"~/napa-flow.tsv"</span><span class="p">,</span> sep<span class="o">=</span><span class="s">"\t"</span><span class="p">,</span> col.names <span class="o">=</span> <span class="bp">F</span><span class="p">,</span> row.names <span class="o">=</span> <span class="bp">F</span><span class="p">)</span>
</code></pre></div>
<p>And here's our file:</p>
<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span></span>$ head ~/napa-flow.tsv
diff --git a/blog/2014/04/15/intro-to-pydruid.html b/blog/2014/04/15/intro-to-pydruid.html
index 14d856c..55f45ca 100644
--- a/blog/2014/04/15/intro-to-pydruid.html
+++ b/blog/2014/04/15/intro-to-pydruid.html
@@ -221,7 +221,7 @@
<span class="n">threshold</span> <span class="o">=</span> <span class="mi">4</span>
<span class="p">)</span>
-<span class="nb">print</span> <span class="n">top_langs</span> <span class="c1"># Do this if you want to see the raw JSON</span>
+<span class="k">print</span> <span class="n">top_langs</span> <span class="c1"># Do this if you want to see the raw JSON</span>
</code></pre></div>
<p>Let's break this query down:</p>
@@ -259,7 +259,7 @@
<span class="n">threshold</span> <span class="o">=</span> <span class="mi">4</span>
<span class="p">)</span>
-<span class="nb">print</span> <span class="n">top_langs</span> <span class="c1"># Do this if you want to see the raw JSON</span>
+<span class="k">print</span> <span class="n">top_langs</span> <span class="c1"># Do this if you want to see the raw JSON</span>
<span class="n">df</span> <span class="o">=</span> <span class="n">query</span><span class="o">.</span><span class="n">export_pandas</span><span class="p">()</span> <span class="c1"># Client will import Pandas, no need to do so separately.</span>
@@ -267,7 +267,7 @@
<span class="n">df</span><span class="o">.</span><span class="n">index</span> <span class="o">=</span> <span class="nb">range</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="nb">len</span><span class="p">(</span><span class="n">df</span><span class="p">)</span><span class="o">+</span><span class="mi">1</span><span class="p">)</span> <span class="c1"># Get a naturally numbered index</span>
-<span class="nb">print</span> <span class="n">df</span>
+<span class="k">print</span> <span class="n">df</span>
<span class="n">df</span><span class="o">.</span><span class="n">plot</span><span class="p">(</span><span class="n">x</span><span class="o">=</span><span class="s1">'language'</span><span class="p">,</span> <span class="n">kind</span><span class="o">=</span><span class="s1">'bar'</span><span class="p">)</span>
diff --git a/css/base.css b/css/base.css
new file mode 100644
index 0000000..940e77a
--- /dev/null
+++ b/css/base.css
@@ -0,0 +1,280 @@
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, menu, nav, output, ruby, section, summary, time, mark, audio, video {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ vertical-align: baseline; }
+
+article, aside, details, figcaption, figure, footer, header, menu, nav, section {
+ display: block; }
+
+body {
+ line-height: 1; }
+
+ol, ul {
+ list-style: none; }
+
+table {
+ border-collapse: collapse;
+ border-spacing: 0; }
+
+* {
+ box-sizing: border-box;
+ vertical-align: top; }
+
+body * {
+ position: relative; }
+
+a {
+ text-decoration: inherit;
+ color: inherit;
+ cursor: inherit; }
+
+div, span {
+ cursor: inherit; }
+
+text {
+ cursor: default; }
+
+button, input, textarea {
+ border: 0;
+ margin: 0; }
+ button:focus, input:focus, textarea:focus {
+ outline: none; }
+
+body {
+ margin-top: 54px; }
+
+html, body {
+ position: relative;
+ color: #1C1C26;
+ font-family: 'Open Sans', Arial, Helvetica, sans-serif;
+ font-weight: 400;
+ font-size: 15px;
+ word-wrap: break-word; }
+ html h1, html h2, html h3, html h4, html h5, html h6, html .h1, html .h2, html .h3, html .h4, html .h5, html .h6, body h1, body h2, body h3, body h4, body h5, body h6, body .h1, body .h2, body .h3, body .h4, body .h5, body .h6 {
+ font-weight: 600;
+ line-height: 140%;
+ margin-bottom: 14px;
+ margin-top: 28px; }
+ html h1, body h1 {
+ font-size: 2.7em; }
+ html h2, body h2 {
+ font-size: 2.2em; }
+ html h3, body h3 {
+ font-size: 1.7em; }
+ html h4, body h4 {
+ font-size: 1.4em; }
+ html h5, body h5 {
+ font-weight: bold; }
+ html h6, body h6 {
+ font-weight: bold;
+ color: #999999; }
+ html p, body p {
+ line-height: 170%;
+ margin-bottom: 14px;
+ margin-top: 14px; }
+ html p:first-child, body p:first-child {
+ margin-top: 28px; }
+ html strong, body strong {
+ font-weight: 700; }
+ html hr, body hr {
+ margin: 30px 0 30px 0; }
+ html a, body a {
+ cursor: pointer; }
+ html p a, html table a, html ul a, html li a, body p a, body table a, body ul a, body li a {
+ color: #4460de;
+ cursor: pointer;
+ font-weight: 600; }
+ html p a:hover, html table a:hover, html ul a:hover, html li a:hover, body p a:hover, body table a:hover, body ul a:hover, body li a:hover {
+ text-decoration: underline; }
+ html ul, body ul {
+ margin-top: 14px;
+ margin-bottom: 14px;
+ line-height: 170%; }
+ html ul li, body ul li {
+ margin-left: 18px;
+ list-style-type: disc; }
+ html ol, body ol {
+ margin-top: 14px;
+ margin-bottom: 14px;
+ line-height: 170%; }
+ html ol li, body ol li {
+ margin-left: 22px;
+ list-style-type: decimal; }
+ html table, body table {
+ width: 100%;
+ table-layout: fixed;
+ margin-top: 14px;
+ margin-bottom: 14px; }
+ html table th, body table th {
+ font-weight: 700; }
+ html table th, html table td, body table th, body table td {
+ padding: 5px; }
+ html blockquote, body blockquote {
+ font-size: 14px;
+ font-style: italic;
+ color: #777; }
+
+.druid-header {
+ padding: 34px 0 44px;
+ margin-bottom: 24px;
+ color: #1c1c26;
+ text-align: center;
+ background-image: url("/img/watermark-light.png");
+ background-size: 330px 330px;
+ background-repeat: no-repeat;
+ background-position: 18% -30px;
+ background-color: #ececf1;
+ overflow: hidden; }
+ .druid-header h1 {
+ margin-top: 14px;
+ font-size: 2.8em; }
+ .druid-header h4 {
+ font-weight: 400;
+ font-size: 15px;
+ margin-top: 0;
+ margin-bottom: 0; }
+ .druid-header h4 a {
+ color: #4460de;
+ font-weight: 600; }
+ .druid-header h4 a .fa {
+ margin-right: 4px; }
+ .druid-header h4 a:hover {
+ text-decoration: underline; }
+
+.text-indent {
+ padding-left: 50px; }
+
+.text-indent-2 {
+ padding-left: 100px; }
+
+.text-indent-p p {
+ padding-left: 50px; }
+
+.image-large {
+ text-align: center;
+ margin-top: 28px;
+ margin-bottom: 28px; }
+ .image-large img {
+ width: 100%;
+ max-width: 660px; }
+
+.large-button {
+ display: inline-block;
+ padding: 10px 22px;
+ color: white;
+ background: #4460de;
+ border-radius: 2px;
+ font-size: 15px;
+ margin-top: 14px;
+ margin-bottom: 14px; }
+ .large-button .fa {
+ margin-right: 3px; }
+ .large-button:hover {
+ background: #2442cb;
+ text-decoration: none; }
+
+.fancy-list {
+ margin-top: 22px;
+ margin-bottom: 22px; }
+ .fancy-list li {
+ list-style: none;
+ font-weight: 600;
+ margin-left: 0;
+ padding-left: 30px;
+ margin-bottom: 8px; }
+ .fancy-list li:before {
+ content: "";
+ position: absolute;
+ top: 5px;
+ left: 0;
+ width: 16px;
+ height: 16px;
+ border-radius: 50%;
+ background: #9caeff; }
+
+.features {
+ margin-bottom: 28px;
+ margin-top: 38px; }
+ .features .feature {
+ padding-left: 74px;
+ margin-bottom: 34px; }
+ .features .feature:nth-child(3n-2) .fa {
+ background: #cbd5ff; }
+ .features .feature:nth-child(3n-1) .fa {
+ background: #a7f1d9; }
+ .features .feature:nth-child(3n) .fa {
+ background: #ffd8a8; }
+ .features .feature .fa {
+ top: 0;
+ left: 0;
+ position: absolute;
+ width: 54px;
+ height: 54px;
+ line-height: 54px;
+ border-radius: 40px;
+ text-align: center;
+ font-size: 20px;
+ background: #cbd5ff;
+ color: #1C1C26; }
+ .features .feature p {
+ margin-top: 0; }
+ .features .feature h5 {
+ margin-bottom: 0;
+ font-size: 1.2em; }
+
+.zigzag-features {
+ margin-bottom: 100px; }
+ .zigzag-features .zigzag-feature {
+ margin-top: 100px; }
+ .zigzag-features .zigzag-feature .fa {
+ top: 0;
+ position: absolute;
+ width: 220px;
+ height: 220px;
+ line-height: 220px;
+ border-radius: 50%;
+ text-align: center;
+ font-size: 70px;
+ background: #cbd5ff;
+ color: #5062B4; }
+ .zigzag-features .zigzag-feature:nth-child(2n-1) {
+ padding-right: 300px; }
+ .zigzag-features .zigzag-feature:nth-child(2n-1) .fa {
+ right: 0; }
+ .zigzag-features .zigzag-feature:nth-child(2n) {
+ padding-left: 300px; }
+ .zigzag-features .zigzag-feature:nth-child(2n) .fa {
+ left: 0; }
+ .zigzag-features .zigzag-feature:nth-child(3n-2) .fa {
+ background: #cbd5ff;
+ color: #5062B4; }
+ .zigzag-features .zigzag-feature:nth-child(3n-1) .fa {
+ background: #a7f1d9;
+ color: #2C8265; }
+ .zigzag-features .zigzag-feature:nth-child(3n) .fa {
+ background: #ffd8a8;
+ color: #926226; }
+ @media (max-width: 840px) {
+ .zigzag-features .zigzag-feature .fa {
+ position: relative;
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+ margin-bottom: 40px; }
+ .zigzag-features .zigzag-feature:nth-child(2n-1) {
+ padding-right: 0; }
+ .zigzag-features .zigzag-feature:nth-child(2n) {
+ padding-left: 0; } }
+ @media (max-width: 440px) {
+ .zigzag-features {
+ margin-bottom: 70px; }
+ .zigzag-features .zigzag-feature {
+ margin-top: 70px; }
+ .zigzag-features .zigzag-feature .fa {
+ width: 180px;
+ height: 180px;
+ line-height: 180px;
+ font-size: 60px; } }
diff --git a/css/blogs.css b/css/blogs.css
new file mode 100644
index 0000000..081b39e
--- /dev/null
+++ b/css/blogs.css
@@ -0,0 +1,68 @@
+.blog-listing {
+ margin-bottom: 70px; }
+
+.blog-listing h2 {
+ color: #333; }
+
+.blog-listing h2 a {
+ color: inherit;
+ color: #575B61; }
+
+.blog-listing h2 a:hover,
+.blog-listing h2 a:focus {
+ color: #b1bac6;
+ text-decoration: none; }
+
+.blog-listing .btn-default {
+ border-color: #b1b1ac;
+ border-color: #2ceefb;
+ border-color: #2C90FB;
+ border-color: #2576CC;
+ color: #575B61;
+ color: #2C90FB;
+ color: #2576CC; }
+
+.blog-listing .btn-default:hover,
+.blog-listing .btn-default:focus {
+ /* background-color: #b1b1ac; */
+ background-color: #2C90FB;
+ background-color: #2576CC;
+ color: #fff; }
+
+.blog-entry {
+ margin-bottom: 70px; }
+
+.druid-header.blog {
+ padding: 0;
+ overflow: hidden; }
+
+.blog .title-spacer {
+ min-height: 240px; }
+
+.blog .title-image-wrap {
+ top: -50%;
+ left: -50%;
+ width: 200%;
+ height: 200%;
+ position: relative;
+ overflow: hidden;
+ min-height: 45px;
+ /* min-height: 200px; */ }
+
+.blog-entry img {
+ max-width: 100%; }
+
+.blog .title-image {
+ position: absolute;
+ min-width: 30%;
+ min-height: 200px;
+ margin: auto;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ box-shadow: 0px 2px 9px rgba(0, 0, 0, 0.5); }
+
+.recents ul li {
+ font-weight: 400;
+ margin-bottom: 15px; }
diff --git a/css/bootstrap-pure.css b/css/bootstrap-pure.css
new file mode 100644
index 0000000..820c985
--- /dev/null
+++ b/css/bootstrap-pure.css
@@ -0,0 +1,1855 @@
+/*!
+ * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Modified by Vadim Ogievetsky
+ */
+article, aside, details, figure, footer, header, main, menu, nav, section, summary {
+ display: block; }
+
+progress, video {
+ display: inline-block;
+ vertical-align: baseline; }
+
+[hidden], template {
+ display: none; }
+
+b, strong {
+ font-weight: bold; }
+
+mark {
+ color: #000;
+ background: #ff0; }
+
+small {
+ font-size: 80%; }
+
+sub {
+ position: relative;
+ font-size: 75%;
+ line-height: 0;
+ vertical-align: baseline; }
+
+sub {
+ bottom: -.25em; }
+
+img {
+ border: 0; }
+
+figure {
+ margin: 1em 40px; }
+
+hr {
+ height: 0;
+ -webkit-box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box; }
+
+pre {
+ overflow: auto; }
+
+code, pre {
+ font-family: monospace, monospace;
+ font-size: 1em; }
+
+button, input, select {
+ margin: 0;
+ font: inherit;
+ color: inherit; }
+
+button {
+ overflow: visible; }
+
+button, select {
+ text-transform: none; }
+
+button, html input[type="button"], input[type="reset"], input[type="submit"] {
+ -webkit-appearance: button;
+ cursor: pointer; }
+
+button[disabled], html input[disabled] {
+ cursor: default; }
+
+button::-moz-focus-inner, input::-moz-focus-inner {
+ padding: 0;
+ border: 0; }
+
+input {
+ line-height: normal; }
+
+input[type="checkbox"], input[type="radio"] {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ padding: 0; }
+
+input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button {
+ height: auto; }
+
+input[type="search"] {
+ -webkit-box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
+ -webkit-appearance: textfield; }
+
+input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration {
+ -webkit-appearance: none; }
+
+table {
+ border-spacing: 0;
+ border-collapse: collapse; }
+
+td, th {
+ padding: 0; }
+
+/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
+@media print {
+ *, *:before, *:after {
+ color: #000 !important;
+ text-shadow: none !important;
+ background: transparent !important;
+ -webkit-box-shadow: none !important;
+ box-shadow: none !important; }
+ a, a:visited {
+ text-decoration: underline; }
+ a[href]:after {
+ content: " (" attr(href) ")"; }
+ a[href^="#"]:after, a[href^="javascript:"]:after {
+ content: ""; }
+ pre, blockquote {
+ border: 1px solid #999;
+ page-break-inside: avoid; }
+ thead {
+ display: table-header-group; }
+ tr, img {
+ page-break-inside: avoid; }
+ img {
+ max-width: 100% !important; }
+ p, h2, h3 {
+ orphans: 3;
+ widows: 3; }
+ h2, h3 {
+ page-break-after: avoid; }
+ .navbar {
+ display: none; }
+ .label {
+ border: 1px solid #000; }
+ .table {
+ border-collapse: collapse !important; }
+ .table td, .table th {
+ background-color: #fff !important; } }
+
+@font-face {
+ font-family: 'Glyphicons Halflings';
+ src: url("../fonts/glyphicons-halflings-regular.eot");
+ src: url("../fonts/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("../fonts/glyphicons-halflings-regular.woff2") format("woff2"), url("../fonts/glyphicons-halflings-regular.woff") format("woff"), url("../fonts/glyphicons-halflings-regular.ttf") format("truetype"), url("../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg"); }
+
+* {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box; }
+
+*:before, *:after {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box; }
+
+input, button, select {
+ font-family: inherit;
+ font-size: inherit;
+ line-height: inherit; }
+
+figure {
+ margin: 0; }
+
+.img-rounded {
+ border-radius: 6px; }
+
+.img-circle {
+ border-radius: 50%; }
+
+hr {
+ margin-top: 20px;
+ margin-bottom: 20px;
+ border: 0;
+ border-top: 1px solid #eee; }
+
+.sr-only {
+ position: absolute;
+ width: 1px;
+ height: 1px;
+ padding: 0;
+ margin: -1px;
+ overflow: hidden;
+ clip: rect(0, 0, 0, 0);
+ border: 0; }
+
+[role="button"] {
+ cursor: pointer; }
+
+.lead {
+ margin-bottom: 20px;
+ font-size: 16px;
+ font-weight: 300;
+ line-height: 1.4; }
+
+@media (min-width: 768px) {
+ .lead {
+ font-size: 21px; } }
+
+small, .small {
+ font-size: 85%; }
+
+mark, .mark {
+ padding: .2em;
+ background-color: #fcf8e3; }
+
+.text-left {
+ text-align: left; }
+
+.text-right {
+ text-align: right; }
+
+.text-center {
+ text-align: center; }
+
+.text-lowercase {
+ text-transform: lowercase; }
+
+.text-uppercase {
+ text-transform: uppercase; }
+
+.text-muted {
+ color: #777; }
+
+.text-primary {
+ color: #337ab7; }
+
+a.text-primary:hover, a.text-primary:focus {
+ color: #286090; }
+
+.text-success {
+ color: #3c763d; }
+
+a.text-success:hover, a.text-success:focus {
+ color: #2b542c; }
+
+.text-info {
+ color: #31708f; }
+
+a.text-info:hover, a.text-info:focus {
+ color: #245269; }
+
+.text-warning {
+ color: #8a6d3b; }
+
+a.text-warning:hover, a.text-warning:focus {
+ color: #66512c; }
+
+.text-danger {
+ color: #a94442; }
+
+a.text-danger:hover, a.text-danger:focus {
+ color: #843534; }
+
+.bg-primary {
+ color: #fff;
+ background-color: #337ab7; }
+
+a.bg-primary:hover, a.bg-primary:focus {
+ background-color: #286090; }
+
+.bg-success {
+ background-color: #dff0d8; }
+
+a.bg-success:hover, a.bg-success:focus {
+ background-color: #c1e2b3; }
+
+.bg-info {
+ background-color: #d9edf7; }
+
+a.bg-info:hover, a.bg-info:focus {
+ background-color: #afd9ee; }
+
+.bg-warning {
+ background-color: #fcf8e3; }
+
+a.bg-warning:hover, a.bg-warning:focus {
+ background-color: #f7ecb5; }
+
+.bg-danger {
+ background-color: #f2dede; }
+
+a.bg-danger:hover, a.bg-danger:focus {
+ background-color: #e4b9b9; }
+
+.page-header {
+ padding-bottom: 9px;
+ margin: 40px 0 20px;
+ border-bottom: 1px solid #eee; }
+
+ul, ol {
+ margin-top: 0;
+ margin-bottom: 10px; }
+
+ul ul, ol ul, ul ol, ol ol {
+ margin-bottom: 0; }
+
+.list-inline {
+ padding-left: 0;
+ margin-left: -5px;
+ list-style: none; }
+
+.list-inline > li {
+ display: inline-block;
+ padding-right: 5px;
+ padding-left: 5px; }
+
+dl {
+ margin-top: 0;
+ margin-bottom: 20px; }
+
+dt, dd {
+ line-height: 1.42857143; }
+
+dt {
+ font-weight: bold; }
+
+dd {
+ margin-left: 0; }
+
+@media (min-width: 768px) {
+ .dl-horizontal dt {
+ float: left;
+ width: 160px;
+ overflow: hidden;
+ clear: left;
+ text-align: right;
+ text-overflow: ellipsis;
+ white-space: nowrap; }
+ .dl-horizontal dd {
+ margin-left: 180px; } }
+
+blockquote {
+ padding: 10px 20px;
+ margin: 0 0 20px;
+ font-size: 17.5px;
+ border-left: 5px solid #eee; }
+
+blockquote p:last-child, blockquote ul:last-child, blockquote ol:last-child {
+ margin-bottom: 0; }
+
+blockquote footer, blockquote small, blockquote .small {
+ display: block;
+ font-size: 80%;
+ line-height: 1.42857143;
+ color: #777; }
+
+blockquote footer:before, blockquote small:before, blockquote .small:before {
+ content: '\2014 \00A0'; }
+
+.blockquote-reverse, blockquote.pull-right {
+ padding-right: 15px;
+ padding-left: 0;
+ text-align: right;
+ border-right: 5px solid #eee;
+ border-left: 0; }
+
+.blockquote-reverse footer:before, blockquote.pull-right footer:before, .blockquote-reverse small:before, blockquote.pull-right small:before, .blockquote-reverse .small:before, blockquote.pull-right .small:before {
+ content: ''; }
+
+.blockquote-reverse footer:after, blockquote.pull-right footer:after, .blockquote-reverse small:after, blockquote.pull-right small:after, .blockquote-reverse .small:after, blockquote.pull-right .small:after {
+ content: '\00A0 \2014'; }
+
+address {
+ margin-bottom: 20px;
+ font-style: normal;
+ line-height: 1.42857143; }
+
+code, pre {
+ font-family: Menlo, Monaco, Consolas, "Courier New", monospace; }
+
+code {
+ padding: 2px 4px;
+ font-size: 90%;
+ color: #c7254e;
+ background-color: #f9f2f4;
+ border-radius: 4px; }
+
+pre {
+ display: block;
+ padding: 9.5px;
+ margin: 0 0 10px;
+ font-size: 13px;
+ line-height: 1.42857143;
+ color: #333;
+ word-break: break-all;
+ word-wrap: break-word;
+ background-color: #f5f5f5;
+ border: 1px solid #ccc;
+ border-radius: 4px; }
+
+pre code {
+ padding: 0;
+ font-size: inherit;
+ color: inherit;
+ white-space: pre-wrap;
+ background-color: transparent;
+ border-radius: 0; }
+
+.container {
+ padding-right: 15px;
+ padding-left: 15px;
+ margin-right: auto;
+ margin-left: auto; }
+
+@media (min-width: 768px) {
+ .container {
+ width: 750px; } }
+
+@media (min-width: 992px) {
+ .container {
+ width: 970px; } }
+
+@media (min-width: 1200px) {
+ .container {
+ width: 1170px; } }
+
+.container-fluid {
+ padding-right: 15px;
+ padding-left: 15px;
+ margin-right: auto;
+ margin-left: auto; }
+
+.row {
+ margin-right: -15px;
+ margin-left: -15px; }
+
+.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
+ position: relative;
+ min-height: 1px;
+ padding-right: 15px;
+ padding-left: 15px; }
+
+.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 {
+ float: left; }
+
+@media (min-width: 992px) {
+ .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
+ float: left; }
+ .col-md-12 {
+ width: 100%; }
+ .col-md-11 {
+ width: 91.66666667%; }
+ .col-md-10 {
+ width: 83.33333333%; }
+ .col-md-9 {
+ width: 75%; }
+ .col-md-8 {
+ width: 66.66666667%; }
+ .col-md-7 {
+ width: 58.33333333%; }
+ .col-md-6 {
+ width: 50%; }
+ .col-md-5 {
+ width: 41.66666667%; }
+ .col-md-4 {
+ width: 33.33333333%; }
+ .col-md-3 {
+ width: 25%; }
+ .col-md-2 {
+ width: 16.66666667%; }
+ .col-md-1 {
+ width: 8.33333333%; }
+ .col-md-pull-12 {
+ right: 100%; }
+ .col-md-pull-11 {
+ right: 91.66666667%; }
+ .col-md-pull-10 {
+ right: 83.33333333%; }
+ .col-md-pull-9 {
+ right: 75%; }
+ .col-md-pull-8 {
+ right: 66.66666667%; }
+ .col-md-pull-7 {
+ right: 58.33333333%; }
+ .col-md-pull-6 {
+ right: 50%; }
+ .col-md-pull-5 {
+ right: 41.66666667%; }
+ .col-md-pull-4 {
+ right: 33.33333333%; }
+ .col-md-pull-3 {
+ right: 25%; }
+ .col-md-pull-2 {
+ right: 16.66666667%; }
+ .col-md-pull-1 {
+ right: 8.33333333%; }
+ .col-md-pull-0 {
+ right: auto; }
+ .col-md-push-12 {
+ left: 100%; }
+ .col-md-push-11 {
+ left: 91.66666667%; }
+ .col-md-push-10 {
+ left: 83.33333333%; }
+ .col-md-push-9 {
+ left: 75%; }
+ .col-md-push-8 {
+ left: 66.66666667%; }
+ .col-md-push-7 {
+ left: 58.33333333%; }
+ .col-md-push-6 {
+ left: 50%; }
+ .col-md-push-5 {
+ left: 41.66666667%; }
+ .col-md-push-4 {
+ left: 33.33333333%; }
+ .col-md-push-3 {
+ left: 25%; }
+ .col-md-push-2 {
+ left: 16.66666667%; }
+ .col-md-push-1 {
+ left: 8.33333333%; }
+ .col-md-push-0 {
+ left: auto; }
+ .col-md-offset-12 {
+ margin-left: 100%; }
+ .col-md-offset-11 {
+ margin-left: 91.66666667%; }
+ .col-md-offset-10 {
+ margin-left: 83.33333333%; }
+ .col-md-offset-9 {
+ margin-left: 75%; }
+ .col-md-offset-8 {
+ margin-left: 66.66666667%; }
+ .col-md-offset-7 {
+ margin-left: 58.33333333%; }
+ .col-md-offset-6 {
+ margin-left: 50%; }
+ .col-md-offset-5 {
+ margin-left: 41.66666667%; }
+ .col-md-offset-4 {
+ margin-left: 33.33333333%; }
+ .col-md-offset-3 {
+ margin-left: 25%; }
+ .col-md-offset-2 {
+ margin-left: 16.66666667%; }
+ .col-md-offset-1 {
+ margin-left: 8.33333333%; }
+ .col-md-offset-0 {
+ margin-left: 0; } }
+
+table {
+ background-color: transparent; }
+
+caption {
+ padding-top: 8px;
+ padding-bottom: 8px;
+ color: #777;
+ text-align: left; }
+
+th {
+ text-align: left; }
+
+.table {
+ width: 100%;
+ max-width: 100%;
+ margin-bottom: 20px; }
+
+.table > thead > tr > th, .table > tbody > tr > th, .table > thead > tr > td, .table > tbody > tr > td {
+ padding: 8px;
+ line-height: 1.42857143;
+ vertical-align: top;
+ border-top: 1px solid #ddd; }
+
+.table > thead > tr > th {
+ vertical-align: bottom;
+ border-bottom: 2px solid #ddd; }
+
+.table > caption + thead > tr:first-child > th, .table > thead:first-child > tr:first-child > th, .table > caption + thead > tr:first-child > td, .table > thead:first-child > tr:first-child > td {
+ border-top: 0; }
+
+.table > tbody + tbody {
+ border-top: 2px solid #ddd; }
+
+.table .table {
+ background-color: #fff; }
+
+.table-condensed > thead > tr > th, .table-condensed > tbody > tr > th, .table-condensed > thead > tr > td, .table-condensed > tbody > tr > td {
+ padding: 5px; }
+
+table col[class*="col-"] {
+ position: static;
+ display: table-column;
+ float: none; }
+
+table td[class*="col-"], table th[class*="col-"] {
+ position: static;
+ display: table-cell;
+ float: none; }
+
+.table > thead > tr > td.active, .table > tbody > tr > td.active, .table > thead > tr > th.active, .table > tbody > tr > th.active, .table > thead > tr.active > td, .table > tbody > tr.active > td, .table > thead > tr.active > th, .table > tbody > tr.active > th {
+ background-color: #f5f5f5; }
+
+.table > thead > tr > td.success, .table > tbody > tr > td.success, .table > thead > tr > th.success, .table > tbody > tr > th.success, .table > thead > tr.success > td, .table > tbody > tr.success > td, .table > thead > tr.success > th, .table > tbody > tr.success > th {
+ background-color: #dff0d8; }
+
+.table > thead > tr > td.info, .table > tbody > tr > td.info, .table > thead > tr > th.info, .table > tbody > tr > th.info, .table > thead > tr.info > td, .table > tbody > tr.info > td, .table > thead > tr.info > th, .table > tbody > tr.info > th {
+ background-color: #d9edf7; }
+
+.table > thead > tr > td.warning, .table > tbody > tr > td.warning, .table > thead > tr > th.warning, .table > tbody > tr > th.warning, .table > thead > tr.warning > td, .table > tbody > tr.warning > td, .table > thead > tr.warning > th, .table > tbody > tr.warning > th {
+ background-color: #fcf8e3; }
+
+.table > thead > tr > td.danger, .table > tbody > tr > td.danger, .table > thead > tr > th.danger, .table > tbody > tr > th.danger, .table > thead > tr.danger > td, .table > tbody > tr.danger > td, .table > thead > tr.danger > th, .table > tbody > tr.danger > th {
+ background-color: #f2dede; }
+
+label {
+ display: inline-block;
+ max-width: 100%;
+ margin-bottom: 5px;
+ font-weight: bold; }
+
+input[type="search"] {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box; }
+
+input[type="radio"], input[type="checkbox"] {
+ margin: 4px 0 0;
+ margin-top: 1px \9;
+ line-height: normal; }
+
+input[type="file"] {
+ display: block; }
+
+input[type="range"] {
+ display: block;
+ width: 100%; }
+
+select[multiple], select[size] {
+ height: auto; }
+
+input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus {
+ outline: thin dotted;
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px; }
+
+output {
+ display: block;
+ padding-top: 7px;
+ font-size: 14px;
+ line-height: 1.42857143;
+ color: #555; }
+
+input[type="search"] {
+ -webkit-appearance: none; }
+
+@media screen and (-webkit-min-device-pixel-ratio: 0) {
+ input[type="date"].form-control, input[type="time"].form-control, input[type="datetime-local"].form-control, input[type="month"].form-control {
+ line-height: 34px; }
+ input[type="date"].input-sm, input[type="time"].input-sm, input[type="datetime-local"].input-sm, input[type="month"].input-sm, .input-group-sm input[type="date"], .input-group-sm input[type="time"], .input-group-sm input[type="datetime-local"], .input-group-sm input[type="month"] {
+ line-height: 30px; }
+ input[type="date"].input-lg, input[type="time"].input-lg, input[type="datetime-local"].input-lg, input[type="month"].input-lg, .input-group-lg input[type="date"], .input-group-lg input[type="time"], .input-group-lg input[type="datetime-local"], .input-group-lg input[type="month"] {
+ line-height: 46px; } }
+
+.form-group {
+ margin-bottom: 15px; }
+
+input[type="radio"][disabled], input[type="checkbox"][disabled], input[type="radio"].disabled, input[type="checkbox"].disabled {
+ cursor: not-allowed; }
+
+.form-control-static {
+ min-height: 34px;
+ padding-top: 7px;
+ padding-bottom: 7px;
+ margin-bottom: 0; }
+
+.form-control-static.input-lg, .form-control-static.input-sm {
+ padding-right: 0;
+ padding-left: 0; }
+
+.input-sm {
+ height: 30px;
+ padding: 5px 10px;
+ font-size: 12px;
+ line-height: 1.5;
+ border-radius: 3px; }
+
+select.input-sm {
+ height: 30px;
+ line-height: 30px; }
+
+select[multiple].input-sm {
+ height: auto; }
+
+.input-lg {
+ height: 46px;
+ padding: 10px 16px;
+ font-size: 18px;
+ line-height: 1.3333333;
+ border-radius: 6px; }
+
+select.input-lg {
+ height: 46px;
+ line-height: 46px; }
+
+select[multiple].input-lg {
+ height: auto; }
+
+.has-feedback {
+ position: relative; }
+
+.has-feedback .form-control {
+ padding-right: 42.5px; }
+
+.form-control-feedback {
+ position: absolute;
+ top: 0;
+ right: 0;
+ z-index: 2;
+ display: block;
+ width: 34px;
+ height: 34px;
+ line-height: 34px;
+ text-align: center;
+ pointer-events: none; }
+
+.input-lg + .form-control-feedback, .input-group-lg + .form-control-feedback, .form-group-lg .form-control + .form-control-feedback {
+ width: 46px;
+ height: 46px;
+ line-height: 46px; }
+
+.input-sm + .form-control-feedback, .input-group-sm + .form-control-feedback, .form-group-sm .form-control + .form-control-feedback {
+ width: 30px;
+ height: 30px;
+ line-height: 30px; }
+
+.has-success .help-block, .has-success .control-label {
+ color: #3c763d; }
+
+.has-success .form-control {
+ border-color: #3c763d;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); }
+
+.has-success .form-control:focus {
+ border-color: #2b542c;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168; }
+
+.has-success .form-control-feedback {
+ color: #3c763d; }
+
+.has-warning .help-block, .has-warning .control-label {
+ color: #8a6d3b; }
+
+.has-warning .form-control {
+ border-color: #8a6d3b;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); }
+
+.has-warning .form-control:focus {
+ border-color: #66512c;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b; }
+
+.has-warning .form-control-feedback {
+ color: #8a6d3b; }
+
+.has-error .help-block, .has-error .control-label {
+ color: #a94442; }
+
+.has-error .form-control {
+ border-color: #a94442;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); }
+
+.has-error .form-control:focus {
+ border-color: #843534;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483; }
+
+.has-error .form-control-feedback {
+ color: #a94442; }
+
+.has-feedback label ~ .form-control-feedback {
+ top: 25px; }
+
+.has-feedback label.sr-only ~ .form-control-feedback {
+ top: 0; }
+
+.help-block {
+ display: block;
+ margin-top: 5px;
+ margin-bottom: 10px;
+ color: #737373; }
+
+@media (min-width: 768px) {
+ .form-inline .form-group {
+ display: inline-block;
+ margin-bottom: 0;
+ vertical-align: middle; }
+ .form-inline .form-control {
+ display: inline-block;
+ width: auto;
+ vertical-align: middle; }
+ .form-inline .form-control-static {
+ display: inline-block; }
+ .form-inline .input-group {
+ display: inline-table;
+ vertical-align: middle; }
+ .form-inline .input-group .input-group-btn, .form-inline .input-group .form-control {
+ width: auto; }
+ .form-inline .input-group > .form-control {
+ width: 100%; }
+ .form-inline .control-label {
+ margin-bottom: 0;
+ vertical-align: middle; }
+ .form-inline .has-feedback .form-control-feedback {
+ top: 0; } }
+
+.form-horizontal .form-group {
+ margin-right: -15px;
+ margin-left: -15px; }
+
+@media (min-width: 768px) {
+ .form-horizontal .control-label {
+ padding-top: 7px;
+ margin-bottom: 0;
+ text-align: right; } }
+
+.form-horizontal .has-feedback .form-control-feedback {
+ right: 15px; }
+
+@media (min-width: 768px) {
+ .form-horizontal .form-group-lg .control-label {
+ padding-top: 14.333333px;
+ font-size: 18px; } }
+
+@media (min-width: 768px) {
+ .form-horizontal .form-group-sm .control-label {
+ padding-top: 6px;
+ font-size: 12px; } }
+
+.btn {
+ display: inline-block;
+ padding: 6px 12px;
+ margin-bottom: 0;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 1.42857143;
+ text-align: center;
+ white-space: nowrap;
+ vertical-align: middle;
+ -ms-touch-action: manipulation;
+ touch-action: manipulation;
+ cursor: pointer;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ background-image: none;
+ border: 1px solid transparent;
+ border-radius: 4px; }
+
+.btn:focus, .btn:active:focus, .btn.active:focus, .btn.focus, .btn:active.focus, .btn.active.focus {
+ outline: thin dotted;
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px; }
+
+.btn:hover, .btn:focus, .btn.focus {
+ color: #333;
+ text-decoration: none; }
+
+.btn:active, .btn.active {
+ background-image: none;
+ outline: 0;
+ -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+ box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); }
+
+.btn.disabled, .btn[disabled] {
+ cursor: not-allowed;
+ filter: alpha(opacity=65);
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ opacity: .65; }
+
+a.btn.disabled {
+ pointer-events: none; }
+
+.btn-default {
+ color: #333;
+ background-color: #fff;
+ border-color: #ccc; }
+
+.btn-default:focus, .btn-default.focus {
+ color: #333;
+ background-color: #e6e6e6;
+ border-color: #8c8c8c; }
+
+.btn-default:hover {
+ color: #333;
+ background-color: #e6e6e6;
+ border-color: #adadad; }
+
+.btn-default:active, .btn-default.active {
+ color: #333;
+ background-color: #e6e6e6;
+ border-color: #adadad; }
+
+.btn-default:active:hover, .btn-default.active:hover, .btn-default:active:focus, .btn-default.active:focus, .btn-default:active.focus, .btn-default.active.focus {
+ color: #333;
+ background-color: #d4d4d4;
+ border-color: #8c8c8c; }
+
+.btn-default:active, .btn-default.active {
+ background-image: none; }
+
+.btn-default.disabled, .btn-default[disabled], .btn-default.disabled:hover, .btn-default[disabled]:hover, .btn-default.disabled:focus, .btn-default[disabled]:focus, .btn-default.disabled.focus, .btn-default[disabled].focus, .btn-default.disabled:active, .btn-default[disabled]:active, .btn-default.disabled.active, .btn-default[disabled].active {
+ background-color: #fff;
+ border-color: #ccc; }
+
+.btn-primary {
+ color: #fff;
+ background-color: #337ab7;
+ border-color: #2e6da4; }
+
+.btn-primary:focus, .btn-primary.focus {
+ color: #fff;
+ background-color: #286090;
+ border-color: #122b40; }
+
+.btn-primary:hover {
+ color: #fff;
+ background-color: #286090;
+ border-color: #204d74; }
+
+.btn-primary:active, .btn-primary.active {
+ color: #fff;
+ background-color: #286090;
+ border-color: #204d74; }
+
+.btn-primary:active:hover, .btn-primary.active:hover, .btn-primary:active:focus, .btn-primary.active:focus, .btn-primary:active.focus, .btn-primary.active.focus {
+ color: #fff;
+ background-color: #204d74;
+ border-color: #122b40; }
+
+.btn-primary:active, .btn-primary.active {
+ background-image: none; }
+
+.btn-primary.disabled, .btn-primary[disabled], .btn-primary.disabled:hover, .btn-primary[disabled]:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, .btn-primary.disabled.focus, .btn-primary[disabled].focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, .btn-primary.disabled.active, .btn-primary[disabled].active {
+ background-color: #337ab7;
+ border-color: #2e6da4; }
+
+.btn-success {
+ color: #fff;
+ background-color: #5cb85c;
+ border-color: #4cae4c; }
+
+.btn-success:focus, .btn-success.focus {
+ color: #fff;
+ background-color: #449d44;
+ border-color: #255625; }
+
+.btn-success:hover {
+ color: #fff;
+ background-color: #449d44;
+ border-color: #398439; }
+
+.btn-success:active, .btn-success.active {
+ color: #fff;
+ background-color: #449d44;
+ border-color: #398439; }
+
+.btn-success:active:hover, .btn-success.active:hover, .btn-success:active:focus, .btn-success.active:focus, .btn-success:active.focus, .btn-success.active.focus {
+ color: #fff;
+ background-color: #398439;
+ border-color: #255625; }
+
+.btn-success:active, .btn-success.active {
+ background-image: none; }
+
+.btn-success.disabled, .btn-success[disabled], .btn-success.disabled:hover, .btn-success[disabled]:hover, .btn-success.disabled:focus, .btn-success[disabled]:focus, .btn-success.disabled.focus, .btn-success[disabled].focus, .btn-success.disabled:active, .btn-success[disabled]:active, .btn-success.disabled.active, .btn-success[disabled].active {
+ background-color: #5cb85c;
+ border-color: #4cae4c; }
+
+.btn-info {
+ color: #fff;
+ background-color: #5bc0de;
+ border-color: #46b8da; }
+
+.btn-info:focus, .btn-info.focus {
+ color: #fff;
+ background-color: #31b0d5;
+ border-color: #1b6d85; }
+
+.btn-info:hover {
+ color: #fff;
+ background-color: #31b0d5;
+ border-color: #269abc; }
+
+.btn-info:active, .btn-info.active {
+ color: #fff;
+ background-color: #31b0d5;
+ border-color: #269abc; }
+
+.btn-info:active:hover, .btn-info.active:hover, .btn-info:active:focus, .btn-info.active:focus, .btn-info:active.focus, .btn-info.active.focus {
+ color: #fff;
+ background-color: #269abc;
+ border-color: #1b6d85; }
+
+.btn-info:active, .btn-info.active {
+ background-image: none; }
+
+.btn-info.disabled, .btn-info[disabled], .btn-info.disabled:hover, .btn-info[disabled]:hover, .btn-info.disabled:focus, .btn-info[disabled]:focus, .btn-info.disabled.focus, .btn-info[disabled].focus, .btn-info.disabled:active, .btn-info[disabled]:active, .btn-info.disabled.active, .btn-info[disabled].active {
+ background-color: #5bc0de;
+ border-color: #46b8da; }
+
+.btn-warning {
+ color: #fff;
+ background-color: #f0ad4e;
+ border-color: #eea236; }
+
+.btn-warning:focus, .btn-warning.focus {
+ color: #fff;
+ background-color: #ec971f;
+ border-color: #985f0d; }
+
+.btn-warning:hover {
+ color: #fff;
+ background-color: #ec971f;
+ border-color: #d58512; }
+
+.btn-warning:active, .btn-warning.active {
+ color: #fff;
+ background-color: #ec971f;
+ border-color: #d58512; }
+
+.btn-warning:active:hover, .btn-warning.active:hover, .btn-warning:active:focus, .btn-warning.active:focus, .btn-warning:active.focus, .btn-warning.active.focus {
+ color: #fff;
+ background-color: #d58512;
+ border-color: #985f0d; }
+
+.btn-warning:active, .btn-warning.active {
+ background-image: none; }
+
+.btn-warning.disabled, .btn-warning[disabled], .btn-warning.disabled:hover, .btn-warning[disabled]:hover, .btn-warning.disabled:focus, .btn-warning[disabled]:focus, .btn-warning.disabled.focus, .btn-warning[disabled].focus, .btn-warning.disabled:active, .btn-warning[disabled]:active, .btn-warning.disabled.active, .btn-warning[disabled].active {
+ background-color: #f0ad4e;
+ border-color: #eea236; }
+
+.btn-danger {
+ color: #fff;
+ background-color: #d9534f;
+ border-color: #d43f3a; }
+
+.btn-danger:focus, .btn-danger.focus {
+ color: #fff;
+ background-color: #c9302c;
+ border-color: #761c19; }
+
+.btn-danger:hover {
+ color: #fff;
+ background-color: #c9302c;
+ border-color: #ac2925; }
+
+.btn-danger:active, .btn-danger.active {
+ color: #fff;
+ background-color: #c9302c;
+ border-color: #ac2925; }
+
+.btn-danger:active:hover, .btn-danger.active:hover, .btn-danger:active:focus, .btn-danger.active:focus, .btn-danger:active.focus, .btn-danger.active.focus {
+ color: #fff;
+ background-color: #ac2925;
+ border-color: #761c19; }
+
+.btn-danger:active, .btn-danger.active {
+ background-image: none; }
+
+.btn-danger.disabled, .btn-danger[disabled], .btn-danger.disabled:hover, .btn-danger[disabled]:hover, .btn-danger.disabled:focus, .btn-danger[disabled]:focus, .btn-danger.disabled.focus, .btn-danger[disabled].focus, .btn-danger.disabled:active, .btn-danger[disabled]:active, .btn-danger.disabled.active, .btn-danger[disabled].active {
+ background-color: #d9534f;
+ border-color: #d43f3a; }
+
+.btn-link {
+ font-weight: normal;
+ color: #337ab7;
+ border-radius: 0; }
+
+.btn-link, .btn-link:active, .btn-link.active, .btn-link[disabled] {
+ background-color: transparent;
+ -webkit-box-shadow: none;
+ box-shadow: none; }
+
+.btn-link, .btn-link:hover, .btn-link:focus, .btn-link:active {
+ border-color: transparent; }
+
+.btn-link:hover, .btn-link:focus {
+ color: #23527c;
+ text-decoration: underline;
+ background-color: transparent; }
+
+.btn-link[disabled]:hover, .btn-link[disabled]:focus {
+ color: #777;
+ text-decoration: none; }
+
+.btn-lg, .btn-group-lg > .btn {
+ padding: 10px 16px;
+ font-size: 18px;
+ line-height: 1.3333333;
+ border-radius: 6px; }
+
+.btn-sm, .btn-group-sm > .btn {
+ padding: 5px 10px;
+ font-size: 12px;
+ line-height: 1.5;
+ border-radius: 3px; }
+
+.btn-xs, .btn-group-xs > .btn {
+ padding: 1px 5px;
+ font-size: 12px;
+ line-height: 1.5;
+ border-radius: 3px; }
+
+.btn-block {
+ display: block;
+ width: 100%; }
+
+.btn-block + .btn-block {
+ margin-top: 5px; }
+
+input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="button"].btn-block {
+ width: 100%; }
+
+.collapse {
+ display: none; }
+
+.collapse.in {
+ display: block; }
+
+tr.collapse.in {
+ display: table-row; }
+
+tbody.collapse.in {
+ display: table-row-group; }
+
+.open > a {
+ outline: 0; }
+
+.btn-group {
+ position: relative;
+ display: inline-block;
+ vertical-align: middle; }
+
+.btn-group > .btn {
+ position: relative;
+ float: left; }
+
+.btn-group > .btn:hover, .btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active {
+ z-index: 2; }
+
+.btn-group .btn + .btn, .btn-group .btn + .btn-group, .btn-group .btn-group + .btn, .btn-group .btn-group + .btn-group {
+ margin-left: -1px; }
+
+.btn-group > .btn:first-child {
+ margin-left: 0; }
+
+.btn-group > .btn:last-child:not(:first-child) {
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0; }
+
+.btn-group > .btn-group {
+ float: left; }
+
+.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
+ border-radius: 0; }
+
+.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child {
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0; }
+
+.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0; }
+
+[data-toggle="buttons"] > .btn input[type="radio"], [data-toggle="buttons"] > .btn-group > .btn input[type="radio"], [data-toggle="buttons"] > .btn input[type="checkbox"], [data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] {
+ position: absolute;
+ clip: rect(0, 0, 0, 0);
+ pointer-events: none; }
+
+.input-group {
+ position: relative;
+ display: table;
+ border-collapse: separate; }
+
+.input-group[class*="col-"] {
+ float: none;
+ padding-right: 0;
+ padding-left: 0; }
+
+.input-group .form-control {
+ position: relative;
+ z-index: 2;
+ float: left;
+ width: 100%;
+ margin-bottom: 0; }
+
+.input-group-lg > .form-control, .input-group-lg > .input-group-btn > .btn {
+ height: 46px;
+ padding: 10px 16px;
+ font-size: 18px;
+ line-height: 1.3333333;
+ border-radius: 6px; }
+
+select.input-group-lg > .form-control, select.input-group-lg > .input-group-btn > .btn {
+ height: 46px;
+ line-height: 46px; }
+
+select[multiple].input-group-lg > .form-control, select[multiple].input-group-lg > .input-group-btn > .btn {
+ height: auto; }
+
+.input-group-sm > .form-control, .input-group-sm > .input-group-btn > .btn {
+ height: 30px;
+ padding: 5px 10px;
+ font-size: 12px;
+ line-height: 1.5;
+ border-radius: 3px; }
+
+select.input-group-sm > .form-control, select.input-group-sm > .input-group-btn > .btn {
+ height: 30px;
+ line-height: 30px; }
+
+select[multiple].input-group-sm > .form-control, select[multiple].input-group-sm > .input-group-btn > .btn {
+ height: auto; }
+
+.input-group-btn, .input-group .form-control {
+ display: table-cell; }
+
+.input-group-btn:not(:first-child):not(:last-child), .input-group .form-control:not(:first-child):not(:last-child) {
+ border-radius: 0; }
+
+.input-group-btn {
+ width: 1%;
+ white-space: nowrap;
+ vertical-align: middle; }
+
+.input-group .form-control:first-child, .input-group-btn:first-child > .btn, .input-group-btn:first-child > .btn-group > .btn, .input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0; }
+
+.input-group .form-control:last-child, .input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group > .btn, .input-group-btn:first-child > .btn:not(:first-child), .input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0; }
+
+.input-group-btn {
+ position: relative;
+ font-size: 0;
+ white-space: nowrap; }
+
+.input-group-btn > .btn {
+ position: relative; }
+
+.input-group-btn > .btn + .btn {
+ margin-left: -1px; }
+
+.input-group-btn > .btn:hover, .input-group-btn > .btn:focus, .input-group-btn > .btn:active {
+ z-index: 2; }
+
+.input-group-btn:first-child > .btn, .input-group-btn:first-child > .btn-group {
+ margin-right: -1px; }
+
+.input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group {
+ z-index: 2;
+ margin-left: -1px; }
+
+.nav {
+ padding-left: 0;
+ margin-bottom: 0;
+ list-style: none; }
+
+.nav > li {
+ position: relative;
+ display: block; }
+
+.nav > li > a {
+ position: relative;
+ display: block;
+ padding: 10px 15px; }
+
+.nav > li > a:hover, .nav > li > a:focus {
+ text-decoration: none;
+ background-color: #eee; }
+
+.nav > li.disabled > a {
+ color: #777; }
+
+.nav > li.disabled > a:hover, .nav > li.disabled > a:focus {
+ color: #777;
+ text-decoration: none;
+ cursor: not-allowed;
+ background-color: transparent; }
+
+.nav .open > a, .nav .open > a:hover, .nav .open > a:focus {
+ background-color: #eee;
+ border-color: #337ab7; }
+
+.nav > li > a > img {
+ max-width: none; }
+
+.tab-content > .active {
+ display: block; }
+
+.navbar {
+ position: relative;
+ min-height: 50px;
+ margin-bottom: 20px;
+ border: 1px solid transparent; }
+
+@media (min-width: 768px) {
+ .navbar {
+ border-radius: 4px; } }
+
+@media (min-width: 768px) {
+ .navbar-header {
+ float: left; } }
+
+.navbar-collapse {
+ padding-right: 15px;
+ padding-left: 15px;
+ overflow-x: visible;
+ -webkit-overflow-scrolling: touch;
+ border-top: 1px solid transparent;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); }
+
+.navbar-collapse.in {
+ overflow-y: auto; }
+
+@media (min-width: 768px) {
+ .navbar-collapse {
+ width: auto;
+ border-top: 0;
+ -webkit-box-shadow: none;
+ box-shadow: none; }
+ .navbar-collapse.collapse {
+ display: block !important;
+ height: auto !important;
+ padding-bottom: 0;
+ overflow: visible !important; }
+ .navbar-collapse.in {
+ overflow-y: visible; }
+ .navbar-fixed-top .navbar-collapse, .navbar-static-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse {
+ padding-right: 0;
+ padding-left: 0; } }
+
+.navbar-fixed-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse {
+ max-height: 340px; }
+
+@media (max-device-width: 480px) and (orientation: landscape) {
+ .navbar-fixed-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse {
+ max-height: 200px; } }
+
+.container > .navbar-header, .container-fluid > .navbar-header, .container > .navbar-collapse, .container-fluid > .navbar-collapse {
+ margin-right: -15px;
+ margin-left: -15px; }
+
+@media (min-width: 768px) {
+ .container > .navbar-header, .container-fluid > .navbar-header, .container > .navbar-collapse, .container-fluid > .navbar-collapse {
+ margin-right: 0;
+ margin-left: 0; } }
+
+.navbar-static-top {
+ z-index: 1000;
+ border-width: 0 0 1px; }
+
+@media (min-width: 768px) {
+ .navbar-static-top {
+ border-radius: 0; } }
+
+.navbar-fixed-top, .navbar-fixed-bottom {
+ position: fixed;
+ right: 0;
+ left: 0;
+ z-index: 1030; }
+
+@media (min-width: 768px) {
+ .navbar-fixed-top, .navbar-fixed-bottom {
+ border-radius: 0; } }
+
+.navbar-fixed-top {
+ top: 0;
+ border-width: 0 0 1px; }
+
+.navbar-fixed-bottom {
+ bottom: 0;
+ margin-bottom: 0;
+ border-width: 1px 0 0; }
+
+.navbar-brand {
+ float: left;
+ height: 50px;
+ padding: 15px 15px;
+ font-size: 18px;
+ line-height: 20px; }
+
+.navbar-brand:hover, .navbar-brand:focus {
+ text-decoration: none; }
+
+.navbar-brand > img {
+ display: block; }
+
+@media (min-width: 768px) {
+ .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand {
+ margin-left: -15px; } }
+
+.navbar-toggle {
+ position: relative;
+ float: right;
+ padding: 9px 10px;
+ margin-top: 8px;
+ margin-right: 15px;
+ margin-bottom: 8px;
+ background-color: transparent;
+ background-image: none;
+ border: 1px solid transparent;
+ border-radius: 4px; }
+
+.navbar-toggle:focus {
+ outline: 0; }
+
+.navbar-toggle .icon-bar {
+ display: block;
+ width: 22px;
+ height: 2px;
+ border-radius: 1px; }
+
+.navbar-toggle .icon-bar + .icon-bar {
+ margin-top: 4px; }
+
+@media (min-width: 768px) {
+ .navbar-toggle {
+ display: none; } }
+
+.navbar-nav {
+ margin: 7.5px -15px; }
+
+.navbar-nav > li > a {
+ padding-top: 10px;
+ padding-bottom: 10px;
+ line-height: 20px; }
+
+@media (min-width: 768px) {
+ .navbar-nav {
+ float: left;
+ margin: 0; }
+ .navbar-nav > li {
+ float: left; }
+ .navbar-nav > li > a {
+ padding-top: 15px;
+ padding-bottom: 15px; } }
+
+@media (min-width: 768px) {
+ .navbar-right {
+ float: right !important;
+ margin-right: -15px; }
+ .navbar-right ~ .navbar-right {
+ margin-right: 0; } }
+
+.navbar-default {
+ background-color: #f8f8f8;
+ border-color: #e7e7e7; }
+
+.navbar-default .navbar-brand {
+ color: #777; }
+
+.navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus {
+ color: #5e5e5e;
+ background-color: transparent; }
+
+.navbar-default .navbar-text {
+ color: #777; }
+
+.navbar-default .navbar-nav > li > a {
+ color: #777; }
+
+.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
+ color: #333;
+ background-color: transparent; }
+
+.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
+ color: #555;
+ background-color: #e7e7e7; }
+
+.navbar-default .navbar-nav > .disabled > a, .navbar-default .navbar-nav > .disabled > a:hover, .navbar-default .navbar-nav > .disabled > a:focus {
+ color: #ccc;
+ background-color: transparent; }
+
+.navbar-default .navbar-toggle {
+ border-color: #ddd; }
+
+.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
+ background-color: #ddd; }
+
+.navbar-default .navbar-toggle .icon-bar {
+ background-color: #888; }
+
+.navbar-default .navbar-collapse, .navbar-default .navbar-form {
+ border-color: #e7e7e7; }
+
+.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
+ color: #555;
+ background-color: #e7e7e7; }
+
+.navbar-default .navbar-link {
+ color: #777; }
+
+.navbar-default .navbar-link:hover {
+ color: #333; }
+
+.navbar-default .btn-link {
+ color: #777; }
+
+.navbar-default .btn-link:hover, .navbar-default .btn-link:focus {
+ color: #333; }
+
+.navbar-default .btn-link[disabled]:hover, .navbar-default .btn-link[disabled]:focus {
+ color: #ccc; }
+
+.navbar-inverse {
+ background-color: #222;
+ border-color: #080808; }
+
+.navbar-inverse .navbar-brand {
+ color: #9d9d9d; }
+
+.navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus {
+ color: #fff;
+ background-color: transparent; }
+
+.navbar-inverse .navbar-text {
+ color: #9d9d9d; }
+
+.navbar-inverse .navbar-nav > li > a {
+ color: #9d9d9d; }
+
+.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus {
+ color: #fff;
+ background-color: transparent; }
+
+.navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus {
+ color: #fff;
+ background-color: #080808; }
+
+.navbar-inverse .navbar-nav > .disabled > a, .navbar-inverse .navbar-nav > .disabled > a:hover, .navbar-inverse .navbar-nav > .disabled > a:focus {
+ color: #444;
+ background-color: transparent; }
+
+.navbar-inverse .navbar-toggle {
+ border-color: #333; }
+
+.navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {
+ background-color: #333; }
+
+.navbar-inverse .navbar-toggle .icon-bar {
+ background-color: #fff; }
+
+.navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form {
+ border-color: #101010; }
+
+.navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus {
+ color: #fff;
+ background-color: #080808; }
+
+.navbar-inverse .navbar-link {
+ color: #9d9d9d; }
+
+.navbar-inverse .navbar-link:hover {
+ color: #fff; }
+
+.navbar-inverse .btn-link {
+ color: #9d9d9d; }
+
+.navbar-inverse .btn-link:hover, .navbar-inverse .btn-link:focus {
+ color: #fff; }
+
+.navbar-inverse .btn-link[disabled]:hover, .navbar-inverse .btn-link[disabled]:focus {
+ color: #444; }
+
+.label {
+ display: inline;
+ padding: .2em .6em .3em;
+ font-size: 75%;
+ font-weight: bold;
+ line-height: 1;
+ color: #fff;
+ text-align: center;
+ white-space: nowrap;
+ vertical-align: baseline;
+ border-radius: .25em; }
+
+a.label:hover, a.label:focus {
+ color: #fff;
+ text-decoration: none;
+ cursor: pointer; }
+
+.label:empty {
+ display: none; }
+
+.btn .label {
+ position: relative;
+ top: -1px; }
+
+.alert {
+ padding: 15px;
+ margin-bottom: 20px;
+ border: 1px solid transparent;
+ border-radius: 4px; }
+
+.alert h4 {
+ margin-top: 0;
+ color: inherit; }
+
+.alert .alert-link {
+ font-weight: bold; }
+
+.alert > p, .alert > ul {
+ margin-bottom: 0; }
+
+.alert > p + p {
+ margin-top: 5px; }
+
+.alert-success {
+ color: #3c763d;
+ background-color: #dff0d8;
+ border-color: #d6e9c6; }
+
+.alert-success hr {
+ border-top-color: #c9e2b3; }
+
+.alert-success .alert-link {
+ color: #2b542c; }
+
+.alert-info {
+ color: #31708f;
+ background-color: #d9edf7;
+ border-color: #bce8f1; }
+
+.alert-info hr {
+ border-top-color: #a6e1ec; }
+
+.alert-info .alert-link {
+ color: #245269; }
+
+.alert-warning {
+ color: #8a6d3b;
+ background-color: #fcf8e3;
+ border-color: #faebcc; }
+
+.alert-warning hr {
+ border-top-color: #f7e1b5; }
+
+.alert-warning .alert-link {
+ color: #66512c; }
+
+.alert-danger {
+ color: #a94442;
+ background-color: #f2dede;
+ border-color: #ebccd1; }
+
+.alert-danger hr {
+ border-top-color: #e4b9c0; }
+
+.alert-danger .alert-link {
+ color: #843534; }
+
+.media {
+ margin-top: 15px; }
+
+.media:first-child {
+ margin-top: 0; }
+
+.media, .media-body {
+ overflow: hidden;
+ zoom: 1; }
+
+.media-body {
+ width: 10000px; }
+
+.media-object {
+ display: block; }
+
+.media-right, .media > .pull-right {
+ padding-left: 10px; }
+
+.media-left, .media > .pull-left {
+ padding-right: 10px; }
+
+.media-left, .media-right, .media-body {
+ display: table-cell;
+ vertical-align: top; }
+
+.media-middle {
+ vertical-align: middle; }
+
+.media-bottom {
+ vertical-align: bottom; }
+
+.media-heading {
+ margin-top: 0;
+ margin-bottom: 5px; }
+
+.media-list {
+ padding-left: 0;
+ list-style: none; }
+
+.close {
+ float: right;
+ font-size: 21px;
+ font-weight: bold;
+ line-height: 1;
+ color: #000;
+ text-shadow: 0 1px 0 #fff;
+ filter: alpha(opacity=20);
+ opacity: .2; }
+
+.close:hover, .close:focus {
+ color: #000;
+ text-decoration: none;
+ cursor: pointer;
+ filter: alpha(opacity=50);
+ opacity: .5; }
+
+button.close {
+ -webkit-appearance: none;
+ padding: 0;
+ cursor: pointer;
+ background: transparent;
+ border: 0; }
+
+.dl-horizontal dd:before, .dl-horizontal dd:after, .container:before, .container:after, .container-fluid:before, .container-fluid:after, .row:before, .row:after, .form-horizontal .form-group:before, .form-horizontal .form-group:after, .nav:before, .nav:after, .navbar:before, .navbar:after, .navbar-header:before, .navbar-header:after, .navbar-collapse:before, .navbar-collapse:after, .panel-body:before, .panel-body:after {
+ display: table;
+ content: " "; }
+
+.dl-horizontal dd:after, .container:after, .container-fluid:after, .row:after, .form-horizontal .form-group:after, .nav:after, .navbar:after, .navbar-header:after, .navbar-collapse:after, .panel-body:after {
+ clear: both; }
+
+.center-block {
+ display: block;
+ margin-right: auto;
+ margin-left: auto; }
+
+.pull-right {
+ float: right !important; }
+
+.pull-left {
+ float: left !important; }
+
+.hide {
+ display: none !important; }
+
+.show {
+ display: block !important; }
+
+.text-hide {
+ font: 0/0 a;
+ color: transparent;
+ text-shadow: none;
+ background-color: transparent;
+ border: 0; }
+
+.hidden {
+ display: none !important; }
+
+@-ms-viewport {
+ width: device-width; }
+
+.visible-xs, .visible-sm, .visible-md, .visible-lg {
+ display: none !important; }
+
+.visible-xs-block, .visible-xs-inline, .visible-xs-inline-block, .visible-sm-block, .visible-sm-inline, .visible-sm-inline-block, .visible-md-block, .visible-md-inline, .visible-md-inline-block, .visible-lg-block, .visible-lg-inline, .visible-lg-inline-block {
+ display: none !important; }
+
+@media (max-width: 767px) {
+ .visible-xs {
+ display: block !important; }
+ table.visible-xs {
+ display: table !important; }
+ tr.visible-xs {
+ display: table-row !important; }
+ th.visible-xs, td.visible-xs {
+ display: table-cell !important; } }
+
+@media (max-width: 767px) {
+ .visible-xs-block {
+ display: block !important; } }
+
+@media (max-width: 767px) {
+ .visible-xs-inline {
+ display: inline !important; } }
+
+@media (max-width: 767px) {
+ .visible-xs-inline-block {
+ display: inline-block !important; } }
+
+@media (min-width: 768px) and (max-width: 991px) {
+ .visible-sm {
+ display: block !important; }
+ table.visible-sm {
+ display: table !important; }
+ tr.visible-sm {
+ display: table-row !important; }
+ th.visible-sm, td.visible-sm {
+ display: table-cell !important; } }
+
+@media (min-width: 768px) and (max-width: 991px) {
+ .visible-sm-block {
+ display: block !important; } }
+
+@media (min-width: 768px) and (max-width: 991px) {
+ .visible-sm-inline {
+ display: inline !important; } }
+
+@media (min-width: 768px) and (max-width: 991px) {
+ .visible-sm-inline-block {
+ display: inline-block !important; } }
+
+@media (min-width: 992px) and (max-width: 1199px) {
+ .visible-md {
+ display: block !important; }
+ table.visible-md {
+ display: table !important; }
+ tr.visible-md {
+ display: table-row !important; }
+ th.visible-md, td.visible-md {
+ display: table-cell !important; } }
+
+@media (min-width: 992px) and (max-width: 1199px) {
+ .visible-md-block {
+ display: block !important; } }
+
+@media (min-width: 992px) and (max-width: 1199px) {
+ .visible-md-inline {
+ display: inline !important; } }
+
+@media (min-width: 992px) and (max-width: 1199px) {
+ .visible-md-inline-block {
+ display: inline-block !important; } }
+
+@media (max-width: 767px) {
+ .hidden-xs {
+ display: none !important; } }
+
+@media (min-width: 768px) and (max-width: 991px) {
+ .hidden-sm {
+ display: none !important; } }
+
+@media (min-width: 992px) and (max-width: 1199px) {
+ .hidden-md {
+ display: none !important; } }
+
+@media (min-width: 1200px) {
+ .hidden-lg {
+ display: none !important; } }
+
+@media print {
+ .hidden-print {
+ display: none !important; } }
diff --git a/css/docs.css b/css/docs.css
new file mode 100644
index 0000000..1bea588
--- /dev/null
+++ b/css/docs.css
@@ -0,0 +1,126 @@
+.doc-container {
+ padding-top: 28px; }
+
+.doc-content pre, .doc-content pre code {
+ overflow: auto;
+ white-space: pre;
+ word-wrap: normal; }
+
+.doc-content img {
+ max-width: 847.5px; }
+
+.doc-content code {
+ background-color: #e0e0e0; }
+
+.doc-content pre code {
+ background-color: transparent; }
+
+.doc-content table,
+.doc-content pre {
+ margin: 35px 0 35px 0; }
+
+.doc-content table,
+.doc-content table > thead > tr > th,
+.doc-content table > tbody > tr > th,
+.doc-content table > tfoot > tr > th,
+.doc-content table > thead > tr > td,
+.doc-content table > tbody > tr > td,
+.doc-content table > tfoot > tr > td {
+ border: 1px solid #dddddd; }
+
+.doc-content table > thead > tr > th,
+.doc-content table > thead > tr > td {
+ border-bottom-width: 2px; }
+
+.doc-content table > tbody > tr:nth-child(odd) > td,
+.doc-content table > tbody > tr:nth-child(odd) > th {
+ background-color: #f9f9f9; }
+
+.doc-content table > tbody > tr:hover > td,
+.doc-content table > tbody > tr:hover > th,
+.doc-content table > tbody > tr:focus > td,
+.doc-content table > tbody > tr:focus > th {
+ background-color: #d5d5d5; }
+
+.doc-content table code {
+ background-color: transparent; }
+
+.doc-content td, .doc-content th {
+ padding: 5px; }
+
+.doc-content .note {
+ position: relative;
+ display: block;
+ padding: 10px 14px 10px 42px;
+ margin: 35px 0 35px 0;
+ background: light-gray;
+ border-radius: 3px;
+ line-height: 170%; }
+ .doc-content .note:after {
+ content: '';
+ position: absolute;
+ top: 2px;
+ left: 0;
+ bottom: 0;
+ width: 42px;
+ background-position: 10px 9px;
+ background-size: 22px 22px;
+ background-repeat: no-repeat; }
+ .doc-content .note.info {
+ background: rgba(51, 200, 208, 0.26);
+ border-left: 2px solid rgba(51, 200, 208, 0.5); }
+ .doc-content .note.info:after {
+ background-image: url(/img/note-info.svg); }
+ .doc-content .note.caution {
+ background: rgba(249, 169, 86, 0.26);
+ border-left: 2px solid rgba(249, 169, 86, 0.5); }
+ .doc-content .note.caution:after {
+ background-image: url(/img/note-caution.svg); }
+
+.toc h2 {
+ font-size: 28px; }
+
+.toc ul {
+ list-style: none;
+ list-style-position: inside;
+ color: #4460de;
+ line-height: 1.9em; }
+ .toc ul li {
+ color: #999999;
+ font-weight: 600;
+ list-style-type: none;
+ margin-left: 0; }
+ .toc ul li a {
+ color: #4460de;
+ display: block; }
+ .toc ul li a:hover {
+ text-decoration: underline; }
+ .toc ul ul {
+ margin-top: 0;
+ margin-bottom: 0;
+ padding-left: 20px; }
+
+.searchbox {
+ position: relative;
+ height: 26px;
+ margin-top: 17px; }
+ .searchbox .gsc-search-button, .searchbox .searchbox .gsib_b {
+ display: none; }
+ .searchbox input {
+ background: white !important;
+ width: 100% !important;
+ padding: 5px 8px !important;
+ font-size: 13px !important;
+ border: 1px solid #dfdfdf !important;
+ height: 30px !important;
+ text-indent: 0 !important;
+ border-radius: 2px !important; }
+ .searchbox input:hover {
+ border-color: #c4c4c4 !important; }
+ .searchbox input:focus {
+ border-color: #c4c4c4 !important; }
+ .searchbox form, .searchbox table, .searchbox tbody, .searchbox tr, .searchbox td, .searchbox .gsc-input-box {
+ border: none !important;
+ padding: 0 !important;
+ margin: 0 !important;
+ background: none !important; }
diff --git a/css/footer.css b/css/footer.css
new file mode 100644
index 0000000..2149437
--- /dev/null
+++ b/css/footer.css
@@ -0,0 +1,29 @@
+footer {
+ line-height: 1.4em; }
+ footer a:hover {
+ color: #4460de; }
+ footer .license {
+ margin-top: 12px;
+ font-size: 11px;
+ color: #aaa;
+ line-height: 1.4em; }
+ footer .license a:hover {
+ text-decoration: underline; }
+
+footer .license {
+ margin-top: 12px;
+ font-size: 11px;
+ color: #aaa; }
+ footer .license a:hover {
+ color: #4460de;
+ text-decoration: underline; }
+
+.druid-footer {
+ padding: 32px 0 48px 0;
+ background-color: #f2f2f5;
+ border-top: 1px solid white;
+ margin-top: 50px; }
+ .druid-footer .fa, .druid-footer .fab, .druid-footer .fas {
+ font-size: 18px;
+ margin: 6px 0;
+ color: #4460de; }
diff --git a/css/header.css b/css/header.css
new file mode 100644
index 0000000..0fb02ec
--- /dev/null
+++ b/css/header.css
@@ -0,0 +1,110 @@
+.top-navigator {
+ background: #1C1C26;
+ height: 54px;
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ z-index: 100; }
+ .top-navigator .left-cont .druid-logo {
+ display: inline-block;
+ height: 54px;
+ width: 120px;
+ margin-bottom: -2px;
+ background-position: center;
+ background-image: url("/img/druid_nav.png");
+ background-size: 120px auto;
+ background-repeat: no-repeat; }
+ .top-navigator .right-cont {
+ position: absolute;
+ top: 0;
+ right: 15px; }
+ .top-navigator .right-cont ul {
+ margin: 0; }
+ .top-navigator .right-cont li {
+ line-height: 54px;
+ display: inline-block;
+ font-size: 15px;
+ margin: 0; }
+ .top-navigator .right-cont li.active a {
+ color: white; }
+ .top-navigator .right-cont li.active:after {
+ content: '';
+ position: absolute;
+ height: 2px;
+ bottom: 0;
+ left: 0;
+ right: 0; }
+ .top-navigator .right-cont li a {
+ display: block;
+ padding-left: 8px;
+ padding-right: 8px;
+ color: #9caeff; }
+ .top-navigator .right-cont li a:hover {
+ text-decoration: none;
+ color: white; }
+ .top-navigator .right-cont li.button-link {
+ margin-left: 8px; }
+ .top-navigator .right-cont li.button-link a {
+ display: inline-block;
+ height: 32px;
+ line-height: 32px;
+ margin-top: 9px;
+ background: #9caeff;
+ border-radius: 2px;
+ padding: 0 10px;
+ color: #1C1C26;
+ font-weight: 600;
+ min-width: 106px;
+ text-align: center; }
+ .top-navigator .right-cont li.button-link a:hover {
+ background: white; }
+ .top-navigator .action-button {
+ position: absolute;
+ top: 10px;
+ right: 30px;
+ padding: 8px 16px;
+ text-align: center;
+ border-radius: 2px;
+ cursor: pointer;
+ display: none;
+ color: #9caeff;
+ font-size: 18px;
+ line-height: 18px;
+ font-weight: 600; }
+ .top-navigator .action-button .fa {
+ margin-right: 6px; }
+ .top-navigator .action-button:hover {
+ color: white; }
+ .top-navigator .header-dropdown .header-dropdown-menu {
+ display: none;
+ z-index: 100;
+ position: absolute;
+ top: 54px;
+ left: 0;
+ width: 200px;
+ background: #3a3a52;
+ box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.18);
+ overflow: visible; }
+ .top-navigator .header-dropdown:hover .header-dropdown-menu {
+ display: block; }
+
+@media (max-width: 840px) {
+ body {
+ margin-top: 0; }
+ .top-navigator {
+ height: auto;
+ min-height: 54px;
+ position: relative; }
+ .top-navigator .right-cont {
+ position: relative;
+ display: block;
+ display: none;
+ padding-bottom: 28px; }
+ .top-navigator .right-cont ul {
+ margin-left: 20px; }
+ .top-navigator .right-cont li {
+ display: block;
+ line-height: 42px; }
+ .top-navigator .action-button.menu-icon {
+ display: block; } }
diff --git a/css/index.css b/css/index.css
new file mode 100644
index 0000000..6eb61a0
--- /dev/null
+++ b/css/index.css
@@ -0,0 +1,50 @@
+.druid-masthead {
+ padding: 50px 20px 42px 20px;
+ background-color: #3b3b50;
+ text-align: center;
+ margin: 0 auto 20px;
+ margin-bottom: 14px;
+ color: white;
+ overflow: hidden;
+ background-image: url("/img/watermark-dark.png");
+ background-size: 800px auto;
+ background-repeat: no-repeat;
+ background-position: 26% -76px; }
+ .druid-masthead .button {
+ display: inline-block;
+ min-width: 155px;
+ margin: 6px;
+ font-size: 1.1em;
+ line-height: 1.4em;
+ font-weight: 600;
+ padding: 9px 12px;
+ border-radius: 2px;
+ background: #9caeff;
+ color: #1C1C26;
+ transition: background-color 0.1s ease; }
+ .druid-masthead .button .fa, .druid-masthead .button .fab {
+ font-size: 16px;
+ margin-right: 3px; }
+ .druid-masthead .button:hover, .druid-masthead .button:active {
+ background: white;
+ text-decoration: none; }
+ .druid-masthead .lead {
+ font-size: 1.7em;
+ line-height: 1.7em;
+ font-weight: 600;
+ margin-top: 8px;
+ margin-bottom: 26px;
+ max-width: 820px;
+ margin-left: auto;
+ margin-right: auto; }
+ .druid-masthead b {
+ font-weight: 700; }
+
+.bottom-news {
+ display: block; }
+
+@media (max-width: 500px) {
+ .druid-masthead .lead {
+ font-size: 1.4em; }
+ .druid-masthead .button {
+ min-width: 130px; } }
diff --git a/css/news-list.css b/css/news-list.css
new file mode 100644
index 0000000..dfea42e
--- /dev/null
+++ b/css/news-list.css
@@ -0,0 +1,63 @@
+.item-list {
+ margin-top: 6px;
+ padding: 0 10px; }
+ .item-list h3 {
+ font-size: 22px; }
+ .item-list a {
+ display: block;
+ line-height: 1.5em; }
+ .item-list a:hover {
+ text-decoration: none; }
+ .item-list a:hover span.title {
+ text-decoration: underline; }
+ .item-list .text-muted {
+ color: #888;
+ font-weight: 400;
+ font-size: 14px;
+ line-height: 15px; }
+ .item-list .event {
+ position: relative;
+ padding-left: 42px;
+ margin-bottom: 12px; }
+ .item-list .mini-cal {
+ position: absolute;
+ top: 4px;
+ left: 0;
+ background: #4460de;
+ padding: 2px;
+ width: 32px;
+ text-align: center;
+ border-radius: 2px;
+ padding-top: 16px; }
+ .item-list .date-month {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ padding: 1px;
+ background: #4460de;
+ border-radius: 2px;
+ color: white;
+ font-size: 10px;
+ line-height: 14px;
+ font-weight: 600;
+ text-transform: uppercase; }
+ .item-list .date-day {
+ background: white;
+ color: #2442cb;
+ font-size: 16px;
+ font-weight: 600;
+ line-height: 19px; }
+ .item-list .btn-default {
+ border-color: #4460de;
+ background: #4460de;
+ color: white;
+ font-weight: 600;
+ display: inline-block;
+ margin-top: 10px;
+ margin-bottom: 10px;
+ padding: 3px 8px; }
+ .item-list .btn-default:hover, .item-list .btn-default:active {
+ background-color: #4460de;
+ border-color: #4460de;
+ color: #fff; }
diff --git a/css/reset.css b/css/reset.css
new file mode 100644
index 0000000..6d44268
--- /dev/null
+++ b/css/reset.css
@@ -0,0 +1,44 @@
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, menu, nav, output, ruby, section, summary, time, mark, audio, video {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ vertical-align: baseline; }
+
+article, aside, details, figcaption, figure, footer, header, menu, nav, section {
+ display: block; }
+
+body {
+ line-height: 1; }
+
+ol, ul {
+ list-style: none; }
+
+table {
+ border-collapse: collapse;
+ border-spacing: 0; }
+
+* {
+ box-sizing: border-box;
+ vertical-align: top; }
+
+body * {
+ position: relative; }
+
+a {
+ text-decoration: inherit;
+ color: inherit;
+ cursor: inherit; }
+
+div, span {
+ cursor: inherit; }
+
+text {
+ cursor: default; }
+
+button, input, textarea {
+ border: 0;
+ margin: 0; }
+ button:focus, input:focus, textarea:focus {
+ outline: none; }
diff --git a/css/syntax.css b/css/syntax.css
new file mode 100644
index 0000000..03b781b
--- /dev/null
+++ b/css/syntax.css
@@ -0,0 +1,281 @@
+.hll {
+ background-color: #ffffcc; }
+
+.c {
+ color: #93a1a1;
+ font-style: italic; }
+
+/* Comment */
+.err {
+ color: #dc322f; }
+
+/* Error */
+.g {
+ color: #657b83; }
+
+/* Generic */
+.k {
+ color: #859900; }
+
+/* Keyword */
+.l {
+ color: #657b83; }
+
+/* Literal */
+.n {
+ color: #586e75; }
+
+/* Name */
+.o {
+ color: #657b83; }
+
+/* Operator */
+.x {
+ color: #657b83; }
+
+/* Other */
+.p {
+ color: #657b83; }
+
+/* Punctuation */
+.cm {
+ color: #93a1a1;
+ font-style: italic; }
+
+/* Comment.Multiline */
+.cp {
+ color: #93a1a1;
+ font-style: italic; }
+
+/* Comment.Preproc */
+.c1 {
+ color: #93a1a1;
+ font-style: italic; }
+
+/* Comment.Single */
+.cs {
+ color: #93a1a1;
+ font-style: italic; }
+
+/* Comment.Special */
+.gd {
+ color: #657b83; }
+
+/* Generic.Deleted */
+.ge {
+ color: #657b83; }
+
+/* Generic.Emph */
+.gr {
+ color: #657b83; }
+
+/* Generic.Error */
+.gh {
+ color: #657b83; }
+
+/* Generic.Heading */
+.gi {
+ color: #657b83; }
+
+/* Generic.Inserted */
+.go {
+ color: #657b83; }
+
+/* Generic.Output */
+.gp {
+ color: #657b83; }
+
+/* Generic.Prompt */
+.gs {
+ color: #657b83; }
+
+/* Generic.Strong */
+.gu {
+ color: #657b83; }
+
+/* Generic.Subheading */
+.gt {
+ color: #657b83; }
+
+/* Generic.Traceback */
+.kc {
+ color: #859900; }
+
+/* Keyword.Constant */
+.kd {
+ color: #859900; }
+
+/* Keyword.Declaration */
+.kn {
+ color: #cb4b16; }
+
+/* Keyword.Namespace */
+.kp {
+ color: #cb4b16; }
+
+/* Keyword.Pseudo */
+.kr {
+ color: #859900; }
+
+/* Keyword.Reserved */
+.kt {
+ color: #859900; }
+
+/* Keyword.Type */
+.ld {
+ color: #657b83; }
+
+/* Literal.Date */
+.m {
+ color: #2aa198; }
+
+/* Literal.Number */
+.s {
+ color: #2aa198; }
+
+/* Literal.String */
+.na {
+ color: #657b83; }
+
+/* Name.Attribute */
+.nb {
+ color: #268bd2; }
+
+/* Name.Builtin */
+.nc {
+ color: #268bd2; }
+
+/* Name.Class */
+.no {
+ color: #b58900; }
+
+/* Name.Constant */
+.nd {
+ color: #cb4b16; }
+
+/* Name.Decorator */
+.ni {
+ color: #cb4b16; }
+
+/* Name.Entity */
+.ne {
+ color: #cb4b16; }
+
+/* Name.Exception */
+.nf {
+ color: #268bd2; }
+
+/* Name.Function */
+.nl {
+ color: #657b83; }
+
+/* Name.Label */
+.nn {
+ color: #b58900; }
+
+/* Name.Namespace */
+.nx {
+ color: #657b83; }
+
+/* Name.Other */
+.py {
+ color: #268bd2; }
+
+/* Name.Property */
+.nt {
+ color: #859900; }
+
+/* Name.Tag */
+.nv {
+ color: #cd4b16; }
+
+/* Name.Variable */
+.ow {
+ color: #859900; }
+
+/* Operator.Word */
+.w {
+ color: #fdf6e3; }
+
+/* Text.Whitespace */
+.mf {
+ color: #2aa198; }
+
+/* Literal.Number.Float */
+.mh {
+ color: #2aa198; }
+
+/* Literal.Number.Hex */
+.mi {
+ color: #2aa198; }
+
+/* Literal.Number.Integer */
+.mo {
+ color: #2aa198; }
+
+/* Literal.Number.Oct */
+.sb {
+ color: #2aa198; }
+
+/* Literal.String.Backtick */
+.sc {
+ color: #2aa198; }
+
+/* Literal.String.Char */
+.sd {
+ color: #2aa198; }
+
+/* Literal.String.Doc */
+.s2 {
+ color: #2aa198; }
+
+/* Literal.String.Double */
+.se {
+ color: #cb4b16; }
+
+/* Literal.String.Escape */
+.sh {
+ color: #2aa198; }
+
+/* Literal.String.Heredoc */
+.si {
+ color: #cb4b16; }
+
+/* Literal.String.Interpol */
+.sx {
+ color: #2aa198; }
+
+/* Literal.String.Other */
+.sr {
+ color: #2aa198; }
+
+/* Literal.String.Regex */
+.s1 {
+ color: #2aa198; }
+
+/* Literal.String.Single */
+.ss {
+ color: #2aa198; }
+
+/* Literal.String.Symbol */
+.bp {
+ color: #268bd2;
+ font-weight: bold; }
+
+/* Name.Builtin.Pseudo */
+.vc {
+ color: #268bd2; }
+
+/* Name.Variable.Class */
+.vg {
+ color: #268bd2; }
+
+/* Name.Variable.Global */
+.vi {
+ color: #268bd2; }
+
+/* Name.Variable.Instance */
+.il {
+ color: #2aa198; }
+
+/* Literal.Number.Integer.Long */
diff --git a/css/variables.css b/css/variables.css
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/css/variables.css
diff --git a/docs/0.13.0-incubating/dependencies/metadata-storage.html b/docs/0.13.0-incubating/dependencies/metadata-storage.html
index 71bb690..603edd5 100644
--- a/docs/0.13.0-incubating/dependencies/metadata-storage.html
+++ b/docs/0.13.0-incubating/dependencies/metadata-storage.html
@@ -208,7 +208,7 @@
<span class="nt">"metrics"</span><span class="p">:</span><span class="s2">"comma-delimited-list-of-metric-names"</span><span class="p">,</span>
<span class="nt">"shardSpec"</span><span class="p">:{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"none"</span><span class="p">},</span>
<span class="nt">"binaryVersion"</span><span class="p">:</span><span class="mi">9</span><span class="p">,</span>
- <span class="nt">"size"</span><span class="p">:</span><span class="err">size_o</span><span class="kc">f</span><span class="err">_segme</span><span class="kc">nt</span><span class="p">,</span>
+ <span class="nt">"size"</span><span class="p">:</span><span class="err">size_of_segment</span><span class="p">,</span>
<span class="nt">"identifier"</span><span class="p">:</span><span class="s2">"wikipedia_2012-05-23T00:00:00.000Z_2012-05-24T00:00:00.000Z_2012-05-23T00:10:00.046Z"</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.13.0-incubating/design/auth.html b/docs/0.13.0-incubating/design/auth.html
index d06875d..03c61be 100644
--- a/docs/0.13.0-incubating/design/auth.html
+++ b/docs/0.13.0-incubating/design/auth.html
@@ -313,11 +313,11 @@
<p>An Authenticator implementation that is intended to support internal Druid communications must recognize credentials for the "internal system user", as provided by a corresponding Escalator implementation.</p>
<p>An Escalator must implement three methods related to the internal system user:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="kd">public</span> <span class="n">HttpClient</span> <span class="nf">createEscalatedClient</span><span class="p">(</span><span class="n">HttpClient</span> <span class="n">baseClient</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="kd">public</span> <span class="n">HttpClient</span> <span class="nf">createEscalatedClient</span><span class="o">(</span><span class="n">HttpClient</span> <span class="n">baseClient</span><span class="o">);</span>
- <span class="kd">public</span> <span class="n">org</span><span class="p">.</span><span class="na">eclipse</span><span class="p">.</span><span class="na">jetty</span><span class="p">.</span><span class="na">client</span><span class="p">.</span><span class="na">HttpClient</span> <span class="nf">createEscalatedJettyClient</span><span class="p">(</span><span class="n">org</span><span class="p">.</span><span class="na">eclipse</span><span class="p">.</span><span class="na">jetty</span><span class="p">.</span><span class="na">client</span><span class="p">.</span><span class="na">HttpClient</span> <span class="n">baseClient</span><span class="p">);</span>
+ <span class="kd">public</span> <span class="n">org</span><span class="o">.</span><span class="na">eclipse</span><span class="o">.</span><span class="na">jetty</span><span class="o">.</span><span class="na">client</span><span class="o">.</span><span class="na">HttpClient</span> <span class="nf">createEscalatedJettyClient</span><span class="o">(</span><span class="n">org</span><span class="o">.</span><span class="na">eclipse</span><span class="o">.</span><span class="na">jetty</span><span class="o">.</span><span class="na">client</span><span class="o">.</span><span class="na">HttpClient</span> <span class="n">baseClient</span><span class="o">);</span>
- <span class="kd">public</span> <span class="n">AuthenticationResult</span> <span class="nf">createEscalatedAuthenticationResult</span><span class="p">();</span>
+ <span class="kd">public</span> <span class="n">AuthenticationResult</span> <span class="nf">createEscalatedAuthenticationResult</span><span class="o">();</span>
</code></pre></div>
<p><code>createEscalatedClient</code> returns an wrapped HttpClient that attaches the credentials of the "internal system user" to requests.</p>
diff --git a/docs/0.13.0-incubating/development/extensions-contrib/ambari-metrics-emitter.html b/docs/0.13.0-incubating/development/extensions-contrib/ambari-metrics-emitter.html
index 8d459bb..eb5cb9d 100644
--- a/docs/0.13.0-incubating/development/extensions-contrib/ambari-metrics-emitter.html
+++ b/docs/0.13.0-incubating/development/extensions-contrib/ambari-metrics-emitter.html
@@ -274,7 +274,7 @@
<p>The first implementation called <code>all</code>, will send all the druid service metrics events.
The path will be in the form <code><namespacePrefix>.[<druid service name>].[<druid hostname>].<dimensions values ordered by dimension's name>.<metric></code>
User has control of <code><namespacePrefix>.[<druid service name>].[<druid hostname>].</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.ambari</span><span class="mi">-</span><span class="err">me</span><span class="kc">tr</span><span class="err">ics.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.ambari-metrics.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">}</span>
</code></pre></div>
<h4 id="white-list-based-converter">White-list based converter</h4>
@@ -285,7 +285,7 @@
<p>Although user can override the default white list map by supplying a property called <code>mapPath</code>.
This property is a String containing the path for the file containing <strong>white list map Json object</strong>.
For example the following converter will read the map from the file <code>/pathPrefix/fileName.json</code>. </p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.ambari</span><span class="mi">-</span><span class="err">me</span><span class="kc">tr</span><span class="err">ics.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.ambari-metrics.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
</code></pre></div>
<p><strong>Druid emits a huge number of metrics we highly recommend to use the <code>whiteList</code> converter</strong></p>
diff --git a/docs/0.13.0-incubating/development/extensions-contrib/azure.html b/docs/0.13.0-incubating/development/extensions-contrib/azure.html
index 63d141e..afc79cc 100644
--- a/docs/0.13.0-incubating/development/extensions-contrib/azure.html
+++ b/docs/0.13.0-incubating/development/extensions-contrib/azure.html
@@ -220,7 +220,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-azure-blobstore"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
diff --git a/docs/0.13.0-incubating/development/extensions-contrib/cloudfiles.html b/docs/0.13.0-incubating/development/extensions-contrib/cloudfiles.html
index 5464f7c..2650e97 100644
--- a/docs/0.13.0-incubating/development/extensions-contrib/cloudfiles.html
+++ b/docs/0.13.0-incubating/development/extensions-contrib/cloudfiles.html
@@ -234,17 +234,17 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-cloudfiles"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
- <span class="nt">"region"</span><span class="p">:</span> <span class="nt">"DFW"</span>
- <span class="nt">"container"</span><span class="p">:</span> <span class="s2">"container"</span><span class="p">,</span>
+ <span class="nt">"region"</span><span class="p">:</span> <span class="s2">"DFW"</span>
+ <span class="s2">"container"</span><span class="p">:</span> <span class="s2">"container"</span><span class="p">,</span>
<span class="nt">"path"</span><span class="p">:</span> <span class="s2">"/path/to/your/file.json"</span>
<span class="p">},</span>
<span class="p">{</span>
- <span class="nt">"region"</span><span class="p">:</span> <span class="nt">"ORD"</span>
- <span class="nt">"container"</span><span class="p">:</span> <span class="s2">"anothercontainer"</span><span class="p">,</span>
+ <span class="nt">"region"</span><span class="p">:</span> <span class="s2">"ORD"</span>
+ <span class="s2">"container"</span><span class="p">:</span> <span class="s2">"anothercontainer"</span><span class="p">,</span>
<span class="nt">"path"</span><span class="p">:</span> <span class="s2">"/another/path.json"</span>
<span class="p">}</span>
<span class="p">]</span>
diff --git a/docs/0.13.0-incubating/development/extensions-contrib/google.html b/docs/0.13.0-incubating/development/extensions-contrib/google.html
index 098dcc1..5ada1bf 100644
--- a/docs/0.13.0-incubating/development/extensions-contrib/google.html
+++ b/docs/0.13.0-incubating/development/extensions-contrib/google.html
@@ -198,7 +198,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-google-blobstore"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
diff --git a/docs/0.13.0-incubating/development/extensions-contrib/graphite.html b/docs/0.13.0-incubating/development/extensions-contrib/graphite.html
index bc1f265..712776c 100644
--- a/docs/0.13.0-incubating/development/extensions-contrib/graphite.html
+++ b/docs/0.13.0-incubating/development/extensions-contrib/graphite.html
@@ -281,7 +281,7 @@
<p>Elements in metric name by default are separated by "/", so graphite will create all metrics on one level. If you want to have metrics in the tree structure, you have to set <code>replaceSlashWithDot=true</code>
Original: <code>druid.HOSTNAME.dataSourceName.queryType.query/time</code>
Changed: <code>druid.HOSTNAME.dataSourceName.queryType.query.time</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.graphi</span><span class="kc">te</span><span class="err">.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.graphite.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">}</span>
</code></pre></div>
<h4 id="white-list-based-converter">White-list based converter</h4>
@@ -292,7 +292,7 @@
<p>Although user can override the default white list map by supplying a property called <code>mapPath</code>.
This property is a String containing the path for the file containing <strong>white list map Json object</strong>.
For example the following converter will read the map from the file <code>/pathPrefix/fileName.json</code>. </p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.graphi</span><span class="kc">te</span><span class="err">.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.graphite.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
</code></pre></div>
<p><strong>Druid emits a huge number of metrics we highly recommend to use the <code>whiteList</code> converter</strong></p>
diff --git a/docs/0.13.0-incubating/development/extensions-contrib/kafka-simple.html b/docs/0.13.0-incubating/development/extensions-contrib/kafka-simple.html
index 9bfa885..9b66cd4 100644
--- a/docs/0.13.0-incubating/development/extensions-contrib/kafka-simple.html
+++ b/docs/0.13.0-incubating/development/extensions-contrib/kafka-simple.html
@@ -156,7 +156,7 @@
<p>This is an experimental firehose to ingest data from kafka using kafka simple consumer api. Currently, this firehose would only work inside standalone realtime nodes.
The configuration for KafkaSimpleConsumerFirehose is similar to the Kafka Eight Firehose , except <code>firehose</code> should be replaced with <code>firehoseV2</code> like this:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehoseV2"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehoseV2"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"kafka-0.8-v2"</span><span class="p">,</span>
<span class="nt">"brokerList"</span> <span class="p">:</span> <span class="p">[</span><span class="s2">"localhost:4443"</span><span class="p">],</span>
<span class="nt">"queueBufferLength"</span><span class="p">:</span><span class="mi">10001</span><span class="p">,</span>
diff --git a/docs/0.13.0-incubating/development/extensions-contrib/opentsdb-emitter.html b/docs/0.13.0-incubating/development/extensions-contrib/opentsdb-emitter.html
index 83d8913..d969b6a 100644
--- a/docs/0.13.0-incubating/development/extensions-contrib/opentsdb-emitter.html
+++ b/docs/0.13.0-incubating/development/extensions-contrib/opentsdb-emitter.html
@@ -224,7 +224,7 @@
If the user does not specify their own JSON file, a default file is used. All metrics are expected to be configured in the JSON file. Metrics which are not configured will be logged.
Desired metrics and dimensions is organized using the following schema:<code><druid metric name> : [ <dimension list> ]</code><br />
e.g.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"query/time"</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"query/time"</span><span class="err">:</span> <span class="p">[</span>
<span class="s2">"dataSource"</span><span class="p">,</span>
<span class="s2">"type"</span>
<span class="p">]</span>
diff --git a/docs/0.13.0-incubating/development/extensions-contrib/rabbitmq.html b/docs/0.13.0-incubating/development/extensions-contrib/rabbitmq.html
index 6231290..268e366 100644
--- a/docs/0.13.0-incubating/development/extensions-contrib/rabbitmq.html
+++ b/docs/0.13.0-incubating/development/extensions-contrib/rabbitmq.html
@@ -161,7 +161,7 @@
<p><strong>Note:</strong> Add <strong>amqp-client-3.2.1.jar</strong> to lib directory of druid to use this firehose.</p>
<p>A sample spec for rabbitmq firehose:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"rabbitmq"</span><span class="p">,</span>
<span class="nt">"connection"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"host"</span><span class="p">:</span> <span class="s2">"localhost"</span><span class="p">,</span>
diff --git a/docs/0.13.0-incubating/development/extensions-core/approximate-histograms.html b/docs/0.13.0-incubating/development/extensions-core/approximate-histograms.html
index 2bb47d3..1e25d9c 100644
--- a/docs/0.13.0-incubating/development/extensions-core/approximate-histograms.html
+++ b/docs/0.13.0-incubating/development/extensions-core/approximate-histograms.html
@@ -203,12 +203,12 @@
query.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"approxHistogram or approxHistogramFold (at ingestion time), approxHistogramFold (at query time)"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"resolution"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
- <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
- <span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fl</span><span class="err">oa</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fl</span><span class="err">oa</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"resolution"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
+ <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
+ <span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><float></span><span class="p">,</span>
+ <span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><float></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -249,7 +249,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalBuckets"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"numBuckets"</span><span class="p">:</span> <span class="err"><cou</span><span class="kc">nt</span><span class="err">></span>
+ <span class="nt">"numBuckets"</span><span class="p">:</span> <span class="err"><count></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="buckets-post-aggregator">Buckets post-aggregator</h4>
@@ -263,37 +263,37 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"buckets"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"bucketSize"</span><span class="p">:</span> <span class="err"><bucke</span><span class="kc">t</span><span class="err">_size></span><span class="p">,</span>
- <span class="nt">"offset"</span><span class="p">:</span> <span class="err"><o</span><span class="kc">ffset</span><span class="err">></span>
+ <span class="nt">"bucketSize"</span><span class="p">:</span> <span class="err"><bucket_size></span><span class="p">,</span>
+ <span class="nt">"offset"</span><span class="p">:</span> <span class="err"><offset></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="custom-buckets-post-aggregator">Custom buckets post-aggregator</h4>
<p>Computes a visual representation of the approximate histogram with bins laid out according to the given breaks.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"customBuckets"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"customBuckets"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
<span class="nt">"breaks"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><value></span><span class="p">,</span> <span class="err"><value></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<h4 id="min-post-aggregator">min post-aggregator</h4>
<p>Returns the minimum value of the underlying approximate histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"min"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"min"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="max-post-aggregator">max post-aggregator</h4>
<p>Returns the maximum value of the underlying approximate histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"max"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"max"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="quantile-post-aggregator">quantile post-aggregator</h4>
<p>Computes a single quantile based on the underlying approximate histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantile"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"probability"</span> <span class="p">:</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantile"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
+ <span class="nt">"probability"</span> <span class="p">:</span> <span class="err"><quantile></span> <span class="p">}</span>
</code></pre></div>
<h4 id="quantiles-post-aggregator">quantiles post-aggregator</h4>
<p>Computes an array of quantiles based on the underlying approximate histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantiles"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"probabilities"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span><span class="p">,</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantiles"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
+ <span class="nt">"probabilities"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><quantile></span><span class="p">,</span> <span class="err"><quantile></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.13.0-incubating/development/extensions-core/avro.html b/docs/0.13.0-incubating/development/extensions-core/avro.html
index 69918fa..9190a13 100644
--- a/docs/0.13.0-incubating/development/extensions-core/avro.html
+++ b/docs/0.13.0-incubating/development/extensions-core/avro.html
@@ -188,7 +188,7 @@
field types, which can be used to read nested Avro records. The "jq" field type is not currently supported for Avro.</p>
<p>For example, using Avro stream parser with schema repo Avro bytes decoder:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"parser"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"avro_stream"</span><span class="p">,</span>
<span class="nt">"avroBytesDecoder"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"schema_repo"</span><span class="p">,</span>
@@ -203,9 +203,9 @@
<span class="p">},</span>
<span class="nt">"parseSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"avro"</span><span class="p">,</span>
- <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mpSpec></span><span class="p">,</span>
- <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
- <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">></span>
+ <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">timestampSpec></span><span class="p">,</span>
+ <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
+ <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><optional></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -433,9 +433,9 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"avro_hadoop"</span><span class="p">,</span>
<span class="nt">"parseSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"avro"</span><span class="p">,</span>
- <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mpSpec></span><span class="p">,</span>
- <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
- <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">></span>
+ <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">timestampSpec></span><span class="p">,</span>
+ <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
+ <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><optional></span>
<span class="p">}</span>
<span class="p">}</span>
<span class="p">},</span>
diff --git a/docs/0.13.0-incubating/development/extensions-core/bloom-filter.html b/docs/0.13.0-incubating/development/extensions-core/bloom-filter.html
index db1e274..853f837 100644
--- a/docs/0.13.0-incubating/development/extensions-core/bloom-filter.html
+++ b/docs/0.13.0-incubating/development/extensions-core/bloom-filter.html
@@ -167,9 +167,9 @@
<h3 id="json-representation-of-bloom-filter">JSON Representation of Bloom Filter</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"bloom"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"bloomKFilter"</span> <span class="p">:</span> <span class="err"><serialized_by</span><span class="kc">tes</span><span class="err">_</span><span class="kc">f</span><span class="err">or_BloomKFil</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fn</span><span class="err">></span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension_name></span><span class="p">,</span>
+ <span class="nt">"bloomKFilter"</span> <span class="p">:</span> <span class="err"><serialized_bytes_for_BloomKFilter></span><span class="p">,</span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><extraction_fn></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.13.0-incubating/development/extensions-core/datasketches-quantiles.html b/docs/0.13.0-incubating/development/extensions-core/datasketches-quantiles.html
index 2d491f9..47cda79 100644
--- a/docs/0.13.0-incubating/development/extensions-core/datasketches-quantiles.html
+++ b/docs/0.13.0-incubating/development/extensions-core/datasketches-quantiles.html
@@ -168,9 +168,9 @@
<p>The result of the aggregation is a DoublesSketch that is the union of all sketches either built from raw data or read from the segments.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"k"</span><span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">co</span><span class="kc">ntr</span><span class="err">ols</span> <span class="err">size</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">accuracy></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"k"</span><span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">controls</span> <span class="err">size</span> <span class="err">and</span> <span class="err">accuracy></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -209,9 +209,9 @@
<p>This returns an approximation to the value that would be preceded by a given fraction of a hypothetical sorted version of the input stream.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToQuantile"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"fraction"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">posi</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hypo</span><span class="kc">t</span><span class="err">he</span><span class="kc">t</span><span class="err">ical</span> <span class="err">sor</span><span class="kc">te</span><span class="err">d</span> <span class="err">s</span><span class="kc">trea</span><span class="err">m</span><span class="p">,</span> <span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">0</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1</span> <span class="err">i</span><span class="kc">n</span><span class="err">clusive></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"fraction"</span> <span class="p">:</span> <span class="err"><fractional</span> <span class="err">position</span> <span class="err">in</span> <span class="err">the</span> <span class="err">hypothetical</span> <span class="err">sorted</span> <span class="err">stream</span><span class="p">,</span> <span class="err">number</span> <span class="err">from</span> <span class="err">0</span> <span class="err">to</span> <span class="err">1</span> <span class="err">inclusive></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="quantiles">Quantiles</h4>
@@ -219,9 +219,9 @@
<p>This returns an array of quantiles corresponding to a given array of fractions</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToQuantiles"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"fractions"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">fra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">posi</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hypo</span><span class="kc">t</span><span class="err">he</span><span class="kc">t</span><span class="err">ical</span> <span class="err">sor</span><span class="kc">te</span><span class="err">d</span> <span class="err">s</span><span class="kc">trea</span><span class="err">m</span><span class="p">,</span> <span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">0</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1</span> <span class="err">i</span><span class="kc">n</span><span class="err">clusive></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"fractions"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">fractional</span> <span class="err">positions</span> <span class="err">in</span> <span class="err">the</span> <span class="err">hypothetical</span> <span class="err">sorted</span> <span class="err">stream</span><span class="p">,</span> <span class="err">number</span> <span class="err">from</span> <span class="err">0</span> <span class="err">to</span> <span class="err">1</span> <span class="err">inclusive></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="histogram">Histogram</h4>
@@ -229,9 +229,9 @@
<p>This returns an approximation to the histogram given an array of split points that define the histogram bins. An array of <i>m</i> unique, monotonically increasing split points divide the real number line into <i>m+1</i> consecutive disjoint intervals. The definition of an interval is inclusive of the left split point and exclusive of the right split point.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToHistogram"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"splitPoints"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">spli</span><span class="kc">t</span> <span class="err">poi</span><span class="kc">nts</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"splitPoints"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">split</span> <span class="err">points></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-summary">Sketch Summary</h4>
@@ -239,8 +239,8 @@
<p>This returns a summary of the sketch that can be used for debugging. This is the result of calling toString() method.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToString"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.13.0-incubating/development/extensions-core/datasketches-theta.html b/docs/0.13.0-incubating/development/extensions-core/datasketches-theta.html
index df8c461..18db4f1 100644
--- a/docs/0.13.0-incubating/development/extensions-core/datasketches-theta.html
+++ b/docs/0.13.0-incubating/development/extensions-core/datasketches-theta.html
@@ -160,8 +160,8 @@
<h3 id="aggregators">Aggregators</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="nt">"isInputThetaSketch"</span><span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
<span class="nt">"size"</span><span class="p">:</span> <span class="mi">16384</span>
<span class="p">}</span>
@@ -205,17 +205,17 @@
<h4 id="sketch-estimator">Sketch Estimator</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketchEstimate"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">ype</span> <span class="kc">f</span><span class="err">ieldAccess</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">ype</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">chSe</span><span class="kc">t</span><span class="err">Op></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">of</span> <span class="err">type</span> <span class="err">fieldAccess</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">thetaSketch</span> <span class="err">aggregator</span> <span class="err">or</span> <span class="err">that</span> <span class="err">of</span> <span class="err">type</span> <span class="err">thetaSketchSetOp></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-operations">Sketch Operations</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketchSetOp"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
<span class="nt">"func"</span><span class="p">:</span> <span class="err"><UNION|INTERSECT|NOT></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">f</span><span class="err">ieldAccess</span> <span class="kc">t</span><span class="err">ype</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="kc">t</span><span class="err">he</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">chSe</span><span class="kc">t</span><span class="err">Op</span> <span class="kc">t</span><span class="err">ype</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">allow</span> <span class="err">arbi</span><span class="kc">trar</span><span class="err">y</span> <span class="err">combi</span><span class="kc">nat</span><span class="err">io</span><span class="kc">n</span> <span class="err">o</span><span class="kc">f</span> <span class="err">se</span><span class="kc">t</span> <span class="err">opera</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"size"</span><span class="p">:</span> <span class="err"><</span><span class="mi">16384</span> <span class="err">by</span> <span class="err">de</span><span class="kc">fault</span><span class="p">,</span> <span class="err">mus</span><span class="kc">t</span> <span class="err">be</span> <span class="err">max</span> <span class="err">o</span><span class="kc">f</span> <span class="err">size</span> <span class="kc">fr</span><span class="err">om</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ches</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">f</span><span class="err">ields</span> <span class="err">i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">fieldAccess</span> <span class="err">type</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">the</span> <span class="err">thetaSketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">thetaSketchSetOp</span> <span class="err">type</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">allow</span> <span class="err">arbitrary</span> <span class="err">combination</span> <span class="err">of</span> <span class="err">set</span> <span class="err">operations></span><span class="p">,</span>
+ <span class="nt">"size"</span><span class="p">:</span> <span class="err"><</span><span class="mi">16384</span> <span class="err">by</span> <span class="err">default</span><span class="p">,</span> <span class="err">must</span> <span class="err">be</span> <span class="err">max</span> <span class="err">of</span> <span class="err">size</span> <span class="err">from</span> <span class="err">sketches</span> <span class="err">in</span> <span class="err">fields</span> <span class="err">input></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="examples">Examples</h3>
diff --git a/docs/0.13.0-incubating/development/extensions-core/datasketches-tuple.html b/docs/0.13.0-incubating/development/extensions-core/datasketches-tuple.html
index 87ea4c1..596b33d 100644
--- a/docs/0.13.0-incubating/development/extensions-core/datasketches-tuple.html
+++ b/docs/0.13.0-incubating/development/extensions-core/datasketches-tuple.html
@@ -158,11 +158,11 @@
<h3 id="aggregators">Aggregators</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"nominalEntries"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"metricColumns"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">gs></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"nominalEntries"</span><span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"metricColumns"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">strings></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -211,8 +211,8 @@
<p>Returns a distinct count estimate from a given ArrayOfDoublesSketch.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToEstimate"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="estimate-of-the-number-of-distinct-keys-with-error-bounds">Estimate of the number of distinct keys with error bounds</h4>
@@ -220,9 +220,9 @@
<p>Returns a distinct count estimate and error bounds from a given ArrayOfDoublesSketch. The result will be three double values: estimate of the number of distinct keys, lower bound and upper bound. The bounds are provided at the given number of standard deviations (optional, defaults to 1). This must be an integer value of 1, 2 or 3 corresponding to approximately 68.3%, 95.4% and 99.7% confidence intervals.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToEstimateAndBounds"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="s2">"numStdDevs"</span><span class="p">,</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">1</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">3</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"numStdDevs"</span><span class="p">,</span> <span class="err"><number</span> <span class="err">from</span> <span class="err">1</span> <span class="err">to</span> <span class="err">3></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="number-of-retained-entries">Number of retained entries</h4>
@@ -230,8 +230,8 @@
<p>Returns the number of retained entries from a given ArrayOfDoublesSketch.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToNumEntries"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="mean-values-for-each-column">Mean values for each column</h4>
@@ -239,8 +239,8 @@
<p>Returns a list of mean values from a given ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToMeans"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="variance-values-for-each-column">Variance values for each column</h4>
@@ -248,8 +248,8 @@
<p>Returns a list of variance values from a given ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToVariances"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="quantiles-sketch-from-a-column">Quantiles sketch from a column</h4>
@@ -263,10 +263,10 @@
</ul>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToQuantilesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"column"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"k"</span> <span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">de</span><span class="kc">ter</span><span class="err">mi</span><span class="kc">nes</span> <span class="kc">t</span><span class="err">he</span> <span class="err">accuracy</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">qua</span><span class="kc">nt</span><span class="err">iles</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"column"</span> <span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"k"</span> <span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">determines</span> <span class="err">the</span> <span class="err">accuracy</span> <span class="err">and</span> <span class="err">size</span> <span class="err">of</span> <span class="err">the</span> <span class="err">quantiles</span> <span class="err">sketch></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="set-operations">Set Operations</h4>
@@ -274,11 +274,11 @@
<p>Returns a result of a specified set operation on the given array of sketches. Supported operations are: union, intersection and set difference (UNION, INTERSECT, NOT).</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchSetOp"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
<span class="nt">"operation"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"UNION"</span><span class="err">|</span><span class="s2">"INTERSECT"</span><span class="err">|</span><span class="s2">"NOT"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">allow</span> <span class="err">arbi</span><span class="kc">trar</span><span class="err">y</span> <span class="err">combi</span><span class="kc">nat</span><span class="err">io</span><span class="kc">n</span> <span class="err">o</span><span class="kc">f</span> <span class="err">se</span><span class="kc">t</span> <span class="err">opera</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"nominalEntries"</span> <span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">de</span><span class="kc">ter</span><span class="err">mi</span><span class="kc">nes</span> <span class="kc">t</span><span class="err">he</span> <span class="err">accuracy</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch></span><span class="p">,</span>
- <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber</span> <span class="err">o</span><span class="kc">f</span> <span class="err">values</span> <span class="err">associa</span><span class="kc">te</span><span class="err">d</span> <span class="err">wi</span><span class="kc">t</span><span class="err">h</span> <span class="err">each</span> <span class="err">dis</span><span class="kc">t</span><span class="err">i</span><span class="kc">n</span><span class="err">c</span><span class="kc">t</span> <span class="err">key></span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">sketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">allow</span> <span class="err">arbitrary</span> <span class="err">combination</span> <span class="err">of</span> <span class="err">set</span> <span class="err">operations></span><span class="p">,</span>
+ <span class="nt">"nominalEntries"</span> <span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">determines</span> <span class="err">the</span> <span class="err">accuracy</span> <span class="err">and</span> <span class="err">size</span> <span class="err">of</span> <span class="err">the</span> <span class="err">sketch></span><span class="p">,</span>
+ <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><number</span> <span class="err">of</span> <span class="err">values</span> <span class="err">associated</span> <span class="err">with</span> <span class="err">each</span> <span class="err">distinct</span> <span class="err">key></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="students-t-test">Student's t-test</h4>
@@ -286,8 +286,8 @@
<p>Performs Student's t-test and returns a list of p-values given two instances of ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key. See <a href="http://commons.apache.org/proper/commons-math/javadocs/api-3.4/org/apache/commons/math3/stat/inference/TTest.html">t-test documentation</a>.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchTTest"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">wi</span><span class="kc">t</span><span class="err">h</span> <span class="kc">t</span><span class="err">wo</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">re</span><span class="kc">ferr</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">with</span> <span class="err">two</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">sketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">referring</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch></span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-summary">Sketch summary</h4>
@@ -295,8 +295,8 @@
<p>Returns a human-readable summary of a given ArrayOfDoublesSketch. This is a string returned by toString() method of the sketch. This can be useful for debugging.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToString"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.13.0-incubating/development/extensions-core/examples.html b/docs/0.13.0-incubating/development/extensions-core/examples.html
index c1dc17a..ba62c0f 100644
--- a/docs/0.13.0-incubating/development/extensions-core/examples.html
+++ b/docs/0.13.0-incubating/development/extensions-core/examples.html
@@ -155,7 +155,7 @@
<p>This firehose connects directly to the twitter spritzer data stream.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"twitzer"</span><span class="p">,</span>
<span class="nt">"maxEventCount"</span><span class="p">:</span> <span class="mi">-1</span><span class="p">,</span>
<span class="nt">"maxRunMinutes"</span><span class="p">:</span> <span class="mi">0</span>
diff --git a/docs/0.13.0-incubating/development/extensions-core/kafka-eight-firehose.html b/docs/0.13.0-incubating/development/extensions-core/kafka-eight-firehose.html
index 99b17a4..436d0d6 100644
--- a/docs/0.13.0-incubating/development/extensions-core/kafka-eight-firehose.html
+++ b/docs/0.13.0-incubating/development/extensions-core/kafka-eight-firehose.html
@@ -155,7 +155,7 @@
<p>This firehose acts as a Kafka 0.8.x consumer and ingests data from Kafka.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"kafka-0.8"</span><span class="p">,</span>
<span class="nt">"consumerProps"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"zookeeper.connect"</span><span class="p">:</span> <span class="s2">"localhost:2181"</span><span class="p">,</span>
diff --git a/docs/0.13.0-incubating/development/extensions-core/lookups-cached-global.html b/docs/0.13.0-incubating/development/extensions-core/lookups-cached-global.html
index e681c04..8b0781a 100644
--- a/docs/0.13.0-incubating/development/extensions-core/lookups-cached-global.html
+++ b/docs/0.13.0-incubating/development/extensions-core/lookups-cached-global.html
@@ -459,7 +459,7 @@
truck,something3,buck
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"csv"</span><span class="p">,</span>
<span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"value"</span><span class="p">,</span><span class="s2">"somethingElse"</span><span class="p">,</span><span class="s2">"key"</span><span class="p">],</span>
<span class="nt">"keyColumn"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
@@ -530,7 +530,7 @@
truck|something,3|buck
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"tsv"</span><span class="p">,</span>
<span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"value"</span><span class="p">,</span><span class="s2">"somethingElse"</span><span class="p">,</span><span class="s2">"key"</span><span class="p">],</span>
<span class="nt">"keyColumn"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
@@ -568,7 +568,7 @@
<span class="p">{</span><span class="nt">"key"</span><span class="p">:</span> <span class="s2">"buck"</span><span class="p">,</span> <span class="nt">"somethingElse"</span><span class="p">:</span> <span class="s2">"something"</span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="s2">"truck"</span><span class="p">}</span>
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"customJson"</span><span class="p">,</span>
<span class="nt">"keyFieldName"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
<span class="nt">"valueFieldName"</span><span class="p">:</span> <span class="s2">"value"</span>
@@ -587,7 +587,7 @@
<span class="p">{</span><span class="nt">"buck"</span><span class="p">:</span> <span class="s2">"truck"</span><span class="p">}</span>
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"simpleJson"</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.13.0-incubating/development/extensions-core/s3.html b/docs/0.13.0-incubating/development/extensions-core/s3.html
index f8a4962..e6a7120 100644
--- a/docs/0.13.0-incubating/development/extensions-core/s3.html
+++ b/docs/0.13.0-incubating/development/extensions-core/s3.html
@@ -274,7 +274,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-s3"</span><span class="p">,</span>
<span class="nt">"uris"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"s3://foo/bar/file.gz"</span><span class="p">,</span> <span class="s2">"s3://bar/foo/file2.gz"</span><span class="p">]</span>
<span class="p">}</span>
diff --git a/docs/0.13.0-incubating/development/extensions-core/stats.html b/docs/0.13.0-incubating/development/extensions-core/stats.html
index 32be515..8eb3312 100644
--- a/docs/0.13.0-incubating/development/extensions-core/stats.html
+++ b/docs/0.13.0-incubating/development/extensions-core/stats.html
@@ -180,18 +180,18 @@
<p>User can specify expected input type as one of "float", "long", "variance" for ingestion, which is by default "float".</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"variance"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"inputType"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">t</span><span class="err">ype></span><span class="p">,</span>
- <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"inputType"</span> <span class="p">:</span> <span class="err"><input_type></span><span class="p">,</span>
+ <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<p>To query for results, "variance" aggregator with "variance" input type or simply a "varianceFold" aggregator must be included in the query.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"varianceFold"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -215,7 +215,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"stddev"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"estimator"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"estimator"</span><span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="query-examples">Query Examples:</h2>
diff --git a/docs/0.13.0-incubating/development/extensions-core/test-stats.html b/docs/0.13.0-incubating/development/extensions-core/test-stats.html
index aab4154..47df51c 100644
--- a/docs/0.13.0-incubating/development/extensions-core/test-stats.html
+++ b/docs/0.13.0-incubating/development/extensions-core/test-stats.html
@@ -175,10 +175,10 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"zscore2sample"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"successCount1"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">success</span> <span class="err">cou</span><span class="kc">nt</span> <span class="err">o</span><span class="kc">f</span> <span class="err">sample</span> <span class="mi">1</span><span class="p">,</span>
- <span class="nt">"sample1Size"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggregaror></span> <span class="err">sample</span> <span class="mi">1</span> <span class="err">size</span><span class="p">,</span>
- <span class="nt">"successCount2"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">success</span> <span class="err">cou</span><span class="kc">nt</span> <span class="err">o</span><span class="kc">f</span> <span class="err">sample</span> <span class="mi">2</span><span class="p">,</span>
- <span class="nt">"sample2Size"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">sample</span> <span class="mi">2</span> <span class="err">size</span>
+ <span class="nt">"successCount1"</span><span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">success</span> <span class="err">count</span> <span class="err">of</span> <span class="err">sample</span> <span class="mi">1</span><span class="p">,</span>
+ <span class="nt">"sample1Size"</span><span class="p">:</span> <span class="err"><post_aggregaror></span> <span class="err">sample</span> <span class="mi">1</span> <span class="err">size</span><span class="p">,</span>
+ <span class="nt">"successCount2"</span><span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">success</span> <span class="err">count</span> <span class="err">of</span> <span class="err">sample</span> <span class="mi">2</span><span class="p">,</span>
+ <span class="nt">"sample2Size"</span> <span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">sample</span> <span class="mi">2</span> <span class="err">size</span>
<span class="p">}</span>
</code></pre></div>
<p>Please note the post aggregator will be converting binary variables to continuous variables for two population proportions. Specifically</p>
@@ -199,7 +199,7 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"pvalue2tailedZtest"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"zScore"</span><span class="p">:</span> <span class="err"><zscore</span> <span class="err">pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span>
+ <span class="nt">"zScore"</span><span class="p">:</span> <span class="err"><zscore</span> <span class="err">post_aggregator></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="example-usage">Example Usage</h2>
diff --git a/docs/0.13.0-incubating/development/geo.html b/docs/0.13.0-incubating/development/geo.html
index 7273d2c..1c74fa3 100644
--- a/docs/0.13.0-incubating/development/geo.html
+++ b/docs/0.13.0-incubating/development/geo.html
@@ -201,7 +201,7 @@
<h1 id="spatial-filters">Spatial Filters</h1>
<p>The grammar for a spatial filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"spatial"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"spatialDim"</span><span class="p">,</span>
<span class="nt">"bound"</span><span class="p">:</span> <span class="p">{</span>
diff --git a/docs/0.13.0-incubating/development/modules.html b/docs/0.13.0-incubating/development/modules.html
index 81779d3..8b8f6dd 100644
--- a/docs/0.13.0-incubating/development/modules.html
+++ b/docs/0.13.0-incubating/development/modules.html
@@ -208,13 +208,13 @@
<p>Check the <code>azure-storage</code>, <code>google-storage</code>, <code>cassandra-storage</code>, <code>hdfs-storage</code> and <code>s3-extensions</code> modules for examples of how to do this.</p>
<p>The basic idea behind the extension is that you need to add bindings for your DataSegmentPusher and DataSegmentPuller objects. The way to add them is something like (taken from HdfsStorageDruidModule)</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Binders</span><span class="p">.</span><span class="na">dataSegmentPullerBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="s">"hdfs"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">HdfsDataSegmentPuller</span><span class="p">.</span><span class="na">class</span><span class="p">).</span><span class="na">in</span><span class="p">(</span><span class="n">LazySingleton</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Binders</span><span class="o">.</span><span class="na">dataSegmentPullerBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="s">"hdfs"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">HdfsDataSegmentPuller</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">in</span><span class="o">(</span><span class="n">LazySingleton</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-<span class="n">Binders</span><span class="p">.</span><span class="na">dataSegmentPusherBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="s">"hdfs"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">HdfsDataSegmentPusher</span><span class="p">.</span><span class="na">class</span><span class="p">).</span><span class="na">in</span><span class="p">(</span><span class="n">LazySingleton</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<span class="n">Binders</span><span class="o">.</span><span class="na">dataSegmentPusherBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="s">"hdfs"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">HdfsDataSegmentPusher</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">in</span><span class="o">(</span><span class="n">LazySingleton</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<p><code>Binders.dataSegment*Binder()</code> is a call provided by the druid-api jar which sets up a Guice multibind "MapBinder". If that doesn't make sense, don't worry about it, just think of it as a magical incantation.</p>
@@ -284,12 +284,12 @@
<p>Adding a Firehose is done almost entirely through the Jackson Modules instead of Guice. Specifically, note the implementation</p>
<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="nd">@Override</span>
-<span class="kd">public</span> <span class="n">List</span><span class="o"><?</span> <span class="kd">extends</span> <span class="n">Module</span><span class="o">></span> <span class="nf">getJacksonModules</span><span class="p">()</span>
-<span class="p">{</span>
- <span class="k">return</span> <span class="n">ImmutableList</span><span class="p">.</span><span class="na">of</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">SimpleModule</span><span class="p">().</span><span class="na">registerSubtypes</span><span class="p">(</span><span class="k">new</span> <span class="n">NamedType</span><span class="p">(</span><span class="n">StaticS3FirehoseFactory</span><span class="p">.</span><span class="na">class</span><span class="p">,</span> <span class="s">"static-s3"</span><span class="p">))</span>
- <span class="p">);</span>
-<span class="p">}</span>
+<span class="kd">public</span> <span class="n">List</span><span class="o"><?</span> <span class="kd">extends</span> <span class="n">Module</span><span class="o">></span> <span class="nf">getJacksonModules</span><span class="o">()</span>
+<span class="o">{</span>
+ <span class="k">return</span> <span class="n">ImmutableList</span><span class="o">.</span><span class="na">of</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">SimpleModule</span><span class="o">().</span><span class="na">registerSubtypes</span><span class="o">(</span><span class="k">new</span> <span class="n">NamedType</span><span class="o">(</span><span class="n">StaticS3FirehoseFactory</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="s">"static-s3"</span><span class="o">))</span>
+ <span class="o">);</span>
+<span class="o">}</span>
</code></pre></div>
<p>This is registering the FirehoseFactory with Jackson's polymorphic serde layer. More concretely, having this will mean that if you specify a <code>"firehose": { "type": "static-s3", ... }</code> in your realtime config, then the system will load this FirehoseFactory for your firehose.</p>
@@ -314,32 +314,32 @@
</ol>
<p>Registering these uses the same general strategy as a deep storage mechanism does. You do something like</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">DruidBinders</span><span class="p">.</span><span class="na">queryToolChestBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="n">SegmentMetadataQuery</span><span class="p">.</span><span class="na">class</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">SegmentMetadataQueryQueryToolChest</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">DruidBinders</span><span class="o">.</span><span class="na">queryToolChestBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="n">SegmentMetadataQuery</span><span class="o">.</span><span class="na">class</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">SegmentMetadataQueryQueryToolChest</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-<span class="n">DruidBinders</span><span class="p">.</span><span class="na">queryRunnerFactoryBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="n">SegmentMetadataQuery</span><span class="p">.</span><span class="na">class</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">SegmentMetadataQueryRunnerFactory</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<span class="n">DruidBinders</span><span class="o">.</span><span class="na">queryRunnerFactoryBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="n">SegmentMetadataQuery</span><span class="o">.</span><span class="na">class</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">SegmentMetadataQueryRunnerFactory</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<p>The first one binds the SegmentMetadataQueryQueryToolChest for usage when a SegmentMetadataQuery is used. The second one does the same thing but for the QueryRunnerFactory instead.</p>
<h3 id="adding-new-jersey-resources">Adding new Jersey resources</h3>
<p>Adding new Jersey resources to a module requires calling the following code to bind the resource in the module:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Jerseys</span><span class="p">.</span><span class="na">addResource</span><span class="p">(</span><span class="n">binder</span><span class="p">,</span> <span class="n">NewResource</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Jerseys</span><span class="o">.</span><span class="na">addResource</span><span class="o">(</span><span class="n">binder</span><span class="o">,</span> <span class="n">NewResource</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<h3 id="adding-a-new-password-provider-implementation">Adding a new Password Provider implementation</h3>
<p>You will need to implement <code>org.apache.druid.metadata.PasswordProvider</code> interface. For every place where Druid uses PasswordProvider, a new instance of the implementation will be created,
thus make sure all the necessary information required for fetching each password is supplied during object instantiation.
In your implementation of <code>org.apache.druid.initialization.DruidModule</code>, <code>getJacksonModules</code> should look something like this -</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="k">return</span> <span class="n">ImmutableList</span><span class="p">.</span><span class="na">of</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">SimpleModule</span><span class="p">(</span><span class="s">"SomePasswordProviderModule"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">registerSubtypes</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">NamedType</span><span class="p">(</span><span class="n">SomePasswordProvider</span><span class="p">.</span><span class="na">class</span><span class="p">,</span> <span class="s">"some"</span><span class="p">)</span>
- <span class="p">)</span>
- <span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="k">return</span> <span class="n">ImmutableList</span><span class="o">.</span><span class="na">of</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">SimpleModule</span><span class="o">(</span><span class="s">"SomePasswordProviderModule"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">registerSubtypes</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">NamedType</span><span class="o">(</span><span class="n">SomePasswordProvider</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="s">"some"</span><span class="o">)</span>
+ <span class="o">)</span>
+ <span class="o">);</span>
</code></pre></div>
<p>where <code>SomePasswordProvider</code> is the implementation of <code>PasswordProvider</code> interface, you can have a look at <code>org.apache.druid.metadata.EnvironmentVariablePasswordProvider</code> for example.</p>
diff --git a/docs/0.13.0-incubating/ingestion/compaction.html b/docs/0.13.0-incubating/ingestion/compaction.html
index fef9b88..5217f2e 100644
--- a/docs/0.13.0-incubating/ingestion/compaction.html
+++ b/docs/0.13.0-incubating/ingestion/compaction.html
@@ -153,14 +153,14 @@
<p>Compaction tasks merge all segments of the given interval. The syntax is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"compact"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><i</span><span class="kc">nter</span><span class="err">val</span> <span class="kc">t</span><span class="err">o</span> <span class="err">speci</span><span class="kc">f</span><span class="err">y</span> <span class="err">segme</span><span class="kc">nts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
- <span class="s2">"dimensions"</span> <span class="err"><cus</span><span class="kc">t</span><span class="err">om</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><interval</span> <span class="err">to</span> <span class="err">specify</span> <span class="err">segments</span> <span class="err">to</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
+ <span class="nt">"dimensions"</span> <span class="err"><custom</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
<span class="nt">"keepSegmentGranularity"</span><span class="p">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"targetCompactionSizeBytes"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tar</span><span class="err">ge</span><span class="kc">t</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="err">compac</span><span class="kc">te</span><span class="err">d</span> <span class="err">segme</span><span class="kc">nts</span><span class="err">></span>
- <span class="s2">"tuningConfig"</span> <span class="err"><i</span><span class="kc">n</span><span class="err">dex</span> <span class="kc">tas</span><span class="err">k</span> <span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">gCo</span><span class="kc">nf</span><span class="err">ig></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"targetCompactionSizeBytes"</span><span class="p">:</span> <span class="err"><target</span> <span class="err">size</span> <span class="err">of</span> <span class="err">compacted</span> <span class="err">segments></span>
+ <span class="s2">"tuningConfig"</span> <span class="err"><index</span> <span class="err">task</span> <span class="err">tuningConfig></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.13.0-incubating/ingestion/data-formats.html b/docs/0.13.0-incubating/ingestion/data-formats.html
index 8d49131..b994dfb 100644
--- a/docs/0.13.0-incubating/ingestion/data-formats.html
+++ b/docs/0.13.0-incubating/ingestion/data-formats.html
@@ -192,7 +192,7 @@
<p>All forms of Druid ingestion require some form of schema object. The format of the data to be ingested is specified using the<code>parseSpec</code> entry in your <code>dataSchema</code>.</p>
<h3 id="json">JSON</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"json"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -205,7 +205,7 @@
<p>If you have nested JSON, <a href="flatten-json.html">Druid can automatically flatten it for you</a>.</p>
<h3 id="csv">CSV</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"csv"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -234,7 +234,7 @@
<p>The <code>columns</code> field must be included and and ensure that the order of the fields matches the columns of your input data in the same order.</p>
<h3 id="tsv-delimited">TSV (Delimited)</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"tsv"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -266,23 +266,23 @@
<p>The <code>columns</code> field must be included and and ensure that the order of the fields matches the columns of your input data in the same order.</p>
<h3 id="regex">Regex</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
<span class="p">},</span>
<span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"dimensions"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_lis</span><span class="kc">t</span><span class="err">_o</span><span class="kc">f</span><span class="err">_dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">]</span>
+ <span class="nt">"dimensions"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_list_of_dimensions></span><span class="p">]</span>
<span class="p">},</span>
- <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_colum</span><span class="kc">ns</span><span class="err">_here></span><span class="p">],</span>
- <span class="nt">"pattern"</span> <span class="p">:</span> <span class="err"><regex</span> <span class="err">pa</span><span class="kc">ttern</span> <span class="kc">f</span><span class="err">or</span> <span class="err">par</span><span class="kc">t</span><span class="err">i</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">da</span><span class="kc">ta</span><span class="err">></span>
+ <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_columns_here></span><span class="p">],</span>
+ <span class="nt">"pattern"</span> <span class="p">:</span> <span class="err"><regex</span> <span class="err">pattern</span> <span class="err">for</span> <span class="err">partitioning</span> <span class="err">data></span>
<span class="p">}</span>
</code></pre></div>
<p>The <code>columns</code> field must match the columns of your regex matching groups in the same order. If columns are not provided, default
columns names ("column_1", "column2", ... "column_n") will be assigned. Ensure that your column names include all your dimensions. </p>
<h3 id="javascript">JavaScript</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
diff --git a/docs/0.13.0-incubating/ingestion/delete-data.html b/docs/0.13.0-incubating/ingestion/delete-data.html
index 6e8a29d..c8a5772 100644
--- a/docs/0.13.0-incubating/ingestion/delete-data.html
+++ b/docs/0.13.0-incubating/ingestion/delete-data.html
@@ -168,10 +168,10 @@
<p>Kill tasks delete all information about a segment and removes it from deep storage. Killable segments must be disabled (used==0) in the Druid segment table. The available grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"kill"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><all_segme</span><span class="kc">nts</span><span class="err">_i</span><span class="kc">n</span><span class="err">_</span><span class="kc">t</span><span class="err">his_i</span><span class="kc">nter</span><span class="err">val_will_die!></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><all_segments_in_this_interval_will_die!></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.13.0-incubating/ingestion/firehose.html b/docs/0.13.0-incubating/ingestion/firehose.html
index e3bd4cf..49b201f 100644
--- a/docs/0.13.0-incubating/ingestion/firehose.html
+++ b/docs/0.13.0-incubating/ingestion/firehose.html
@@ -391,7 +391,7 @@
This can be used to merge data from more than one firehose.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"combining"</span><span class="p">,</span>
- <span class="nt">"delegates"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span> <span class="kc">f</span><span class="err">irehose</span><span class="mi">1</span> <span class="p">},</span> <span class="p">{</span> <span class="kc">f</span><span class="err">irehose</span><span class="mi">2</span> <span class="p">},</span> <span class="err">.....</span> <span class="p">]</span>
+ <span class="nt">"delegates"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span> <span class="err">firehose1</span> <span class="p">},</span> <span class="p">{</span> <span class="err">firehose2</span> <span class="p">},</span> <span class="err">.....</span> <span class="p">]</span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.13.0-incubating/ingestion/flatten-json.html b/docs/0.13.0-incubating/ingestion/flatten-json.html
index 675fcf5..433a2a3 100644
--- a/docs/0.13.0-incubating/ingestion/flatten-json.html
+++ b/docs/0.13.0-incubating/ingestion/flatten-json.html
@@ -226,7 +226,7 @@
<p>The column "metrica" is a Long metric column, "hello" is an array of Double metrics, and "nestmet.val" is a nested Long metric. All other columns are dimensions.</p>
<p>To flatten this JSON, the parseSpec could be defined as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"json"</span><span class="p">,</span>
<span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"useFieldDiscovery"</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
@@ -307,7 +307,7 @@
<p>"ignore_me" will be automatically discovered but excluded as specified by dimensionsExclusions.</p>
<p>Aggregators should use the metric column names as defined in the flattenSpec. Using the example above:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metricsSpec"</span> <span class="p">:</span> <span class="p">[</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metricsSpec"</span> <span class="err">:</span> <span class="p">[</span>
<span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span>
<span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"path-metric-sum"</span><span class="p">,</span>
diff --git a/docs/0.13.0-incubating/ingestion/hadoop.html b/docs/0.13.0-incubating/ingestion/hadoop.html
index 9a804d1..b0363a9 100644
--- a/docs/0.13.0-incubating/ingestion/hadoop.html
+++ b/docs/0.13.0-incubating/ingestion/hadoop.html
@@ -220,7 +220,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hadoop"</span>
<span class="p">}</span>
<span class="p">},</span>
- <span class="nt">"hadoopDependencyCoordinates"</span><span class="p">:</span> <span class="err"><my_hadoop_versio</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"hadoopDependencyCoordinates"</span><span class="p">:</span> <span class="err"><my_hadoop_version></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -510,7 +510,7 @@
</tbody></table>
<h3 id="jobproperties-field-of-tuningconfig">jobProperties field of TuningConfig</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"tuningConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"tuningConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"jobProperties"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"<hadoop-property-a>"</span><span class="p">:</span> <span class="s2">"<value-a>"</span><span class="p">,</span>
@@ -614,7 +614,7 @@
sized data segments relative to single-dimension partitioning.</p>
<h3 id="hash-based-partitioning">Hash-based partitioning</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"partitionsSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"partitionsSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hashed"</span><span class="p">,</span>
<span class="nt">"targetPartitionSize"</span><span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
@@ -655,7 +655,7 @@
</tbody></table>
<h3 id="single-dimension-partitioning">Single-dimension partitioning</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"partitionsSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"partitionsSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimension"</span><span class="p">,</span>
<span class="nt">"targetPartitionSize"</span><span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
diff --git a/docs/0.13.0-incubating/ingestion/ingestion-spec.html b/docs/0.13.0-incubating/ingestion/ingestion-spec.html
index 59ce459..8760375 100644
--- a/docs/0.13.0-incubating/ingestion/ingestion-spec.html
+++ b/docs/0.13.0-incubating/ingestion/ingestion-spec.html
@@ -188,7 +188,7 @@
<h1 id="dataschema">DataSchema</h1>
<p>An example dataSchema is shown below:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"wikipedia"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -600,7 +600,7 @@
<p>For example, the following <code>dimensionsSpec</code> section from a <code>dataSchema</code> ingests one column as Long (<code>countryNum</code>), two
columns as Float (<code>userLatitude</code>, <code>userLongitude</code>), and the other columns as Strings, with bitmap indexes disabled
for the <code>comment</code> column.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dimensionsSpec"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span>
<span class="s2">"page"</span><span class="p">,</span>
<span class="s2">"language"</span><span class="p">,</span>
diff --git a/docs/0.13.0-incubating/ingestion/locking-and-priority.html b/docs/0.13.0-incubating/ingestion/locking-and-priority.html
index 0dc1183..156bfea 100644
--- a/docs/0.13.0-incubating/ingestion/locking-and-priority.html
+++ b/docs/0.13.0-incubating/ingestion/locking-and-priority.html
@@ -202,7 +202,7 @@
</tbody></table>
<p>You can override the task priority by setting your priority in the task context like below.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"context"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"context"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"priority"</span> <span class="p">:</span> <span class="mi">100</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.13.0-incubating/ingestion/misc-tasks.html b/docs/0.13.0-incubating/ingestion/misc-tasks.html
index 8d93549..73cf6ab 100644
--- a/docs/0.13.0-incubating/ingestion/misc-tasks.html
+++ b/docs/0.13.0-incubating/ingestion/misc-tasks.html
@@ -155,10 +155,10 @@
<p>These tasks start, sleep for a time and are used only for testing. The available grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"noop"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_segme</span><span class="kc">nt</span><span class="err">_i</span><span class="kc">nter</span><span class="err">val></span><span class="p">,</span>
- <span class="nt">"runTime"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_millis_</span><span class="kc">t</span><span class="err">o_sleep></span><span class="p">,</span>
- <span class="nt">"firehose"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_</span><span class="kc">f</span><span class="err">irehose_</span><span class="kc">t</span><span class="err">o_</span><span class="kc">test</span><span class="err">_co</span><span class="kc">nne</span><span class="err">c</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><optional_task_id></span><span class="p">,</span>
+ <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><optional_segment_interval></span><span class="p">,</span>
+ <span class="nt">"runTime"</span> <span class="p">:</span> <span class="err"><optional_millis_to_sleep></span><span class="p">,</span>
+ <span class="nt">"firehose"</span><span class="p">:</span> <span class="err"><optional_firehose_to_test_connect></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="segment-merging-tasks-deprecated">Segment Merging Tasks (Deprecated)</h2>
@@ -168,11 +168,11 @@
<p>Append tasks append a list of segments together into a single segment (one after the other). The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"append"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">appe</span><span class="kc">n</span><span class="err">d></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">list</span> <span class="err">of</span> <span class="err">DataSegment</span> <span class="err">objects</span> <span class="err">to</span> <span class="err">append></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><optional</span> <span class="err">list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="merge-task">Merge Task</h3>
@@ -183,12 +183,12 @@
<p>The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"merge"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whe</span><span class="kc">t</span><span class="err">her</span> <span class="err">or</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="kc">t</span><span class="err">o</span> <span class="err">rollup</span> <span class="err">da</span><span class="kc">ta</span> <span class="err">duri</span><span class="kc">n</span><span class="err">g</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whether</span> <span class="err">or</span> <span class="err">not</span> <span class="err">to</span> <span class="err">rollup</span> <span class="err">data</span> <span class="err">during</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">list</span> <span class="err">of</span> <span class="err">DataSegment</span> <span class="err">objects</span> <span class="err">to</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="same-interval-merge-task">Same Interval Merge Task</h3>
@@ -198,12 +198,12 @@
<p>The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"same_interval_merge"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whe</span><span class="kc">t</span><span class="err">her</span> <span class="err">or</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="kc">t</span><span class="err">o</span> <span class="err">rollup</span> <span class="err">da</span><span class="kc">ta</span> <span class="err">duri</span><span class="kc">n</span><span class="err">g</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">his</span> <span class="err">i</span><span class="kc">nter</span><span class="err">val</span> <span class="err">are</span> <span class="err">goi</span><span class="kc">n</span><span class="err">g</span> <span class="kc">t</span><span class="err">o</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whether</span> <span class="err">or</span> <span class="err">not</span> <span class="err">to</span> <span class="err">rollup</span> <span class="err">data</span> <span class="err">during</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><DataSegment</span> <span class="err">objects</span> <span class="err">in</span> <span class="err">this</span> <span class="err">interval</span> <span class="err">are</span> <span class="err">going</span> <span class="err">to</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.13.0-incubating/ingestion/stream-pull.html b/docs/0.13.0-incubating/ingestion/stream-pull.html
index 34418f9..1da0726 100644
--- a/docs/0.13.0-incubating/ingestion/stream-pull.html
+++ b/docs/0.13.0-incubating/ingestion/stream-pull.html
@@ -529,7 +529,7 @@
<p>Segments are identified by datasource, time interval, and version. With sharding, a segment is also identified by a partition number. Typically, each shard will have the same version but a different partition number to uniquely identify it.</p>
<p>In small-data scenarios, sharding is unnecessary and can be set to none (the default):</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span><span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span><span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
</code></pre></div>
<p>However, in scenarios with multiple realtime nodes, <code>none</code> is less useful as it cannot help with scaling data volume (see below). Note that for the batch indexing service, no explicit configuration is required; sharding is provided automatically.</p>
@@ -547,7 +547,7 @@
</ul>
<p>Configure <code>linear</code> under <code>schema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
@@ -557,7 +557,7 @@
<p>This strategy is similar to <code>linear</code> except that it does not tolerate non-sequential partition numbering (it will <em>not</em> allow querying of partitions 0 and 2 if partition 1 is missing). It also requires explicitly setting the total number of partitions.</p>
<p>Configure <code>numbered</code> under <code>schema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"numbered"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span><span class="p">,</span>
<span class="nt">"partitions"</span><span class="p">:</span> <span class="mi">2</span>
@@ -568,13 +568,13 @@
<p>The <code>shardSpec</code> configuration can be used to create redundancy by having the same <code>partitionNum</code> values on different nodes.</p>
<p>For example, if RealTimeNode1 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
</code></pre></div>
<p>and RealTimeNode2 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
@@ -582,7 +582,7 @@
<p>then two realtime nodes can store segments with the same datasource, version, time interval, and partition number. Brokers that query for data in such segments will assume that they hold the same data, and the query will target only one of the segments.</p>
<p><code>shardSpec</code> can also help achieve scale. For this, add nodes with a different <code>partionNum</code>. Continuing with the example, if RealTimeNode3 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">1</span>
<span class="p">}</span>
diff --git a/docs/0.13.0-incubating/ingestion/update-existing-data.html b/docs/0.13.0-incubating/ingestion/update-existing-data.html
index 51cde28..364f8fa 100644
--- a/docs/0.13.0-incubating/ingestion/update-existing-data.html
+++ b/docs/0.13.0-incubating/ingestion/update-existing-data.html
@@ -275,7 +275,7 @@
</tbody></table>
<p>For example</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"inputSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"dataSource"</span><span class="p">,</span>
@@ -309,7 +309,7 @@
</tbody></table>
<p>For example:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"inputSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"multi"</span><span class="p">,</span>
diff --git a/docs/0.13.0-incubating/operations/use_sbt_to_build_fat_jar.html b/docs/0.13.0-incubating/operations/use_sbt_to_build_fat_jar.html
index c5d7d2f..f30dea1 100644
--- a/docs/0.13.0-incubating/operations/use_sbt_to_build_fat_jar.html
+++ b/docs/0.13.0-incubating/operations/use_sbt_to_build_fat_jar.html
@@ -149,106 +149,106 @@
-->
<h1 id="content-for-build-sbt">Content for build.sbt</h1>
-<div class="highlight"><pre><code class="language-scala" data-lang="scala"><span></span><span class="n">libraryDependencies</span> <span class="o">++=</span> <span class="nc">Seq</span><span class="p">(</span>
- <span class="s">"com.amazonaws"</span> <span class="o">%</span> <span class="s">"aws-java-sdk"</span> <span class="o">%</span> <span class="s">"1.9.23"</span> <span class="n">exclude</span><span class="p">(</span><span class="s">"common-logging"</span><span class="p">,</span> <span class="s">"common-logging"</span><span class="p">),</span>
- <span class="s">"org.joda"</span> <span class="o">%</span> <span class="s">"joda-convert"</span> <span class="o">%</span> <span class="s">"1.7"</span><span class="p">,</span>
- <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"2.7"</span><span class="p">,</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-services"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-service"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-hadoop"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"mysql-metadata-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-s3-extensions"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-histogram"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-hdfs-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-core"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-databind"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-guava"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-joda"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-base"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-json-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-smile-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.module"</span> <span class="o">%</span> <span class="s">"jackson-module-jaxb-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.sun.jersey"</span> <span class="o">%</span> <span class="s">"jersey-servlet"</span> <span class="o">%</span> <span class="s">"1.17.1"</span><span class="p">,</span>
- <span class="s">"mysql"</span> <span class="o">%</span> <span class="s">"mysql-connector-java"</span> <span class="o">%</span> <span class="s">"5.1.34"</span><span class="p">,</span>
- <span class="s">"org.scalatest"</span> <span class="o">%%</span> <span class="s">"scalatest"</span> <span class="o">%</span> <span class="s">"2.2.3"</span> <span class="o">%</span> <span class="s">"test"</span><span class="p">,</span>
+<div class="highlight"><pre><code class="language-scala" data-lang="scala"><span></span><span class="n">libraryDependencies</span> <span class="o">++=</span> <span class="nc">Seq</span><span class="o">(</span>
+ <span class="s">"com.amazonaws"</span> <span class="o">%</span> <span class="s">"aws-java-sdk"</span> <span class="o">%</span> <span class="s">"1.9.23"</span> <span class="n">exclude</span><span class="o">(</span><span class="s">"common-logging"</span><span class="o">,</span> <span class="s">"common-logging"</span><span class="o">),</span>
+ <span class="s">"org.joda"</span> <span class="o">%</span> <span class="s">"joda-convert"</span> <span class="o">%</span> <span class="s">"1.7"</span><span class="o">,</span>
+ <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"2.7"</span><span class="o">,</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-services"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-service"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-hadoop"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"mysql-metadata-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-s3-extensions"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-histogram"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-hdfs-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-core"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-databind"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-guava"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-joda"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-base"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-json-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-smile-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.module"</span> <span class="o">%</span> <span class="s">"jackson-module-jaxb-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.sun.jersey"</span> <span class="o">%</span> <span class="s">"jersey-servlet"</span> <span class="o">%</span> <span class="s">"1.17.1"</span><span class="o">,</span>
+ <span class="s">"mysql"</span> <span class="o">%</span> <span class="s">"mysql-connector-java"</span> <span class="o">%</span> <span class="s">"5.1.34"</span><span class="o">,</span>
+ <span class="s">"org.scalatest"</span> <span class="o">%%</span> <span class="s">"scalatest"</span> <span class="o">%</span> <span class="s">"2.2.3"</span> <span class="o">%</span> <span class="s">"test"</span><span class="o">,</span>
<span class="s">"org.mockito"</span> <span class="o">%</span> <span class="s">"mockito-core"</span> <span class="o">%</span> <span class="s">"1.10.19"</span> <span class="o">%</span> <span class="s">"test"</span>
-<span class="p">)</span>
+<span class="o">)</span>
-<span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span> <span class="o">:=</span> <span class="p">{</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"pom."</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"javax.inject.Named"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"mime.types"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog$1.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/NoOpLog.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogFactory.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogConfigurationException.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/Log.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"META-INF/jersey-module-version"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".properties"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">x</span> <span class="o">=></span>
- <span class="kd">val</span> <span class="n">oldStrategy</span> <span class="o">=</span> <span class="p">(</span><span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span><span class="p">).</span><span class="n">value</span>
- <span class="n">oldStrategy</span><span class="p">(</span><span class="n">x</span><span class="p">)</span>
-<span class="p">}</span>
+<span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span> <span class="o">:=</span> <span class="o">{</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"pom."</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"javax.inject.Named"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"mime.types"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog$1.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/NoOpLog.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogFactory.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogConfigurationException.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/Log.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"META-INF/jersey-module-version"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".properties"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">x</span> <span class="k">=></span>
+ <span class="k">val</span> <span class="n">oldStrategy</span> <span class="k">=</span> <span class="o">(</span><span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span><span class="o">).</span><span class="n">value</span>
+ <span class="n">oldStrategy</span><span class="o">(</span><span class="n">x</span><span class="o">)</span>
+<span class="o">}</span>
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.13.0-incubating/querying/aggregations.html b/docs/0.13.0-incubating/querying/aggregations.html
index c4c556b..d9664de 100644
--- a/docs/0.13.0-incubating/querying/aggregations.html
+++ b/docs/0.13.0-incubating/querying/aggregations.html
@@ -158,7 +158,7 @@
<h3 id="count-aggregator">Count aggregator</h3>
<p><code>count</code> computes the count of Druid rows that match the filters.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span> <span class="p">}</span>
</code></pre></div>
<p>Please note the count aggregator counts the number of Druid rows, which does not always reflect the number of raw events ingested.
This is because Druid can be configured to roll up data at ingestion time. To
@@ -170,7 +170,7 @@
<h4 id="longsum-aggregator"><code>longSum</code> aggregator</h4>
<p>computes the sum of values as a 64-bit, signed integer</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<p><code>name</code> – output name for the summed value
<code>fieldName</code> – name of the metric column to sum over</p>
@@ -178,44 +178,44 @@
<h4 id="doublesum-aggregator"><code>doubleSum</code> aggregator</h4>
<p>Computes and stores the sum of values as 64-bit floating point value. Similar to <code>longSum</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatsum-aggregator"><code>floatSum</code> aggregator</h4>
<p>Computes and stores the sum of values as 32-bit floating point value. Similar to <code>longSum</code> and <code>doubleSum</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="min-max-aggregators">Min / Max aggregators</h3>
<h4 id="doublemin-aggregator"><code>doubleMin</code> aggregator</h4>
<p><code>doubleMin</code> computes the minimum of all metric values and Double.POSITIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="doublemax-aggregator"><code>doubleMax</code> aggregator</h4>
<p><code>doubleMax</code> computes the maximum of all metric values and Double.NEGATIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatmin-aggregator"><code>floatMin</code> aggregator</h4>
<p><code>floatMin</code> computes the minimum of all metric values and Float.POSITIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatmax-aggregator"><code>floatMax</code> aggregator</h4>
<p><code>floatMax</code> computes the maximum of all metric values and Float.NEGATIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="longmin-aggregator"><code>longMin</code> aggregator</h4>
<p><code>longMin</code> computes the minimum of all metric values and Long.MAX_VALUE</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="longmax-aggregator"><code>longMax</code> aggregator</h4>
<p><code>longMax</code> computes the maximum of all metric values and Long.MIN_VALUE</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="first-last-aggregator">First / Last aggregator</h3>
@@ -228,8 +228,8 @@
<p><code>doubleFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="doublelast-aggregator"><code>doubleLast</code> aggregator</h4>
@@ -237,8 +237,8 @@
<p><code>doubleLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="floatfirst-aggregator"><code>floatFirst</code> aggregator</h4>
@@ -246,8 +246,8 @@
<p><code>floatFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="floatlast-aggregator"><code>floatLast</code> aggregator</h4>
@@ -255,8 +255,8 @@
<p><code>floatLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="longfirst-aggregator"><code>longFirst</code> aggregator</h4>
@@ -264,8 +264,8 @@
<p><code>longFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="longlast-aggregator"><code>longLast</code> aggregator</h4>
@@ -273,8 +273,8 @@
<p><code>longLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="stringfirst-aggregator"><code>stringFirst</code> aggregator</h4>
@@ -282,10 +282,10 @@
<p><code>stringFirst</code> computes the metric value with the minimum timestamp or <code>null</code> if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1024</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolea</span><span class="kc">n</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><integer></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">1024),</span>
+ <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolean></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="stringlast-aggregator"><code>stringLast</code> aggregator</h4>
@@ -293,10 +293,10 @@
<p><code>stringLast</code> computes the metric value with the maximum timestamp or <code>null</code> if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1024</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolea</span><span class="kc">n</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><integer></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">1024),</span>
+ <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolean></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<h3 id="javascript-aggregator">JavaScript aggregator</h3>
@@ -305,7 +305,7 @@
JavaScript functions are expected to return floating-point values.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><colum</span><span class="kc">n</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><colum</span><span class="kc">n</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
+ <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><column</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><column</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
<span class="nt">"fnAggregate"</span> <span class="p">:</span> <span class="s2">"function(current, column1, column2, ...) {</span>
<span class="s2"> <updates partial aggregate (current) based on the current row values></span>
<span class="s2"> return <updated partial aggregate></span>
@@ -339,9 +339,9 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"cardinality"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
- <span class="nt">"byRow"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"round"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span> <span class="err"><dimension</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><dimension</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
+ <span class="nt">"byRow"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false),</span>
+ <span class="nt">"round"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<p>Each individual element of the "fields" list can be a String or <a href="../querying/dimensionspecs.html">DimensionSpec</a>. A String dimension in the fields list is equivalent to a DefaultDimensionSpec (no transformations).</p>
@@ -413,8 +413,8 @@
<p>Uses <a href="http://algo.inria.fr/flajolet/Publications/FlFuGaMe07.pdf">HyperLogLog</a> to compute the estimated cardinality of a dimension that has been aggregated as a "hyperUnique" metric at indexing time.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUnique"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="nt">"isInputHyperUnique"</span> <span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
<span class="nt">"round"</span> <span class="p">:</span> <span class="kc">false</span>
<span class="p">}</span>
@@ -441,10 +441,10 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"filtered"</span><span class="p">,</span>
<span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span> <span class="err">value></span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><dimension</span> <span class="err">value></span>
<span class="p">}</span>
- <span class="nt">"aggregator"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="s2">"aggregator"</span> <span class="p">:</span> <span class="err"><aggregation></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.13.0-incubating/querying/dimensionspecs.html b/docs/0.13.0-incubating/querying/dimensionspecs.html
index 3a64fb3..edde601 100644
--- a/docs/0.13.0-incubating/querying/dimensionspecs.html
+++ b/docs/0.13.0-incubating/querying/dimensionspecs.html
@@ -161,8 +161,8 @@
<p>Returns dimension values as is and optionally renames the dimension.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"default"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"outputName"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"outputName"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
<span class="nt">"outputType"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"STRING"</span><span class="err">|</span><span class="s2">"LONG"</span><span class="err">|</span><span class="s2">"FLOAT"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
@@ -175,10 +175,10 @@
<p>Returns dimension values transformed using the given <a href="#extraction-functions">extraction function</a>.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"extraction"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"outputName"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"outputName"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
<span class="nt">"outputType"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"STRING"</span><span class="err">|</span><span class="s2">"LONG"</span><span class="err">|</span><span class="s2">"FLOAT"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><extraction_function></span>
<span class="p">}</span>
</code></pre></div>
<p><code>outputType</code> may also be specified in an ExtractionDimensionSpec to apply type conversion to results before merging. If left unspecified, the <code>outputType</code> defaults to STRING.</p>
@@ -195,13 +195,13 @@
<p>In addition to "query filter" which efficiently selects the rows to be processed, you can use the filtered dimension spec to filter for specific values within the values of a multi-value dimension. These dimensionSpecs take a delegate DimensionSpec and a filtering criteria. From the "exploded" rows, only rows matching the given filtering criteria are returned in the query result.</p>
<p>The following filtered dimension spec acts as a whitelist or blacklist for values as per the "isWhitelist" attribute value.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"listFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"values"</span><span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">gs></span><span class="p">,</span> <span class="nt">"isWhitelist"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">a</span><span class="kc">ttr</span><span class="err">ibu</span><span class="kc">te</span> <span class="kc">f</span><span class="err">or</span> <span class="kc">true</span><span class="err">/</span><span class="kc">false</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">is</span> <span class="kc">true</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"listFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"values"</span><span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">strings></span><span class="p">,</span> <span class="nt">"isWhitelist"</span><span class="p">:</span> <span class="err"><optional</span> <span class="err">attribute</span> <span class="err">for</span> <span class="kc">true</span><span class="err">/</span><span class="kc">false</span><span class="p">,</span> <span class="err">default</span> <span class="err">is</span> <span class="err">true></span> <span class="p">}</span>
</code></pre></div>
<p>Following filtered dimension spec retains only the values matching regex. Note that <code>listFiltered</code> is faster than this and one should use that for whitelist or blacklist usecase.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regexFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><java</span> <span class="err">regex</span> <span class="err">pa</span><span class="kc">ttern</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regexFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><java</span> <span class="err">regex</span> <span class="err">pattern></span> <span class="p">}</span>
</code></pre></div>
<p>Following filtered dimension spec retains only the values starting with the same prefix.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"prefixFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"prefix"</span><span class="p">:</span> <span class="err"><pre</span><span class="kc">f</span><span class="err">ix</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"prefixFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"prefix"</span><span class="p">:</span> <span class="err"><prefix</span> <span class="err">string></span> <span class="p">}</span>
</code></pre></div>
<p>For more details and examples, see <a href="multi-value-dimensions.html">multi-value dimensions</a>.</p>
@@ -295,8 +295,8 @@
If there is no match, it returns the dimension value as is.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span>
- <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expressio</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"index"</span> <span class="p">:</span> <span class="err"><group</span> <span class="kc">t</span><span class="err">o</span> <span class="err">ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="mi">1</span><span class="err">></span>
+ <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expression></span><span class="p">,</span>
+ <span class="nt">"index"</span> <span class="p">:</span> <span class="err"><group</span> <span class="err">to</span> <span class="err">extract</span><span class="p">,</span> <span class="err">default</span> <span class="err">1></span>
<span class="nt">"replaceMissingValue"</span> <span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
<span class="nt">"replaceMissingValueWith"</span> <span class="p">:</span> <span class="s2">"foobar"</span>
<span class="p">}</span>
@@ -316,7 +316,7 @@
<h3 id="partial-extraction-function">Partial Extraction Function</h3>
<p>Returns the dimension value unchanged if the regular expression matches, otherwise returns null.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"partial"</span><span class="p">,</span> <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expressio</span><span class="kc">n</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"partial"</span><span class="p">,</span> <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expression></span> <span class="p">}</span>
</code></pre></div>
<h3 id="search-query-extraction-function">Search Query Extraction Function</h3>
@@ -366,11 +366,11 @@
<li><code>asMillis</code> : boolean value, set to true to treat input strings as millis rather than ISO8601 strings. Additionally, if <code>format</code> is null or not specified, output will be in millis rather than ISO8601.</li>
</ul>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"timeFormat"</span><span class="p">,</span>
- <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"timeZone"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">t</span><span class="err">ime_zo</span><span class="kc">ne</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">UTC)</span><span class="p">,</span>
- <span class="nt">"locale"</span> <span class="p">:</span> <span class="err"><locale></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">curre</span><span class="kc">nt</span> <span class="err">locale)</span><span class="p">,</span>
- <span class="nt">"granularity"</span> <span class="p">:</span> <span class="err"><gra</span><span class="kc">nular</span><span class="err">i</span><span class="kc">t</span><span class="err">y></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="kc">n</span><span class="err">o</span><span class="kc">ne</span><span class="err">)</span> <span class="p">},</span>
- <span class="nt">"asMillis"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">)</span> <span class="p">}</span>
+ <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><output_format></span> <span class="err">(optional)</span><span class="p">,</span>
+ <span class="nt">"timeZone"</span> <span class="p">:</span> <span class="err"><time_zone></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">UTC),</span>
+ <span class="nt">"locale"</span> <span class="p">:</span> <span class="err"><locale></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">current</span> <span class="err">locale),</span>
+ <span class="nt">"granularity"</span> <span class="p">:</span> <span class="err"><granularity></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">none)</span> <span class="p">}</span><span class="err">,</span>
+ <span class="s2">"asMillis"</span> <span class="err">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span> <span class="err">(optional)</span> <span class="err">}</span>
</code></pre></div>
<p>For example, the following dimension spec returns the day of the week for Montréal in French:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -401,9 +401,9 @@
<p>If a value cannot be parsed using the provided timeFormat, it will be returned as-is.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"time"</span><span class="p">,</span>
- <span class="nt">"timeFormat"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"resultFormat"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"joda"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span><span class="p">,</span> <span class="kc">false</span><span class="err">></span> <span class="p">}</span>
+ <span class="nt">"timeFormat"</span> <span class="p">:</span> <span class="err"><input_format></span><span class="p">,</span>
+ <span class="nt">"resultFormat"</span> <span class="p">:</span> <span class="err"><output_format></span><span class="p">,</span>
+ <span class="nt">"joda"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span><span class="p">,</span> <span class="err">false></span> <span class="p">}</span>
</code></pre></div>
<h3 id="javascript-extraction-function">Javascript Extraction Function</h3>
@@ -574,7 +574,7 @@
<h3 id="string-format-extraction-function">String Format Extraction Function</h3>
<p>Returns the dimension value formatted according to the given format string.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFormat"</span><span class="p">,</span> <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><spri</span><span class="kc">ntf</span><span class="err">_expressio</span><span class="kc">n</span><span class="err">></span><span class="p">,</span> <span class="nt">"nullHandling"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">a</span><span class="kc">ttr</span><span class="err">ibu</span><span class="kc">te</span> <span class="kc">f</span><span class="err">or</span> <span class="err">ha</span><span class="kc">n</span><span class="err">dli</span><span class="kc">n</span><span class="err">g</span> <span class="kc">null</span> <span class="err">value></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFormat"</span><span class="p">,</span> <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><sprintf_expression></span><span class="p">,</span> <span class="nt">"nullHandling"</span> <span class="p">:</span> <span class="err"><optional</span> <span class="err">attribute</span> <span class="err">for</span> <span class="err">handling</span> <span class="kc">null</span> <span class="err">value></span> <span class="p">}</span>
</code></pre></div>
<p>For example if you want to concat "[" and "]" before and after the actual dimension value, you need to specify "[%s]" as format string. "nullHandling" can be one of <code>nullString</code>, <code>emptyString</code> or <code>returnNull</code>. With "[%s]" format, each configuration will result <code>[null]</code>, <code>[]</code>, <code>null</code>. Default is <code>nullString</code>.</p>
diff --git a/docs/0.13.0-incubating/querying/filters.html b/docs/0.13.0-incubating/querying/filters.html
index 49663dc..18261c9 100644
--- a/docs/0.13.0-incubating/querying/filters.html
+++ b/docs/0.13.0-incubating/querying/filters.html
@@ -157,7 +157,7 @@
<p>The simplest filter is a selector filter. The selector filter will match a specific dimension with a specific value. Selector filters can be used as the base filters for more complex Boolean expressions of filters.</p>
<p>The grammar for a SELECTOR filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_value_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dimension_value_string></span> <span class="p">}</span>
</code></pre></div>
<p>This is the equivalent of <code>WHERE <dimension_string> = '<dimension_value_string>'</code>.</p>
@@ -166,7 +166,7 @@
<h3 id="column-comparison-filter">Column Comparison filter</h3>
<p>The column comparison filter is similar to the selector filter, but instead compares dimensions to each other. For example:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"columnComparison"</span><span class="p">,</span> <span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span><span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_a></span><span class="p">,</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_b></span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"columnComparison"</span><span class="p">,</span> <span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span><span class="err"><dimension_a></span><span class="p">,</span> <span class="err"><dimension_b></span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>This is the equivalent of <code>WHERE <dimension_a> = <dimension_b></code>.</p>
@@ -175,7 +175,7 @@
<h3 id="regular-expression-filter">Regular expression filter</h3>
<p>The regular expression filter is similar to the selector filter, but using regular expressions. It matches the specified dimension with the given pattern. The pattern can be any standard <a href="http://docs.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html">Java regular expression</a>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><pa</span><span class="kc">ttern</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><pattern_string></span> <span class="p">}</span>
</code></pre></div>
<p>The regex filter supports the use of extraction functions, see <a href="#filtering-with-extraction-functions">Filtering with Extraction Functions</a> for details.</p>
@@ -184,21 +184,21 @@
<h4 id="and">AND</h4>
<p>The grammar for an AND filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>The filters in fields can be any other filter defined on this page.</p>
<h4 id="or">OR</h4>
<p>The grammar for an OR filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"or"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"or"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>The filters in fields can be any other filter defined on this page.</p>
<h4 id="not">NOT</h4>
<p>The grammar for a NOT filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"not"</span><span class="p">,</span> <span class="nt">"field"</span><span class="p">:</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"not"</span><span class="p">,</span> <span class="nt">"field"</span><span class="p">:</span> <span class="err"><filter></span> <span class="p">}</span>
</code></pre></div>
<p>The filter specified at field can be any other filter defined on this page.</p>
@@ -209,7 +209,7 @@
<p>The function takes a single argument, the dimension value, and returns either true or false.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span>
<span class="nt">"function"</span> <span class="p">:</span> <span class="s2">"function(value) { <...> }"</span>
<span class="p">}</span>
</code></pre></div>
@@ -697,14 +697,14 @@
the "regex" filter) the numeric column values will be converted to strings during the scan.</p>
<p>For example, filtering on a specific value, <code>myFloatColumn = 10.1</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"myFloatColumn"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"10.1"</span>
<span class="p">}</span>
</code></pre></div>
<p>Filtering on a range of values, <code>10 <= myFloatColumn < 20</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"bound"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"myFloatColumn"</span><span class="p">,</span>
<span class="nt">"ordering"</span><span class="p">:</span> <span class="s2">"numeric"</span><span class="p">,</span>
@@ -723,14 +723,14 @@
<p>If the user wishes to interpret the timestamp with a specific format, timezone, or locale, the <a href="./dimensionspecs.html#time-format-extraction-function">Time Format Extraction Function</a> is useful.</p>
<p>For example, filtering on a long timestamp value:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"__time"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"124457387532"</span>
<span class="p">}</span>
</code></pre></div>
<p>Filtering on day of week:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"__time"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"Friday"</span><span class="p">,</span>
diff --git a/docs/0.13.0-incubating/querying/granularities.html b/docs/0.13.0-incubating/querying/granularities.html
index 790d69c..6b5887b 100644
--- a/docs/0.13.0-incubating/querying/granularities.html
+++ b/docs/0.13.0-incubating/querying/granularities.html
@@ -308,10 +308,10 @@
<p>Duration granularities are specified as an exact duration in milliseconds and timestamps are returned as UTC. Duration granularity values are in millis.</p>
<p>They also support specifying an optional origin, which defines where to start counting time buckets from (defaults to 1970-01-01T00:00:00Z).</p>
-<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mf">7200000</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mi">7200000</span><span class="p">}</span>
</code></pre></div>
<p>This chunks up every 2 hours.</p>
-<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mf">3600000</span><span class="p">,</span> <span class="s2">"origin"</span><span class="o">:</span> <span class="s2">"2012-01-01T00:30:00Z"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mi">3600000</span><span class="p">,</span> <span class="s2">"origin"</span><span class="o">:</span> <span class="s2">"2012-01-01T00:30:00Z"</span><span class="p">}</span>
</code></pre></div>
<p>This chunks up every hour on the half-hour.</p>
diff --git a/docs/0.13.0-incubating/querying/groupbyquery.html b/docs/0.13.0-incubating/querying/groupbyquery.html
index 28fec4f..9ceda8f 100644
--- a/docs/0.13.0-incubating/querying/groupbyquery.html
+++ b/docs/0.13.0-incubating/querying/groupbyquery.html
@@ -277,10 +277,10 @@
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"2012-01-01T00:00:00.000Z"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"country"</span> <span class="p">:</span> <span class="err"><some_dim_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"device"</span> <span class="p">:</span> <span class="err"><some_dim_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"total_usage"</span> <span class="p">:</span> <span class="err"><some_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"data_transfer"</span> <span class="p">:</span><span class="err"><some_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
+ <span class="nt">"country"</span> <span class="p">:</span> <span class="err"><some_dim_value_one></span><span class="p">,</span>
+ <span class="nt">"device"</span> <span class="p">:</span> <span class="err"><some_dim_value_two></span><span class="p">,</span>
+ <span class="nt">"total_usage"</span> <span class="p">:</span> <span class="err"><some_value_one></span><span class="p">,</span>
+ <span class="nt">"data_transfer"</span> <span class="p">:</span><span class="err"><some_value_two></span><span class="p">,</span>
<span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_avg_usage_value></span>
<span class="p">}</span>
<span class="p">},</span>
@@ -288,11 +288,11 @@
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"2012-01-01T00:00:12.000Z"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"dim1"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_dim_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"dim2"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_dim_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"sample_name1"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"sample_name2"</span> <span class="p">:</span><span class="err"><some_o</span><span class="kc">t</span><span class="err">her_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_avg_usage_value></span>
+ <span class="nt">"dim1"</span> <span class="p">:</span> <span class="err"><some_other_dim_value_one></span><span class="p">,</span>
+ <span class="nt">"dim2"</span> <span class="p">:</span> <span class="err"><some_other_dim_value_two></span><span class="p">,</span>
+ <span class="nt">"sample_name1"</span> <span class="p">:</span> <span class="err"><some_other_value_one></span><span class="p">,</span>
+ <span class="nt">"sample_name2"</span> <span class="p">:</span><span class="err"><some_other_value_two></span><span class="p">,</span>
+ <span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_other_avg_usage_value></span>
<span class="p">}</span>
<span class="p">},</span>
<span class="err">...</span>
@@ -326,7 +326,7 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"extraction"</span><span class="p">,</span>
<span class="nt">"dimension"</span> <span class="p">:</span> <span class="s2">"d2col"</span><span class="p">,</span>
<span class="nt">"outputName"</span> <span class="p">:</span> <span class="s2">"D2"</span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err">ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fun</span><span class="err">c</span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err">extraction_func</span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span><span class="s2">"lookup"</span><span class="p">,</span>
@@ -337,10 +337,10 @@
<span class="p">],</span>
<span class="err">...</span>
<span class="err">...</span>
-<span class="nt">"subtotalsSpec"</span><span class="p">:[</span> <span class="p">[</span><span class="s2">"D1"</span><span class="p">,</span> <span class="s2">"D2"</span><span class="p">,</span> <span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">1</span><span class="s2">", "</span><span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">3</span><span class="err">"]],</span>
+<span class="nt">"subtotalsSpec"</span><span class="p">:[</span> <span class="p">[</span><span class="s2">"D1"</span><span class="p">,</span> <span class="s2">"D2"</span><span class="p">,</span> <span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">1</span><span class="s2">", "</span><span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">3</span><span class="err">"</span><span class="p">]],</span>
<span class="err">..</span>
-<span class="err">}</span>
+<span class="p">}</span>
</code></pre></div>
<p>Response returned would be equivalent to concatenating result of 3 groupBy queries with "dimensions" field being ["D1", "D2", D3"], ["D1", "D3"] and ["D3"] with appropriate <code>DimensionSpec</code> json blob as used in above query.
Response for above query would look something like below...</p>
@@ -350,13 +350,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D2"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D2"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="err">...</span>
@@ -365,13 +365,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="err">...</span>
@@ -380,13 +380,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="p">]</span>
</code></pre></div>
diff --git a/docs/0.13.0-incubating/querying/having.html b/docs/0.13.0-incubating/querying/having.html
index d8613ab..9650006 100644
--- a/docs/0.13.0-incubating/querying/having.html
+++ b/docs/0.13.0-incubating/querying/having.html
@@ -168,7 +168,7 @@
<span class="nt">"having"</span><span class="p">:</span>
<span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"filter"</span><span class="p">,</span>
- <span class="nt">"filter"</span> <span class="p">:</span> <span class="err"><a</span><span class="kc">n</span><span class="err">y</span> <span class="err">Druid</span> <span class="err">query</span> <span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span>
+ <span class="nt">"filter"</span> <span class="p">:</span> <span class="err"><any</span> <span class="err">Druid</span> <span class="err">query</span> <span class="err">filter></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -205,7 +205,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -221,7 +221,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -239,7 +239,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -257,7 +257,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"lessThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -277,7 +277,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimSelector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"<dimension>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dimension_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -297,12 +297,12 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"lessThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">]</span>
<span class="p">}</span>
@@ -322,12 +322,12 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">]</span>
<span class="p">}</span>
@@ -347,7 +347,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
<span class="p">}</span>
diff --git a/docs/0.13.0-incubating/querying/limitspec.html b/docs/0.13.0-incubating/querying/limitspec.html
index ed5a458..f3c3f99 100644
--- a/docs/0.13.0-incubating/querying/limitspec.html
+++ b/docs/0.13.0-incubating/querying/limitspec.html
@@ -157,8 +157,8 @@
<p>The default limit spec takes a limit and the list of columns to do an orderBy operation over. The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"default"</span><span class="p">,</span>
- <span class="nt">"limit"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger_value></span><span class="p">,</span>
- <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">OrderByColum</span><span class="kc">n</span><span class="err">Spec</span><span class="p">],</span>
+ <span class="nt">"limit"</span> <span class="p">:</span> <span class="err"><integer_value></span><span class="p">,</span>
+ <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err">list</span> <span class="err">of</span> <span class="err">OrderByColumnSpec</span><span class="p">],</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="orderbycolumnspec">OrderByColumnSpec</h4>
@@ -167,7 +167,7 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"dimension"</span> <span class="p">:</span> <span class="s2">"<Any dimension or metric name>"</span><span class="p">,</span>
<span class="nt">"direction"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"ascending"</span><span class="err">|</span><span class="s2">"descending"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"dimensionOrder"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"lexicographic"</span><span class="err">(de</span><span class="kc">fault</span><span class="err">)|</span><span class="s2">"alphanumeric"</span><span class="err">|</span><span class="s2">"strlen"</span><span class="err">|</span><span class="s2">"numeric"</span><span class="err">></span>
+ <span class="nt">"dimensionOrder"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"lexicographic"</span><span class="err">(default)|</span><span class="s2">"alphanumeric"</span><span class="err">|</span><span class="s2">"strlen"</span><span class="err">|</span><span class="s2">"numeric"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
<p>If only the dimension is provided (as a JSON string), the default order-by is ascending with lexicographic sorting.</p>
diff --git a/docs/0.13.0-incubating/querying/post-aggregations.html b/docs/0.13.0-incubating/querying/post-aggregations.html
index 139d3fa..8668711 100644
--- a/docs/0.13.0-incubating/querying/post-aggregations.html
+++ b/docs/0.13.0-incubating/querying/post-aggregations.html
@@ -177,12 +177,12 @@
</ul>
<p>The grammar for an arithmetic post aggregation is:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">pos</span><span class="kc">t</span><span class="err">Aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">postAggregation</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arithmetic"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fn"</span> <span class="p">:</span> <span class="err"><ari</span><span class="kc">t</span><span class="err">hme</span><span class="kc">t</span><span class="err">ic_</span><span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
- <span class="nt">"ordering"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">null</span> <span class="err">(de</span><span class="kc">fault</span><span class="err">)</span><span class="p">,</span> <span class="err">or</span> <span class="s2">"numericFirst"</span><span class="err">></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fn"</span> <span class="p">:</span> <span class="err"><arithmetic_function></span><span class="p">,</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><post_aggregator></span><span class="p">,</span> <span class="err"><post_aggregator></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
+ <span class="nt">"ordering"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">null</span> <span class="err">(default)</span><span class="p">,</span> <span class="err">or</span> <span class="nt">"numericFirst"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="field-accessor-post-aggregators">Field accessor post-aggregators</h3>
@@ -193,15 +193,15 @@
For complex aggregators, like "cardinality" and "hyperUnique", the <code>type</code> of the post-aggregator determines what
the post-aggregator will return. Use type "fieldAccess" to return the raw aggregation object, or use type
"finalizingFieldAccess" to return a finalized value, such as an estimated cardinality.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<p>or</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"finalizingFieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"finalizingFieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="constant-post-aggregator">Constant post-aggregator</h3>
<p>The constant post-aggregator always returns the specified value.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"constant"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">merical_value></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"constant"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><numerical_value></span> <span class="p">}</span>
</code></pre></div>
<h3 id="greatest-least-post-aggregators">Greatest / Least post-aggregators</h3>
@@ -216,18 +216,18 @@
<p>Example:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleGreatest"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><post_aggregator></span><span class="p">,</span> <span class="err"><post_aggregator></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span>
<span class="p">}</span>
</code></pre></div>
<h3 id="javascript-post-aggregator">JavaScript post-aggregator</h3>
<p>Applies the provided JavaScript function to the given fields. Fields are passed as arguments to the JavaScript function in the given order.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">pos</span><span class="kc">t</span><span class="err">Aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">postAggregation</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
- <span class="nt">"function"</span><span class="p">:</span> <span class="err"><javascrip</span><span class="kc">t</span> <span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><aggregator_name></span><span class="p">,</span> <span class="err"><aggregator_name></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
+ <span class="nt">"function"</span><span class="p">:</span> <span class="err"><javascript</span> <span class="err">function></span>
<span class="p">}</span>
</code></pre></div>
<p>Example JavaScript aggregator:</p>
@@ -247,16 +247,16 @@
<p>The hyperUniqueCardinality post aggregator is used to wrap a hyperUnique object such that it can be used in post aggregations.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUniqueCardinality"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">t</span><span class="err">he</span> <span class="kc">na</span><span class="err">me</span> <span class="kc">f</span><span class="err">ield</span> <span class="err">value</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hyperU</span><span class="kc">n</span><span class="err">ique</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><the</span> <span class="err">name</span> <span class="err">field</span> <span class="err">value</span> <span class="err">of</span> <span class="err">the</span> <span class="err">hyperUnique</span> <span class="err">aggregator></span>
<span class="p">}</span>
</code></pre></div>
<p>It can be used in a sample calculation as so:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"aggregations"</span> <span class="p">:</span> <span class="p">[{</span>
- <span class="p">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"rows"</span><span class="p">},</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"aggregations"</span> <span class="err">:</span> <span class="p">[{</span>
+ <span class="err">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"rows"</span><span class="p">},</span>
<span class="p">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUnique"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"unique_users"</span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="s2">"uniques"</span><span class="p">}</span>
- <span class="p">}],</span>
- <span class="nt">"postAggregations"</span> <span class="p">:</span> <span class="p">[{</span>
+ <span class="err">}</span><span class="p">]</span><span class="err">,</span>
+ <span class="s2">"postAggregations"</span> <span class="err">:</span> <span class="p">[{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arithmetic"</span><span class="p">,</span>
<span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"average_users_per_row"</span><span class="p">,</span>
<span class="nt">"fn"</span> <span class="p">:</span> <span class="s2">"/"</span><span class="p">,</span>
diff --git a/docs/0.13.0-incubating/querying/segmentmetadataquery.html b/docs/0.13.0-incubating/querying/segmentmetadataquery.html
index 1faca8e..4c5969c 100644
--- a/docs/0.13.0-incubating/querying/segmentmetadataquery.html
+++ b/docs/0.13.0-incubating/querying/segmentmetadataquery.html
@@ -263,17 +263,17 @@
<h4 id="all">All</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"all"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"all"</span><span class="p">}</span>
</code></pre></div>
<h4 id="none">None</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
</code></pre></div>
<h4 id="list">List</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"list"</span><span class="p">,</span> <span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">colum</span><span class="kc">n</span> <span class="kc">na</span><span class="err">mes></span><span class="p">]}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"list"</span><span class="p">,</span> <span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="err"><string</span> <span class="err">list</span> <span class="err">of</span> <span class="err">column</span> <span class="err">names></span><span class="p">]}</span>
</code></pre></div>
<h3 id="analysistypes">analysisTypes</h3>
diff --git a/docs/0.13.0-incubating/querying/select-query.html b/docs/0.13.0-incubating/querying/select-query.html
index 94e3276..d107da3 100644
--- a/docs/0.13.0-incubating/querying/select-query.html
+++ b/docs/0.13.0-incubating/querying/select-query.html
@@ -341,9 +341,9 @@
<p>The <code>threshold</code> determines how many hits are returned, with each hit indexed by an offset. When <code>descending</code> is true, the offset will be negative value.</p>
<p>The results above include:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"pagingIdentifiers"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"pagingIdentifiers"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"wikipedia_2012-12-29T00:00:00.000Z_2013-01-10T08:00:00.000Z_2013-01-10T08:13:47.830Z_v9"</span> <span class="p">:</span> <span class="mi">4</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<h3 id="result-pagination">Result Pagination</h3>
@@ -352,7 +352,7 @@
<p>The <code>threshold</code> option controls how many rows are returned in each block of paginated results.</p>
<p>To initiate a paginated query, the user should specify a PagingSpec with a <code>threshold</code> set and a blank <code>pagingIdentifiers</code> field, e.g.:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"pagingSpec"</span><span class="p">:{</span><span class="nt">"pagingIdentifiers"</span><span class="p">:</span> <span class="p">{},</span> <span class="nt">"threshold"</span><span class="p">:</span><span class="mi">5</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"pagingSpec"</span><span class="err">:</span><span class="p">{</span><span class="nt">"pagingIdentifiers"</span><span class="p">:</span> <span class="p">{},</span> <span class="nt">"threshold"</span><span class="p">:</span><span class="mi">5</span><span class="p">}</span>
</code></pre></div>
<p>When the query returns, the results will contain a <code>pagingIndentifers</code> field indicating the current pagination point in the result set (an identifier and an offset).</p>
@@ -381,9 +381,9 @@
<span class="p">}</span>
</code></pre></div>
<p>The paginated query with <code>fromNext</code> set to false returns a result set with the following <code>pagingIdentifiers</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"pagingIdentifiers"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"pagingIdentifiers"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"wikipedia_2012-12-29T00:00:00.000Z_2013-01-10T08:00:00.000Z_2013-01-10T08:13:47.830Z_v9"</span> <span class="p">:</span> <span class="mi">4</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<p>To retrieve the next result set, the next query must be sent with the paging offset (4) incremented by 1.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="p">{</span>
diff --git a/docs/0.13.0-incubating/querying/sql.html b/docs/0.13.0-incubating/querying/sql.html
index 67a317e..3dad870 100644
--- a/docs/0.13.0-incubating/querying/sql.html
+++ b/docs/0.13.0-incubating/querying/sql.html
@@ -947,22 +947,22 @@
<p>Example code:</p>
<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="c1">// Connect to /druid/v2/sql/avatica/ on your broker.</span>
-<span class="n">String</span> <span class="n">url</span> <span class="o">=</span> <span class="s">"jdbc:avatica:remote:url=http://localhost:8082/druid/v2/sql/avatica/"</span><span class="p">;</span>
+<span class="n">String</span> <span class="n">url</span> <span class="o">=</span> <span class="s">"jdbc:avatica:remote:url=http://localhost:8082/druid/v2/sql/avatica/"</span><span class="o">;</span>
<span class="c1">// Set any connection context parameters you need here (see "Connection context" below).</span>
<span class="c1">// Or leave empty for default behavior.</span>
-<span class="n">Properties</span> <span class="n">connectionProperties</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="p">();</span>
+<span class="n">Properties</span> <span class="n">connectionProperties</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">();</span>
-<span class="k">try</span> <span class="p">(</span><span class="n">Connection</span> <span class="n">connection</span> <span class="o">=</span> <span class="n">DriverManager</span><span class="p">.</span><span class="na">getConnection</span><span class="p">(</span><span class="n">url</span><span class="p">,</span> <span class="n">connectionProperties</span><span class="p">))</span> <span class="p">{</span>
- <span class="k">try</span> <span class="p">(</span>
- <span class="kd">final</span> <span class="n">Statement</span> <span class="n">statement</span> <span class="o">=</span> <span class="n">connection</span><span class="p">.</span><span class="na">createStatement</span><span class="p">();</span>
- <span class="kd">final</span> <span class="n">ResultSet</span> <span class="n">resultSet</span> <span class="o">=</span> <span class="n">statement</span><span class="p">.</span><span class="na">executeQuery</span><span class="p">(</span><span class="n">query</span><span class="p">)</span>
- <span class="p">)</span> <span class="p">{</span>
- <span class="k">while</span> <span class="p">(</span><span class="n">resultSet</span><span class="p">.</span><span class="na">next</span><span class="p">())</span> <span class="p">{</span>
+<span class="k">try</span> <span class="o">(</span><span class="n">Connection</span> <span class="n">connection</span> <span class="o">=</span> <span class="n">DriverManager</span><span class="o">.</span><span class="na">getConnection</span><span class="o">(</span><span class="n">url</span><span class="o">,</span> <span class="n">connectionProperties</span><span class="o">))</span> <span class="o">{</span>
+ <span class="k">try</span> <span class="o">(</span>
+ <span class="kd">final</span> <span class="n">Statement</span> <span class="n">statement</span> <span class="o">=</span> <span class="n">connection</span><span class="o">.</span><span class="na">createStatement</span><span class="o">();</span>
+ <span class="kd">final</span> <span class="n">ResultSet</span> <span class="n">resultSet</span> <span class="o">=</span> <span class="n">statement</span><span class="o">.</span><span class="na">executeQuery</span><span class="o">(</span><span class="n">query</span><span class="o">)</span>
+ <span class="o">)</span> <span class="o">{</span>
+ <span class="k">while</span> <span class="o">(</span><span class="n">resultSet</span><span class="o">.</span><span class="na">next</span><span class="o">())</span> <span class="o">{</span>
<span class="c1">// Do something</span>
- <span class="p">}</span>
- <span class="p">}</span>
-<span class="p">}</span>
+ <span class="o">}</span>
+ <span class="o">}</span>
+<span class="o">}</span>
</code></pre></div>
<p>Table metadata is available over JDBC using <code>connection.getMetaData()</code> or by querying the
<a href="#retrieving-metadata">"INFORMATION_SCHEMA" tables</a>. Parameterized queries (using <code>?</code> or other placeholders) don't work properly,
diff --git a/docs/0.13.0-incubating/querying/timeboundaryquery.html b/docs/0.13.0-incubating/querying/timeboundaryquery.html
index d0685ff..c0ff90c 100644
--- a/docs/0.13.0-incubating/querying/timeboundaryquery.html
+++ b/docs/0.13.0-incubating/querying/timeboundaryquery.html
@@ -154,8 +154,8 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"queryType"</span> <span class="p">:</span> <span class="s2">"timeBoundary"</span><span class="p">,</span>
<span class="nt">"dataSource"</span><span class="p">:</span> <span class="s2">"sample_datasource"</span><span class="p">,</span>
- <span class="nt">"bound"</span> <span class="p">:</span> <span class="err"><</span> <span class="s2">"maxTime"</span> <span class="err">|</span> <span class="s2">"minTime"</span> <span class="err">></span> <span class="err">#</span> <span class="err">op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="err">re</span><span class="kc">turn</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">bo</span><span class="kc">t</span><span class="err">h</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mps</span> <span class="err">i</span><span class="kc">f</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="err">se</span><span class="kc">t</span>
- <span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span> <span class="err">#</span> <span class="err">op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span>
+ <span class="nt">"bound"</span> <span class="p">:</span> <span class="err"><</span> <span class="s2">"maxTime"</span> <span class="err">|</span> <span class="s2">"minTime"</span> <span class="err">></span> <span class="err">#</span> <span class="err">optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">returning</span> <span class="err">both</span> <span class="err">timestamps</span> <span class="err">if</span> <span class="err">not</span> <span class="err">set</span>
+ <span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span> <span class="err">#</span> <span class="err">optional</span>
<span class="p">}</span>
</code></pre></div>
<p>There are 3 main parts to a time boundary query:</p>
diff --git a/docs/0.13.0-incubating/querying/topnmetricspec.html b/docs/0.13.0-incubating/querying/topnmetricspec.html
index fab10b6..0b1cc11 100644
--- a/docs/0.13.0-incubating/querying/topnmetricspec.html
+++ b/docs/0.13.0-incubating/querying/topnmetricspec.html
@@ -155,10 +155,10 @@
<h2 id="numeric-topnmetricspec">Numeric TopNMetricSpec</h2>
<p>The simplest metric specification is a String value indicating the metric to sort topN results by. They are included in a topN query with:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="s2">"<metric_name>"</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="s2">"<metric_name>"</span>
</code></pre></div>
<p>The metric field can also be given as a JSON object. The grammar for dimension values sorted by numeric value is shown below:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"numeric"</span><span class="p">,</span>
<span class="nt">"metric"</span><span class="p">:</span> <span class="s2">"<metric_name>"</span>
<span class="p">}</span>
@@ -215,7 +215,7 @@
</tbody></table>
<p>The following metricSpec uses lexicographic sorting.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimension"</span><span class="p">,</span>
<span class="nt">"ordering"</span><span class="p">:</span> <span class="s2">"lexicographic"</span><span class="p">,</span>
<span class="nt">"previousStop"</span><span class="p">:</span> <span class="s2">"<previousStop_value>"</span>
@@ -226,9 +226,9 @@
<h2 id="inverted-topnmetricspec">Inverted TopNMetricSpec</h2>
<p>Sort dimension values in inverted order, i.e inverts the order of the delegate metric spec. It can be used to sort the values in ascending order.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"inverted"</span><span class="p">,</span>
- <span class="nt">"metric"</span><span class="p">:</span> <span class="err"><delega</span><span class="kc">te</span><span class="err">_</span><span class="kc">t</span><span class="err">op_</span><span class="kc">n</span><span class="err">_me</span><span class="kc">tr</span><span class="err">ic_spec></span>
+ <span class="nt">"metric"</span><span class="p">:</span> <span class="err"><delegate_top_n_metric_spec></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.13.0-incubating/tutorials/tutorial-compaction.html b/docs/0.13.0-incubating/tutorials/tutorial-compaction.html
index 82da4f3..2824094 100644
--- a/docs/0.13.0-incubating/tutorials/tutorial-compaction.html
+++ b/docs/0.13.0-incubating/tutorials/tutorial-compaction.html
@@ -179,7 +179,7 @@
├────────┤
│ <span class="m">39244</span> │
└────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">1</span>.38s.
+Retrieved <span class="m">1</span> row in <span class="m">1</span>.38s.
</code></pre></div>
<h2 id="compact-the-data">Compact the data</h2>
@@ -224,7 +224,7 @@
├────────┤
│ <span class="m">39244</span> │
└────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">1</span>.30s.
+Retrieved <span class="m">1</span> row in <span class="m">1</span>.30s.
</code></pre></div>
<p>After the coordinator has been running for at least 15 minutes, the http://localhost:8081/#/datasources/compaction-tutorial page should show there is only 1 segment:</p>
diff --git a/docs/0.13.0-incubating/tutorials/tutorial-ingestion-spec.html b/docs/0.13.0-incubating/tutorials/tutorial-ingestion-spec.html
index 27397de..9658be1 100644
--- a/docs/0.13.0-incubating/tutorials/tutorial-ingestion-spec.html
+++ b/docs/0.13.0-incubating/tutorials/tutorial-ingestion-spec.html
@@ -194,14 +194,14 @@
<p>Let's start with an empty <code>dataSchema</code> and add fields to it as we progress through the tutorial.</p>
<p>Create a new file called <code>ingestion-tutorial-index.json</code> in <code>quickstart/</code> with the following contents:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{}</span>
</code></pre></div>
<p>We will be making successive edits to this ingestion spec as we progress through the tutorial.</p>
<h3 id="datasource-name">Datasource name</h3>
<p>The datasource name is specified by the <code>dataSource</code> parameter in the <code>dataSchema</code>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
@@ -212,7 +212,7 @@
<p>A <code>dataSchema</code> has a <code>parser</code> field, which defines the parser that Druid will use to interpret the input data.</p>
<p>Since our input data is represented as JSON strings, we'll use a <code>string</code> parser with <code>json</code> format:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -227,7 +227,7 @@
<p>The <code>parser</code> needs to know how to extract the main timestamp field from the input data. When using a <code>json</code> type <code>parseSpec</code>, the timestamp is defined in a <code>timestampSpec</code>. </p>
<p>The timestamp column in our input data is named "ts", containing ISO 8601 timestamps, so let's add a <code>timestampSpec</code> with that information to the <code>parseSpec</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -261,7 +261,7 @@
<p>For this tutorial, let's enable rollup. This is specified with a <code>granularitySpec</code> on the <code>dataSchema</code>. </p>
<p>Note that the <code>granularitySpec</code> lies outside of the <code>parser</code>. We will revist the <code>parser</code> soon when we define our dimensions and metrics.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -294,7 +294,7 @@
<h4 id="dimensions">Dimensions</h4>
<p>Dimensions are specified with a <code>dimensionsSpec</code> inside the <code>parseSpec</code>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -337,7 +337,7 @@
<h4 id="metrics">Metrics</h4>
<p>Metrics are specified with a <code>metricsSpec</code> inside the <code>dataSchema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -380,7 +380,7 @@
<h3 id="no-rollup">No rollup</h3>
<p>If we were not using rollup, all columns would be specified in the <code>dimensionsSpec</code>, e.g.:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"dimensionsSpec"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span>
<span class="s2">"srcIP"</span><span class="p">,</span>
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"srcPort"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"long"</span> <span class="p">},</span>
@@ -391,7 +391,7 @@
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"bytes"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"long"</span> <span class="p">},</span>
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"srcPort"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"double"</span> <span class="p">}</span>
<span class="p">]</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<h3 id="define-granularities">Define granularities</h3>
@@ -405,7 +405,7 @@
<h4 id="segment-granularity">Segment granularity</h4>
<p>Segment granularity is configured by the <code>segmentGranularity</code> property in the <code>granularitySpec</code>. For this tutorial, we'll create hourly segments:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -444,7 +444,7 @@
<h4 id="query-granularity">Query granularity</h4>
<p>The query granularity is configured by the <code>queryGranularity</code> property in the <code>granularitySpec</code>. For this tutorial, let's use minute granularity:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -474,8 +474,8 @@
<span class="nt">"granularitySpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"uniform"</span><span class="p">,</span>
<span class="nt">"segmentGranularity"</span> <span class="p">:</span> <span class="s2">"HOUR"</span><span class="p">,</span>
- <span class="nt">"queryGranularity"</span> <span class="p">:</span> <span class="nt">"MINUTE"</span>
- <span class="nt">"rollup"</span> <span class="p">:</span> <span class="kc">true</span>
+ <span class="nt">"queryGranularity"</span> <span class="p">:</span> <span class="s2">"MINUTE"</span>
+ <span class="s2">"rollup"</span> <span class="p">:</span> <span class="kc">true</span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -490,7 +490,7 @@
<p>For batch tasks, it is necessary to define a time interval. Input rows with timestamps outside of the time interval will not be ingested.</p>
<p>The interval is also specified in the <code>granularitySpec</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -575,7 +575,7 @@
<h2 id="define-the-input-source">Define the input source</h2>
<p>Now let's define our input source, which is specified in an <code>ioConfig</code> object. Each task type has its own type of <code>ioConfig</code>. The native batch task uses "firehoses" to read input data, so let's configure a "local" firehose to read the example netflow data we saved earlier:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"index"</span><span class="p">,</span>
<span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"local"</span><span class="p">,</span>
@@ -637,7 +637,7 @@
<p>Each ingestion task has a <code>tuningConfig</code> section that allows users to tune various ingestion parameters.</p>
<p>As an example, let's add a <code>tuningConfig</code> that sets a target segment size for the native batch ingestion task:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"tuningConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"tuningConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"index"</span><span class="p">,</span>
<span class="nt">"targetPartitionSize"</span> <span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
@@ -722,7 +722,7 @@
│ <span class="m">2018</span>-01-01T02:33:00.000Z │ <span class="m">30000</span> │ <span class="m">56</span>.9 │ <span class="m">2</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">5000</span> │ <span class="m">300</span> │ <span class="m">17</span> │ <span class="m">7</span>.7.7.7 │ <span class="m">4000</span> │
│ <span class="m">2018</span>-01-01T02:35:00.000Z │ <span class="m">30000</span> │ <span class="m">46</span>.3 │ <span class="m">1</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">5000</span> │ <span class="m">300</span> │ <span class="m">17</span> │ <span class="m">7</span>.7.7.7 │ <span class="m">4000</span> │
└──────────────────────────┴───────┴──────┴───────┴─────────┴─────────┴─────────┴──────────┴─────────┴─────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">0</span>.12s.
+Retrieved <span class="m">5</span> rows in <span class="m">0</span>.12s.
dsql>
</code></pre></div>
diff --git a/docs/0.13.0-incubating/tutorials/tutorial-query.html b/docs/0.13.0-incubating/tutorials/tutorial-query.html
index b158fe7..2fc9af3 100644
--- a/docs/0.13.0-incubating/tutorials/tutorial-query.html
+++ b/docs/0.13.0-incubating/tutorials/tutorial-query.html
@@ -302,7 +302,7 @@
│ Wikipedia:In the news/Candidates │ <span class="m">17</span> │
│ Wikipedia:Requests <span class="k">for</span> page protection │ <span class="m">17</span> │
└──────────────────────────────────────────────────────────┴───────┘
-Retrieved <span class="m">10</span> rows <span class="k">in</span> <span class="m">0</span>.06s.
+Retrieved <span class="m">10</span> rows in <span class="m">0</span>.06s.
</code></pre></div>
<h3 id="additional-druid-sql-queries">Additional Druid SQL queries</h3>
@@ -338,7 +338,7 @@
│ <span class="m">2015</span>-09-12T22:00:00.000Z │ <span class="m">16379</span> │
│ <span class="m">2015</span>-09-12T23:00:00.000Z │ <span class="m">15289</span> │
└──────────────────────────┴──────────────┘
-Retrieved <span class="m">24</span> rows <span class="k">in</span> <span class="m">0</span>.08s.
+Retrieved <span class="m">24</span> rows in <span class="m">0</span>.08s.
</code></pre></div>
<h4 id="groupby">GroupBy</h4>
@@ -353,7 +353,7 @@
│ <span class="c1">#ru.wikipedia │ 640698 │</span>
│ <span class="c1">#es.wikipedia │ 634670 │</span>
└───────────────┴─────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">0</span>.05s.
+Retrieved <span class="m">5</span> rows in <span class="m">0</span>.05s.
</code></pre></div>
<h4 id="scan">Scan</h4>
@@ -368,7 +368,7 @@
│ Lowercase sigmabot III │ User talk:ErrantX │
│ BattyBot │ Hans W. Jung │
└────────────────────────┴────────────────────────────────────────────────────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">0</span>.04s.
+Retrieved <span class="m">5</span> rows in <span class="m">0</span>.04s.
</code></pre></div>
<h4 id="explain-plan-for">EXPLAIN PLAN FOR</h4>
@@ -383,7 +383,7 @@
├─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ DruidQueryRel<span class="o">(</span><span class="nv">query</span><span class="o">=[{</span><span class="s2">"queryType"</span>:<span class="s2">"topN"</span>,<span class="s2">"dataSource"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"table"</span>,<span class="s2">"name"</span>:<span class="s2">"wikipedia"</span><span class="o">}</span>,<span class="s2">"virtualColumns"</span>:<span class="o">[]</span>,<span class="s2">"dimension"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"default"</span>,<span class="s2">"dimension"</span>:<span class="s2">"page"</span>,<span class="s2">"outputName"</span>:<span class="s2">"d0"</span>,<span class="s2">"outputType"</span>:<span class="s2">"STRING"</span><span class="o">}</span>,<span class="s2">"metric"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"numeric"</span>,<span class="s2">"metric"</span>:<span class="s2">"a0"</span><span class="o">}</span>,<span class="s2">"threshold"</span>:10,<span class="s2">"intervals"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"intervals"</span>,<span class="s2">"intervals"</span>:<span class="o">[</span><span class="s2">"2015-09-12T00:00:00.000Z/2015-09-13T00:00:00.001Z"</span><span class="o">]}</span>,<span class="s2">"filter"</span>:null,<span class="s2">"granularity"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"all"</span><span class="o">}</span>,<span class="s2">"aggregations"</span>:<span class="o">[{</span><span class="s2">"type"</span>:<span class="s2">"count"</span>,<span class="s2">"name"</span>:<span class="s2">"a0"</span><span class="o">}]</span>,<span class="s2">"postAggregations"</span>:<span class="o">[]</span>,<span class="s2">"context"</span>:<span class="o">{}</span>,<span class="s2">"descending"</span>:false<span class="o">}]</span>, <span class="nv">signature</span><span class="o">=[{</span>d0:STRING, a0:LONG<span class="o">}])</span> │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">0</span>.03s.
+Retrieved <span class="m">1</span> row in <span class="m">0</span>.03s.
</code></pre></div>
<h2 id="further-reading">Further reading</h2>
diff --git a/docs/0.13.0-incubating/tutorials/tutorial-rollup.html b/docs/0.13.0-incubating/tutorials/tutorial-rollup.html
index f30fb17..8341091 100644
--- a/docs/0.13.0-incubating/tutorials/tutorial-rollup.html
+++ b/docs/0.13.0-incubating/tutorials/tutorial-rollup.html
@@ -256,7 +256,7 @@
│ <span class="m">2018</span>-01-02T21:33:00.000Z │ <span class="m">100288</span> │ <span class="m">2</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">161</span> │ <span class="m">7</span>.7.7.7 │
│ <span class="m">2018</span>-01-02T21:35:00.000Z │ <span class="m">2818</span> │ <span class="m">1</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">12</span> │ <span class="m">7</span>.7.7.7 │
└──────────────────────────┴────────┴───────┴─────────┴─────────┴─────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">1</span>.18s.
+Retrieved <span class="m">5</span> rows in <span class="m">1</span>.18s.
dsql>
</code></pre></div>
diff --git a/docs/0.13.0-incubating/tutorials/tutorial-transform-spec.html b/docs/0.13.0-incubating/tutorials/tutorial-transform-spec.html
index 808c652..3e579f9 100644
--- a/docs/0.13.0-incubating/tutorials/tutorial-transform-spec.html
+++ b/docs/0.13.0-incubating/tutorials/tutorial-transform-spec.html
@@ -267,7 +267,7 @@
│ <span class="m">2018</span>-01-01T06:01:00.000Z │ super-snake │ <span class="m">1</span> │ <span class="m">3</span> │ <span class="m">300</span> │ <span class="m">900</span> │
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ super-octopus │ <span class="m">1</span> │ <span class="m">1</span> │ <span class="m">100</span> │ <span class="m">300</span> │
└──────────────────────────┴────────────────┴───────┴──────────┴────────┴───────────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">0</span>.03s.
+Retrieved <span class="m">3</span> rows in <span class="m">0</span>.03s.
</code></pre></div>
<p>The "lion" row has been discarded, the <code>animal</code> column has been transformed, and we have both the original and transformed <code>number</code> column.</p>
diff --git a/docs/0.13.0-incubating/tutorials/tutorial-update-data.html b/docs/0.13.0-incubating/tutorials/tutorial-update-data.html
index 946534b..a482715 100644
--- a/docs/0.13.0-incubating/tutorials/tutorial-update-data.html
+++ b/docs/0.13.0-incubating/tutorials/tutorial-update-data.html
@@ -179,7 +179,7 @@
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ aardvark │ <span class="m">1</span> │ <span class="m">42</span> │
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ giraffe │ <span class="m">1</span> │ <span class="m">14124</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">1</span>.42s.
+Retrieved <span class="m">3</span> rows in <span class="m">1</span>.42s.
</code></pre></div>
<h3 id="overwrite-the-initial-data">Overwrite the initial data</h3>
@@ -201,7 +201,7 @@
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ aardvark │ <span class="m">1</span> │ <span class="m">9999</span> │
│ <span class="m">2018</span>-01-01T04:01:00.000Z │ bear │ <span class="m">1</span> │ <span class="m">111</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">3</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<h2 id="combine-old-data-with-new-data-and-overwrite">Combine old data with new data and overwrite</h2>
@@ -224,7 +224,7 @@
│ <span class="m">2018</span>-01-01T06:01:00.000Z │ snake │ <span class="m">1</span> │ <span class="m">1234</span> │
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ octopus │ <span class="m">1</span> │ <span class="m">115</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">6</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">6</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<h2 id="append-to-the-data">Append to the data</h2>
@@ -249,7 +249,7 @@
│ <span class="m">2018</span>-01-01T04:01:00.000Z │ bear │ <span class="m">1</span> │ <span class="m">222</span> │
│ <span class="m">2018</span>-01-01T09:01:00.000Z │ falcon │ <span class="m">1</span> │ <span class="m">1241</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">8</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">8</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<p>If we run a GroupBy query instead of a <code>select *</code>, we can see that the "bear" rows will group together at query time:</p>
<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span></span>dsql> <span class="k">select</span> __time, animal, SUM<span class="o">(</span><span class="s2">"count"</span><span class="o">)</span>, SUM<span class="o">(</span><span class="s2">"number"</span><span class="o">)</span> from <span class="s2">"updates-tutorial"</span> group by __time, animal<span class="p">;</span>
@@ -264,7 +264,7 @@
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ octopus │ <span class="m">1</span> │ <span class="m">115</span> │
│ <span class="m">2018</span>-01-01T09:01:00.000Z │ falcon │ <span class="m">1</span> │ <span class="m">1241</span> │
└──────────────────────────┴──────────┴────────┴────────┘
-Retrieved <span class="m">7</span> rows <span class="k">in</span> <span class="m">0</span>.23s.
+Retrieved <span class="m">7</span> rows in <span class="m">0</span>.23s.
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.14.0-incubating/dependencies/metadata-storage.html b/docs/0.14.0-incubating/dependencies/metadata-storage.html
index 1d169e3..c3f0889 100644
--- a/docs/0.14.0-incubating/dependencies/metadata-storage.html
+++ b/docs/0.14.0-incubating/dependencies/metadata-storage.html
@@ -218,7 +218,7 @@
<span class="nt">"metrics"</span><span class="p">:</span><span class="s2">"comma-delimited-list-of-metric-names"</span><span class="p">,</span>
<span class="nt">"shardSpec"</span><span class="p">:{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"none"</span><span class="p">},</span>
<span class="nt">"binaryVersion"</span><span class="p">:</span><span class="mi">9</span><span class="p">,</span>
- <span class="nt">"size"</span><span class="p">:</span><span class="err">size_o</span><span class="kc">f</span><span class="err">_segme</span><span class="kc">nt</span><span class="p">,</span>
+ <span class="nt">"size"</span><span class="p">:</span><span class="err">size_of_segment</span><span class="p">,</span>
<span class="nt">"identifier"</span><span class="p">:</span><span class="s2">"wikipedia_2012-05-23T00:00:00.000Z_2012-05-24T00:00:00.000Z_2012-05-23T00:10:00.046Z"</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.14.0-incubating/design/auth.html b/docs/0.14.0-incubating/design/auth.html
index f1b31c9..499a131 100644
--- a/docs/0.14.0-incubating/design/auth.html
+++ b/docs/0.14.0-incubating/design/auth.html
@@ -315,11 +315,11 @@
<p>An Authenticator implementation that is intended to support internal Druid communications must recognize credentials for the "internal system user", as provided by a corresponding Escalator implementation.</p>
<p>An Escalator must implement three methods related to the internal system user:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="kd">public</span> <span class="n">HttpClient</span> <span class="nf">createEscalatedClient</span><span class="p">(</span><span class="n">HttpClient</span> <span class="n">baseClient</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="kd">public</span> <span class="n">HttpClient</span> <span class="nf">createEscalatedClient</span><span class="o">(</span><span class="n">HttpClient</span> <span class="n">baseClient</span><span class="o">);</span>
- <span class="kd">public</span> <span class="n">org</span><span class="p">.</span><span class="na">eclipse</span><span class="p">.</span><span class="na">jetty</span><span class="p">.</span><span class="na">client</span><span class="p">.</span><span class="na">HttpClient</span> <span class="nf">createEscalatedJettyClient</span><span class="p">(</span><span class="n">org</span><span class="p">.</span><span class="na">eclipse</span><span class="p">.</span><span class="na">jetty</span><span class="p">.</span><span class="na">client</span><span class="p">.</span><span class="na">HttpClient</span> <span class="n">baseClient</span><span class="p">);</span>
+ <span class="kd">public</span> <span class="n">org</span><span class="o">.</span><span class="na">eclipse</span><span class="o">.</span><span class="na">jetty</span><span class="o">.</span><span class="na">client</span><span class="o">.</span><span class="na">HttpClient</span> <span class="nf">createEscalatedJettyClient</span><span class="o">(</span><span class="n">org</span><span class="o">.</span><span class="na">eclipse</span><span class="o">.</span><span class="na">jetty</span><span class="o">.</span><span class="na">client</span><span class="o">.</span><span class="na">HttpClient</span> <span class="n">baseClient</span><span class="o">);</span>
- <span class="kd">public</span> <span class="n">AuthenticationResult</span> <span class="nf">createEscalatedAuthenticationResult</span><span class="p">();</span>
+ <span class="kd">public</span> <span class="n">AuthenticationResult</span> <span class="nf">createEscalatedAuthenticationResult</span><span class="o">();</span>
</code></pre></div>
<p><code>createEscalatedClient</code> returns an wrapped HttpClient that attaches the credentials of the "internal system user" to requests.</p>
diff --git a/docs/0.14.0-incubating/development/extensions-contrib/ambari-metrics-emitter.html b/docs/0.14.0-incubating/development/extensions-contrib/ambari-metrics-emitter.html
index 42db6a1..a722d4c 100644
--- a/docs/0.14.0-incubating/development/extensions-contrib/ambari-metrics-emitter.html
+++ b/docs/0.14.0-incubating/development/extensions-contrib/ambari-metrics-emitter.html
@@ -274,7 +274,7 @@
<p>The first implementation called <code>all</code>, will send all the druid service metrics events.
The path will be in the form <code><namespacePrefix>.[<druid service name>].[<druid hostname>].<dimensions values ordered by dimension's name>.<metric></code>
User has control of <code><namespacePrefix>.[<druid service name>].[<druid hostname>].</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.ambari</span><span class="mi">-</span><span class="err">me</span><span class="kc">tr</span><span class="err">ics.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.ambari-metrics.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">}</span>
</code></pre></div>
<h4 id="white-list-based-converter">White-list based converter</h4>
@@ -285,7 +285,7 @@
<p>Although user can override the default white list map by supplying a property called <code>mapPath</code>.
This property is a String containing the path for the file containing <strong>white list map Json object</strong>.
For example the following converter will read the map from the file <code>/pathPrefix/fileName.json</code>. </p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.ambari</span><span class="mi">-</span><span class="err">me</span><span class="kc">tr</span><span class="err">ics.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.ambari-metrics.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
</code></pre></div>
<p><strong>Druid emits a huge number of metrics we highly recommend to use the <code>whiteList</code> converter</strong></p>
diff --git a/docs/0.14.0-incubating/development/extensions-contrib/azure.html b/docs/0.14.0-incubating/development/extensions-contrib/azure.html
index cdabc6b..8d2b6e1 100644
--- a/docs/0.14.0-incubating/development/extensions-contrib/azure.html
+++ b/docs/0.14.0-incubating/development/extensions-contrib/azure.html
@@ -220,7 +220,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-azure-blobstore"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
diff --git a/docs/0.14.0-incubating/development/extensions-contrib/cloudfiles.html b/docs/0.14.0-incubating/development/extensions-contrib/cloudfiles.html
index c742f30..a6eaa19 100644
--- a/docs/0.14.0-incubating/development/extensions-contrib/cloudfiles.html
+++ b/docs/0.14.0-incubating/development/extensions-contrib/cloudfiles.html
@@ -236,17 +236,17 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-cloudfiles"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
- <span class="nt">"region"</span><span class="p">:</span> <span class="nt">"DFW"</span>
- <span class="nt">"container"</span><span class="p">:</span> <span class="s2">"container"</span><span class="p">,</span>
+ <span class="nt">"region"</span><span class="p">:</span> <span class="s2">"DFW"</span>
+ <span class="s2">"container"</span><span class="p">:</span> <span class="s2">"container"</span><span class="p">,</span>
<span class="nt">"path"</span><span class="p">:</span> <span class="s2">"/path/to/your/file.json"</span>
<span class="p">},</span>
<span class="p">{</span>
- <span class="nt">"region"</span><span class="p">:</span> <span class="nt">"ORD"</span>
- <span class="nt">"container"</span><span class="p">:</span> <span class="s2">"anothercontainer"</span><span class="p">,</span>
+ <span class="nt">"region"</span><span class="p">:</span> <span class="s2">"ORD"</span>
+ <span class="s2">"container"</span><span class="p">:</span> <span class="s2">"anothercontainer"</span><span class="p">,</span>
<span class="nt">"path"</span><span class="p">:</span> <span class="s2">"/another/path.json"</span>
<span class="p">}</span>
<span class="p">]</span>
diff --git a/docs/0.14.0-incubating/development/extensions-contrib/google.html b/docs/0.14.0-incubating/development/extensions-contrib/google.html
index adb6ca7..bb0f2e5 100644
--- a/docs/0.14.0-incubating/development/extensions-contrib/google.html
+++ b/docs/0.14.0-incubating/development/extensions-contrib/google.html
@@ -198,7 +198,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-google-blobstore"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
diff --git a/docs/0.14.0-incubating/development/extensions-contrib/graphite.html b/docs/0.14.0-incubating/development/extensions-contrib/graphite.html
index 0a61ef7..c60f2c9 100644
--- a/docs/0.14.0-incubating/development/extensions-contrib/graphite.html
+++ b/docs/0.14.0-incubating/development/extensions-contrib/graphite.html
@@ -281,7 +281,7 @@
<p>Elements in metric name by default are separated by "/", so graphite will create all metrics on one level. If you want to have metrics in the tree structure, you have to set <code>replaceSlashWithDot=true</code>
Original: <code>druid.HOSTNAME.dataSourceName.queryType.query/time</code>
Changed: <code>druid.HOSTNAME.dataSourceName.queryType.query.time</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.graphi</span><span class="kc">te</span><span class="err">.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.graphite.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">}</span>
</code></pre></div>
<h4 id="white-list-based-converter">White-list based converter</h4>
@@ -292,7 +292,7 @@
<p>Although user can override the default white list map by supplying a property called <code>mapPath</code>.
This property is a String containing the path for the file containing <strong>white list map Json object</strong>.
For example the following converter will read the map from the file <code>/pathPrefix/fileName.json</code>. </p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.graphi</span><span class="kc">te</span><span class="err">.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.graphite.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
</code></pre></div>
<p><strong>Druid emits a huge number of metrics we highly recommend to use the <code>whiteList</code> converter</strong></p>
diff --git a/docs/0.14.0-incubating/development/extensions-contrib/kafka-simple.html b/docs/0.14.0-incubating/development/extensions-contrib/kafka-simple.html
index c74cfc1..055cba6 100644
--- a/docs/0.14.0-incubating/development/extensions-contrib/kafka-simple.html
+++ b/docs/0.14.0-incubating/development/extensions-contrib/kafka-simple.html
@@ -156,7 +156,7 @@
<p>This is an experimental firehose to ingest data from Apache Kafka using the Kafka simple consumer api. Currently, this firehose would only work inside standalone realtime processes.
The configuration for KafkaSimpleConsumerFirehose is similar to the Kafka Eight Firehose , except <code>firehose</code> should be replaced with <code>firehoseV2</code> like this:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehoseV2"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehoseV2"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"kafka-0.8-v2"</span><span class="p">,</span>
<span class="nt">"brokerList"</span> <span class="p">:</span> <span class="p">[</span><span class="s2">"localhost:4443"</span><span class="p">],</span>
<span class="nt">"queueBufferLength"</span><span class="p">:</span><span class="mi">10001</span><span class="p">,</span>
diff --git a/docs/0.14.0-incubating/development/extensions-contrib/opentsdb-emitter.html b/docs/0.14.0-incubating/development/extensions-contrib/opentsdb-emitter.html
index 25b698c..76881fb 100644
--- a/docs/0.14.0-incubating/development/extensions-contrib/opentsdb-emitter.html
+++ b/docs/0.14.0-incubating/development/extensions-contrib/opentsdb-emitter.html
@@ -224,7 +224,7 @@
If the user does not specify their own JSON file, a default file is used. All metrics are expected to be configured in the JSON file. Metrics which are not configured will be logged.
Desired metrics and dimensions is organized using the following schema:<code><druid metric name> : [ <dimension list> ]</code><br />
e.g.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"query/time"</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"query/time"</span><span class="err">:</span> <span class="p">[</span>
<span class="s2">"dataSource"</span><span class="p">,</span>
<span class="s2">"type"</span>
<span class="p">]</span>
diff --git a/docs/0.14.0-incubating/development/extensions-contrib/rabbitmq.html b/docs/0.14.0-incubating/development/extensions-contrib/rabbitmq.html
index 3ba5e45..e8b384e 100644
--- a/docs/0.14.0-incubating/development/extensions-contrib/rabbitmq.html
+++ b/docs/0.14.0-incubating/development/extensions-contrib/rabbitmq.html
@@ -161,7 +161,7 @@
<p><strong>Note:</strong> Add <strong>amqp-client-3.2.1.jar</strong> to lib directory of druid to use this firehose.</p>
<p>A sample spec for rabbitmq firehose:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"rabbitmq"</span><span class="p">,</span>
<span class="nt">"connection"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"host"</span><span class="p">:</span> <span class="s2">"localhost"</span><span class="p">,</span>
diff --git a/docs/0.14.0-incubating/development/extensions-core/approximate-histograms.html b/docs/0.14.0-incubating/development/extensions-core/approximate-histograms.html
index b0a0380..3a00484 100644
--- a/docs/0.14.0-incubating/development/extensions-core/approximate-histograms.html
+++ b/docs/0.14.0-incubating/development/extensions-core/approximate-histograms.html
@@ -211,12 +211,12 @@
query.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"approxHistogram or approxHistogramFold (at ingestion time), approxHistogramFold (at query time)"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"resolution"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
- <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
- <span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fl</span><span class="err">oa</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fl</span><span class="err">oa</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"resolution"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
+ <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
+ <span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><float></span><span class="p">,</span>
+ <span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><float></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -304,9 +304,9 @@
<p>An example aggregator spec is shown below:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fixedBucketsHistogram"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
<span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><double></span><span class="p">,</span>
<span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><double></span><span class="p">,</span>
<span class="nt">"outlierHandlingMode"</span><span class="p">:</span> <span class="err"><mode></span>
@@ -417,7 +417,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalBuckets"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"numBuckets"</span><span class="p">:</span> <span class="err"><cou</span><span class="kc">nt</span><span class="err">></span>
+ <span class="nt">"numBuckets"</span><span class="p">:</span> <span class="err"><count></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="buckets-post-aggregator">Buckets post-aggregator</h3>
@@ -433,8 +433,8 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"buckets"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"bucketSize"</span><span class="p">:</span> <span class="err"><bucke</span><span class="kc">t</span><span class="err">_size></span><span class="p">,</span>
- <span class="nt">"offset"</span><span class="p">:</span> <span class="err"><o</span><span class="kc">ffset</span><span class="err">></span>
+ <span class="nt">"bucketSize"</span><span class="p">:</span> <span class="err"><bucket_size></span><span class="p">,</span>
+ <span class="nt">"offset"</span><span class="p">:</span> <span class="err"><offset></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="custom-buckets-post-aggregator">Custom buckets post-aggregator</h3>
@@ -442,30 +442,30 @@
<p>Computes a visual representation of the approximate histogram with bins laid out according to the given breaks.</p>
<p>This aggregator is not supported for the fixed buckets histogram.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"customBuckets"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"customBuckets"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
<span class="nt">"breaks"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><value></span><span class="p">,</span> <span class="err"><value></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<h3 id="min-post-aggregator">min post-aggregator</h3>
<p>Returns the minimum value of the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"min"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"min"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="max-post-aggregator">max post-aggregator</h3>
<p>Returns the maximum value of the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"max"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"max"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="quantile-post-aggregator">quantile post-aggregator</h4>
<p>Computes a single quantile based on the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantile"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"probability"</span> <span class="p">:</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantile"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
+ <span class="nt">"probability"</span> <span class="p">:</span> <span class="err"><quantile></span> <span class="p">}</span>
</code></pre></div>
<h4 id="quantiles-post-aggregator">quantiles post-aggregator</h4>
<p>Computes an array of quantiles based on the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantiles"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"probabilities"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span><span class="p">,</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantiles"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
+ <span class="nt">"probabilities"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><quantile></span><span class="p">,</span> <span class="err"><quantile></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.14.0-incubating/development/extensions-core/avro.html b/docs/0.14.0-incubating/development/extensions-core/avro.html
index 42d8bb9..25a8949 100644
--- a/docs/0.14.0-incubating/development/extensions-core/avro.html
+++ b/docs/0.14.0-incubating/development/extensions-core/avro.html
@@ -188,7 +188,7 @@
field types, which can be used to read nested Avro records. The "jq" field type is not currently supported for Avro.</p>
<p>For example, using Avro stream parser with schema repo Avro bytes decoder:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"parser"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"avro_stream"</span><span class="p">,</span>
<span class="nt">"avroBytesDecoder"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"schema_repo"</span><span class="p">,</span>
@@ -203,9 +203,9 @@
<span class="p">},</span>
<span class="nt">"parseSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"avro"</span><span class="p">,</span>
- <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mpSpec></span><span class="p">,</span>
- <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
- <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">></span>
+ <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">timestampSpec></span><span class="p">,</span>
+ <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
+ <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><optional></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -433,9 +433,9 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"avro_hadoop"</span><span class="p">,</span>
<span class="nt">"parseSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"avro"</span><span class="p">,</span>
- <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mpSpec></span><span class="p">,</span>
- <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
- <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">></span>
+ <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">timestampSpec></span><span class="p">,</span>
+ <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
+ <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><optional></span>
<span class="p">}</span>
<span class="p">}</span>
<span class="p">},</span>
diff --git a/docs/0.14.0-incubating/development/extensions-core/bloom-filter.html b/docs/0.14.0-incubating/development/extensions-core/bloom-filter.html
index a9591a3..df41eb1 100644
--- a/docs/0.14.0-incubating/development/extensions-core/bloom-filter.html
+++ b/docs/0.14.0-incubating/development/extensions-core/bloom-filter.html
@@ -172,13 +172,13 @@
this implementation uses Murmur3 as the hash algorithm.</p>
<p>To construct a BloomKFilter externally with Java to use as a filter in a Druid query:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">BloomKFilter</span> <span class="n">bloomFilter</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BloomKFilter</span><span class="p">(</span><span class="mi">1500</span><span class="p">);</span>
-<span class="n">bloomFilter</span><span class="p">.</span><span class="na">addString</span><span class="p">(</span><span class="s">"value 1"</span><span class="p">);</span>
-<span class="n">bloomFilter</span><span class="p">.</span><span class="na">addString</span><span class="p">(</span><span class="s">"value 2"</span><span class="p">);</span>
-<span class="n">bloomFilter</span><span class="p">.</span><span class="na">addString</span><span class="p">(</span><span class="s">"value 3"</span><span class="p">);</span>
-<span class="n">ByteArrayOutputStream</span> <span class="n">byteArrayOutputStream</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ByteArrayOutputStream</span><span class="p">();</span>
-<span class="n">BloomKFilter</span><span class="p">.</span><span class="na">serialize</span><span class="p">(</span><span class="n">byteArrayOutputStream</span><span class="p">,</span> <span class="n">bloomFilter</span><span class="p">);</span>
-<span class="n">String</span> <span class="n">base64Serialized</span> <span class="o">=</span> <span class="n">Base64</span><span class="p">.</span><span class="na">encodeBase64String</span><span class="p">(</span><span class="n">byteArrayOutputStream</span><span class="p">.</span><span class="na">toByteArray</span><span class="p">());</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">BloomKFilter</span> <span class="n">bloomFilter</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BloomKFilter</span><span class="o">(</span><span class="mi">1500</span><span class="o">);</span>
+<span class="n">bloomFilter</span><span class="o">.</span><span class="na">addString</span><span class="o">(</span><span class="s">"value 1"</span><span class="o">);</span>
+<span class="n">bloomFilter</span><span class="o">.</span><span class="na">addString</span><span class="o">(</span><span class="s">"value 2"</span><span class="o">);</span>
+<span class="n">bloomFilter</span><span class="o">.</span><span class="na">addString</span><span class="o">(</span><span class="s">"value 3"</span><span class="o">);</span>
+<span class="n">ByteArrayOutputStream</span> <span class="n">byteArrayOutputStream</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ByteArrayOutputStream</span><span class="o">();</span>
+<span class="n">BloomKFilter</span><span class="o">.</span><span class="na">serialize</span><span class="o">(</span><span class="n">byteArrayOutputStream</span><span class="o">,</span> <span class="n">bloomFilter</span><span class="o">);</span>
+<span class="n">String</span> <span class="n">base64Serialized</span> <span class="o">=</span> <span class="n">Base64</span><span class="o">.</span><span class="na">encodeBase64String</span><span class="o">(</span><span class="n">byteArrayOutputStream</span><span class="o">.</span><span class="na">toByteArray</span><span class="o">());</span>
</code></pre></div>
<p>This string can then be used in the native or sql Druid query.</p>
@@ -187,9 +187,9 @@
<h3 id="json-specification-of-bloom-filter">JSON Specification of Bloom Filter</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"bloom"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"bloomKFilter"</span> <span class="p">:</span> <span class="err"><serialized_by</span><span class="kc">tes</span><span class="err">_</span><span class="kc">f</span><span class="err">or_BloomKFil</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fn</span><span class="err">></span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension_name></span><span class="p">,</span>
+ <span class="nt">"bloomKFilter"</span> <span class="p">:</span> <span class="err"><serialized_bytes_for_BloomKFilter></span><span class="p">,</span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><extraction_fn></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -255,9 +255,9 @@
<h3 id="json-specification-of-bloom-filter-aggregator">JSON Specification of Bloom Filter Aggregator</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"bloom"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">ield_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxNumEntries"</span><span class="p">:</span> <span class="err"><maximum_</span><span class="kc">nu</span><span class="err">mber_o</span><span class="kc">f</span><span class="err">_eleme</span><span class="kc">nts</span><span class="err">_</span><span class="kc">f</span><span class="err">or_BloomKFil</span><span class="kc">ter</span><span class="err">></span>
- <span class="nt">"field"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_spec></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_field_name></span><span class="p">,</span>
+ <span class="nt">"maxNumEntries"</span><span class="p">:</span> <span class="err"><maximum_number_of_elements_for_BloomKFilter></span>
+ <span class="s2">"field"</span><span class="p">:</span> <span class="err"><dimension_spec></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.14.0-incubating/development/extensions-core/datasketches-quantiles.html b/docs/0.14.0-incubating/development/extensions-core/datasketches-quantiles.html
index 6a03c7e..a04b0d2 100644
--- a/docs/0.14.0-incubating/development/extensions-core/datasketches-quantiles.html
+++ b/docs/0.14.0-incubating/development/extensions-core/datasketches-quantiles.html
@@ -168,9 +168,9 @@
<p>The result of the aggregation is a DoublesSketch that is the union of all sketches either built from raw data or read from the segments.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"k"</span><span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">co</span><span class="kc">ntr</span><span class="err">ols</span> <span class="err">size</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">accuracy></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"k"</span><span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">controls</span> <span class="err">size</span> <span class="err">and</span> <span class="err">accuracy></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -209,9 +209,9 @@
<p>This returns an approximation to the value that would be preceded by a given fraction of a hypothetical sorted version of the input stream.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToQuantile"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"fraction"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">posi</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hypo</span><span class="kc">t</span><span class="err">he</span><span class="kc">t</span><span class="err">ical</span> <span class="err">sor</span><span class="kc">te</span><span class="err">d</span> <span class="err">s</span><span class="kc">trea</span><span class="err">m</span><span class="p">,</span> <span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">0</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1</span> <span class="err">i</span><span class="kc">n</span><span class="err">clusive></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"fraction"</span> <span class="p">:</span> <span class="err"><fractional</span> <span class="err">position</span> <span class="err">in</span> <span class="err">the</span> <span class="err">hypothetical</span> <span class="err">sorted</span> <span class="err">stream</span><span class="p">,</span> <span class="err">number</span> <span class="err">from</span> <span class="err">0</span> <span class="err">to</span> <span class="err">1</span> <span class="err">inclusive></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="quantiles">Quantiles</h4>
@@ -219,9 +219,9 @@
<p>This returns an array of quantiles corresponding to a given array of fractions</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToQuantiles"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"fractions"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">fra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">posi</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hypo</span><span class="kc">t</span><span class="err">he</span><span class="kc">t</span><span class="err">ical</span> <span class="err">sor</span><span class="kc">te</span><span class="err">d</span> <span class="err">s</span><span class="kc">trea</span><span class="err">m</span><span class="p">,</span> <span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">0</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1</span> <span class="err">i</span><span class="kc">n</span><span class="err">clusive></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"fractions"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">fractional</span> <span class="err">positions</span> <span class="err">in</span> <span class="err">the</span> <span class="err">hypothetical</span> <span class="err">sorted</span> <span class="err">stream</span><span class="p">,</span> <span class="err">number</span> <span class="err">from</span> <span class="err">0</span> <span class="err">to</span> <span class="err">1</span> <span class="err">inclusive></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="histogram">Histogram</h4>
@@ -229,9 +229,9 @@
<p>This returns an approximation to the histogram given an array of split points that define the histogram bins. An array of <i>m</i> unique, monotonically increasing split points divide the real number line into <i>m+1</i> consecutive disjoint intervals. The definition of an interval is inclusive of the left split point and exclusive of the right split point.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToHistogram"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"splitPoints"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">spli</span><span class="kc">t</span> <span class="err">poi</span><span class="kc">nts</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"splitPoints"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">split</span> <span class="err">points></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-summary">Sketch Summary</h4>
@@ -239,8 +239,8 @@
<p>This returns a summary of the sketch that can be used for debugging. This is the result of calling toString() method.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToString"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.14.0-incubating/development/extensions-core/datasketches-theta.html b/docs/0.14.0-incubating/development/extensions-core/datasketches-theta.html
index aac90e4..46c2538 100644
--- a/docs/0.14.0-incubating/development/extensions-core/datasketches-theta.html
+++ b/docs/0.14.0-incubating/development/extensions-core/datasketches-theta.html
@@ -160,8 +160,8 @@
<h3 id="aggregators">Aggregators</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="nt">"isInputThetaSketch"</span><span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
<span class="nt">"size"</span><span class="p">:</span> <span class="mi">16384</span>
<span class="p">}</span>
@@ -205,17 +205,17 @@
<h4 id="sketch-estimator">Sketch Estimator</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketchEstimate"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">ype</span> <span class="kc">f</span><span class="err">ieldAccess</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">ype</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">chSe</span><span class="kc">t</span><span class="err">Op></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">of</span> <span class="err">type</span> <span class="err">fieldAccess</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">thetaSketch</span> <span class="err">aggregator</span> <span class="err">or</span> <span class="err">that</span> <span class="err">of</span> <span class="err">type</span> <span class="err">thetaSketchSetOp></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-operations">Sketch Operations</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketchSetOp"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
<span class="nt">"func"</span><span class="p">:</span> <span class="err"><UNION|INTERSECT|NOT></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">f</span><span class="err">ieldAccess</span> <span class="kc">t</span><span class="err">ype</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="kc">t</span><span class="err">he</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">chSe</span><span class="kc">t</span><span class="err">Op</span> <span class="kc">t</span><span class="err">ype</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">allow</span> <span class="err">arbi</span><span class="kc">trar</span><span class="err">y</span> <span class="err">combi</span><span class="kc">nat</span><span class="err">io</span><span class="kc">n</span> <span class="err">o</span><span class="kc">f</span> <span class="err">se</span><span class="kc">t</span> <span class="err">opera</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"size"</span><span class="p">:</span> <span class="err"><</span><span class="mi">16384</span> <span class="err">by</span> <span class="err">de</span><span class="kc">fault</span><span class="p">,</span> <span class="err">mus</span><span class="kc">t</span> <span class="err">be</span> <span class="err">max</span> <span class="err">o</span><span class="kc">f</span> <span class="err">size</span> <span class="kc">fr</span><span class="err">om</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ches</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">f</span><span class="err">ields</span> <span class="err">i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">fieldAccess</span> <span class="err">type</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">the</span> <span class="err">thetaSketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">thetaSketchSetOp</span> <span class="err">type</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">allow</span> <span class="err">arbitrary</span> <span class="err">combination</span> <span class="err">of</span> <span class="err">set</span> <span class="err">operations></span><span class="p">,</span>
+ <span class="nt">"size"</span><span class="p">:</span> <span class="err"><</span><span class="mi">16384</span> <span class="err">by</span> <span class="err">default</span><span class="p">,</span> <span class="err">must</span> <span class="err">be</span> <span class="err">max</span> <span class="err">of</span> <span class="err">size</span> <span class="err">from</span> <span class="err">sketches</span> <span class="err">in</span> <span class="err">fields</span> <span class="err">input></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="examples">Examples</h3>
diff --git a/docs/0.14.0-incubating/development/extensions-core/datasketches-tuple.html b/docs/0.14.0-incubating/development/extensions-core/datasketches-tuple.html
index 66d1b54..5a4afdd 100644
--- a/docs/0.14.0-incubating/development/extensions-core/datasketches-tuple.html
+++ b/docs/0.14.0-incubating/development/extensions-core/datasketches-tuple.html
@@ -158,11 +158,11 @@
<h3 id="aggregators">Aggregators</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"nominalEntries"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"metricColumns"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">gs></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"nominalEntries"</span><span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"metricColumns"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">strings></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -211,8 +211,8 @@
<p>Returns a distinct count estimate from a given ArrayOfDoublesSketch.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToEstimate"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="estimate-of-the-number-of-distinct-keys-with-error-bounds">Estimate of the number of distinct keys with error bounds</h4>
@@ -220,9 +220,9 @@
<p>Returns a distinct count estimate and error bounds from a given ArrayOfDoublesSketch. The result will be three double values: estimate of the number of distinct keys, lower bound and upper bound. The bounds are provided at the given number of standard deviations (optional, defaults to 1). This must be an integer value of 1, 2 or 3 corresponding to approximately 68.3%, 95.4% and 99.7% confidence intervals.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToEstimateAndBounds"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="s2">"numStdDevs"</span><span class="p">,</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">1</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">3</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"numStdDevs"</span><span class="p">,</span> <span class="err"><number</span> <span class="err">from</span> <span class="err">1</span> <span class="err">to</span> <span class="err">3></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="number-of-retained-entries">Number of retained entries</h4>
@@ -230,8 +230,8 @@
<p>Returns the number of retained entries from a given ArrayOfDoublesSketch.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToNumEntries"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="mean-values-for-each-column">Mean values for each column</h4>
@@ -239,8 +239,8 @@
<p>Returns a list of mean values from a given ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToMeans"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="variance-values-for-each-column">Variance values for each column</h4>
@@ -248,8 +248,8 @@
<p>Returns a list of variance values from a given ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToVariances"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="quantiles-sketch-from-a-column">Quantiles sketch from a column</h4>
@@ -263,10 +263,10 @@
</ul>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToQuantilesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"column"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"k"</span> <span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">de</span><span class="kc">ter</span><span class="err">mi</span><span class="kc">nes</span> <span class="kc">t</span><span class="err">he</span> <span class="err">accuracy</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">qua</span><span class="kc">nt</span><span class="err">iles</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"column"</span> <span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"k"</span> <span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">determines</span> <span class="err">the</span> <span class="err">accuracy</span> <span class="err">and</span> <span class="err">size</span> <span class="err">of</span> <span class="err">the</span> <span class="err">quantiles</span> <span class="err">sketch></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="set-operations">Set Operations</h4>
@@ -274,11 +274,11 @@
<p>Returns a result of a specified set operation on the given array of sketches. Supported operations are: union, intersection and set difference (UNION, INTERSECT, NOT).</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchSetOp"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
<span class="nt">"operation"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"UNION"</span><span class="err">|</span><span class="s2">"INTERSECT"</span><span class="err">|</span><span class="s2">"NOT"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">allow</span> <span class="err">arbi</span><span class="kc">trar</span><span class="err">y</span> <span class="err">combi</span><span class="kc">nat</span><span class="err">io</span><span class="kc">n</span> <span class="err">o</span><span class="kc">f</span> <span class="err">se</span><span class="kc">t</span> <span class="err">opera</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"nominalEntries"</span> <span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">de</span><span class="kc">ter</span><span class="err">mi</span><span class="kc">nes</span> <span class="kc">t</span><span class="err">he</span> <span class="err">accuracy</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch></span><span class="p">,</span>
- <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber</span> <span class="err">o</span><span class="kc">f</span> <span class="err">values</span> <span class="err">associa</span><span class="kc">te</span><span class="err">d</span> <span class="err">wi</span><span class="kc">t</span><span class="err">h</span> <span class="err">each</span> <span class="err">dis</span><span class="kc">t</span><span class="err">i</span><span class="kc">n</span><span class="err">c</span><span class="kc">t</span> <span class="err">key></span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">sketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">allow</span> <span class="err">arbitrary</span> <span class="err">combination</span> <span class="err">of</span> <span class="err">set</span> <span class="err">operations></span><span class="p">,</span>
+ <span class="nt">"nominalEntries"</span> <span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">determines</span> <span class="err">the</span> <span class="err">accuracy</span> <span class="err">and</span> <span class="err">size</span> <span class="err">of</span> <span class="err">the</span> <span class="err">sketch></span><span class="p">,</span>
+ <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><number</span> <span class="err">of</span> <span class="err">values</span> <span class="err">associated</span> <span class="err">with</span> <span class="err">each</span> <span class="err">distinct</span> <span class="err">key></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="students-t-test">Student's t-test</h4>
@@ -286,8 +286,8 @@
<p>Performs Student's t-test and returns a list of p-values given two instances of ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key. See <a href="http://commons.apache.org/proper/commons-math/javadocs/api-3.4/org/apache/commons/math3/stat/inference/TTest.html">t-test documentation</a>.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchTTest"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">wi</span><span class="kc">t</span><span class="err">h</span> <span class="kc">t</span><span class="err">wo</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">re</span><span class="kc">ferr</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">with</span> <span class="err">two</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">sketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">referring</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch></span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-summary">Sketch summary</h4>
@@ -295,8 +295,8 @@
<p>Returns a human-readable summary of a given ArrayOfDoublesSketch. This is a string returned by toString() method of the sketch. This can be useful for debugging.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToString"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.14.0-incubating/development/extensions-core/examples.html b/docs/0.14.0-incubating/development/extensions-core/examples.html
index 0d04bc4..be42ad2 100644
--- a/docs/0.14.0-incubating/development/extensions-core/examples.html
+++ b/docs/0.14.0-incubating/development/extensions-core/examples.html
@@ -155,7 +155,7 @@
<p>This firehose connects directly to the twitter spritzer data stream.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"twitzer"</span><span class="p">,</span>
<span class="nt">"maxEventCount"</span><span class="p">:</span> <span class="mi">-1</span><span class="p">,</span>
<span class="nt">"maxRunMinutes"</span><span class="p">:</span> <span class="mi">0</span>
diff --git a/docs/0.14.0-incubating/development/extensions-core/kafka-eight-firehose.html b/docs/0.14.0-incubating/development/extensions-core/kafka-eight-firehose.html
index 07c72fd..63a2e6b 100644
--- a/docs/0.14.0-incubating/development/extensions-core/kafka-eight-firehose.html
+++ b/docs/0.14.0-incubating/development/extensions-core/kafka-eight-firehose.html
@@ -155,7 +155,7 @@
<p>This firehose acts as a Kafka 0.8.x consumer and ingests data from Kafka.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"kafka-0.8"</span><span class="p">,</span>
<span class="nt">"consumerProps"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"zookeeper.connect"</span><span class="p">:</span> <span class="s2">"localhost:2181"</span><span class="p">,</span>
diff --git a/docs/0.14.0-incubating/development/extensions-core/lookups-cached-global.html b/docs/0.14.0-incubating/development/extensions-core/lookups-cached-global.html
index f6b9526..52eeed5 100644
--- a/docs/0.14.0-incubating/development/extensions-core/lookups-cached-global.html
+++ b/docs/0.14.0-incubating/development/extensions-core/lookups-cached-global.html
@@ -459,7 +459,7 @@
truck,something3,buck
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"csv"</span><span class="p">,</span>
<span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"value"</span><span class="p">,</span><span class="s2">"somethingElse"</span><span class="p">,</span><span class="s2">"key"</span><span class="p">],</span>
<span class="nt">"keyColumn"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
@@ -530,7 +530,7 @@
truck|something,3|buck
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"tsv"</span><span class="p">,</span>
<span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"value"</span><span class="p">,</span><span class="s2">"somethingElse"</span><span class="p">,</span><span class="s2">"key"</span><span class="p">],</span>
<span class="nt">"keyColumn"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
@@ -568,7 +568,7 @@
<span class="p">{</span><span class="nt">"key"</span><span class="p">:</span> <span class="s2">"buck"</span><span class="p">,</span> <span class="nt">"somethingElse"</span><span class="p">:</span> <span class="s2">"something"</span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="s2">"truck"</span><span class="p">}</span>
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"customJson"</span><span class="p">,</span>
<span class="nt">"keyFieldName"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
<span class="nt">"valueFieldName"</span><span class="p">:</span> <span class="s2">"value"</span>
@@ -587,7 +587,7 @@
<span class="p">{</span><span class="nt">"buck"</span><span class="p">:</span> <span class="s2">"truck"</span><span class="p">}</span>
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"simpleJson"</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.14.0-incubating/development/extensions-core/parquet.html b/docs/0.14.0-incubating/development/extensions-core/parquet.html
index 0bbb3cc..0ed9caa 100644
--- a/docs/0.14.0-incubating/development/extensions-core/parquet.html
+++ b/docs/0.14.0-incubating/development/extensions-core/parquet.html
@@ -259,10 +259,10 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
-<span class="p">}</span>
+<span class="err">}</span>
</code></pre></div>
<h4 id="parquet-parser-timeanddims-parsespec"><code>parquet</code> parser, <code>timeAndDims</code> parseSpec</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -301,7 +301,7 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -352,10 +352,10 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
-<span class="p">}</span>
+<span class="err">}</span>
</code></pre></div>
<p>For additional details see <a href="../../ingestion/hadoop.html">hadoop ingestion</a> and <a href="../../ingestion/ingestion-spec.html">general ingestion spec</a> documentation.</p>
diff --git a/docs/0.14.0-incubating/development/extensions-core/s3.html b/docs/0.14.0-incubating/development/extensions-core/s3.html
index 4e1928b..09fb6ee 100644
--- a/docs/0.14.0-incubating/development/extensions-core/s3.html
+++ b/docs/0.14.0-incubating/development/extensions-core/s3.html
@@ -279,7 +279,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-s3"</span><span class="p">,</span>
<span class="nt">"uris"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"s3://foo/bar/file.gz"</span><span class="p">,</span> <span class="s2">"s3://bar/foo/file2.gz"</span><span class="p">]</span>
<span class="p">}</span>
diff --git a/docs/0.14.0-incubating/development/extensions-core/stats.html b/docs/0.14.0-incubating/development/extensions-core/stats.html
index 75870b7..4883aff 100644
--- a/docs/0.14.0-incubating/development/extensions-core/stats.html
+++ b/docs/0.14.0-incubating/development/extensions-core/stats.html
@@ -180,18 +180,18 @@
<p>User can specify expected input type as one of "float", "long", "variance" for ingestion, which is by default "float".</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"variance"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"inputType"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">t</span><span class="err">ype></span><span class="p">,</span>
- <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"inputType"</span> <span class="p">:</span> <span class="err"><input_type></span><span class="p">,</span>
+ <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<p>To query for results, "variance" aggregator with "variance" input type or simply a "varianceFold" aggregator must be included in the query.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"varianceFold"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -215,7 +215,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"stddev"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"estimator"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"estimator"</span><span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="query-examples">Query Examples:</h2>
diff --git a/docs/0.14.0-incubating/development/extensions-core/test-stats.html b/docs/0.14.0-incubating/development/extensions-core/test-stats.html
index 1f49f94..bc5789b 100644
--- a/docs/0.14.0-incubating/development/extensions-core/test-stats.html
+++ b/docs/0.14.0-incubating/development/extensions-core/test-stats.html
@@ -175,10 +175,10 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"zscore2sample"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"successCount1"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">success</span> <span class="err">cou</span><span class="kc">nt</span> <span class="err">o</span><span class="kc">f</span> <span class="err">sample</span> <span class="mi">1</span><span class="p">,</span>
- <span class="nt">"sample1Size"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggregaror></span> <span class="err">sample</span> <span class="mi">1</span> <span class="err">size</span><span class="p">,</span>
- <span class="nt">"successCount2"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">success</span> <span class="err">cou</span><span class="kc">nt</span> <span class="err">o</span><span class="kc">f</span> <span class="err">sample</span> <span class="mi">2</span><span class="p">,</span>
- <span class="nt">"sample2Size"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">sample</span> <span class="mi">2</span> <span class="err">size</span>
+ <span class="nt">"successCount1"</span><span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">success</span> <span class="err">count</span> <span class="err">of</span> <span class="err">sample</span> <span class="mi">1</span><span class="p">,</span>
+ <span class="nt">"sample1Size"</span><span class="p">:</span> <span class="err"><post_aggregaror></span> <span class="err">sample</span> <span class="mi">1</span> <span class="err">size</span><span class="p">,</span>
+ <span class="nt">"successCount2"</span><span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">success</span> <span class="err">count</span> <span class="err">of</span> <span class="err">sample</span> <span class="mi">2</span><span class="p">,</span>
+ <span class="nt">"sample2Size"</span> <span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">sample</span> <span class="mi">2</span> <span class="err">size</span>
<span class="p">}</span>
</code></pre></div>
<p>Please note the post aggregator will be converting binary variables to continuous variables for two population proportions. Specifically</p>
@@ -199,7 +199,7 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"pvalue2tailedZtest"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"zScore"</span><span class="p">:</span> <span class="err"><zscore</span> <span class="err">pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span>
+ <span class="nt">"zScore"</span><span class="p">:</span> <span class="err"><zscore</span> <span class="err">post_aggregator></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="example-usage">Example Usage</h2>
diff --git a/docs/0.14.0-incubating/development/geo.html b/docs/0.14.0-incubating/development/geo.html
index eb6d40b..dc9cf95 100644
--- a/docs/0.14.0-incubating/development/geo.html
+++ b/docs/0.14.0-incubating/development/geo.html
@@ -201,7 +201,7 @@
<h1 id="spatial-filters">Spatial Filters</h1>
<p>The grammar for a spatial filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"spatial"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"spatialDim"</span><span class="p">,</span>
<span class="nt">"bound"</span><span class="p">:</span> <span class="p">{</span>
diff --git a/docs/0.14.0-incubating/development/modules.html b/docs/0.14.0-incubating/development/modules.html
index 9f8c136..5096b21 100644
--- a/docs/0.14.0-incubating/development/modules.html
+++ b/docs/0.14.0-incubating/development/modules.html
@@ -208,13 +208,13 @@
<p>Check the <code>azure-storage</code>, <code>google-storage</code>, <code>cassandra-storage</code>, <code>hdfs-storage</code> and <code>s3-extensions</code> modules for examples of how to do this.</p>
<p>The basic idea behind the extension is that you need to add bindings for your DataSegmentPusher and DataSegmentPuller objects. The way to add them is something like (taken from HdfsStorageDruidModule)</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Binders</span><span class="p">.</span><span class="na">dataSegmentPullerBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="s">"hdfs"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">HdfsDataSegmentPuller</span><span class="p">.</span><span class="na">class</span><span class="p">).</span><span class="na">in</span><span class="p">(</span><span class="n">LazySingleton</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Binders</span><span class="o">.</span><span class="na">dataSegmentPullerBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="s">"hdfs"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">HdfsDataSegmentPuller</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">in</span><span class="o">(</span><span class="n">LazySingleton</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-<span class="n">Binders</span><span class="p">.</span><span class="na">dataSegmentPusherBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="s">"hdfs"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">HdfsDataSegmentPusher</span><span class="p">.</span><span class="na">class</span><span class="p">).</span><span class="na">in</span><span class="p">(</span><span class="n">LazySingleton</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<span class="n">Binders</span><span class="o">.</span><span class="na">dataSegmentPusherBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="s">"hdfs"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">HdfsDataSegmentPusher</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">in</span><span class="o">(</span><span class="n">LazySingleton</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<p><code>Binders.dataSegment*Binder()</code> is a call provided by the druid-core jar which sets up a Guice multibind "MapBinder". If that doesn't make sense, don't worry about it, just think of it as a magical incantation.</p>
@@ -284,12 +284,12 @@
<p>Adding a Firehose is done almost entirely through the Jackson Modules instead of Guice. Specifically, note the implementation</p>
<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="nd">@Override</span>
-<span class="kd">public</span> <span class="n">List</span><span class="o"><?</span> <span class="kd">extends</span> <span class="n">Module</span><span class="o">></span> <span class="nf">getJacksonModules</span><span class="p">()</span>
-<span class="p">{</span>
- <span class="k">return</span> <span class="n">ImmutableList</span><span class="p">.</span><span class="na">of</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">SimpleModule</span><span class="p">().</span><span class="na">registerSubtypes</span><span class="p">(</span><span class="k">new</span> <span class="n">NamedType</span><span class="p">(</span><span class="n">StaticS3FirehoseFactory</span><span class="p">.</span><span class="na">class</span><span class="p">,</span> <span class="s">"static-s3"</span><span class="p">))</span>
- <span class="p">);</span>
-<span class="p">}</span>
+<span class="kd">public</span> <span class="n">List</span><span class="o"><?</span> <span class="kd">extends</span> <span class="n">Module</span><span class="o">></span> <span class="nf">getJacksonModules</span><span class="o">()</span>
+<span class="o">{</span>
+ <span class="k">return</span> <span class="n">ImmutableList</span><span class="o">.</span><span class="na">of</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">SimpleModule</span><span class="o">().</span><span class="na">registerSubtypes</span><span class="o">(</span><span class="k">new</span> <span class="n">NamedType</span><span class="o">(</span><span class="n">StaticS3FirehoseFactory</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="s">"static-s3"</span><span class="o">))</span>
+ <span class="o">);</span>
+<span class="o">}</span>
</code></pre></div>
<p>This is registering the FirehoseFactory with Jackson's polymorphic serde layer. More concretely, having this will mean that if you specify a <code>"firehose": { "type": "static-s3", ... }</code> in your realtime config, then the system will load this FirehoseFactory for your firehose.</p>
@@ -314,32 +314,32 @@
</ol>
<p>Registering these uses the same general strategy as a deep storage mechanism does. You do something like</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">DruidBinders</span><span class="p">.</span><span class="na">queryToolChestBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="n">SegmentMetadataQuery</span><span class="p">.</span><span class="na">class</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">SegmentMetadataQueryQueryToolChest</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">DruidBinders</span><span class="o">.</span><span class="na">queryToolChestBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="n">SegmentMetadataQuery</span><span class="o">.</span><span class="na">class</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">SegmentMetadataQueryQueryToolChest</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-<span class="n">DruidBinders</span><span class="p">.</span><span class="na">queryRunnerFactoryBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="n">SegmentMetadataQuery</span><span class="p">.</span><span class="na">class</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">SegmentMetadataQueryRunnerFactory</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<span class="n">DruidBinders</span><span class="o">.</span><span class="na">queryRunnerFactoryBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="n">SegmentMetadataQuery</span><span class="o">.</span><span class="na">class</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">SegmentMetadataQueryRunnerFactory</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<p>The first one binds the SegmentMetadataQueryQueryToolChest for usage when a SegmentMetadataQuery is used. The second one does the same thing but for the QueryRunnerFactory instead.</p>
<h3 id="adding-new-jersey-resources">Adding new Jersey resources</h3>
<p>Adding new Jersey resources to a module requires calling the following code to bind the resource in the module:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Jerseys</span><span class="p">.</span><span class="na">addResource</span><span class="p">(</span><span class="n">binder</span><span class="p">,</span> <span class="n">NewResource</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Jerseys</span><span class="o">.</span><span class="na">addResource</span><span class="o">(</span><span class="n">binder</span><span class="o">,</span> <span class="n">NewResource</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<h3 id="adding-a-new-password-provider-implementation">Adding a new Password Provider implementation</h3>
<p>You will need to implement <code>org.apache.druid.metadata.PasswordProvider</code> interface. For every place where Druid uses PasswordProvider, a new instance of the implementation will be created,
thus make sure all the necessary information required for fetching each password is supplied during object instantiation.
In your implementation of <code>org.apache.druid.initialization.DruidModule</code>, <code>getJacksonModules</code> should look something like this -</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="k">return</span> <span class="n">ImmutableList</span><span class="p">.</span><span class="na">of</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">SimpleModule</span><span class="p">(</span><span class="s">"SomePasswordProviderModule"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">registerSubtypes</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">NamedType</span><span class="p">(</span><span class="n">SomePasswordProvider</span><span class="p">.</span><span class="na">class</span><span class="p">,</span> <span class="s">"some"</span><span class="p">)</span>
- <span class="p">)</span>
- <span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="k">return</span> <span class="n">ImmutableList</span><span class="o">.</span><span class="na">of</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">SimpleModule</span><span class="o">(</span><span class="s">"SomePasswordProviderModule"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">registerSubtypes</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">NamedType</span><span class="o">(</span><span class="n">SomePasswordProvider</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="s">"some"</span><span class="o">)</span>
+ <span class="o">)</span>
+ <span class="o">);</span>
</code></pre></div>
<p>where <code>SomePasswordProvider</code> is the implementation of <code>PasswordProvider</code> interface, you can have a look at <code>org.apache.druid.metadata.EnvironmentVariablePasswordProvider</code> for example.</p>
diff --git a/docs/0.14.0-incubating/ingestion/compaction.html b/docs/0.14.0-incubating/ingestion/compaction.html
index 1715f3b..8400eeb 100644
--- a/docs/0.14.0-incubating/ingestion/compaction.html
+++ b/docs/0.14.0-incubating/ingestion/compaction.html
@@ -153,15 +153,15 @@
<p>Compaction tasks merge all segments of the given interval. The syntax is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"compact"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><i</span><span class="kc">nter</span><span class="err">val</span> <span class="kc">t</span><span class="err">o</span> <span class="err">speci</span><span class="kc">f</span><span class="err">y</span> <span class="err">segme</span><span class="kc">nts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
- <span class="s2">"dimensions"</span> <span class="err"><cus</span><span class="kc">t</span><span class="err">om</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><interval</span> <span class="err">to</span> <span class="err">specify</span> <span class="err">segments</span> <span class="err">to</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
+ <span class="nt">"dimensions"</span> <span class="err"><custom</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
<span class="nt">"keepSegmentGranularity"</span><span class="p">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"segmentGranularity"</span><span class="p">:</span> <span class="err"><segme</span><span class="kc">nt</span> <span class="err">gra</span><span class="kc">nular</span><span class="err">i</span><span class="kc">t</span><span class="err">y</span> <span class="err">a</span><span class="kc">fter</span> <span class="err">compac</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"targetCompactionSizeBytes"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tar</span><span class="err">ge</span><span class="kc">t</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="err">compac</span><span class="kc">te</span><span class="err">d</span> <span class="err">segme</span><span class="kc">nts</span><span class="err">></span>
- <span class="s2">"tuningConfig"</span> <span class="err"><i</span><span class="kc">n</span><span class="err">dex</span> <span class="kc">tas</span><span class="err">k</span> <span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">gCo</span><span class="kc">nf</span><span class="err">ig></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"segmentGranularity"</span><span class="p">:</span> <span class="err"><segment</span> <span class="err">granularity</span> <span class="err">after</span> <span class="err">compaction></span><span class="p">,</span>
+ <span class="nt">"targetCompactionSizeBytes"</span><span class="p">:</span> <span class="err"><target</span> <span class="err">size</span> <span class="err">of</span> <span class="err">compacted</span> <span class="err">segments></span>
+ <span class="s2">"tuningConfig"</span> <span class="err"><index</span> <span class="err">task</span> <span class="err">tuningConfig></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.14.0-incubating/ingestion/data-formats.html b/docs/0.14.0-incubating/ingestion/data-formats.html
index e412063..5793305 100644
--- a/docs/0.14.0-incubating/ingestion/data-formats.html
+++ b/docs/0.14.0-incubating/ingestion/data-formats.html
@@ -192,7 +192,7 @@
<p>All forms of Druid ingestion require some form of schema object. The format of the data to be ingested is specified using the<code>parseSpec</code> entry in your <code>dataSchema</code>.</p>
<h3 id="json">JSON</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"json"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -205,7 +205,7 @@
<p>If you have nested JSON, <a href="flatten-json.html">Druid can automatically flatten it for you</a>.</p>
<h3 id="csv">CSV</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"csv"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -234,7 +234,7 @@
<p>The <code>columns</code> field must be included and and ensure that the order of the fields matches the columns of your input data in the same order.</p>
<h3 id="tsv-delimited">TSV (Delimited)</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"tsv"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -266,23 +266,23 @@
<p>The <code>columns</code> field must be included and and ensure that the order of the fields matches the columns of your input data in the same order.</p>
<h3 id="regex">Regex</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
<span class="p">},</span>
<span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"dimensions"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_lis</span><span class="kc">t</span><span class="err">_o</span><span class="kc">f</span><span class="err">_dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">]</span>
+ <span class="nt">"dimensions"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_list_of_dimensions></span><span class="p">]</span>
<span class="p">},</span>
- <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_colum</span><span class="kc">ns</span><span class="err">_here></span><span class="p">],</span>
- <span class="nt">"pattern"</span> <span class="p">:</span> <span class="err"><regex</span> <span class="err">pa</span><span class="kc">ttern</span> <span class="kc">f</span><span class="err">or</span> <span class="err">par</span><span class="kc">t</span><span class="err">i</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">da</span><span class="kc">ta</span><span class="err">></span>
+ <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_columns_here></span><span class="p">],</span>
+ <span class="nt">"pattern"</span> <span class="p">:</span> <span class="err"><regex</span> <span class="err">pattern</span> <span class="err">for</span> <span class="err">partitioning</span> <span class="err">data></span>
<span class="p">}</span>
</code></pre></div>
<p>The <code>columns</code> field must match the columns of your regex matching groups in the same order. If columns are not provided, default
columns names ("column_1", "column2", ... "column_n") will be assigned. Ensure that your column names include all your dimensions. </p>
<h3 id="javascript">JavaScript</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
diff --git a/docs/0.14.0-incubating/ingestion/delete-data.html b/docs/0.14.0-incubating/ingestion/delete-data.html
index 49c2605..7a77ab8 100644
--- a/docs/0.14.0-incubating/ingestion/delete-data.html
+++ b/docs/0.14.0-incubating/ingestion/delete-data.html
@@ -168,10 +168,10 @@
<p>Kill tasks delete all information about a segment and removes it from deep storage. Killable segments must be disabled (used==0) in the Druid segment table. The available grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"kill"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><all_segme</span><span class="kc">nts</span><span class="err">_i</span><span class="kc">n</span><span class="err">_</span><span class="kc">t</span><span class="err">his_i</span><span class="kc">nter</span><span class="err">val_will_die!></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><all_segments_in_this_interval_will_die!></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.14.0-incubating/ingestion/firehose.html b/docs/0.14.0-incubating/ingestion/firehose.html
index 9f0707b..1f0c990 100644
--- a/docs/0.14.0-incubating/ingestion/firehose.html
+++ b/docs/0.14.0-incubating/ingestion/firehose.html
@@ -391,7 +391,7 @@
This can be used to merge data from more than one firehose.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"combining"</span><span class="p">,</span>
- <span class="nt">"delegates"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span> <span class="kc">f</span><span class="err">irehose</span><span class="mi">1</span> <span class="p">},</span> <span class="p">{</span> <span class="kc">f</span><span class="err">irehose</span><span class="mi">2</span> <span class="p">},</span> <span class="err">.....</span> <span class="p">]</span>
+ <span class="nt">"delegates"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span> <span class="err">firehose1</span> <span class="p">},</span> <span class="p">{</span> <span class="err">firehose2</span> <span class="p">},</span> <span class="err">.....</span> <span class="p">]</span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.14.0-incubating/ingestion/flatten-json.html b/docs/0.14.0-incubating/ingestion/flatten-json.html
index 65d8e62..d5f1f4c 100644
--- a/docs/0.14.0-incubating/ingestion/flatten-json.html
+++ b/docs/0.14.0-incubating/ingestion/flatten-json.html
@@ -226,7 +226,7 @@
<p>The column "metrica" is a Long metric column, "hello" is an array of Double metrics, and "nestmet.val" is a nested Long metric. All other columns are dimensions.</p>
<p>To flatten this JSON, the parseSpec could be defined as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"json"</span><span class="p">,</span>
<span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"useFieldDiscovery"</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
@@ -307,7 +307,7 @@
<p>"ignore_me" will be automatically discovered but excluded as specified by dimensionsExclusions.</p>
<p>Aggregators should use the metric column names as defined in the flattenSpec. Using the example above:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metricsSpec"</span> <span class="p">:</span> <span class="p">[</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metricsSpec"</span> <span class="err">:</span> <span class="p">[</span>
<span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span>
<span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"path-metric-sum"</span><span class="p">,</span>
diff --git a/docs/0.14.0-incubating/ingestion/hadoop.html b/docs/0.14.0-incubating/ingestion/hadoop.html
index e3541cd..8df0429 100644
--- a/docs/0.14.0-incubating/ingestion/hadoop.html
+++ b/docs/0.14.0-incubating/ingestion/hadoop.html
@@ -222,7 +222,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hadoop"</span>
<span class="p">}</span>
<span class="p">},</span>
- <span class="nt">"hadoopDependencyCoordinates"</span><span class="p">:</span> <span class="err"><my_hadoop_versio</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"hadoopDependencyCoordinates"</span><span class="p">:</span> <span class="err"><my_hadoop_version></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -512,7 +512,7 @@
</tbody></table>
<h3 id="jobproperties-field-of-tuningconfig">jobProperties field of TuningConfig</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"tuningConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"tuningConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"jobProperties"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"<hadoop-property-a>"</span><span class="p">:</span> <span class="s2">"<value-a>"</span><span class="p">,</span>
@@ -616,7 +616,7 @@
sized data segments relative to single-dimension partitioning.</p>
<h3 id="hash-based-partitioning">Hash-based partitioning</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"partitionsSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"partitionsSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hashed"</span><span class="p">,</span>
<span class="nt">"targetPartitionSize"</span><span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
@@ -657,7 +657,7 @@
</tbody></table>
<h3 id="single-dimension-partitioning">Single-dimension partitioning</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"partitionsSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"partitionsSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimension"</span><span class="p">,</span>
<span class="nt">"targetPartitionSize"</span><span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
diff --git a/docs/0.14.0-incubating/ingestion/ingestion-spec.html b/docs/0.14.0-incubating/ingestion/ingestion-spec.html
index 01e8adb..31ca02d 100644
--- a/docs/0.14.0-incubating/ingestion/ingestion-spec.html
+++ b/docs/0.14.0-incubating/ingestion/ingestion-spec.html
@@ -188,7 +188,7 @@
<h1 id="dataschema">DataSchema</h1>
<p>An example dataSchema is shown below:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"wikipedia"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -602,7 +602,7 @@
<p>For example, the following <code>dimensionsSpec</code> section from a <code>dataSchema</code> ingests one column as Long (<code>countryNum</code>), two
columns as Float (<code>userLatitude</code>, <code>userLongitude</code>), and the other columns as Strings, with bitmap indexes disabled
for the <code>comment</code> column.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dimensionsSpec"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span>
<span class="s2">"page"</span><span class="p">,</span>
<span class="s2">"language"</span><span class="p">,</span>
diff --git a/docs/0.14.0-incubating/ingestion/locking-and-priority.html b/docs/0.14.0-incubating/ingestion/locking-and-priority.html
index dccedae..d817328 100644
--- a/docs/0.14.0-incubating/ingestion/locking-and-priority.html
+++ b/docs/0.14.0-incubating/ingestion/locking-and-priority.html
@@ -202,7 +202,7 @@
</tbody></table>
<p>You can override the task priority by setting your priority in the task context like below.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"context"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"context"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"priority"</span> <span class="p">:</span> <span class="mi">100</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.14.0-incubating/ingestion/misc-tasks.html b/docs/0.14.0-incubating/ingestion/misc-tasks.html
index f8bd424..98764bd 100644
--- a/docs/0.14.0-incubating/ingestion/misc-tasks.html
+++ b/docs/0.14.0-incubating/ingestion/misc-tasks.html
@@ -155,10 +155,10 @@
<p>These tasks start, sleep for a time and are used only for testing. The available grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"noop"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_segme</span><span class="kc">nt</span><span class="err">_i</span><span class="kc">nter</span><span class="err">val></span><span class="p">,</span>
- <span class="nt">"runTime"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_millis_</span><span class="kc">t</span><span class="err">o_sleep></span><span class="p">,</span>
- <span class="nt">"firehose"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_</span><span class="kc">f</span><span class="err">irehose_</span><span class="kc">t</span><span class="err">o_</span><span class="kc">test</span><span class="err">_co</span><span class="kc">nne</span><span class="err">c</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><optional_task_id></span><span class="p">,</span>
+ <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><optional_segment_interval></span><span class="p">,</span>
+ <span class="nt">"runTime"</span> <span class="p">:</span> <span class="err"><optional_millis_to_sleep></span><span class="p">,</span>
+ <span class="nt">"firehose"</span><span class="p">:</span> <span class="err"><optional_firehose_to_test_connect></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="segment-merging-tasks-deprecated">Segment Merging Tasks (Deprecated)</h2>
@@ -168,11 +168,11 @@
<p>Append tasks append a list of segments together into a single segment (one after the other). The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"append"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">appe</span><span class="kc">n</span><span class="err">d></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">list</span> <span class="err">of</span> <span class="err">DataSegment</span> <span class="err">objects</span> <span class="err">to</span> <span class="err">append></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><optional</span> <span class="err">list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="merge-task">Merge Task</h3>
@@ -183,12 +183,12 @@
<p>The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"merge"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whe</span><span class="kc">t</span><span class="err">her</span> <span class="err">or</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="kc">t</span><span class="err">o</span> <span class="err">rollup</span> <span class="err">da</span><span class="kc">ta</span> <span class="err">duri</span><span class="kc">n</span><span class="err">g</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whether</span> <span class="err">or</span> <span class="err">not</span> <span class="err">to</span> <span class="err">rollup</span> <span class="err">data</span> <span class="err">during</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">list</span> <span class="err">of</span> <span class="err">DataSegment</span> <span class="err">objects</span> <span class="err">to</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="same-interval-merge-task">Same Interval Merge Task</h3>
@@ -198,12 +198,12 @@
<p>The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"same_interval_merge"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whe</span><span class="kc">t</span><span class="err">her</span> <span class="err">or</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="kc">t</span><span class="err">o</span> <span class="err">rollup</span> <span class="err">da</span><span class="kc">ta</span> <span class="err">duri</span><span class="kc">n</span><span class="err">g</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">his</span> <span class="err">i</span><span class="kc">nter</span><span class="err">val</span> <span class="err">are</span> <span class="err">goi</span><span class="kc">n</span><span class="err">g</span> <span class="kc">t</span><span class="err">o</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whether</span> <span class="err">or</span> <span class="err">not</span> <span class="err">to</span> <span class="err">rollup</span> <span class="err">data</span> <span class="err">during</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><DataSegment</span> <span class="err">objects</span> <span class="err">in</span> <span class="err">this</span> <span class="err">interval</span> <span class="err">are</span> <span class="err">going</span> <span class="err">to</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.14.0-incubating/ingestion/stream-pull.html b/docs/0.14.0-incubating/ingestion/stream-pull.html
index ee6e0ff..8e425e8 100644
--- a/docs/0.14.0-incubating/ingestion/stream-pull.html
+++ b/docs/0.14.0-incubating/ingestion/stream-pull.html
@@ -547,7 +547,7 @@
<p>Segments are identified by datasource, time interval, and version. With sharding, a segment is also identified by a partition number. Typically, each shard will have the same version but a different partition number to uniquely identify it.</p>
<p>In small-data scenarios, sharding is unnecessary and can be set to none (the default):</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span><span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span><span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
</code></pre></div>
<p>However, in scenarios with multiple realtime processes, <code>none</code> is less useful as it cannot help with scaling data volume (see below). Note that for the batch indexing service, no explicit configuration is required; sharding is provided automatically.</p>
@@ -565,7 +565,7 @@
</ul>
<p>Configure <code>linear</code> under <code>schema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
@@ -575,7 +575,7 @@
<p>This strategy is similar to <code>linear</code> except that it does not tolerate non-sequential partition numbering (it will <em>not</em> allow querying of partitions 0 and 2 if partition 1 is missing). It also requires explicitly setting the total number of partitions.</p>
<p>Configure <code>numbered</code> under <code>schema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"numbered"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span><span class="p">,</span>
<span class="nt">"partitions"</span><span class="p">:</span> <span class="mi">2</span>
@@ -586,13 +586,13 @@
<p>The <code>shardSpec</code> configuration can be used to create redundancy by having the same <code>partitionNum</code> values on different processes.</p>
<p>For example, if RealTimeProcess1 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
</code></pre></div>
<p>and RealTimeProcess2 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
@@ -600,7 +600,7 @@
<p>then two realtime processes can store segments with the same datasource, version, time interval, and partition number. Brokers that query for data in such segments will assume that they hold the same data, and the query will target only one of the segments.</p>
<p><code>shardSpec</code> can also help achieve scale. For this, add processes with a different <code>partionNum</code>. Continuing with the example, if RealTimeProcess3 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">1</span>
<span class="p">}</span>
diff --git a/docs/0.14.0-incubating/ingestion/update-existing-data.html b/docs/0.14.0-incubating/ingestion/update-existing-data.html
index 988d5aa..02fbc12 100644
--- a/docs/0.14.0-incubating/ingestion/update-existing-data.html
+++ b/docs/0.14.0-incubating/ingestion/update-existing-data.html
@@ -275,7 +275,7 @@
</tbody></table>
<p>For example</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"inputSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"dataSource"</span><span class="p">,</span>
@@ -309,7 +309,7 @@
</tbody></table>
<p>For example:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"inputSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"multi"</span><span class="p">,</span>
diff --git a/docs/0.14.0-incubating/operations/use_sbt_to_build_fat_jar.html b/docs/0.14.0-incubating/operations/use_sbt_to_build_fat_jar.html
index 6b2c960..86aaffc 100644
--- a/docs/0.14.0-incubating/operations/use_sbt_to_build_fat_jar.html
+++ b/docs/0.14.0-incubating/operations/use_sbt_to_build_fat_jar.html
@@ -149,106 +149,106 @@
-->
<h1 id="content-for-build-sbt">Content for build.sbt</h1>
-<div class="highlight"><pre><code class="language-scala" data-lang="scala"><span></span><span class="n">libraryDependencies</span> <span class="o">++=</span> <span class="nc">Seq</span><span class="p">(</span>
- <span class="s">"com.amazonaws"</span> <span class="o">%</span> <span class="s">"aws-java-sdk"</span> <span class="o">%</span> <span class="s">"1.9.23"</span> <span class="n">exclude</span><span class="p">(</span><span class="s">"common-logging"</span><span class="p">,</span> <span class="s">"common-logging"</span><span class="p">),</span>
- <span class="s">"org.joda"</span> <span class="o">%</span> <span class="s">"joda-convert"</span> <span class="o">%</span> <span class="s">"1.7"</span><span class="p">,</span>
- <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"2.7"</span><span class="p">,</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-services"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-service"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-hadoop"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"mysql-metadata-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-s3-extensions"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-histogram"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-hdfs-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-core"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-databind"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-guava"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-joda"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-base"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-json-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-smile-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.module"</span> <span class="o">%</span> <span class="s">"jackson-module-jaxb-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.sun.jersey"</span> <span class="o">%</span> <span class="s">"jersey-servlet"</span> <span class="o">%</span> <span class="s">"1.17.1"</span><span class="p">,</span>
- <span class="s">"mysql"</span> <span class="o">%</span> <span class="s">"mysql-connector-java"</span> <span class="o">%</span> <span class="s">"5.1.34"</span><span class="p">,</span>
- <span class="s">"org.scalatest"</span> <span class="o">%%</span> <span class="s">"scalatest"</span> <span class="o">%</span> <span class="s">"2.2.3"</span> <span class="o">%</span> <span class="s">"test"</span><span class="p">,</span>
+<div class="highlight"><pre><code class="language-scala" data-lang="scala"><span></span><span class="n">libraryDependencies</span> <span class="o">++=</span> <span class="nc">Seq</span><span class="o">(</span>
+ <span class="s">"com.amazonaws"</span> <span class="o">%</span> <span class="s">"aws-java-sdk"</span> <span class="o">%</span> <span class="s">"1.9.23"</span> <span class="n">exclude</span><span class="o">(</span><span class="s">"common-logging"</span><span class="o">,</span> <span class="s">"common-logging"</span><span class="o">),</span>
+ <span class="s">"org.joda"</span> <span class="o">%</span> <span class="s">"joda-convert"</span> <span class="o">%</span> <span class="s">"1.7"</span><span class="o">,</span>
+ <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"2.7"</span><span class="o">,</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-services"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-service"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-hadoop"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"mysql-metadata-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-s3-extensions"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-histogram"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-hdfs-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-core"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-databind"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-guava"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-joda"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-base"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-json-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-smile-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.module"</span> <span class="o">%</span> <span class="s">"jackson-module-jaxb-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.sun.jersey"</span> <span class="o">%</span> <span class="s">"jersey-servlet"</span> <span class="o">%</span> <span class="s">"1.17.1"</span><span class="o">,</span>
+ <span class="s">"mysql"</span> <span class="o">%</span> <span class="s">"mysql-connector-java"</span> <span class="o">%</span> <span class="s">"5.1.34"</span><span class="o">,</span>
+ <span class="s">"org.scalatest"</span> <span class="o">%%</span> <span class="s">"scalatest"</span> <span class="o">%</span> <span class="s">"2.2.3"</span> <span class="o">%</span> <span class="s">"test"</span><span class="o">,</span>
<span class="s">"org.mockito"</span> <span class="o">%</span> <span class="s">"mockito-core"</span> <span class="o">%</span> <span class="s">"1.10.19"</span> <span class="o">%</span> <span class="s">"test"</span>
-<span class="p">)</span>
+<span class="o">)</span>
-<span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span> <span class="o">:=</span> <span class="p">{</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"pom."</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"javax.inject.Named"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"mime.types"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog$1.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/NoOpLog.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogFactory.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogConfigurationException.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/Log.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"META-INF/jersey-module-version"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".properties"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">x</span> <span class="o">=></span>
- <span class="kd">val</span> <span class="n">oldStrategy</span> <span class="o">=</span> <span class="p">(</span><span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span><span class="p">).</span><span class="n">value</span>
- <span class="n">oldStrategy</span><span class="p">(</span><span class="n">x</span><span class="p">)</span>
-<span class="p">}</span>
+<span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span> <span class="o">:=</span> <span class="o">{</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"pom."</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"javax.inject.Named"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"mime.types"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog$1.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/NoOpLog.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogFactory.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogConfigurationException.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/Log.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"META-INF/jersey-module-version"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".properties"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">x</span> <span class="k">=></span>
+ <span class="k">val</span> <span class="n">oldStrategy</span> <span class="k">=</span> <span class="o">(</span><span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span><span class="o">).</span><span class="n">value</span>
+ <span class="n">oldStrategy</span><span class="o">(</span><span class="n">x</span><span class="o">)</span>
+<span class="o">}</span>
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.14.0-incubating/querying/aggregations.html b/docs/0.14.0-incubating/querying/aggregations.html
index 8b86dba..cb19e02 100644
--- a/docs/0.14.0-incubating/querying/aggregations.html
+++ b/docs/0.14.0-incubating/querying/aggregations.html
@@ -158,7 +158,7 @@
<h3 id="count-aggregator">Count aggregator</h3>
<p><code>count</code> computes the count of Druid rows that match the filters.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span> <span class="p">}</span>
</code></pre></div>
<p>Please note the count aggregator counts the number of Druid rows, which does not always reflect the number of raw events ingested.
This is because Druid can be configured to roll up data at ingestion time. To
@@ -170,7 +170,7 @@
<h4 id="longsum-aggregator"><code>longSum</code> aggregator</h4>
<p>computes the sum of values as a 64-bit, signed integer</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<p><code>name</code> – output name for the summed value
<code>fieldName</code> – name of the metric column to sum over</p>
@@ -178,44 +178,44 @@
<h4 id="doublesum-aggregator"><code>doubleSum</code> aggregator</h4>
<p>Computes and stores the sum of values as 64-bit floating point value. Similar to <code>longSum</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatsum-aggregator"><code>floatSum</code> aggregator</h4>
<p>Computes and stores the sum of values as 32-bit floating point value. Similar to <code>longSum</code> and <code>doubleSum</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="min-max-aggregators">Min / Max aggregators</h3>
<h4 id="doublemin-aggregator"><code>doubleMin</code> aggregator</h4>
<p><code>doubleMin</code> computes the minimum of all metric values and Double.POSITIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="doublemax-aggregator"><code>doubleMax</code> aggregator</h4>
<p><code>doubleMax</code> computes the maximum of all metric values and Double.NEGATIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatmin-aggregator"><code>floatMin</code> aggregator</h4>
<p><code>floatMin</code> computes the minimum of all metric values and Float.POSITIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatmax-aggregator"><code>floatMax</code> aggregator</h4>
<p><code>floatMax</code> computes the maximum of all metric values and Float.NEGATIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="longmin-aggregator"><code>longMin</code> aggregator</h4>
<p><code>longMin</code> computes the minimum of all metric values and Long.MAX_VALUE</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="longmax-aggregator"><code>longMax</code> aggregator</h4>
<p><code>longMax</code> computes the maximum of all metric values and Long.MIN_VALUE</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="first-last-aggregator">First / Last aggregator</h3>
@@ -228,8 +228,8 @@
<p><code>doubleFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="doublelast-aggregator"><code>doubleLast</code> aggregator</h4>
@@ -237,8 +237,8 @@
<p><code>doubleLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="floatfirst-aggregator"><code>floatFirst</code> aggregator</h4>
@@ -246,8 +246,8 @@
<p><code>floatFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="floatlast-aggregator"><code>floatLast</code> aggregator</h4>
@@ -255,8 +255,8 @@
<p><code>floatLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="longfirst-aggregator"><code>longFirst</code> aggregator</h4>
@@ -264,8 +264,8 @@
<p><code>longFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="longlast-aggregator"><code>longLast</code> aggregator</h4>
@@ -273,8 +273,8 @@
<p><code>longLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="stringfirst-aggregator"><code>stringFirst</code> aggregator</h4>
@@ -282,10 +282,10 @@
<p><code>stringFirst</code> computes the metric value with the minimum timestamp or <code>null</code> if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1024</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolea</span><span class="kc">n</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><integer></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">1024),</span>
+ <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolean></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="stringlast-aggregator"><code>stringLast</code> aggregator</h4>
@@ -293,10 +293,10 @@
<p><code>stringLast</code> computes the metric value with the maximum timestamp or <code>null</code> if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1024</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolea</span><span class="kc">n</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><integer></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">1024),</span>
+ <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolean></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<h3 id="javascript-aggregator">JavaScript aggregator</h3>
@@ -305,7 +305,7 @@
JavaScript functions are expected to return floating-point values.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><colum</span><span class="kc">n</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><colum</span><span class="kc">n</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
+ <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><column</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><column</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
<span class="nt">"fnAggregate"</span> <span class="p">:</span> <span class="s2">"function(current, column1, column2, ...) {</span>
<span class="s2"> <updates partial aggregate (current) based on the current row values></span>
<span class="s2"> return <updated partial aggregate></span>
@@ -418,10 +418,10 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"filtered"</span><span class="p">,</span>
<span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span> <span class="err">value></span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><dimension</span> <span class="err">value></span>
<span class="p">}</span>
- <span class="nt">"aggregator"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="s2">"aggregator"</span> <span class="p">:</span> <span class="err"><aggregation></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.14.0-incubating/querying/dimensionspecs.html b/docs/0.14.0-incubating/querying/dimensionspecs.html
index c3885e3..13ddf66 100644
--- a/docs/0.14.0-incubating/querying/dimensionspecs.html
+++ b/docs/0.14.0-incubating/querying/dimensionspecs.html
@@ -161,8 +161,8 @@
<p>Returns dimension values as is and optionally renames the dimension.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"default"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"outputName"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"outputName"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
<span class="nt">"outputType"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"STRING"</span><span class="err">|</span><span class="s2">"LONG"</span><span class="err">|</span><span class="s2">"FLOAT"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
@@ -175,10 +175,10 @@
<p>Returns dimension values transformed using the given <a href="#extraction-functions">extraction function</a>.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"extraction"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"outputName"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"outputName"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
<span class="nt">"outputType"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"STRING"</span><span class="err">|</span><span class="s2">"LONG"</span><span class="err">|</span><span class="s2">"FLOAT"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><extraction_function></span>
<span class="p">}</span>
</code></pre></div>
<p><code>outputType</code> may also be specified in an ExtractionDimensionSpec to apply type conversion to results before merging. If left unspecified, the <code>outputType</code> defaults to STRING.</p>
@@ -195,13 +195,13 @@
<p>In addition to "query filter" which efficiently selects the rows to be processed, you can use the filtered dimension spec to filter for specific values within the values of a multi-value dimension. These dimensionSpecs take a delegate DimensionSpec and a filtering criteria. From the "exploded" rows, only rows matching the given filtering criteria are returned in the query result.</p>
<p>The following filtered dimension spec acts as a whitelist or blacklist for values as per the "isWhitelist" attribute value.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"listFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"values"</span><span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">gs></span><span class="p">,</span> <span class="nt">"isWhitelist"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">a</span><span class="kc">ttr</span><span class="err">ibu</span><span class="kc">te</span> <span class="kc">f</span><span class="err">or</span> <span class="kc">true</span><span class="err">/</span><span class="kc">false</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">is</span> <span class="kc">true</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"listFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"values"</span><span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">strings></span><span class="p">,</span> <span class="nt">"isWhitelist"</span><span class="p">:</span> <span class="err"><optional</span> <span class="err">attribute</span> <span class="err">for</span> <span class="kc">true</span><span class="err">/</span><span class="kc">false</span><span class="p">,</span> <span class="err">default</span> <span class="err">is</span> <span class="err">true></span> <span class="p">}</span>
</code></pre></div>
<p>Following filtered dimension spec retains only the values matching regex. Note that <code>listFiltered</code> is faster than this and one should use that for whitelist or blacklist usecase.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regexFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><java</span> <span class="err">regex</span> <span class="err">pa</span><span class="kc">ttern</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regexFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><java</span> <span class="err">regex</span> <span class="err">pattern></span> <span class="p">}</span>
</code></pre></div>
<p>Following filtered dimension spec retains only the values starting with the same prefix.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"prefixFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"prefix"</span><span class="p">:</span> <span class="err"><pre</span><span class="kc">f</span><span class="err">ix</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"prefixFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"prefix"</span><span class="p">:</span> <span class="err"><prefix</span> <span class="err">string></span> <span class="p">}</span>
</code></pre></div>
<p>For more details and examples, see <a href="multi-value-dimensions.html">multi-value dimensions</a>.</p>
@@ -295,8 +295,8 @@
If there is no match, it returns the dimension value as is.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span>
- <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expressio</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"index"</span> <span class="p">:</span> <span class="err"><group</span> <span class="kc">t</span><span class="err">o</span> <span class="err">ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="mi">1</span><span class="err">></span>
+ <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expression></span><span class="p">,</span>
+ <span class="nt">"index"</span> <span class="p">:</span> <span class="err"><group</span> <span class="err">to</span> <span class="err">extract</span><span class="p">,</span> <span class="err">default</span> <span class="err">1></span>
<span class="nt">"replaceMissingValue"</span> <span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
<span class="nt">"replaceMissingValueWith"</span> <span class="p">:</span> <span class="s2">"foobar"</span>
<span class="p">}</span>
@@ -316,7 +316,7 @@
<h3 id="partial-extraction-function">Partial Extraction Function</h3>
<p>Returns the dimension value unchanged if the regular expression matches, otherwise returns null.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"partial"</span><span class="p">,</span> <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expressio</span><span class="kc">n</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"partial"</span><span class="p">,</span> <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expression></span> <span class="p">}</span>
</code></pre></div>
<h3 id="search-query-extraction-function">Search Query Extraction Function</h3>
@@ -366,11 +366,11 @@
<li><code>asMillis</code> : boolean value, set to true to treat input strings as millis rather than ISO8601 strings. Additionally, if <code>format</code> is null or not specified, output will be in millis rather than ISO8601.</li>
</ul>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"timeFormat"</span><span class="p">,</span>
- <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"timeZone"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">t</span><span class="err">ime_zo</span><span class="kc">ne</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">UTC)</span><span class="p">,</span>
- <span class="nt">"locale"</span> <span class="p">:</span> <span class="err"><locale></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">curre</span><span class="kc">nt</span> <span class="err">locale)</span><span class="p">,</span>
- <span class="nt">"granularity"</span> <span class="p">:</span> <span class="err"><gra</span><span class="kc">nular</span><span class="err">i</span><span class="kc">t</span><span class="err">y></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="kc">n</span><span class="err">o</span><span class="kc">ne</span><span class="err">)</span> <span class="p">},</span>
- <span class="nt">"asMillis"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">)</span> <span class="p">}</span>
+ <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><output_format></span> <span class="err">(optional)</span><span class="p">,</span>
+ <span class="nt">"timeZone"</span> <span class="p">:</span> <span class="err"><time_zone></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">UTC),</span>
+ <span class="nt">"locale"</span> <span class="p">:</span> <span class="err"><locale></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">current</span> <span class="err">locale),</span>
+ <span class="nt">"granularity"</span> <span class="p">:</span> <span class="err"><granularity></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">none)</span> <span class="p">}</span><span class="err">,</span>
+ <span class="s2">"asMillis"</span> <span class="err">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span> <span class="err">(optional)</span> <span class="err">}</span>
</code></pre></div>
<p>For example, the following dimension spec returns the day of the week for Montréal in French:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -401,9 +401,9 @@
<p>If a value cannot be parsed using the provided timeFormat, it will be returned as-is.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"time"</span><span class="p">,</span>
- <span class="nt">"timeFormat"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"resultFormat"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"joda"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span><span class="p">,</span> <span class="kc">false</span><span class="err">></span> <span class="p">}</span>
+ <span class="nt">"timeFormat"</span> <span class="p">:</span> <span class="err"><input_format></span><span class="p">,</span>
+ <span class="nt">"resultFormat"</span> <span class="p">:</span> <span class="err"><output_format></span><span class="p">,</span>
+ <span class="nt">"joda"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span><span class="p">,</span> <span class="err">false></span> <span class="p">}</span>
</code></pre></div>
<h3 id="javascript-extraction-function">Javascript Extraction Function</h3>
@@ -574,7 +574,7 @@
<h3 id="string-format-extraction-function">String Format Extraction Function</h3>
<p>Returns the dimension value formatted according to the given format string.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFormat"</span><span class="p">,</span> <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><spri</span><span class="kc">ntf</span><span class="err">_expressio</span><span class="kc">n</span><span class="err">></span><span class="p">,</span> <span class="nt">"nullHandling"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">a</span><span class="kc">ttr</span><span class="err">ibu</span><span class="kc">te</span> <span class="kc">f</span><span class="err">or</span> <span class="err">ha</span><span class="kc">n</span><span class="err">dli</span><span class="kc">n</span><span class="err">g</span> <span class="kc">null</span> <span class="err">value></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFormat"</span><span class="p">,</span> <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><sprintf_expression></span><span class="p">,</span> <span class="nt">"nullHandling"</span> <span class="p">:</span> <span class="err"><optional</span> <span class="err">attribute</span> <span class="err">for</span> <span class="err">handling</span> <span class="kc">null</span> <span class="err">value></span> <span class="p">}</span>
</code></pre></div>
<p>For example if you want to concat "[" and "]" before and after the actual dimension value, you need to specify "[%s]" as format string. "nullHandling" can be one of <code>nullString</code>, <code>emptyString</code> or <code>returnNull</code>. With "[%s]" format, each configuration will result <code>[null]</code>, <code>[]</code>, <code>null</code>. Default is <code>nullString</code>.</p>
diff --git a/docs/0.14.0-incubating/querying/filters.html b/docs/0.14.0-incubating/querying/filters.html
index bc2d50f..2b2264b 100644
--- a/docs/0.14.0-incubating/querying/filters.html
+++ b/docs/0.14.0-incubating/querying/filters.html
@@ -157,7 +157,7 @@
<p>The simplest filter is a selector filter. The selector filter will match a specific dimension with a specific value. Selector filters can be used as the base filters for more complex Boolean expressions of filters.</p>
<p>The grammar for a SELECTOR filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_value_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dimension_value_string></span> <span class="p">}</span>
</code></pre></div>
<p>This is the equivalent of <code>WHERE <dimension_string> = '<dimension_value_string>'</code>.</p>
@@ -166,7 +166,7 @@
<h3 id="column-comparison-filter">Column Comparison filter</h3>
<p>The column comparison filter is similar to the selector filter, but instead compares dimensions to each other. For example:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"columnComparison"</span><span class="p">,</span> <span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span><span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_a></span><span class="p">,</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_b></span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"columnComparison"</span><span class="p">,</span> <span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span><span class="err"><dimension_a></span><span class="p">,</span> <span class="err"><dimension_b></span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>This is the equivalent of <code>WHERE <dimension_a> = <dimension_b></code>.</p>
@@ -175,7 +175,7 @@
<h3 id="regular-expression-filter">Regular expression filter</h3>
<p>The regular expression filter is similar to the selector filter, but using regular expressions. It matches the specified dimension with the given pattern. The pattern can be any standard <a href="http://docs.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html">Java regular expression</a>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><pa</span><span class="kc">ttern</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><pattern_string></span> <span class="p">}</span>
</code></pre></div>
<p>The regex filter supports the use of extraction functions, see <a href="#filtering-with-extraction-functions">Filtering with Extraction Functions</a> for details.</p>
@@ -184,21 +184,21 @@
<h4 id="and">AND</h4>
<p>The grammar for an AND filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>The filters in fields can be any other filter defined on this page.</p>
<h4 id="or">OR</h4>
<p>The grammar for an OR filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"or"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"or"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>The filters in fields can be any other filter defined on this page.</p>
<h4 id="not">NOT</h4>
<p>The grammar for a NOT filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"not"</span><span class="p">,</span> <span class="nt">"field"</span><span class="p">:</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"not"</span><span class="p">,</span> <span class="nt">"field"</span><span class="p">:</span> <span class="err"><filter></span> <span class="p">}</span>
</code></pre></div>
<p>The filter specified at field can be any other filter defined on this page.</p>
@@ -209,7 +209,7 @@
<p>The function takes a single argument, the dimension value, and returns either true or false.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span>
<span class="nt">"function"</span> <span class="p">:</span> <span class="s2">"function(value) { <...> }"</span>
<span class="p">}</span>
</code></pre></div>
@@ -699,14 +699,14 @@
the "regex" filter) the numeric column values will be converted to strings during the scan.</p>
<p>For example, filtering on a specific value, <code>myFloatColumn = 10.1</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"myFloatColumn"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"10.1"</span>
<span class="p">}</span>
</code></pre></div>
<p>Filtering on a range of values, <code>10 <= myFloatColumn < 20</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"bound"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"myFloatColumn"</span><span class="p">,</span>
<span class="nt">"ordering"</span><span class="p">:</span> <span class="s2">"numeric"</span><span class="p">,</span>
@@ -725,14 +725,14 @@
<p>If the user wishes to interpret the timestamp with a specific format, timezone, or locale, the <a href="./dimensionspecs.html#time-format-extraction-function">Time Format Extraction Function</a> is useful.</p>
<p>For example, filtering on a long timestamp value:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"__time"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"124457387532"</span>
<span class="p">}</span>
</code></pre></div>
<p>Filtering on day of week:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"__time"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"Friday"</span><span class="p">,</span>
diff --git a/docs/0.14.0-incubating/querying/granularities.html b/docs/0.14.0-incubating/querying/granularities.html
index c8dc05e..7f4a6d1 100644
--- a/docs/0.14.0-incubating/querying/granularities.html
+++ b/docs/0.14.0-incubating/querying/granularities.html
@@ -308,10 +308,10 @@
<p>Duration granularities are specified as an exact duration in milliseconds and timestamps are returned as UTC. Duration granularity values are in millis.</p>
<p>They also support specifying an optional origin, which defines where to start counting time buckets from (defaults to 1970-01-01T00:00:00Z).</p>
-<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mf">7200000</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mi">7200000</span><span class="p">}</span>
</code></pre></div>
<p>This chunks up every 2 hours.</p>
-<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mf">3600000</span><span class="p">,</span> <span class="s2">"origin"</span><span class="o">:</span> <span class="s2">"2012-01-01T00:30:00Z"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mi">3600000</span><span class="p">,</span> <span class="s2">"origin"</span><span class="o">:</span> <span class="s2">"2012-01-01T00:30:00Z"</span><span class="p">}</span>
</code></pre></div>
<p>This chunks up every hour on the half-hour.</p>
diff --git a/docs/0.14.0-incubating/querying/groupbyquery.html b/docs/0.14.0-incubating/querying/groupbyquery.html
index cf54c9c..1054503 100644
--- a/docs/0.14.0-incubating/querying/groupbyquery.html
+++ b/docs/0.14.0-incubating/querying/groupbyquery.html
@@ -277,10 +277,10 @@
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"2012-01-01T00:00:00.000Z"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"country"</span> <span class="p">:</span> <span class="err"><some_dim_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"device"</span> <span class="p">:</span> <span class="err"><some_dim_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"total_usage"</span> <span class="p">:</span> <span class="err"><some_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"data_transfer"</span> <span class="p">:</span><span class="err"><some_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
+ <span class="nt">"country"</span> <span class="p">:</span> <span class="err"><some_dim_value_one></span><span class="p">,</span>
+ <span class="nt">"device"</span> <span class="p">:</span> <span class="err"><some_dim_value_two></span><span class="p">,</span>
+ <span class="nt">"total_usage"</span> <span class="p">:</span> <span class="err"><some_value_one></span><span class="p">,</span>
+ <span class="nt">"data_transfer"</span> <span class="p">:</span><span class="err"><some_value_two></span><span class="p">,</span>
<span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_avg_usage_value></span>
<span class="p">}</span>
<span class="p">},</span>
@@ -288,11 +288,11 @@
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"2012-01-01T00:00:12.000Z"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"dim1"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_dim_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"dim2"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_dim_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"sample_name1"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"sample_name2"</span> <span class="p">:</span><span class="err"><some_o</span><span class="kc">t</span><span class="err">her_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_avg_usage_value></span>
+ <span class="nt">"dim1"</span> <span class="p">:</span> <span class="err"><some_other_dim_value_one></span><span class="p">,</span>
+ <span class="nt">"dim2"</span> <span class="p">:</span> <span class="err"><some_other_dim_value_two></span><span class="p">,</span>
+ <span class="nt">"sample_name1"</span> <span class="p">:</span> <span class="err"><some_other_value_one></span><span class="p">,</span>
+ <span class="nt">"sample_name2"</span> <span class="p">:</span><span class="err"><some_other_value_two></span><span class="p">,</span>
+ <span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_other_avg_usage_value></span>
<span class="p">}</span>
<span class="p">},</span>
<span class="err">...</span>
@@ -326,7 +326,7 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"extraction"</span><span class="p">,</span>
<span class="nt">"dimension"</span> <span class="p">:</span> <span class="s2">"d2col"</span><span class="p">,</span>
<span class="nt">"outputName"</span> <span class="p">:</span> <span class="s2">"D2"</span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err">ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fun</span><span class="err">c</span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err">extraction_func</span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span><span class="s2">"lookup"</span><span class="p">,</span>
@@ -337,10 +337,10 @@
<span class="p">],</span>
<span class="err">...</span>
<span class="err">...</span>
-<span class="nt">"subtotalsSpec"</span><span class="p">:[</span> <span class="p">[</span><span class="s2">"D1"</span><span class="p">,</span> <span class="s2">"D2"</span><span class="p">,</span> <span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">1</span><span class="s2">", "</span><span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">3</span><span class="err">"]],</span>
+<span class="nt">"subtotalsSpec"</span><span class="p">:[</span> <span class="p">[</span><span class="s2">"D1"</span><span class="p">,</span> <span class="s2">"D2"</span><span class="p">,</span> <span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">1</span><span class="s2">", "</span><span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">3</span><span class="err">"</span><span class="p">]],</span>
<span class="err">..</span>
-<span class="err">}</span>
+<span class="p">}</span>
</code></pre></div>
<p>Response returned would be equivalent to concatenating result of 3 groupBy queries with "dimensions" field being ["D1", "D2", D3"], ["D1", "D3"] and ["D3"] with appropriate <code>DimensionSpec</code> json blob as used in above query.
Response for above query would look something like below...</p>
@@ -350,13 +350,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D2"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D2"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="err">...</span>
@@ -365,13 +365,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="err">...</span>
@@ -380,13 +380,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="p">]</span>
</code></pre></div>
diff --git a/docs/0.14.0-incubating/querying/having.html b/docs/0.14.0-incubating/querying/having.html
index 26231d5..6a4d015 100644
--- a/docs/0.14.0-incubating/querying/having.html
+++ b/docs/0.14.0-incubating/querying/having.html
@@ -168,7 +168,7 @@
<span class="nt">"having"</span><span class="p">:</span>
<span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"filter"</span><span class="p">,</span>
- <span class="nt">"filter"</span> <span class="p">:</span> <span class="err"><a</span><span class="kc">n</span><span class="err">y</span> <span class="err">Druid</span> <span class="err">query</span> <span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span>
+ <span class="nt">"filter"</span> <span class="p">:</span> <span class="err"><any</span> <span class="err">Druid</span> <span class="err">query</span> <span class="err">filter></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -205,7 +205,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -221,7 +221,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -239,7 +239,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -257,7 +257,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"lessThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -277,7 +277,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimSelector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"<dimension>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dimension_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -297,12 +297,12 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"lessThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">]</span>
<span class="p">}</span>
@@ -322,12 +322,12 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">]</span>
<span class="p">}</span>
@@ -347,7 +347,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
<span class="p">}</span>
diff --git a/docs/0.14.0-incubating/querying/hll-old.html b/docs/0.14.0-incubating/querying/hll-old.html
index 04afb6a..28ae3f6 100644
--- a/docs/0.14.0-incubating/querying/hll-old.html
+++ b/docs/0.14.0-incubating/querying/hll-old.html
@@ -159,9 +159,9 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"cardinality"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
- <span class="nt">"byRow"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"round"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span> <span class="err"><dimension</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><dimension</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
+ <span class="nt">"byRow"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false),</span>
+ <span class="nt">"round"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<p>Each individual element of the "fields" list can be a String or <a href="../querying/dimensionspecs.html">DimensionSpec</a>. A String dimension in the fields list is equivalent to a DefaultDimensionSpec (no transformations).</p>
@@ -233,8 +233,8 @@
<p>Uses <a href="http://algo.inria.fr/flajolet/Publications/FlFuGaMe07.pdf">HyperLogLog</a> to compute the estimated cardinality of a dimension that has been aggregated as a "hyperUnique" metric at indexing time.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUnique"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="nt">"isInputHyperUnique"</span> <span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
<span class="nt">"round"</span> <span class="p">:</span> <span class="kc">false</span>
<span class="p">}</span>
diff --git a/docs/0.14.0-incubating/querying/limitspec.html b/docs/0.14.0-incubating/querying/limitspec.html
index 8ac5d95..d4a43ef 100644
--- a/docs/0.14.0-incubating/querying/limitspec.html
+++ b/docs/0.14.0-incubating/querying/limitspec.html
@@ -157,8 +157,8 @@
<p>The default limit spec takes a limit and the list of columns to do an orderBy operation over. The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"default"</span><span class="p">,</span>
- <span class="nt">"limit"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger_value></span><span class="p">,</span>
- <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">OrderByColum</span><span class="kc">n</span><span class="err">Spec</span><span class="p">],</span>
+ <span class="nt">"limit"</span> <span class="p">:</span> <span class="err"><integer_value></span><span class="p">,</span>
+ <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err">list</span> <span class="err">of</span> <span class="err">OrderByColumnSpec</span><span class="p">],</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="orderbycolumnspec">OrderByColumnSpec</h4>
@@ -167,7 +167,7 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"dimension"</span> <span class="p">:</span> <span class="s2">"<Any dimension or metric name>"</span><span class="p">,</span>
<span class="nt">"direction"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"ascending"</span><span class="err">|</span><span class="s2">"descending"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"dimensionOrder"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"lexicographic"</span><span class="err">(de</span><span class="kc">fault</span><span class="err">)|</span><span class="s2">"alphanumeric"</span><span class="err">|</span><span class="s2">"strlen"</span><span class="err">|</span><span class="s2">"numeric"</span><span class="err">></span>
+ <span class="nt">"dimensionOrder"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"lexicographic"</span><span class="err">(default)|</span><span class="s2">"alphanumeric"</span><span class="err">|</span><span class="s2">"strlen"</span><span class="err">|</span><span class="s2">"numeric"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
<p>If only the dimension is provided (as a JSON string), the default order-by is ascending with lexicographic sorting.</p>
diff --git a/docs/0.14.0-incubating/querying/post-aggregations.html b/docs/0.14.0-incubating/querying/post-aggregations.html
index 1fd89e0..9a53e3a 100644
--- a/docs/0.14.0-incubating/querying/post-aggregations.html
+++ b/docs/0.14.0-incubating/querying/post-aggregations.html
@@ -177,12 +177,12 @@
</ul>
<p>The grammar for an arithmetic post aggregation is:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">pos</span><span class="kc">t</span><span class="err">Aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">postAggregation</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arithmetic"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fn"</span> <span class="p">:</span> <span class="err"><ari</span><span class="kc">t</span><span class="err">hme</span><span class="kc">t</span><span class="err">ic_</span><span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
- <span class="nt">"ordering"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">null</span> <span class="err">(de</span><span class="kc">fault</span><span class="err">)</span><span class="p">,</span> <span class="err">or</span> <span class="s2">"numericFirst"</span><span class="err">></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fn"</span> <span class="p">:</span> <span class="err"><arithmetic_function></span><span class="p">,</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><post_aggregator></span><span class="p">,</span> <span class="err"><post_aggregator></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
+ <span class="nt">"ordering"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">null</span> <span class="err">(default)</span><span class="p">,</span> <span class="err">or</span> <span class="nt">"numericFirst"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="field-accessor-post-aggregators">Field accessor post-aggregators</h3>
@@ -193,15 +193,15 @@
For complex aggregators, like "cardinality" and "hyperUnique", the <code>type</code> of the post-aggregator determines what
the post-aggregator will return. Use type "fieldAccess" to return the raw aggregation object, or use type
"finalizingFieldAccess" to return a finalized value, such as an estimated cardinality.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<p>or</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"finalizingFieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"finalizingFieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="constant-post-aggregator">Constant post-aggregator</h3>
<p>The constant post-aggregator always returns the specified value.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"constant"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">merical_value></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"constant"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><numerical_value></span> <span class="p">}</span>
</code></pre></div>
<h3 id="greatest-least-post-aggregators">Greatest / Least post-aggregators</h3>
@@ -216,18 +216,18 @@
<p>Example:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleGreatest"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><post_aggregator></span><span class="p">,</span> <span class="err"><post_aggregator></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span>
<span class="p">}</span>
</code></pre></div>
<h3 id="javascript-post-aggregator">JavaScript post-aggregator</h3>
<p>Applies the provided JavaScript function to the given fields. Fields are passed as arguments to the JavaScript function in the given order.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">pos</span><span class="kc">t</span><span class="err">Aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">postAggregation</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
- <span class="nt">"function"</span><span class="p">:</span> <span class="err"><javascrip</span><span class="kc">t</span> <span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><aggregator_name></span><span class="p">,</span> <span class="err"><aggregator_name></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
+ <span class="nt">"function"</span><span class="p">:</span> <span class="err"><javascript</span> <span class="err">function></span>
<span class="p">}</span>
</code></pre></div>
<p>Example JavaScript aggregator:</p>
@@ -247,16 +247,16 @@
<p>The hyperUniqueCardinality post aggregator is used to wrap a hyperUnique object such that it can be used in post aggregations.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUniqueCardinality"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">t</span><span class="err">he</span> <span class="kc">na</span><span class="err">me</span> <span class="kc">f</span><span class="err">ield</span> <span class="err">value</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hyperU</span><span class="kc">n</span><span class="err">ique</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><the</span> <span class="err">name</span> <span class="err">field</span> <span class="err">value</span> <span class="err">of</span> <span class="err">the</span> <span class="err">hyperUnique</span> <span class="err">aggregator></span>
<span class="p">}</span>
</code></pre></div>
<p>It can be used in a sample calculation as so:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"aggregations"</span> <span class="p">:</span> <span class="p">[{</span>
- <span class="p">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"rows"</span><span class="p">},</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"aggregations"</span> <span class="err">:</span> <span class="p">[{</span>
+ <span class="err">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"rows"</span><span class="p">},</span>
<span class="p">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUnique"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"unique_users"</span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="s2">"uniques"</span><span class="p">}</span>
- <span class="p">}],</span>
- <span class="nt">"postAggregations"</span> <span class="p">:</span> <span class="p">[{</span>
+ <span class="err">}</span><span class="p">]</span><span class="err">,</span>
+ <span class="s2">"postAggregations"</span> <span class="err">:</span> <span class="p">[{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arithmetic"</span><span class="p">,</span>
<span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"average_users_per_row"</span><span class="p">,</span>
<span class="nt">"fn"</span> <span class="p">:</span> <span class="s2">"/"</span><span class="p">,</span>
diff --git a/docs/0.14.0-incubating/querying/segmentmetadataquery.html b/docs/0.14.0-incubating/querying/segmentmetadataquery.html
index 5235cfb..2097509 100644
--- a/docs/0.14.0-incubating/querying/segmentmetadataquery.html
+++ b/docs/0.14.0-incubating/querying/segmentmetadataquery.html
@@ -263,17 +263,17 @@
<h4 id="all">All</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"all"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"all"</span><span class="p">}</span>
</code></pre></div>
<h4 id="none">None</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
</code></pre></div>
<h4 id="list">List</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"list"</span><span class="p">,</span> <span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">colum</span><span class="kc">n</span> <span class="kc">na</span><span class="err">mes></span><span class="p">]}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"list"</span><span class="p">,</span> <span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="err"><string</span> <span class="err">list</span> <span class="err">of</span> <span class="err">column</span> <span class="err">names></span><span class="p">]}</span>
</code></pre></div>
<h3 id="analysistypes">analysisTypes</h3>
diff --git a/docs/0.14.0-incubating/querying/select-query.html b/docs/0.14.0-incubating/querying/select-query.html
index 5ab234a..680f477 100644
--- a/docs/0.14.0-incubating/querying/select-query.html
+++ b/docs/0.14.0-incubating/querying/select-query.html
@@ -341,9 +341,9 @@
<p>The <code>threshold</code> determines how many hits are returned, with each hit indexed by an offset. When <code>descending</code> is true, the offset will be negative value.</p>
<p>The results above include:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"pagingIdentifiers"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"pagingIdentifiers"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"wikipedia_2012-12-29T00:00:00.000Z_2013-01-10T08:00:00.000Z_2013-01-10T08:13:47.830Z_v9"</span> <span class="p">:</span> <span class="mi">4</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<h3 id="result-pagination">Result Pagination</h3>
@@ -352,7 +352,7 @@
<p>The <code>threshold</code> option controls how many rows are returned in each block of paginated results.</p>
<p>To initiate a paginated query, the user should specify a PagingSpec with a <code>threshold</code> set and a blank <code>pagingIdentifiers</code> field, e.g.:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"pagingSpec"</span><span class="p">:{</span><span class="nt">"pagingIdentifiers"</span><span class="p">:</span> <span class="p">{},</span> <span class="nt">"threshold"</span><span class="p">:</span><span class="mi">5</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"pagingSpec"</span><span class="err">:</span><span class="p">{</span><span class="nt">"pagingIdentifiers"</span><span class="p">:</span> <span class="p">{},</span> <span class="nt">"threshold"</span><span class="p">:</span><span class="mi">5</span><span class="p">}</span>
</code></pre></div>
<p>When the query returns, the results will contain a <code>pagingIndentifers</code> field indicating the current pagination point in the result set (an identifier and an offset).</p>
@@ -381,9 +381,9 @@
<span class="p">}</span>
</code></pre></div>
<p>The paginated query with <code>fromNext</code> set to false returns a result set with the following <code>pagingIdentifiers</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"pagingIdentifiers"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"pagingIdentifiers"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"wikipedia_2012-12-29T00:00:00.000Z_2013-01-10T08:00:00.000Z_2013-01-10T08:13:47.830Z_v9"</span> <span class="p">:</span> <span class="mi">4</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<p>To retrieve the next result set, the next query must be sent with the paging offset (4) incremented by 1.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="p">{</span>
diff --git a/docs/0.14.0-incubating/querying/sql.html b/docs/0.14.0-incubating/querying/sql.html
index 9a5a8f1..6c5a106 100644
--- a/docs/0.14.0-incubating/querying/sql.html
+++ b/docs/0.14.0-incubating/querying/sql.html
@@ -975,22 +975,22 @@
<p>Example code:</p>
<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="c1">// Connect to /druid/v2/sql/avatica/ on your Broker.</span>
-<span class="n">String</span> <span class="n">url</span> <span class="o">=</span> <span class="s">"jdbc:avatica:remote:url=http://localhost:8082/druid/v2/sql/avatica/"</span><span class="p">;</span>
+<span class="n">String</span> <span class="n">url</span> <span class="o">=</span> <span class="s">"jdbc:avatica:remote:url=http://localhost:8082/druid/v2/sql/avatica/"</span><span class="o">;</span>
<span class="c1">// Set any connection context parameters you need here (see "Connection context" below).</span>
<span class="c1">// Or leave empty for default behavior.</span>
-<span class="n">Properties</span> <span class="n">connectionProperties</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="p">();</span>
+<span class="n">Properties</span> <span class="n">connectionProperties</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">();</span>
-<span class="k">try</span> <span class="p">(</span><span class="n">Connection</span> <span class="n">connection</span> <span class="o">=</span> <span class="n">DriverManager</span><span class="p">.</span><span class="na">getConnection</span><span class="p">(</span><span class="n">url</span><span class="p">,</span> <span class="n">connectionProperties</span><span class="p">))</span> <span class="p">{</span>
- <span class="k">try</span> <span class="p">(</span>
- <span class="kd">final</span> <span class="n">Statement</span> <span class="n">statement</span> <span class="o">=</span> <span class="n">connection</span><span class="p">.</span><span class="na">createStatement</span><span class="p">();</span>
- <span class="kd">final</span> <span class="n">ResultSet</span> <span class="n">resultSet</span> <span class="o">=</span> <span class="n">statement</span><span class="p">.</span><span class="na">executeQuery</span><span class="p">(</span><span class="n">query</span><span class="p">)</span>
- <span class="p">)</span> <span class="p">{</span>
- <span class="k">while</span> <span class="p">(</span><span class="n">resultSet</span><span class="p">.</span><span class="na">next</span><span class="p">())</span> <span class="p">{</span>
+<span class="k">try</span> <span class="o">(</span><span class="n">Connection</span> <span class="n">connection</span> <span class="o">=</span> <span class="n">DriverManager</span><span class="o">.</span><span class="na">getConnection</span><span class="o">(</span><span class="n">url</span><span class="o">,</span> <span class="n">connectionProperties</span><span class="o">))</span> <span class="o">{</span>
+ <span class="k">try</span> <span class="o">(</span>
+ <span class="kd">final</span> <span class="n">Statement</span> <span class="n">statement</span> <span class="o">=</span> <span class="n">connection</span><span class="o">.</span><span class="na">createStatement</span><span class="o">();</span>
+ <span class="kd">final</span> <span class="n">ResultSet</span> <span class="n">resultSet</span> <span class="o">=</span> <span class="n">statement</span><span class="o">.</span><span class="na">executeQuery</span><span class="o">(</span><span class="n">query</span><span class="o">)</span>
+ <span class="o">)</span> <span class="o">{</span>
+ <span class="k">while</span> <span class="o">(</span><span class="n">resultSet</span><span class="o">.</span><span class="na">next</span><span class="o">())</span> <span class="o">{</span>
<span class="c1">// Do something</span>
- <span class="p">}</span>
- <span class="p">}</span>
-<span class="p">}</span>
+ <span class="o">}</span>
+ <span class="o">}</span>
+<span class="o">}</span>
</code></pre></div>
<p>Table metadata is available over JDBC using <code>connection.getMetaData()</code> or by querying the
<a href="#retrieving-metadata">"INFORMATION_SCHEMA" tables</a>. Parameterized queries (using <code>?</code> or other placeholders) don't work properly,
diff --git a/docs/0.14.0-incubating/querying/timeboundaryquery.html b/docs/0.14.0-incubating/querying/timeboundaryquery.html
index fbd0281..1fec5e0 100644
--- a/docs/0.14.0-incubating/querying/timeboundaryquery.html
+++ b/docs/0.14.0-incubating/querying/timeboundaryquery.html
@@ -154,8 +154,8 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"queryType"</span> <span class="p">:</span> <span class="s2">"timeBoundary"</span><span class="p">,</span>
<span class="nt">"dataSource"</span><span class="p">:</span> <span class="s2">"sample_datasource"</span><span class="p">,</span>
- <span class="nt">"bound"</span> <span class="p">:</span> <span class="err"><</span> <span class="s2">"maxTime"</span> <span class="err">|</span> <span class="s2">"minTime"</span> <span class="err">></span> <span class="err">#</span> <span class="err">op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="err">re</span><span class="kc">turn</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">bo</span><span class="kc">t</span><span class="err">h</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mps</span> <span class="err">i</span><span class="kc">f</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="err">se</span><span class="kc">t</span>
- <span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span> <span class="err">#</span> <span class="err">op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span>
+ <span class="nt">"bound"</span> <span class="p">:</span> <span class="err"><</span> <span class="s2">"maxTime"</span> <span class="err">|</span> <span class="s2">"minTime"</span> <span class="err">></span> <span class="err">#</span> <span class="err">optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">returning</span> <span class="err">both</span> <span class="err">timestamps</span> <span class="err">if</span> <span class="err">not</span> <span class="err">set</span>
+ <span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span> <span class="err">#</span> <span class="err">optional</span>
<span class="p">}</span>
</code></pre></div>
<p>There are 3 main parts to a time boundary query:</p>
diff --git a/docs/0.14.0-incubating/querying/topnmetricspec.html b/docs/0.14.0-incubating/querying/topnmetricspec.html
index fdc0239..28493f8 100644
--- a/docs/0.14.0-incubating/querying/topnmetricspec.html
+++ b/docs/0.14.0-incubating/querying/topnmetricspec.html
@@ -155,10 +155,10 @@
<h2 id="numeric-topnmetricspec">Numeric TopNMetricSpec</h2>
<p>The simplest metric specification is a String value indicating the metric to sort topN results by. They are included in a topN query with:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="s2">"<metric_name>"</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="s2">"<metric_name>"</span>
</code></pre></div>
<p>The metric field can also be given as a JSON object. The grammar for dimension values sorted by numeric value is shown below:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"numeric"</span><span class="p">,</span>
<span class="nt">"metric"</span><span class="p">:</span> <span class="s2">"<metric_name>"</span>
<span class="p">}</span>
@@ -215,7 +215,7 @@
</tbody></table>
<p>The following metricSpec uses lexicographic sorting.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimension"</span><span class="p">,</span>
<span class="nt">"ordering"</span><span class="p">:</span> <span class="s2">"lexicographic"</span><span class="p">,</span>
<span class="nt">"previousStop"</span><span class="p">:</span> <span class="s2">"<previousStop_value>"</span>
@@ -226,9 +226,9 @@
<h2 id="inverted-topnmetricspec">Inverted TopNMetricSpec</h2>
<p>Sort dimension values in inverted order, i.e inverts the order of the delegate metric spec. It can be used to sort the values in ascending order.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"inverted"</span><span class="p">,</span>
- <span class="nt">"metric"</span><span class="p">:</span> <span class="err"><delega</span><span class="kc">te</span><span class="err">_</span><span class="kc">t</span><span class="err">op_</span><span class="kc">n</span><span class="err">_me</span><span class="kc">tr</span><span class="err">ic_spec></span>
+ <span class="nt">"metric"</span><span class="p">:</span> <span class="err"><delegate_top_n_metric_spec></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.14.0-incubating/tutorials/tutorial-compaction.html b/docs/0.14.0-incubating/tutorials/tutorial-compaction.html
index a63e13c..9def15b 100644
--- a/docs/0.14.0-incubating/tutorials/tutorial-compaction.html
+++ b/docs/0.14.0-incubating/tutorials/tutorial-compaction.html
@@ -189,7 +189,7 @@
├────────┤
│ <span class="m">39244</span> │
└────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">1</span>.38s.
+Retrieved <span class="m">1</span> row in <span class="m">1</span>.38s.
</code></pre></div>
<h2 id="compact-the-data">Compact the data</h2>
@@ -236,7 +236,7 @@
├────────┤
│ <span class="m">39244</span> │
└────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">1</span>.30s.
+Retrieved <span class="m">1</span> row in <span class="m">1</span>.30s.
</code></pre></div>
<p>After the Coordinator has been running for at least 15 minutes, the <a href="http://localhost:8888/unified-console.html#segments">segments view</a> should show there are 24 segments, one per hour:</p>
diff --git a/docs/0.14.0-incubating/tutorials/tutorial-ingestion-spec.html b/docs/0.14.0-incubating/tutorials/tutorial-ingestion-spec.html
index 8c16fce..e54eb27 100644
--- a/docs/0.14.0-incubating/tutorials/tutorial-ingestion-spec.html
+++ b/docs/0.14.0-incubating/tutorials/tutorial-ingestion-spec.html
@@ -194,14 +194,14 @@
<p>Let's start with an empty <code>dataSchema</code> and add fields to it as we progress through the tutorial.</p>
<p>Create a new file called <code>ingestion-tutorial-index.json</code> in <code>quickstart/</code> with the following contents:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{}</span>
</code></pre></div>
<p>We will be making successive edits to this ingestion spec as we progress through the tutorial.</p>
<h3 id="datasource-name">Datasource name</h3>
<p>The datasource name is specified by the <code>dataSource</code> parameter in the <code>dataSchema</code>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
@@ -212,7 +212,7 @@
<p>A <code>dataSchema</code> has a <code>parser</code> field, which defines the parser that Druid will use to interpret the input data.</p>
<p>Since our input data is represented as JSON strings, we'll use a <code>string</code> parser with <code>json</code> format:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -227,7 +227,7 @@
<p>The <code>parser</code> needs to know how to extract the main timestamp field from the input data. When using a <code>json</code> type <code>parseSpec</code>, the timestamp is defined in a <code>timestampSpec</code>. </p>
<p>The timestamp column in our input data is named "ts", containing ISO 8601 timestamps, so let's add a <code>timestampSpec</code> with that information to the <code>parseSpec</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -261,7 +261,7 @@
<p>For this tutorial, let's enable rollup. This is specified with a <code>granularitySpec</code> on the <code>dataSchema</code>. </p>
<p>Note that the <code>granularitySpec</code> lies outside of the <code>parser</code>. We will revist the <code>parser</code> soon when we define our dimensions and metrics.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -294,7 +294,7 @@
<h4 id="dimensions">Dimensions</h4>
<p>Dimensions are specified with a <code>dimensionsSpec</code> inside the <code>parseSpec</code>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -337,7 +337,7 @@
<h4 id="metrics">Metrics</h4>
<p>Metrics are specified with a <code>metricsSpec</code> inside the <code>dataSchema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -380,7 +380,7 @@
<h3 id="no-rollup">No rollup</h3>
<p>If we were not using rollup, all columns would be specified in the <code>dimensionsSpec</code>, e.g.:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"dimensionsSpec"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span>
<span class="s2">"srcIP"</span><span class="p">,</span>
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"srcPort"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"long"</span> <span class="p">},</span>
@@ -391,7 +391,7 @@
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"bytes"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"long"</span> <span class="p">},</span>
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"srcPort"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"double"</span> <span class="p">}</span>
<span class="p">]</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<h3 id="define-granularities">Define granularities</h3>
@@ -405,7 +405,7 @@
<h4 id="segment-granularity">Segment granularity</h4>
<p>Segment granularity is configured by the <code>segmentGranularity</code> property in the <code>granularitySpec</code>. For this tutorial, we'll create hourly segments:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -444,7 +444,7 @@
<h4 id="query-granularity">Query granularity</h4>
<p>The query granularity is configured by the <code>queryGranularity</code> property in the <code>granularitySpec</code>. For this tutorial, let's use minute granularity:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -474,8 +474,8 @@
<span class="nt">"granularitySpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"uniform"</span><span class="p">,</span>
<span class="nt">"segmentGranularity"</span> <span class="p">:</span> <span class="s2">"HOUR"</span><span class="p">,</span>
- <span class="nt">"queryGranularity"</span> <span class="p">:</span> <span class="nt">"MINUTE"</span>
- <span class="nt">"rollup"</span> <span class="p">:</span> <span class="kc">true</span>
+ <span class="nt">"queryGranularity"</span> <span class="p">:</span> <span class="s2">"MINUTE"</span>
+ <span class="s2">"rollup"</span> <span class="p">:</span> <span class="kc">true</span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -490,7 +490,7 @@
<p>For batch tasks, it is necessary to define a time interval. Input rows with timestamps outside of the time interval will not be ingested.</p>
<p>The interval is also specified in the <code>granularitySpec</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -575,7 +575,7 @@
<h2 id="define-the-input-source">Define the input source</h2>
<p>Now let's define our input source, which is specified in an <code>ioConfig</code> object. Each task type has its own type of <code>ioConfig</code>. The native batch task uses "firehoses" to read input data, so let's configure a "local" firehose to read the example netflow data we saved earlier:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"index"</span><span class="p">,</span>
<span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"local"</span><span class="p">,</span>
@@ -637,7 +637,7 @@
<p>Each ingestion task has a <code>tuningConfig</code> section that allows users to tune various ingestion parameters.</p>
<p>As an example, let's add a <code>tuningConfig</code> that sets a target segment size for the native batch ingestion task:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"tuningConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"tuningConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"index"</span><span class="p">,</span>
<span class="nt">"maxRowsPerSegment"</span> <span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
@@ -722,7 +722,7 @@
│ <span class="m">2018</span>-01-01T02:33:00.000Z │ <span class="m">30000</span> │ <span class="m">56</span>.9 │ <span class="m">2</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">5000</span> │ <span class="m">300</span> │ <span class="m">17</span> │ <span class="m">7</span>.7.7.7 │ <span class="m">4000</span> │
│ <span class="m">2018</span>-01-01T02:35:00.000Z │ <span class="m">30000</span> │ <span class="m">46</span>.3 │ <span class="m">1</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">5000</span> │ <span class="m">300</span> │ <span class="m">17</span> │ <span class="m">7</span>.7.7.7 │ <span class="m">4000</span> │
└──────────────────────────┴───────┴──────┴───────┴─────────┴─────────┴─────────┴──────────┴─────────┴─────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">0</span>.12s.
+Retrieved <span class="m">5</span> rows in <span class="m">0</span>.12s.
dsql>
</code></pre></div>
diff --git a/docs/0.14.0-incubating/tutorials/tutorial-query.html b/docs/0.14.0-incubating/tutorials/tutorial-query.html
index e2c5107..e2be662 100644
--- a/docs/0.14.0-incubating/tutorials/tutorial-query.html
+++ b/docs/0.14.0-incubating/tutorials/tutorial-query.html
@@ -302,7 +302,7 @@
│ Wikipedia:In the news/Candidates │ <span class="m">17</span> │
│ Wikipedia:Requests <span class="k">for</span> page protection │ <span class="m">17</span> │
└──────────────────────────────────────────────────────────┴───────┘
-Retrieved <span class="m">10</span> rows <span class="k">in</span> <span class="m">0</span>.06s.
+Retrieved <span class="m">10</span> rows in <span class="m">0</span>.06s.
</code></pre></div>
<h3 id="additional-druid-sql-queries">Additional Druid SQL queries</h3>
@@ -338,7 +338,7 @@
│ <span class="m">2015</span>-09-12T22:00:00.000Z │ <span class="m">16379</span> │
│ <span class="m">2015</span>-09-12T23:00:00.000Z │ <span class="m">15289</span> │
└──────────────────────────┴──────────────┘
-Retrieved <span class="m">24</span> rows <span class="k">in</span> <span class="m">0</span>.08s.
+Retrieved <span class="m">24</span> rows in <span class="m">0</span>.08s.
</code></pre></div>
<h4 id="groupby">GroupBy</h4>
@@ -353,7 +353,7 @@
│ <span class="c1">#ru.wikipedia │ 640698 │</span>
│ <span class="c1">#es.wikipedia │ 634670 │</span>
└───────────────┴─────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">0</span>.05s.
+Retrieved <span class="m">5</span> rows in <span class="m">0</span>.05s.
</code></pre></div>
<h4 id="scan">Scan</h4>
@@ -368,7 +368,7 @@
│ Lowercase sigmabot III │ User talk:ErrantX │
│ BattyBot │ Hans W. Jung │
└────────────────────────┴────────────────────────────────────────────────────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">0</span>.04s.
+Retrieved <span class="m">5</span> rows in <span class="m">0</span>.04s.
</code></pre></div>
<h4 id="explain-plan-for">EXPLAIN PLAN FOR</h4>
@@ -383,7 +383,7 @@
├─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ DruidQueryRel<span class="o">(</span><span class="nv">query</span><span class="o">=[{</span><span class="s2">"queryType"</span>:<span class="s2">"topN"</span>,<span class="s2">"dataSource"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"table"</span>,<span class="s2">"name"</span>:<span class="s2">"wikipedia"</span><span class="o">}</span>,<span class="s2">"virtualColumns"</span>:<span class="o">[]</span>,<span class="s2">"dimension"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"default"</span>,<span class="s2">"dimension"</span>:<span class="s2">"page"</span>,<span class="s2">"outputName"</span>:<span class="s2">"d0"</span>,<span class="s2">"outputType"</span>:<span class="s2">"STRING"</span><span class="o">}</span>,<span class="s2">"metric"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"numeric"</span>,<span class="s2">"metric"</span>:<span class="s2">"a0"</span><span class="o">}</span>,<span class="s2">"threshold"</span>:10,<span class="s2">"intervals"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"intervals"</span>,<span class="s2">"intervals"</span>:<span class="o">[</span><span class="s2">"2015-09-12T00:00:00.000Z/2015-09-13T00:00:00.001Z"</span><span class="o">]}</span>,<span class="s2">"filter"</span>:null,<span class="s2">"granularity"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"all"</span><span class="o">}</span>,<span class="s2">"aggregations"</span>:<span class="o">[{</span><span class="s2">"type"</span>:<span class="s2">"count"</span>,<span class="s2">"name"</span>:<span class="s2">"a0"</span><span class="o">}]</span>,<span class="s2">"postAggregations"</span>:<span class="o">[]</span>,<span class="s2">"context"</span>:<span class="o">{}</span>,<span class="s2">"descending"</span>:false<span class="o">}]</span>, <span class="nv">signature</span><span class="o">=[{</span>d0:STRING, a0:LONG<span class="o">}])</span> │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">0</span>.03s.
+Retrieved <span class="m">1</span> row in <span class="m">0</span>.03s.
</code></pre></div>
<h2 id="further-reading">Further reading</h2>
diff --git a/docs/0.14.0-incubating/tutorials/tutorial-rollup.html b/docs/0.14.0-incubating/tutorials/tutorial-rollup.html
index 3097453..a028d12 100644
--- a/docs/0.14.0-incubating/tutorials/tutorial-rollup.html
+++ b/docs/0.14.0-incubating/tutorials/tutorial-rollup.html
@@ -256,7 +256,7 @@
│ <span class="m">2018</span>-01-02T21:33:00.000Z │ <span class="m">100288</span> │ <span class="m">2</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">161</span> │ <span class="m">7</span>.7.7.7 │
│ <span class="m">2018</span>-01-02T21:35:00.000Z │ <span class="m">2818</span> │ <span class="m">1</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">12</span> │ <span class="m">7</span>.7.7.7 │
└──────────────────────────┴────────┴───────┴─────────┴─────────┴─────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">1</span>.18s.
+Retrieved <span class="m">5</span> rows in <span class="m">1</span>.18s.
dsql>
</code></pre></div>
diff --git a/docs/0.14.0-incubating/tutorials/tutorial-transform-spec.html b/docs/0.14.0-incubating/tutorials/tutorial-transform-spec.html
index 76b1f8d..89890b8 100644
--- a/docs/0.14.0-incubating/tutorials/tutorial-transform-spec.html
+++ b/docs/0.14.0-incubating/tutorials/tutorial-transform-spec.html
@@ -267,7 +267,7 @@
│ <span class="m">2018</span>-01-01T06:01:00.000Z │ super-snake │ <span class="m">1</span> │ <span class="m">3</span> │ <span class="m">300</span> │ <span class="m">900</span> │
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ super-octopus │ <span class="m">1</span> │ <span class="m">1</span> │ <span class="m">100</span> │ <span class="m">300</span> │
└──────────────────────────┴────────────────┴───────┴──────────┴────────┴───────────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">0</span>.03s.
+Retrieved <span class="m">3</span> rows in <span class="m">0</span>.03s.
</code></pre></div>
<p>The "lion" row has been discarded, the <code>animal</code> column has been transformed, and we have both the original and transformed <code>number</code> column.</p>
diff --git a/docs/0.14.0-incubating/tutorials/tutorial-update-data.html b/docs/0.14.0-incubating/tutorials/tutorial-update-data.html
index aef8d55..54203d3 100644
--- a/docs/0.14.0-incubating/tutorials/tutorial-update-data.html
+++ b/docs/0.14.0-incubating/tutorials/tutorial-update-data.html
@@ -179,7 +179,7 @@
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ aardvark │ <span class="m">1</span> │ <span class="m">42</span> │
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ giraffe │ <span class="m">1</span> │ <span class="m">14124</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">1</span>.42s.
+Retrieved <span class="m">3</span> rows in <span class="m">1</span>.42s.
</code></pre></div>
<h3 id="overwrite-the-initial-data">Overwrite the initial data</h3>
@@ -201,7 +201,7 @@
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ aardvark │ <span class="m">1</span> │ <span class="m">9999</span> │
│ <span class="m">2018</span>-01-01T04:01:00.000Z │ bear │ <span class="m">1</span> │ <span class="m">111</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">3</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<h2 id="combine-old-data-with-new-data-and-overwrite">Combine old data with new data and overwrite</h2>
@@ -224,7 +224,7 @@
│ <span class="m">2018</span>-01-01T06:01:00.000Z │ snake │ <span class="m">1</span> │ <span class="m">1234</span> │
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ octopus │ <span class="m">1</span> │ <span class="m">115</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">6</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">6</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<h2 id="append-to-the-data">Append to the data</h2>
@@ -249,7 +249,7 @@
│ <span class="m">2018</span>-01-01T04:01:00.000Z │ bear │ <span class="m">1</span> │ <span class="m">222</span> │
│ <span class="m">2018</span>-01-01T09:01:00.000Z │ falcon │ <span class="m">1</span> │ <span class="m">1241</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">8</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">8</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<p>If we run a GroupBy query instead of a <code>select *</code>, we can see that the "bear" rows will group together at query time:</p>
<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span></span>dsql> <span class="k">select</span> __time, animal, SUM<span class="o">(</span><span class="s2">"count"</span><span class="o">)</span>, SUM<span class="o">(</span><span class="s2">"number"</span><span class="o">)</span> from <span class="s2">"updates-tutorial"</span> group by __time, animal<span class="p">;</span>
@@ -264,7 +264,7 @@
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ octopus │ <span class="m">1</span> │ <span class="m">115</span> │
│ <span class="m">2018</span>-01-01T09:01:00.000Z │ falcon │ <span class="m">1</span> │ <span class="m">1241</span> │
└──────────────────────────┴──────────┴────────┴────────┘
-Retrieved <span class="m">7</span> rows <span class="k">in</span> <span class="m">0</span>.23s.
+Retrieved <span class="m">7</span> rows in <span class="m">0</span>.23s.
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.14.1-incubating/dependencies/metadata-storage.html b/docs/0.14.1-incubating/dependencies/metadata-storage.html
index c577961..aa9fa46 100644
--- a/docs/0.14.1-incubating/dependencies/metadata-storage.html
+++ b/docs/0.14.1-incubating/dependencies/metadata-storage.html
@@ -218,7 +218,7 @@
<span class="nt">"metrics"</span><span class="p">:</span><span class="s2">"comma-delimited-list-of-metric-names"</span><span class="p">,</span>
<span class="nt">"shardSpec"</span><span class="p">:{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"none"</span><span class="p">},</span>
<span class="nt">"binaryVersion"</span><span class="p">:</span><span class="mi">9</span><span class="p">,</span>
- <span class="nt">"size"</span><span class="p">:</span><span class="err">size_o</span><span class="kc">f</span><span class="err">_segme</span><span class="kc">nt</span><span class="p">,</span>
+ <span class="nt">"size"</span><span class="p">:</span><span class="err">size_of_segment</span><span class="p">,</span>
<span class="nt">"identifier"</span><span class="p">:</span><span class="s2">"wikipedia_2012-05-23T00:00:00.000Z_2012-05-24T00:00:00.000Z_2012-05-23T00:10:00.046Z"</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.14.1-incubating/design/auth.html b/docs/0.14.1-incubating/design/auth.html
index 2fc2900..710753e 100644
--- a/docs/0.14.1-incubating/design/auth.html
+++ b/docs/0.14.1-incubating/design/auth.html
@@ -315,11 +315,11 @@
<p>An Authenticator implementation that is intended to support internal Druid communications must recognize credentials for the "internal system user", as provided by a corresponding Escalator implementation.</p>
<p>An Escalator must implement three methods related to the internal system user:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="kd">public</span> <span class="n">HttpClient</span> <span class="nf">createEscalatedClient</span><span class="p">(</span><span class="n">HttpClient</span> <span class="n">baseClient</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="kd">public</span> <span class="n">HttpClient</span> <span class="nf">createEscalatedClient</span><span class="o">(</span><span class="n">HttpClient</span> <span class="n">baseClient</span><span class="o">);</span>
- <span class="kd">public</span> <span class="n">org</span><span class="p">.</span><span class="na">eclipse</span><span class="p">.</span><span class="na">jetty</span><span class="p">.</span><span class="na">client</span><span class="p">.</span><span class="na">HttpClient</span> <span class="nf">createEscalatedJettyClient</span><span class="p">(</span><span class="n">org</span><span class="p">.</span><span class="na">eclipse</span><span class="p">.</span><span class="na">jetty</span><span class="p">.</span><span class="na">client</span><span class="p">.</span><span class="na">HttpClient</span> <span class="n">baseClient</span><span class="p">);</span>
+ <span class="kd">public</span> <span class="n">org</span><span class="o">.</span><span class="na">eclipse</span><span class="o">.</span><span class="na">jetty</span><span class="o">.</span><span class="na">client</span><span class="o">.</span><span class="na">HttpClient</span> <span class="nf">createEscalatedJettyClient</span><span class="o">(</span><span class="n">org</span><span class="o">.</span><span class="na">eclipse</span><span class="o">.</span><span class="na">jetty</span><span class="o">.</span><span class="na">client</span><span class="o">.</span><span class="na">HttpClient</span> <span class="n">baseClient</span><span class="o">);</span>
- <span class="kd">public</span> <span class="n">AuthenticationResult</span> <span class="nf">createEscalatedAuthenticationResult</span><span class="p">();</span>
+ <span class="kd">public</span> <span class="n">AuthenticationResult</span> <span class="nf">createEscalatedAuthenticationResult</span><span class="o">();</span>
</code></pre></div>
<p><code>createEscalatedClient</code> returns an wrapped HttpClient that attaches the credentials of the "internal system user" to requests.</p>
diff --git a/docs/0.14.1-incubating/development/extensions-contrib/ambari-metrics-emitter.html b/docs/0.14.1-incubating/development/extensions-contrib/ambari-metrics-emitter.html
index 7643770..3a71687 100644
--- a/docs/0.14.1-incubating/development/extensions-contrib/ambari-metrics-emitter.html
+++ b/docs/0.14.1-incubating/development/extensions-contrib/ambari-metrics-emitter.html
@@ -274,7 +274,7 @@
<p>The first implementation called <code>all</code>, will send all the druid service metrics events.
The path will be in the form <code><namespacePrefix>.[<druid service name>].[<druid hostname>].<dimensions values ordered by dimension's name>.<metric></code>
User has control of <code><namespacePrefix>.[<druid service name>].[<druid hostname>].</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.ambari</span><span class="mi">-</span><span class="err">me</span><span class="kc">tr</span><span class="err">ics.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.ambari-metrics.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">}</span>
</code></pre></div>
<h4 id="white-list-based-converter">White-list based converter</h4>
@@ -285,7 +285,7 @@
<p>Although user can override the default white list map by supplying a property called <code>mapPath</code>.
This property is a String containing the path for the file containing <strong>white list map Json object</strong>.
For example the following converter will read the map from the file <code>/pathPrefix/fileName.json</code>. </p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.ambari</span><span class="mi">-</span><span class="err">me</span><span class="kc">tr</span><span class="err">ics.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.ambari-metrics.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
</code></pre></div>
<p><strong>Druid emits a huge number of metrics we highly recommend to use the <code>whiteList</code> converter</strong></p>
diff --git a/docs/0.14.1-incubating/development/extensions-contrib/azure.html b/docs/0.14.1-incubating/development/extensions-contrib/azure.html
index 6625ea5..34d8d9f 100644
--- a/docs/0.14.1-incubating/development/extensions-contrib/azure.html
+++ b/docs/0.14.1-incubating/development/extensions-contrib/azure.html
@@ -220,7 +220,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-azure-blobstore"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
diff --git a/docs/0.14.1-incubating/development/extensions-contrib/cloudfiles.html b/docs/0.14.1-incubating/development/extensions-contrib/cloudfiles.html
index 093a1e4..aec4c49 100644
--- a/docs/0.14.1-incubating/development/extensions-contrib/cloudfiles.html
+++ b/docs/0.14.1-incubating/development/extensions-contrib/cloudfiles.html
@@ -236,17 +236,17 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-cloudfiles"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
- <span class="nt">"region"</span><span class="p">:</span> <span class="nt">"DFW"</span>
- <span class="nt">"container"</span><span class="p">:</span> <span class="s2">"container"</span><span class="p">,</span>
+ <span class="nt">"region"</span><span class="p">:</span> <span class="s2">"DFW"</span>
+ <span class="s2">"container"</span><span class="p">:</span> <span class="s2">"container"</span><span class="p">,</span>
<span class="nt">"path"</span><span class="p">:</span> <span class="s2">"/path/to/your/file.json"</span>
<span class="p">},</span>
<span class="p">{</span>
- <span class="nt">"region"</span><span class="p">:</span> <span class="nt">"ORD"</span>
- <span class="nt">"container"</span><span class="p">:</span> <span class="s2">"anothercontainer"</span><span class="p">,</span>
+ <span class="nt">"region"</span><span class="p">:</span> <span class="s2">"ORD"</span>
+ <span class="s2">"container"</span><span class="p">:</span> <span class="s2">"anothercontainer"</span><span class="p">,</span>
<span class="nt">"path"</span><span class="p">:</span> <span class="s2">"/another/path.json"</span>
<span class="p">}</span>
<span class="p">]</span>
diff --git a/docs/0.14.1-incubating/development/extensions-contrib/google.html b/docs/0.14.1-incubating/development/extensions-contrib/google.html
index 15f7342..e1bac25 100644
--- a/docs/0.14.1-incubating/development/extensions-contrib/google.html
+++ b/docs/0.14.1-incubating/development/extensions-contrib/google.html
@@ -198,7 +198,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-google-blobstore"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
diff --git a/docs/0.14.1-incubating/development/extensions-contrib/graphite.html b/docs/0.14.1-incubating/development/extensions-contrib/graphite.html
index d9023b6..3f0bfb8 100644
--- a/docs/0.14.1-incubating/development/extensions-contrib/graphite.html
+++ b/docs/0.14.1-incubating/development/extensions-contrib/graphite.html
@@ -281,7 +281,7 @@
<p>Elements in metric name by default are separated by "/", so graphite will create all metrics on one level. If you want to have metrics in the tree structure, you have to set <code>replaceSlashWithDot=true</code>
Original: <code>druid.HOSTNAME.dataSourceName.queryType.query/time</code>
Changed: <code>druid.HOSTNAME.dataSourceName.queryType.query.time</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.graphi</span><span class="kc">te</span><span class="err">.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.graphite.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">}</span>
</code></pre></div>
<h4 id="white-list-based-converter">White-list based converter</h4>
@@ -292,7 +292,7 @@
<p>Although user can override the default white list map by supplying a property called <code>mapPath</code>.
This property is a String containing the path for the file containing <strong>white list map Json object</strong>.
For example the following converter will read the map from the file <code>/pathPrefix/fileName.json</code>. </p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.graphi</span><span class="kc">te</span><span class="err">.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.graphite.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
</code></pre></div>
<p><strong>Druid emits a huge number of metrics we highly recommend to use the <code>whiteList</code> converter</strong></p>
diff --git a/docs/0.14.1-incubating/development/extensions-contrib/kafka-simple.html b/docs/0.14.1-incubating/development/extensions-contrib/kafka-simple.html
index 3512bed..9e4f469 100644
--- a/docs/0.14.1-incubating/development/extensions-contrib/kafka-simple.html
+++ b/docs/0.14.1-incubating/development/extensions-contrib/kafka-simple.html
@@ -156,7 +156,7 @@
<p>This is an experimental firehose to ingest data from Apache Kafka using the Kafka simple consumer api. Currently, this firehose would only work inside standalone realtime processes.
The configuration for KafkaSimpleConsumerFirehose is similar to the Kafka Eight Firehose , except <code>firehose</code> should be replaced with <code>firehoseV2</code> like this:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehoseV2"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehoseV2"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"kafka-0.8-v2"</span><span class="p">,</span>
<span class="nt">"brokerList"</span> <span class="p">:</span> <span class="p">[</span><span class="s2">"localhost:4443"</span><span class="p">],</span>
<span class="nt">"queueBufferLength"</span><span class="p">:</span><span class="mi">10001</span><span class="p">,</span>
diff --git a/docs/0.14.1-incubating/development/extensions-contrib/opentsdb-emitter.html b/docs/0.14.1-incubating/development/extensions-contrib/opentsdb-emitter.html
index 1588295..b3e8a63 100644
--- a/docs/0.14.1-incubating/development/extensions-contrib/opentsdb-emitter.html
+++ b/docs/0.14.1-incubating/development/extensions-contrib/opentsdb-emitter.html
@@ -224,7 +224,7 @@
If the user does not specify their own JSON file, a default file is used. All metrics are expected to be configured in the JSON file. Metrics which are not configured will be logged.
Desired metrics and dimensions is organized using the following schema:<code><druid metric name> : [ <dimension list> ]</code><br />
e.g.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"query/time"</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"query/time"</span><span class="err">:</span> <span class="p">[</span>
<span class="s2">"dataSource"</span><span class="p">,</span>
<span class="s2">"type"</span>
<span class="p">]</span>
diff --git a/docs/0.14.1-incubating/development/extensions-contrib/rabbitmq.html b/docs/0.14.1-incubating/development/extensions-contrib/rabbitmq.html
index 233d1ba..61fe761 100644
--- a/docs/0.14.1-incubating/development/extensions-contrib/rabbitmq.html
+++ b/docs/0.14.1-incubating/development/extensions-contrib/rabbitmq.html
@@ -161,7 +161,7 @@
<p><strong>Note:</strong> Add <strong>amqp-client-3.2.1.jar</strong> to lib directory of druid to use this firehose.</p>
<p>A sample spec for rabbitmq firehose:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"rabbitmq"</span><span class="p">,</span>
<span class="nt">"connection"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"host"</span><span class="p">:</span> <span class="s2">"localhost"</span><span class="p">,</span>
diff --git a/docs/0.14.1-incubating/development/extensions-core/approximate-histograms.html b/docs/0.14.1-incubating/development/extensions-core/approximate-histograms.html
index e59fcce..6b9e9f0 100644
--- a/docs/0.14.1-incubating/development/extensions-core/approximate-histograms.html
+++ b/docs/0.14.1-incubating/development/extensions-core/approximate-histograms.html
@@ -211,12 +211,12 @@
query.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"approxHistogram or approxHistogramFold (at ingestion time), approxHistogramFold (at query time)"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"resolution"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
- <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
- <span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fl</span><span class="err">oa</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fl</span><span class="err">oa</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"resolution"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
+ <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
+ <span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><float></span><span class="p">,</span>
+ <span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><float></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -304,9 +304,9 @@
<p>An example aggregator spec is shown below:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fixedBucketsHistogram"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
<span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><double></span><span class="p">,</span>
<span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><double></span><span class="p">,</span>
<span class="nt">"outlierHandlingMode"</span><span class="p">:</span> <span class="err"><mode></span>
@@ -417,7 +417,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalBuckets"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"numBuckets"</span><span class="p">:</span> <span class="err"><cou</span><span class="kc">nt</span><span class="err">></span>
+ <span class="nt">"numBuckets"</span><span class="p">:</span> <span class="err"><count></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="buckets-post-aggregator">Buckets post-aggregator</h3>
@@ -433,8 +433,8 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"buckets"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"bucketSize"</span><span class="p">:</span> <span class="err"><bucke</span><span class="kc">t</span><span class="err">_size></span><span class="p">,</span>
- <span class="nt">"offset"</span><span class="p">:</span> <span class="err"><o</span><span class="kc">ffset</span><span class="err">></span>
+ <span class="nt">"bucketSize"</span><span class="p">:</span> <span class="err"><bucket_size></span><span class="p">,</span>
+ <span class="nt">"offset"</span><span class="p">:</span> <span class="err"><offset></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="custom-buckets-post-aggregator">Custom buckets post-aggregator</h3>
@@ -442,30 +442,30 @@
<p>Computes a visual representation of the approximate histogram with bins laid out according to the given breaks.</p>
<p>This aggregator is not supported for the fixed buckets histogram.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"customBuckets"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"customBuckets"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
<span class="nt">"breaks"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><value></span><span class="p">,</span> <span class="err"><value></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<h3 id="min-post-aggregator">min post-aggregator</h3>
<p>Returns the minimum value of the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"min"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"min"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="max-post-aggregator">max post-aggregator</h3>
<p>Returns the maximum value of the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"max"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"max"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="quantile-post-aggregator">quantile post-aggregator</h4>
<p>Computes a single quantile based on the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantile"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"probability"</span> <span class="p">:</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantile"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
+ <span class="nt">"probability"</span> <span class="p">:</span> <span class="err"><quantile></span> <span class="p">}</span>
</code></pre></div>
<h4 id="quantiles-post-aggregator">quantiles post-aggregator</h4>
<p>Computes an array of quantiles based on the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantiles"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"probabilities"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span><span class="p">,</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantiles"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
+ <span class="nt">"probabilities"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><quantile></span><span class="p">,</span> <span class="err"><quantile></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.14.1-incubating/development/extensions-core/avro.html b/docs/0.14.1-incubating/development/extensions-core/avro.html
index e9a4a85..99120f0 100644
--- a/docs/0.14.1-incubating/development/extensions-core/avro.html
+++ b/docs/0.14.1-incubating/development/extensions-core/avro.html
@@ -188,7 +188,7 @@
field types, which can be used to read nested Avro records. The "jq" field type is not currently supported for Avro.</p>
<p>For example, using Avro stream parser with schema repo Avro bytes decoder:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"parser"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"avro_stream"</span><span class="p">,</span>
<span class="nt">"avroBytesDecoder"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"schema_repo"</span><span class="p">,</span>
@@ -203,9 +203,9 @@
<span class="p">},</span>
<span class="nt">"parseSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"avro"</span><span class="p">,</span>
- <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mpSpec></span><span class="p">,</span>
- <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
- <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">></span>
+ <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">timestampSpec></span><span class="p">,</span>
+ <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
+ <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><optional></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -433,9 +433,9 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"avro_hadoop"</span><span class="p">,</span>
<span class="nt">"parseSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"avro"</span><span class="p">,</span>
- <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mpSpec></span><span class="p">,</span>
- <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
- <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">></span>
+ <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">timestampSpec></span><span class="p">,</span>
+ <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
+ <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><optional></span>
<span class="p">}</span>
<span class="p">}</span>
<span class="p">},</span>
diff --git a/docs/0.14.1-incubating/development/extensions-core/bloom-filter.html b/docs/0.14.1-incubating/development/extensions-core/bloom-filter.html
index 58284db..9fc3d4e 100644
--- a/docs/0.14.1-incubating/development/extensions-core/bloom-filter.html
+++ b/docs/0.14.1-incubating/development/extensions-core/bloom-filter.html
@@ -172,13 +172,13 @@
this implementation uses Murmur3 as the hash algorithm.</p>
<p>To construct a BloomKFilter externally with Java to use as a filter in a Druid query:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">BloomKFilter</span> <span class="n">bloomFilter</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BloomKFilter</span><span class="p">(</span><span class="mi">1500</span><span class="p">);</span>
-<span class="n">bloomFilter</span><span class="p">.</span><span class="na">addString</span><span class="p">(</span><span class="s">"value 1"</span><span class="p">);</span>
-<span class="n">bloomFilter</span><span class="p">.</span><span class="na">addString</span><span class="p">(</span><span class="s">"value 2"</span><span class="p">);</span>
-<span class="n">bloomFilter</span><span class="p">.</span><span class="na">addString</span><span class="p">(</span><span class="s">"value 3"</span><span class="p">);</span>
-<span class="n">ByteArrayOutputStream</span> <span class="n">byteArrayOutputStream</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ByteArrayOutputStream</span><span class="p">();</span>
-<span class="n">BloomKFilter</span><span class="p">.</span><span class="na">serialize</span><span class="p">(</span><span class="n">byteArrayOutputStream</span><span class="p">,</span> <span class="n">bloomFilter</span><span class="p">);</span>
-<span class="n">String</span> <span class="n">base64Serialized</span> <span class="o">=</span> <span class="n">Base64</span><span class="p">.</span><span class="na">encodeBase64String</span><span class="p">(</span><span class="n">byteArrayOutputStream</span><span class="p">.</span><span class="na">toByteArray</span><span class="p">());</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">BloomKFilter</span> <span class="n">bloomFilter</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BloomKFilter</span><span class="o">(</span><span class="mi">1500</span><span class="o">);</span>
+<span class="n">bloomFilter</span><span class="o">.</span><span class="na">addString</span><span class="o">(</span><span class="s">"value 1"</span><span class="o">);</span>
+<span class="n">bloomFilter</span><span class="o">.</span><span class="na">addString</span><span class="o">(</span><span class="s">"value 2"</span><span class="o">);</span>
+<span class="n">bloomFilter</span><span class="o">.</span><span class="na">addString</span><span class="o">(</span><span class="s">"value 3"</span><span class="o">);</span>
+<span class="n">ByteArrayOutputStream</span> <span class="n">byteArrayOutputStream</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ByteArrayOutputStream</span><span class="o">();</span>
+<span class="n">BloomKFilter</span><span class="o">.</span><span class="na">serialize</span><span class="o">(</span><span class="n">byteArrayOutputStream</span><span class="o">,</span> <span class="n">bloomFilter</span><span class="o">);</span>
+<span class="n">String</span> <span class="n">base64Serialized</span> <span class="o">=</span> <span class="n">Base64</span><span class="o">.</span><span class="na">encodeBase64String</span><span class="o">(</span><span class="n">byteArrayOutputStream</span><span class="o">.</span><span class="na">toByteArray</span><span class="o">());</span>
</code></pre></div>
<p>This string can then be used in the native or sql Druid query.</p>
@@ -187,9 +187,9 @@
<h3 id="json-specification-of-bloom-filter">JSON Specification of Bloom Filter</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"bloom"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"bloomKFilter"</span> <span class="p">:</span> <span class="err"><serialized_by</span><span class="kc">tes</span><span class="err">_</span><span class="kc">f</span><span class="err">or_BloomKFil</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fn</span><span class="err">></span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension_name></span><span class="p">,</span>
+ <span class="nt">"bloomKFilter"</span> <span class="p">:</span> <span class="err"><serialized_bytes_for_BloomKFilter></span><span class="p">,</span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><extraction_fn></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -255,9 +255,9 @@
<h3 id="json-specification-of-bloom-filter-aggregator">JSON Specification of Bloom Filter Aggregator</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"bloom"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">ield_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxNumEntries"</span><span class="p">:</span> <span class="err"><maximum_</span><span class="kc">nu</span><span class="err">mber_o</span><span class="kc">f</span><span class="err">_eleme</span><span class="kc">nts</span><span class="err">_</span><span class="kc">f</span><span class="err">or_BloomKFil</span><span class="kc">ter</span><span class="err">></span>
- <span class="nt">"field"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_spec></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_field_name></span><span class="p">,</span>
+ <span class="nt">"maxNumEntries"</span><span class="p">:</span> <span class="err"><maximum_number_of_elements_for_BloomKFilter></span>
+ <span class="s2">"field"</span><span class="p">:</span> <span class="err"><dimension_spec></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.14.1-incubating/development/extensions-core/datasketches-quantiles.html b/docs/0.14.1-incubating/development/extensions-core/datasketches-quantiles.html
index f2bb27d..ea1c88e 100644
--- a/docs/0.14.1-incubating/development/extensions-core/datasketches-quantiles.html
+++ b/docs/0.14.1-incubating/development/extensions-core/datasketches-quantiles.html
@@ -168,9 +168,9 @@
<p>The result of the aggregation is a DoublesSketch that is the union of all sketches either built from raw data or read from the segments.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"k"</span><span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">co</span><span class="kc">ntr</span><span class="err">ols</span> <span class="err">size</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">accuracy></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"k"</span><span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">controls</span> <span class="err">size</span> <span class="err">and</span> <span class="err">accuracy></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -209,9 +209,9 @@
<p>This returns an approximation to the value that would be preceded by a given fraction of a hypothetical sorted version of the input stream.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToQuantile"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"fraction"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">posi</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hypo</span><span class="kc">t</span><span class="err">he</span><span class="kc">t</span><span class="err">ical</span> <span class="err">sor</span><span class="kc">te</span><span class="err">d</span> <span class="err">s</span><span class="kc">trea</span><span class="err">m</span><span class="p">,</span> <span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">0</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1</span> <span class="err">i</span><span class="kc">n</span><span class="err">clusive></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"fraction"</span> <span class="p">:</span> <span class="err"><fractional</span> <span class="err">position</span> <span class="err">in</span> <span class="err">the</span> <span class="err">hypothetical</span> <span class="err">sorted</span> <span class="err">stream</span><span class="p">,</span> <span class="err">number</span> <span class="err">from</span> <span class="err">0</span> <span class="err">to</span> <span class="err">1</span> <span class="err">inclusive></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="quantiles">Quantiles</h4>
@@ -219,9 +219,9 @@
<p>This returns an array of quantiles corresponding to a given array of fractions</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToQuantiles"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"fractions"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">fra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">posi</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hypo</span><span class="kc">t</span><span class="err">he</span><span class="kc">t</span><span class="err">ical</span> <span class="err">sor</span><span class="kc">te</span><span class="err">d</span> <span class="err">s</span><span class="kc">trea</span><span class="err">m</span><span class="p">,</span> <span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">0</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1</span> <span class="err">i</span><span class="kc">n</span><span class="err">clusive></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"fractions"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">fractional</span> <span class="err">positions</span> <span class="err">in</span> <span class="err">the</span> <span class="err">hypothetical</span> <span class="err">sorted</span> <span class="err">stream</span><span class="p">,</span> <span class="err">number</span> <span class="err">from</span> <span class="err">0</span> <span class="err">to</span> <span class="err">1</span> <span class="err">inclusive></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="histogram">Histogram</h4>
@@ -229,9 +229,9 @@
<p>This returns an approximation to the histogram given an array of split points that define the histogram bins. An array of <i>m</i> unique, monotonically increasing split points divide the real number line into <i>m+1</i> consecutive disjoint intervals. The definition of an interval is inclusive of the left split point and exclusive of the right split point.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToHistogram"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"splitPoints"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">spli</span><span class="kc">t</span> <span class="err">poi</span><span class="kc">nts</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"splitPoints"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">split</span> <span class="err">points></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-summary">Sketch Summary</h4>
@@ -239,8 +239,8 @@
<p>This returns a summary of the sketch that can be used for debugging. This is the result of calling toString() method.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToString"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.14.1-incubating/development/extensions-core/datasketches-theta.html b/docs/0.14.1-incubating/development/extensions-core/datasketches-theta.html
index 1038612..9d73da6 100644
--- a/docs/0.14.1-incubating/development/extensions-core/datasketches-theta.html
+++ b/docs/0.14.1-incubating/development/extensions-core/datasketches-theta.html
@@ -160,8 +160,8 @@
<h3 id="aggregators">Aggregators</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="nt">"isInputThetaSketch"</span><span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
<span class="nt">"size"</span><span class="p">:</span> <span class="mi">16384</span>
<span class="p">}</span>
@@ -205,17 +205,17 @@
<h4 id="sketch-estimator">Sketch Estimator</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketchEstimate"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">ype</span> <span class="kc">f</span><span class="err">ieldAccess</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">ype</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">chSe</span><span class="kc">t</span><span class="err">Op></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">of</span> <span class="err">type</span> <span class="err">fieldAccess</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">thetaSketch</span> <span class="err">aggregator</span> <span class="err">or</span> <span class="err">that</span> <span class="err">of</span> <span class="err">type</span> <span class="err">thetaSketchSetOp></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-operations">Sketch Operations</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketchSetOp"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
<span class="nt">"func"</span><span class="p">:</span> <span class="err"><UNION|INTERSECT|NOT></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">f</span><span class="err">ieldAccess</span> <span class="kc">t</span><span class="err">ype</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="kc">t</span><span class="err">he</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">chSe</span><span class="kc">t</span><span class="err">Op</span> <span class="kc">t</span><span class="err">ype</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">allow</span> <span class="err">arbi</span><span class="kc">trar</span><span class="err">y</span> <span class="err">combi</span><span class="kc">nat</span><span class="err">io</span><span class="kc">n</span> <span class="err">o</span><span class="kc">f</span> <span class="err">se</span><span class="kc">t</span> <span class="err">opera</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"size"</span><span class="p">:</span> <span class="err"><</span><span class="mi">16384</span> <span class="err">by</span> <span class="err">de</span><span class="kc">fault</span><span class="p">,</span> <span class="err">mus</span><span class="kc">t</span> <span class="err">be</span> <span class="err">max</span> <span class="err">o</span><span class="kc">f</span> <span class="err">size</span> <span class="kc">fr</span><span class="err">om</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ches</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">f</span><span class="err">ields</span> <span class="err">i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">fieldAccess</span> <span class="err">type</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">the</span> <span class="err">thetaSketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">thetaSketchSetOp</span> <span class="err">type</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">allow</span> <span class="err">arbitrary</span> <span class="err">combination</span> <span class="err">of</span> <span class="err">set</span> <span class="err">operations></span><span class="p">,</span>
+ <span class="nt">"size"</span><span class="p">:</span> <span class="err"><</span><span class="mi">16384</span> <span class="err">by</span> <span class="err">default</span><span class="p">,</span> <span class="err">must</span> <span class="err">be</span> <span class="err">max</span> <span class="err">of</span> <span class="err">size</span> <span class="err">from</span> <span class="err">sketches</span> <span class="err">in</span> <span class="err">fields</span> <span class="err">input></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="examples">Examples</h3>
diff --git a/docs/0.14.1-incubating/development/extensions-core/datasketches-tuple.html b/docs/0.14.1-incubating/development/extensions-core/datasketches-tuple.html
index f155cef..1544703 100644
--- a/docs/0.14.1-incubating/development/extensions-core/datasketches-tuple.html
+++ b/docs/0.14.1-incubating/development/extensions-core/datasketches-tuple.html
@@ -158,11 +158,11 @@
<h3 id="aggregators">Aggregators</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"nominalEntries"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"metricColumns"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">gs></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"nominalEntries"</span><span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"metricColumns"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">strings></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -211,8 +211,8 @@
<p>Returns a distinct count estimate from a given ArrayOfDoublesSketch.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToEstimate"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="estimate-of-the-number-of-distinct-keys-with-error-bounds">Estimate of the number of distinct keys with error bounds</h4>
@@ -220,9 +220,9 @@
<p>Returns a distinct count estimate and error bounds from a given ArrayOfDoublesSketch. The result will be three double values: estimate of the number of distinct keys, lower bound and upper bound. The bounds are provided at the given number of standard deviations (optional, defaults to 1). This must be an integer value of 1, 2 or 3 corresponding to approximately 68.3%, 95.4% and 99.7% confidence intervals.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToEstimateAndBounds"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="s2">"numStdDevs"</span><span class="p">,</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">1</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">3</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"numStdDevs"</span><span class="p">,</span> <span class="err"><number</span> <span class="err">from</span> <span class="err">1</span> <span class="err">to</span> <span class="err">3></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="number-of-retained-entries">Number of retained entries</h4>
@@ -230,8 +230,8 @@
<p>Returns the number of retained entries from a given ArrayOfDoublesSketch.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToNumEntries"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="mean-values-for-each-column">Mean values for each column</h4>
@@ -239,8 +239,8 @@
<p>Returns a list of mean values from a given ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToMeans"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="variance-values-for-each-column">Variance values for each column</h4>
@@ -248,8 +248,8 @@
<p>Returns a list of variance values from a given ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToVariances"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="quantiles-sketch-from-a-column">Quantiles sketch from a column</h4>
@@ -263,10 +263,10 @@
</ul>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToQuantilesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"column"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"k"</span> <span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">de</span><span class="kc">ter</span><span class="err">mi</span><span class="kc">nes</span> <span class="kc">t</span><span class="err">he</span> <span class="err">accuracy</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">qua</span><span class="kc">nt</span><span class="err">iles</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"column"</span> <span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"k"</span> <span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">determines</span> <span class="err">the</span> <span class="err">accuracy</span> <span class="err">and</span> <span class="err">size</span> <span class="err">of</span> <span class="err">the</span> <span class="err">quantiles</span> <span class="err">sketch></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="set-operations">Set Operations</h4>
@@ -274,11 +274,11 @@
<p>Returns a result of a specified set operation on the given array of sketches. Supported operations are: union, intersection and set difference (UNION, INTERSECT, NOT).</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchSetOp"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
<span class="nt">"operation"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"UNION"</span><span class="err">|</span><span class="s2">"INTERSECT"</span><span class="err">|</span><span class="s2">"NOT"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">allow</span> <span class="err">arbi</span><span class="kc">trar</span><span class="err">y</span> <span class="err">combi</span><span class="kc">nat</span><span class="err">io</span><span class="kc">n</span> <span class="err">o</span><span class="kc">f</span> <span class="err">se</span><span class="kc">t</span> <span class="err">opera</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"nominalEntries"</span> <span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">de</span><span class="kc">ter</span><span class="err">mi</span><span class="kc">nes</span> <span class="kc">t</span><span class="err">he</span> <span class="err">accuracy</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch></span><span class="p">,</span>
- <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber</span> <span class="err">o</span><span class="kc">f</span> <span class="err">values</span> <span class="err">associa</span><span class="kc">te</span><span class="err">d</span> <span class="err">wi</span><span class="kc">t</span><span class="err">h</span> <span class="err">each</span> <span class="err">dis</span><span class="kc">t</span><span class="err">i</span><span class="kc">n</span><span class="err">c</span><span class="kc">t</span> <span class="err">key></span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">sketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">allow</span> <span class="err">arbitrary</span> <span class="err">combination</span> <span class="err">of</span> <span class="err">set</span> <span class="err">operations></span><span class="p">,</span>
+ <span class="nt">"nominalEntries"</span> <span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">determines</span> <span class="err">the</span> <span class="err">accuracy</span> <span class="err">and</span> <span class="err">size</span> <span class="err">of</span> <span class="err">the</span> <span class="err">sketch></span><span class="p">,</span>
+ <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><number</span> <span class="err">of</span> <span class="err">values</span> <span class="err">associated</span> <span class="err">with</span> <span class="err">each</span> <span class="err">distinct</span> <span class="err">key></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="students-t-test">Student's t-test</h4>
@@ -286,8 +286,8 @@
<p>Performs Student's t-test and returns a list of p-values given two instances of ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key. See <a href="http://commons.apache.org/proper/commons-math/javadocs/api-3.4/org/apache/commons/math3/stat/inference/TTest.html">t-test documentation</a>.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchTTest"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">wi</span><span class="kc">t</span><span class="err">h</span> <span class="kc">t</span><span class="err">wo</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">re</span><span class="kc">ferr</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">with</span> <span class="err">two</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">sketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">referring</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch></span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-summary">Sketch summary</h4>
@@ -295,8 +295,8 @@
<p>Returns a human-readable summary of a given ArrayOfDoublesSketch. This is a string returned by toString() method of the sketch. This can be useful for debugging.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToString"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.14.1-incubating/development/extensions-core/examples.html b/docs/0.14.1-incubating/development/extensions-core/examples.html
index dd9faee..fac3747 100644
--- a/docs/0.14.1-incubating/development/extensions-core/examples.html
+++ b/docs/0.14.1-incubating/development/extensions-core/examples.html
@@ -155,7 +155,7 @@
<p>This firehose connects directly to the twitter spritzer data stream.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"twitzer"</span><span class="p">,</span>
<span class="nt">"maxEventCount"</span><span class="p">:</span> <span class="mi">-1</span><span class="p">,</span>
<span class="nt">"maxRunMinutes"</span><span class="p">:</span> <span class="mi">0</span>
diff --git a/docs/0.14.1-incubating/development/extensions-core/kafka-eight-firehose.html b/docs/0.14.1-incubating/development/extensions-core/kafka-eight-firehose.html
index 348175a..a1395f5 100644
--- a/docs/0.14.1-incubating/development/extensions-core/kafka-eight-firehose.html
+++ b/docs/0.14.1-incubating/development/extensions-core/kafka-eight-firehose.html
@@ -155,7 +155,7 @@
<p>This firehose acts as a Kafka 0.8.x consumer and ingests data from Kafka.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"kafka-0.8"</span><span class="p">,</span>
<span class="nt">"consumerProps"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"zookeeper.connect"</span><span class="p">:</span> <span class="s2">"localhost:2181"</span><span class="p">,</span>
diff --git a/docs/0.14.1-incubating/development/extensions-core/lookups-cached-global.html b/docs/0.14.1-incubating/development/extensions-core/lookups-cached-global.html
index f275793..0206261 100644
--- a/docs/0.14.1-incubating/development/extensions-core/lookups-cached-global.html
+++ b/docs/0.14.1-incubating/development/extensions-core/lookups-cached-global.html
@@ -459,7 +459,7 @@
truck,something3,buck
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"csv"</span><span class="p">,</span>
<span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"value"</span><span class="p">,</span><span class="s2">"somethingElse"</span><span class="p">,</span><span class="s2">"key"</span><span class="p">],</span>
<span class="nt">"keyColumn"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
@@ -530,7 +530,7 @@
truck|something,3|buck
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"tsv"</span><span class="p">,</span>
<span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"value"</span><span class="p">,</span><span class="s2">"somethingElse"</span><span class="p">,</span><span class="s2">"key"</span><span class="p">],</span>
<span class="nt">"keyColumn"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
@@ -568,7 +568,7 @@
<span class="p">{</span><span class="nt">"key"</span><span class="p">:</span> <span class="s2">"buck"</span><span class="p">,</span> <span class="nt">"somethingElse"</span><span class="p">:</span> <span class="s2">"something"</span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="s2">"truck"</span><span class="p">}</span>
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"customJson"</span><span class="p">,</span>
<span class="nt">"keyFieldName"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
<span class="nt">"valueFieldName"</span><span class="p">:</span> <span class="s2">"value"</span>
@@ -587,7 +587,7 @@
<span class="p">{</span><span class="nt">"buck"</span><span class="p">:</span> <span class="s2">"truck"</span><span class="p">}</span>
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"simpleJson"</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.14.1-incubating/development/extensions-core/parquet.html b/docs/0.14.1-incubating/development/extensions-core/parquet.html
index 102f142..47d7572 100644
--- a/docs/0.14.1-incubating/development/extensions-core/parquet.html
+++ b/docs/0.14.1-incubating/development/extensions-core/parquet.html
@@ -259,10 +259,10 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
-<span class="p">}</span>
+<span class="err">}</span>
</code></pre></div>
<h4 id="parquet-parser-timeanddims-parsespec"><code>parquet</code> parser, <code>timeAndDims</code> parseSpec</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -301,7 +301,7 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -352,10 +352,10 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
-<span class="p">}</span>
+<span class="err">}</span>
</code></pre></div>
<p>For additional details see <a href="../../ingestion/hadoop.html">hadoop ingestion</a> and <a href="../../ingestion/ingestion-spec.html">general ingestion spec</a> documentation.</p>
diff --git a/docs/0.14.1-incubating/development/extensions-core/s3.html b/docs/0.14.1-incubating/development/extensions-core/s3.html
index 25e6a15..41a9cfb 100644
--- a/docs/0.14.1-incubating/development/extensions-core/s3.html
+++ b/docs/0.14.1-incubating/development/extensions-core/s3.html
@@ -279,7 +279,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-s3"</span><span class="p">,</span>
<span class="nt">"uris"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"s3://foo/bar/file.gz"</span><span class="p">,</span> <span class="s2">"s3://bar/foo/file2.gz"</span><span class="p">]</span>
<span class="p">}</span>
diff --git a/docs/0.14.1-incubating/development/extensions-core/stats.html b/docs/0.14.1-incubating/development/extensions-core/stats.html
index 0d64b1c..4dce757 100644
--- a/docs/0.14.1-incubating/development/extensions-core/stats.html
+++ b/docs/0.14.1-incubating/development/extensions-core/stats.html
@@ -180,18 +180,18 @@
<p>User can specify expected input type as one of "float", "long", "variance" for ingestion, which is by default "float".</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"variance"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"inputType"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">t</span><span class="err">ype></span><span class="p">,</span>
- <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"inputType"</span> <span class="p">:</span> <span class="err"><input_type></span><span class="p">,</span>
+ <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<p>To query for results, "variance" aggregator with "variance" input type or simply a "varianceFold" aggregator must be included in the query.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"varianceFold"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -215,7 +215,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"stddev"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"estimator"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"estimator"</span><span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="query-examples">Query Examples:</h2>
diff --git a/docs/0.14.1-incubating/development/extensions-core/test-stats.html b/docs/0.14.1-incubating/development/extensions-core/test-stats.html
index 5df005e..4d975fc 100644
--- a/docs/0.14.1-incubating/development/extensions-core/test-stats.html
+++ b/docs/0.14.1-incubating/development/extensions-core/test-stats.html
@@ -175,10 +175,10 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"zscore2sample"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"successCount1"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">success</span> <span class="err">cou</span><span class="kc">nt</span> <span class="err">o</span><span class="kc">f</span> <span class="err">sample</span> <span class="mi">1</span><span class="p">,</span>
- <span class="nt">"sample1Size"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggregaror></span> <span class="err">sample</span> <span class="mi">1</span> <span class="err">size</span><span class="p">,</span>
- <span class="nt">"successCount2"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">success</span> <span class="err">cou</span><span class="kc">nt</span> <span class="err">o</span><span class="kc">f</span> <span class="err">sample</span> <span class="mi">2</span><span class="p">,</span>
- <span class="nt">"sample2Size"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">sample</span> <span class="mi">2</span> <span class="err">size</span>
+ <span class="nt">"successCount1"</span><span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">success</span> <span class="err">count</span> <span class="err">of</span> <span class="err">sample</span> <span class="mi">1</span><span class="p">,</span>
+ <span class="nt">"sample1Size"</span><span class="p">:</span> <span class="err"><post_aggregaror></span> <span class="err">sample</span> <span class="mi">1</span> <span class="err">size</span><span class="p">,</span>
+ <span class="nt">"successCount2"</span><span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">success</span> <span class="err">count</span> <span class="err">of</span> <span class="err">sample</span> <span class="mi">2</span><span class="p">,</span>
+ <span class="nt">"sample2Size"</span> <span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">sample</span> <span class="mi">2</span> <span class="err">size</span>
<span class="p">}</span>
</code></pre></div>
<p>Please note the post aggregator will be converting binary variables to continuous variables for two population proportions. Specifically</p>
@@ -199,7 +199,7 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"pvalue2tailedZtest"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"zScore"</span><span class="p">:</span> <span class="err"><zscore</span> <span class="err">pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span>
+ <span class="nt">"zScore"</span><span class="p">:</span> <span class="err"><zscore</span> <span class="err">post_aggregator></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="example-usage">Example Usage</h2>
diff --git a/docs/0.14.1-incubating/development/geo.html b/docs/0.14.1-incubating/development/geo.html
index de399e2..8e94b40 100644
--- a/docs/0.14.1-incubating/development/geo.html
+++ b/docs/0.14.1-incubating/development/geo.html
@@ -201,7 +201,7 @@
<h1 id="spatial-filters">Spatial Filters</h1>
<p>The grammar for a spatial filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"spatial"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"spatialDim"</span><span class="p">,</span>
<span class="nt">"bound"</span><span class="p">:</span> <span class="p">{</span>
diff --git a/docs/0.14.1-incubating/development/modules.html b/docs/0.14.1-incubating/development/modules.html
index 30fe4e4..83a0292 100644
--- a/docs/0.14.1-incubating/development/modules.html
+++ b/docs/0.14.1-incubating/development/modules.html
@@ -208,13 +208,13 @@
<p>Check the <code>azure-storage</code>, <code>google-storage</code>, <code>cassandra-storage</code>, <code>hdfs-storage</code> and <code>s3-extensions</code> modules for examples of how to do this.</p>
<p>The basic idea behind the extension is that you need to add bindings for your DataSegmentPusher and DataSegmentPuller objects. The way to add them is something like (taken from HdfsStorageDruidModule)</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Binders</span><span class="p">.</span><span class="na">dataSegmentPullerBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="s">"hdfs"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">HdfsDataSegmentPuller</span><span class="p">.</span><span class="na">class</span><span class="p">).</span><span class="na">in</span><span class="p">(</span><span class="n">LazySingleton</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Binders</span><span class="o">.</span><span class="na">dataSegmentPullerBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="s">"hdfs"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">HdfsDataSegmentPuller</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">in</span><span class="o">(</span><span class="n">LazySingleton</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-<span class="n">Binders</span><span class="p">.</span><span class="na">dataSegmentPusherBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="s">"hdfs"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">HdfsDataSegmentPusher</span><span class="p">.</span><span class="na">class</span><span class="p">).</span><span class="na">in</span><span class="p">(</span><span class="n">LazySingleton</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<span class="n">Binders</span><span class="o">.</span><span class="na">dataSegmentPusherBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="s">"hdfs"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">HdfsDataSegmentPusher</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">in</span><span class="o">(</span><span class="n">LazySingleton</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<p><code>Binders.dataSegment*Binder()</code> is a call provided by the druid-core jar which sets up a Guice multibind "MapBinder". If that doesn't make sense, don't worry about it, just think of it as a magical incantation.</p>
@@ -284,12 +284,12 @@
<p>Adding a Firehose is done almost entirely through the Jackson Modules instead of Guice. Specifically, note the implementation</p>
<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="nd">@Override</span>
-<span class="kd">public</span> <span class="n">List</span><span class="o"><?</span> <span class="kd">extends</span> <span class="n">Module</span><span class="o">></span> <span class="nf">getJacksonModules</span><span class="p">()</span>
-<span class="p">{</span>
- <span class="k">return</span> <span class="n">ImmutableList</span><span class="p">.</span><span class="na">of</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">SimpleModule</span><span class="p">().</span><span class="na">registerSubtypes</span><span class="p">(</span><span class="k">new</span> <span class="n">NamedType</span><span class="p">(</span><span class="n">StaticS3FirehoseFactory</span><span class="p">.</span><span class="na">class</span><span class="p">,</span> <span class="s">"static-s3"</span><span class="p">))</span>
- <span class="p">);</span>
-<span class="p">}</span>
+<span class="kd">public</span> <span class="n">List</span><span class="o"><?</span> <span class="kd">extends</span> <span class="n">Module</span><span class="o">></span> <span class="nf">getJacksonModules</span><span class="o">()</span>
+<span class="o">{</span>
+ <span class="k">return</span> <span class="n">ImmutableList</span><span class="o">.</span><span class="na">of</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">SimpleModule</span><span class="o">().</span><span class="na">registerSubtypes</span><span class="o">(</span><span class="k">new</span> <span class="n">NamedType</span><span class="o">(</span><span class="n">StaticS3FirehoseFactory</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="s">"static-s3"</span><span class="o">))</span>
+ <span class="o">);</span>
+<span class="o">}</span>
</code></pre></div>
<p>This is registering the FirehoseFactory with Jackson's polymorphic serde layer. More concretely, having this will mean that if you specify a <code>"firehose": { "type": "static-s3", ... }</code> in your realtime config, then the system will load this FirehoseFactory for your firehose.</p>
@@ -314,32 +314,32 @@
</ol>
<p>Registering these uses the same general strategy as a deep storage mechanism does. You do something like</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">DruidBinders</span><span class="p">.</span><span class="na">queryToolChestBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="n">SegmentMetadataQuery</span><span class="p">.</span><span class="na">class</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">SegmentMetadataQueryQueryToolChest</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">DruidBinders</span><span class="o">.</span><span class="na">queryToolChestBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="n">SegmentMetadataQuery</span><span class="o">.</span><span class="na">class</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">SegmentMetadataQueryQueryToolChest</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-<span class="n">DruidBinders</span><span class="p">.</span><span class="na">queryRunnerFactoryBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="n">SegmentMetadataQuery</span><span class="p">.</span><span class="na">class</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">SegmentMetadataQueryRunnerFactory</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<span class="n">DruidBinders</span><span class="o">.</span><span class="na">queryRunnerFactoryBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="n">SegmentMetadataQuery</span><span class="o">.</span><span class="na">class</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">SegmentMetadataQueryRunnerFactory</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<p>The first one binds the SegmentMetadataQueryQueryToolChest for usage when a SegmentMetadataQuery is used. The second one does the same thing but for the QueryRunnerFactory instead.</p>
<h3 id="adding-new-jersey-resources">Adding new Jersey resources</h3>
<p>Adding new Jersey resources to a module requires calling the following code to bind the resource in the module:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Jerseys</span><span class="p">.</span><span class="na">addResource</span><span class="p">(</span><span class="n">binder</span><span class="p">,</span> <span class="n">NewResource</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Jerseys</span><span class="o">.</span><span class="na">addResource</span><span class="o">(</span><span class="n">binder</span><span class="o">,</span> <span class="n">NewResource</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<h3 id="adding-a-new-password-provider-implementation">Adding a new Password Provider implementation</h3>
<p>You will need to implement <code>org.apache.druid.metadata.PasswordProvider</code> interface. For every place where Druid uses PasswordProvider, a new instance of the implementation will be created,
thus make sure all the necessary information required for fetching each password is supplied during object instantiation.
In your implementation of <code>org.apache.druid.initialization.DruidModule</code>, <code>getJacksonModules</code> should look something like this -</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="k">return</span> <span class="n">ImmutableList</span><span class="p">.</span><span class="na">of</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">SimpleModule</span><span class="p">(</span><span class="s">"SomePasswordProviderModule"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">registerSubtypes</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">NamedType</span><span class="p">(</span><span class="n">SomePasswordProvider</span><span class="p">.</span><span class="na">class</span><span class="p">,</span> <span class="s">"some"</span><span class="p">)</span>
- <span class="p">)</span>
- <span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="k">return</span> <span class="n">ImmutableList</span><span class="o">.</span><span class="na">of</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">SimpleModule</span><span class="o">(</span><span class="s">"SomePasswordProviderModule"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">registerSubtypes</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">NamedType</span><span class="o">(</span><span class="n">SomePasswordProvider</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="s">"some"</span><span class="o">)</span>
+ <span class="o">)</span>
+ <span class="o">);</span>
</code></pre></div>
<p>where <code>SomePasswordProvider</code> is the implementation of <code>PasswordProvider</code> interface, you can have a look at <code>org.apache.druid.metadata.EnvironmentVariablePasswordProvider</code> for example.</p>
diff --git a/docs/0.14.1-incubating/ingestion/compaction.html b/docs/0.14.1-incubating/ingestion/compaction.html
index 3525692..53a8392 100644
--- a/docs/0.14.1-incubating/ingestion/compaction.html
+++ b/docs/0.14.1-incubating/ingestion/compaction.html
@@ -153,15 +153,15 @@
<p>Compaction tasks merge all segments of the given interval. The syntax is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"compact"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><i</span><span class="kc">nter</span><span class="err">val</span> <span class="kc">t</span><span class="err">o</span> <span class="err">speci</span><span class="kc">f</span><span class="err">y</span> <span class="err">segme</span><span class="kc">nts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
- <span class="s2">"dimensions"</span> <span class="err"><cus</span><span class="kc">t</span><span class="err">om</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><interval</span> <span class="err">to</span> <span class="err">specify</span> <span class="err">segments</span> <span class="err">to</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
+ <span class="nt">"dimensions"</span> <span class="err"><custom</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
<span class="nt">"keepSegmentGranularity"</span><span class="p">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"segmentGranularity"</span><span class="p">:</span> <span class="err"><segme</span><span class="kc">nt</span> <span class="err">gra</span><span class="kc">nular</span><span class="err">i</span><span class="kc">t</span><span class="err">y</span> <span class="err">a</span><span class="kc">fter</span> <span class="err">compac</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"targetCompactionSizeBytes"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tar</span><span class="err">ge</span><span class="kc">t</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="err">compac</span><span class="kc">te</span><span class="err">d</span> <span class="err">segme</span><span class="kc">nts</span><span class="err">></span>
- <span class="s2">"tuningConfig"</span> <span class="err"><i</span><span class="kc">n</span><span class="err">dex</span> <span class="kc">tas</span><span class="err">k</span> <span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">gCo</span><span class="kc">nf</span><span class="err">ig></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"segmentGranularity"</span><span class="p">:</span> <span class="err"><segment</span> <span class="err">granularity</span> <span class="err">after</span> <span class="err">compaction></span><span class="p">,</span>
+ <span class="nt">"targetCompactionSizeBytes"</span><span class="p">:</span> <span class="err"><target</span> <span class="err">size</span> <span class="err">of</span> <span class="err">compacted</span> <span class="err">segments></span>
+ <span class="s2">"tuningConfig"</span> <span class="err"><index</span> <span class="err">task</span> <span class="err">tuningConfig></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.14.1-incubating/ingestion/data-formats.html b/docs/0.14.1-incubating/ingestion/data-formats.html
index 2a2e5e7..00f3c8b 100644
--- a/docs/0.14.1-incubating/ingestion/data-formats.html
+++ b/docs/0.14.1-incubating/ingestion/data-formats.html
@@ -192,7 +192,7 @@
<p>All forms of Druid ingestion require some form of schema object. The format of the data to be ingested is specified using the<code>parseSpec</code> entry in your <code>dataSchema</code>.</p>
<h3 id="json">JSON</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"json"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -205,7 +205,7 @@
<p>If you have nested JSON, <a href="flatten-json.html">Druid can automatically flatten it for you</a>.</p>
<h3 id="csv">CSV</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"csv"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -234,7 +234,7 @@
<p>The <code>columns</code> field must be included and and ensure that the order of the fields matches the columns of your input data in the same order.</p>
<h3 id="tsv-delimited">TSV (Delimited)</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"tsv"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -266,23 +266,23 @@
<p>The <code>columns</code> field must be included and and ensure that the order of the fields matches the columns of your input data in the same order.</p>
<h3 id="regex">Regex</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
<span class="p">},</span>
<span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"dimensions"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_lis</span><span class="kc">t</span><span class="err">_o</span><span class="kc">f</span><span class="err">_dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">]</span>
+ <span class="nt">"dimensions"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_list_of_dimensions></span><span class="p">]</span>
<span class="p">},</span>
- <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_colum</span><span class="kc">ns</span><span class="err">_here></span><span class="p">],</span>
- <span class="nt">"pattern"</span> <span class="p">:</span> <span class="err"><regex</span> <span class="err">pa</span><span class="kc">ttern</span> <span class="kc">f</span><span class="err">or</span> <span class="err">par</span><span class="kc">t</span><span class="err">i</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">da</span><span class="kc">ta</span><span class="err">></span>
+ <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_columns_here></span><span class="p">],</span>
+ <span class="nt">"pattern"</span> <span class="p">:</span> <span class="err"><regex</span> <span class="err">pattern</span> <span class="err">for</span> <span class="err">partitioning</span> <span class="err">data></span>
<span class="p">}</span>
</code></pre></div>
<p>The <code>columns</code> field must match the columns of your regex matching groups in the same order. If columns are not provided, default
columns names ("column_1", "column2", ... "column_n") will be assigned. Ensure that your column names include all your dimensions. </p>
<h3 id="javascript">JavaScript</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
diff --git a/docs/0.14.1-incubating/ingestion/delete-data.html b/docs/0.14.1-incubating/ingestion/delete-data.html
index fc484f6..81d9ba7 100644
--- a/docs/0.14.1-incubating/ingestion/delete-data.html
+++ b/docs/0.14.1-incubating/ingestion/delete-data.html
@@ -168,10 +168,10 @@
<p>Kill tasks delete all information about a segment and removes it from deep storage. Killable segments must be disabled (used==0) in the Druid segment table. The available grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"kill"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><all_segme</span><span class="kc">nts</span><span class="err">_i</span><span class="kc">n</span><span class="err">_</span><span class="kc">t</span><span class="err">his_i</span><span class="kc">nter</span><span class="err">val_will_die!></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><all_segments_in_this_interval_will_die!></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.14.1-incubating/ingestion/firehose.html b/docs/0.14.1-incubating/ingestion/firehose.html
index fcb8d0f..21b1442 100644
--- a/docs/0.14.1-incubating/ingestion/firehose.html
+++ b/docs/0.14.1-incubating/ingestion/firehose.html
@@ -391,7 +391,7 @@
This can be used to merge data from more than one firehose.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"combining"</span><span class="p">,</span>
- <span class="nt">"delegates"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span> <span class="kc">f</span><span class="err">irehose</span><span class="mi">1</span> <span class="p">},</span> <span class="p">{</span> <span class="kc">f</span><span class="err">irehose</span><span class="mi">2</span> <span class="p">},</span> <span class="err">.....</span> <span class="p">]</span>
+ <span class="nt">"delegates"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span> <span class="err">firehose1</span> <span class="p">},</span> <span class="p">{</span> <span class="err">firehose2</span> <span class="p">},</span> <span class="err">.....</span> <span class="p">]</span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.14.1-incubating/ingestion/flatten-json.html b/docs/0.14.1-incubating/ingestion/flatten-json.html
index 90b719e..7f87d29 100644
--- a/docs/0.14.1-incubating/ingestion/flatten-json.html
+++ b/docs/0.14.1-incubating/ingestion/flatten-json.html
@@ -226,7 +226,7 @@
<p>The column "metrica" is a Long metric column, "hello" is an array of Double metrics, and "nestmet.val" is a nested Long metric. All other columns are dimensions.</p>
<p>To flatten this JSON, the parseSpec could be defined as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"json"</span><span class="p">,</span>
<span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"useFieldDiscovery"</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
@@ -307,7 +307,7 @@
<p>"ignore_me" will be automatically discovered but excluded as specified by dimensionsExclusions.</p>
<p>Aggregators should use the metric column names as defined in the flattenSpec. Using the example above:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metricsSpec"</span> <span class="p">:</span> <span class="p">[</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metricsSpec"</span> <span class="err">:</span> <span class="p">[</span>
<span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span>
<span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"path-metric-sum"</span><span class="p">,</span>
diff --git a/docs/0.14.1-incubating/ingestion/hadoop.html b/docs/0.14.1-incubating/ingestion/hadoop.html
index 67f6f55..8db337a 100644
--- a/docs/0.14.1-incubating/ingestion/hadoop.html
+++ b/docs/0.14.1-incubating/ingestion/hadoop.html
@@ -222,7 +222,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hadoop"</span>
<span class="p">}</span>
<span class="p">},</span>
- <span class="nt">"hadoopDependencyCoordinates"</span><span class="p">:</span> <span class="err"><my_hadoop_versio</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"hadoopDependencyCoordinates"</span><span class="p">:</span> <span class="err"><my_hadoop_version></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -512,7 +512,7 @@
</tbody></table>
<h3 id="jobproperties-field-of-tuningconfig">jobProperties field of TuningConfig</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"tuningConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"tuningConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"jobProperties"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"<hadoop-property-a>"</span><span class="p">:</span> <span class="s2">"<value-a>"</span><span class="p">,</span>
@@ -616,7 +616,7 @@
sized data segments relative to single-dimension partitioning.</p>
<h3 id="hash-based-partitioning">Hash-based partitioning</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"partitionsSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"partitionsSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hashed"</span><span class="p">,</span>
<span class="nt">"targetPartitionSize"</span><span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
@@ -657,7 +657,7 @@
</tbody></table>
<h3 id="single-dimension-partitioning">Single-dimension partitioning</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"partitionsSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"partitionsSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimension"</span><span class="p">,</span>
<span class="nt">"targetPartitionSize"</span><span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
diff --git a/docs/0.14.1-incubating/ingestion/ingestion-spec.html b/docs/0.14.1-incubating/ingestion/ingestion-spec.html
index adbd1bd..ec57807 100644
--- a/docs/0.14.1-incubating/ingestion/ingestion-spec.html
+++ b/docs/0.14.1-incubating/ingestion/ingestion-spec.html
@@ -188,7 +188,7 @@
<h1 id="dataschema">DataSchema</h1>
<p>An example dataSchema is shown below:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"wikipedia"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -602,7 +602,7 @@
<p>For example, the following <code>dimensionsSpec</code> section from a <code>dataSchema</code> ingests one column as Long (<code>countryNum</code>), two
columns as Float (<code>userLatitude</code>, <code>userLongitude</code>), and the other columns as Strings, with bitmap indexes disabled
for the <code>comment</code> column.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dimensionsSpec"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span>
<span class="s2">"page"</span><span class="p">,</span>
<span class="s2">"language"</span><span class="p">,</span>
diff --git a/docs/0.14.1-incubating/ingestion/locking-and-priority.html b/docs/0.14.1-incubating/ingestion/locking-and-priority.html
index 713c074..2e41e85 100644
--- a/docs/0.14.1-incubating/ingestion/locking-and-priority.html
+++ b/docs/0.14.1-incubating/ingestion/locking-and-priority.html
@@ -202,7 +202,7 @@
</tbody></table>
<p>You can override the task priority by setting your priority in the task context like below.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"context"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"context"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"priority"</span> <span class="p">:</span> <span class="mi">100</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.14.1-incubating/ingestion/misc-tasks.html b/docs/0.14.1-incubating/ingestion/misc-tasks.html
index bd00f7e..f36a8d2 100644
--- a/docs/0.14.1-incubating/ingestion/misc-tasks.html
+++ b/docs/0.14.1-incubating/ingestion/misc-tasks.html
@@ -155,10 +155,10 @@
<p>These tasks start, sleep for a time and are used only for testing. The available grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"noop"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_segme</span><span class="kc">nt</span><span class="err">_i</span><span class="kc">nter</span><span class="err">val></span><span class="p">,</span>
- <span class="nt">"runTime"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_millis_</span><span class="kc">t</span><span class="err">o_sleep></span><span class="p">,</span>
- <span class="nt">"firehose"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_</span><span class="kc">f</span><span class="err">irehose_</span><span class="kc">t</span><span class="err">o_</span><span class="kc">test</span><span class="err">_co</span><span class="kc">nne</span><span class="err">c</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><optional_task_id></span><span class="p">,</span>
+ <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><optional_segment_interval></span><span class="p">,</span>
+ <span class="nt">"runTime"</span> <span class="p">:</span> <span class="err"><optional_millis_to_sleep></span><span class="p">,</span>
+ <span class="nt">"firehose"</span><span class="p">:</span> <span class="err"><optional_firehose_to_test_connect></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="segment-merging-tasks-deprecated">Segment Merging Tasks (Deprecated)</h2>
@@ -168,11 +168,11 @@
<p>Append tasks append a list of segments together into a single segment (one after the other). The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"append"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">appe</span><span class="kc">n</span><span class="err">d></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">list</span> <span class="err">of</span> <span class="err">DataSegment</span> <span class="err">objects</span> <span class="err">to</span> <span class="err">append></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><optional</span> <span class="err">list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="merge-task">Merge Task</h3>
@@ -183,12 +183,12 @@
<p>The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"merge"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whe</span><span class="kc">t</span><span class="err">her</span> <span class="err">or</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="kc">t</span><span class="err">o</span> <span class="err">rollup</span> <span class="err">da</span><span class="kc">ta</span> <span class="err">duri</span><span class="kc">n</span><span class="err">g</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whether</span> <span class="err">or</span> <span class="err">not</span> <span class="err">to</span> <span class="err">rollup</span> <span class="err">data</span> <span class="err">during</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">list</span> <span class="err">of</span> <span class="err">DataSegment</span> <span class="err">objects</span> <span class="err">to</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="same-interval-merge-task">Same Interval Merge Task</h3>
@@ -198,12 +198,12 @@
<p>The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"same_interval_merge"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whe</span><span class="kc">t</span><span class="err">her</span> <span class="err">or</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="kc">t</span><span class="err">o</span> <span class="err">rollup</span> <span class="err">da</span><span class="kc">ta</span> <span class="err">duri</span><span class="kc">n</span><span class="err">g</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">his</span> <span class="err">i</span><span class="kc">nter</span><span class="err">val</span> <span class="err">are</span> <span class="err">goi</span><span class="kc">n</span><span class="err">g</span> <span class="kc">t</span><span class="err">o</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whether</span> <span class="err">or</span> <span class="err">not</span> <span class="err">to</span> <span class="err">rollup</span> <span class="err">data</span> <span class="err">during</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><DataSegment</span> <span class="err">objects</span> <span class="err">in</span> <span class="err">this</span> <span class="err">interval</span> <span class="err">are</span> <span class="err">going</span> <span class="err">to</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.14.1-incubating/ingestion/stream-pull.html b/docs/0.14.1-incubating/ingestion/stream-pull.html
index d033ff2..ede4217 100644
--- a/docs/0.14.1-incubating/ingestion/stream-pull.html
+++ b/docs/0.14.1-incubating/ingestion/stream-pull.html
@@ -547,7 +547,7 @@
<p>Segments are identified by datasource, time interval, and version. With sharding, a segment is also identified by a partition number. Typically, each shard will have the same version but a different partition number to uniquely identify it.</p>
<p>In small-data scenarios, sharding is unnecessary and can be set to none (the default):</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span><span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span><span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
</code></pre></div>
<p>However, in scenarios with multiple realtime processes, <code>none</code> is less useful as it cannot help with scaling data volume (see below). Note that for the batch indexing service, no explicit configuration is required; sharding is provided automatically.</p>
@@ -565,7 +565,7 @@
</ul>
<p>Configure <code>linear</code> under <code>schema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
@@ -575,7 +575,7 @@
<p>This strategy is similar to <code>linear</code> except that it does not tolerate non-sequential partition numbering (it will <em>not</em> allow querying of partitions 0 and 2 if partition 1 is missing). It also requires explicitly setting the total number of partitions.</p>
<p>Configure <code>numbered</code> under <code>schema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"numbered"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span><span class="p">,</span>
<span class="nt">"partitions"</span><span class="p">:</span> <span class="mi">2</span>
@@ -586,13 +586,13 @@
<p>The <code>shardSpec</code> configuration can be used to create redundancy by having the same <code>partitionNum</code> values on different processes.</p>
<p>For example, if RealTimeProcess1 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
</code></pre></div>
<p>and RealTimeProcess2 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
@@ -600,7 +600,7 @@
<p>then two realtime processes can store segments with the same datasource, version, time interval, and partition number. Brokers that query for data in such segments will assume that they hold the same data, and the query will target only one of the segments.</p>
<p><code>shardSpec</code> can also help achieve scale. For this, add processes with a different <code>partionNum</code>. Continuing with the example, if RealTimeProcess3 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">1</span>
<span class="p">}</span>
diff --git a/docs/0.14.1-incubating/ingestion/update-existing-data.html b/docs/0.14.1-incubating/ingestion/update-existing-data.html
index f22c327..97a7d35 100644
--- a/docs/0.14.1-incubating/ingestion/update-existing-data.html
+++ b/docs/0.14.1-incubating/ingestion/update-existing-data.html
@@ -275,7 +275,7 @@
</tbody></table>
<p>For example</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"inputSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"dataSource"</span><span class="p">,</span>
@@ -309,7 +309,7 @@
</tbody></table>
<p>For example:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"inputSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"multi"</span><span class="p">,</span>
diff --git a/docs/0.14.1-incubating/operations/use_sbt_to_build_fat_jar.html b/docs/0.14.1-incubating/operations/use_sbt_to_build_fat_jar.html
index abbe8a6..8bade54 100644
--- a/docs/0.14.1-incubating/operations/use_sbt_to_build_fat_jar.html
+++ b/docs/0.14.1-incubating/operations/use_sbt_to_build_fat_jar.html
@@ -149,106 +149,106 @@
-->
<h1 id="content-for-build-sbt">Content for build.sbt</h1>
-<div class="highlight"><pre><code class="language-scala" data-lang="scala"><span></span><span class="n">libraryDependencies</span> <span class="o">++=</span> <span class="nc">Seq</span><span class="p">(</span>
- <span class="s">"com.amazonaws"</span> <span class="o">%</span> <span class="s">"aws-java-sdk"</span> <span class="o">%</span> <span class="s">"1.9.23"</span> <span class="n">exclude</span><span class="p">(</span><span class="s">"common-logging"</span><span class="p">,</span> <span class="s">"common-logging"</span><span class="p">),</span>
- <span class="s">"org.joda"</span> <span class="o">%</span> <span class="s">"joda-convert"</span> <span class="o">%</span> <span class="s">"1.7"</span><span class="p">,</span>
- <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"2.7"</span><span class="p">,</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-services"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-service"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-hadoop"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"mysql-metadata-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-s3-extensions"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-histogram"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-hdfs-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-core"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-databind"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-guava"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-joda"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-base"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-json-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-smile-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.module"</span> <span class="o">%</span> <span class="s">"jackson-module-jaxb-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.sun.jersey"</span> <span class="o">%</span> <span class="s">"jersey-servlet"</span> <span class="o">%</span> <span class="s">"1.17.1"</span><span class="p">,</span>
- <span class="s">"mysql"</span> <span class="o">%</span> <span class="s">"mysql-connector-java"</span> <span class="o">%</span> <span class="s">"5.1.34"</span><span class="p">,</span>
- <span class="s">"org.scalatest"</span> <span class="o">%%</span> <span class="s">"scalatest"</span> <span class="o">%</span> <span class="s">"2.2.3"</span> <span class="o">%</span> <span class="s">"test"</span><span class="p">,</span>
+<div class="highlight"><pre><code class="language-scala" data-lang="scala"><span></span><span class="n">libraryDependencies</span> <span class="o">++=</span> <span class="nc">Seq</span><span class="o">(</span>
+ <span class="s">"com.amazonaws"</span> <span class="o">%</span> <span class="s">"aws-java-sdk"</span> <span class="o">%</span> <span class="s">"1.9.23"</span> <span class="n">exclude</span><span class="o">(</span><span class="s">"common-logging"</span><span class="o">,</span> <span class="s">"common-logging"</span><span class="o">),</span>
+ <span class="s">"org.joda"</span> <span class="o">%</span> <span class="s">"joda-convert"</span> <span class="o">%</span> <span class="s">"1.7"</span><span class="o">,</span>
+ <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"2.7"</span><span class="o">,</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-services"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-service"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-hadoop"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"mysql-metadata-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-s3-extensions"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-histogram"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-hdfs-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-core"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-databind"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-guava"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-joda"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-base"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-json-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-smile-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.module"</span> <span class="o">%</span> <span class="s">"jackson-module-jaxb-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.sun.jersey"</span> <span class="o">%</span> <span class="s">"jersey-servlet"</span> <span class="o">%</span> <span class="s">"1.17.1"</span><span class="o">,</span>
+ <span class="s">"mysql"</span> <span class="o">%</span> <span class="s">"mysql-connector-java"</span> <span class="o">%</span> <span class="s">"5.1.34"</span><span class="o">,</span>
+ <span class="s">"org.scalatest"</span> <span class="o">%%</span> <span class="s">"scalatest"</span> <span class="o">%</span> <span class="s">"2.2.3"</span> <span class="o">%</span> <span class="s">"test"</span><span class="o">,</span>
<span class="s">"org.mockito"</span> <span class="o">%</span> <span class="s">"mockito-core"</span> <span class="o">%</span> <span class="s">"1.10.19"</span> <span class="o">%</span> <span class="s">"test"</span>
-<span class="p">)</span>
+<span class="o">)</span>
-<span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span> <span class="o">:=</span> <span class="p">{</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"pom."</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"javax.inject.Named"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"mime.types"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog$1.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/NoOpLog.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogFactory.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogConfigurationException.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/Log.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"META-INF/jersey-module-version"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".properties"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">x</span> <span class="o">=></span>
- <span class="kd">val</span> <span class="n">oldStrategy</span> <span class="o">=</span> <span class="p">(</span><span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span><span class="p">).</span><span class="n">value</span>
- <span class="n">oldStrategy</span><span class="p">(</span><span class="n">x</span><span class="p">)</span>
-<span class="p">}</span>
+<span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span> <span class="o">:=</span> <span class="o">{</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"pom."</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"javax.inject.Named"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"mime.types"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog$1.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/NoOpLog.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogFactory.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogConfigurationException.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/Log.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"META-INF/jersey-module-version"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".properties"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">x</span> <span class="k">=></span>
+ <span class="k">val</span> <span class="n">oldStrategy</span> <span class="k">=</span> <span class="o">(</span><span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span><span class="o">).</span><span class="n">value</span>
+ <span class="n">oldStrategy</span><span class="o">(</span><span class="n">x</span><span class="o">)</span>
+<span class="o">}</span>
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.14.1-incubating/querying/aggregations.html b/docs/0.14.1-incubating/querying/aggregations.html
index 1082d92..5ec20df 100644
--- a/docs/0.14.1-incubating/querying/aggregations.html
+++ b/docs/0.14.1-incubating/querying/aggregations.html
@@ -158,7 +158,7 @@
<h3 id="count-aggregator">Count aggregator</h3>
<p><code>count</code> computes the count of Druid rows that match the filters.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span> <span class="p">}</span>
</code></pre></div>
<p>Please note the count aggregator counts the number of Druid rows, which does not always reflect the number of raw events ingested.
This is because Druid can be configured to roll up data at ingestion time. To
@@ -170,7 +170,7 @@
<h4 id="longsum-aggregator"><code>longSum</code> aggregator</h4>
<p>computes the sum of values as a 64-bit, signed integer</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<p><code>name</code> – output name for the summed value
<code>fieldName</code> – name of the metric column to sum over</p>
@@ -178,44 +178,44 @@
<h4 id="doublesum-aggregator"><code>doubleSum</code> aggregator</h4>
<p>Computes and stores the sum of values as 64-bit floating point value. Similar to <code>longSum</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatsum-aggregator"><code>floatSum</code> aggregator</h4>
<p>Computes and stores the sum of values as 32-bit floating point value. Similar to <code>longSum</code> and <code>doubleSum</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="min-max-aggregators">Min / Max aggregators</h3>
<h4 id="doublemin-aggregator"><code>doubleMin</code> aggregator</h4>
<p><code>doubleMin</code> computes the minimum of all metric values and Double.POSITIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="doublemax-aggregator"><code>doubleMax</code> aggregator</h4>
<p><code>doubleMax</code> computes the maximum of all metric values and Double.NEGATIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatmin-aggregator"><code>floatMin</code> aggregator</h4>
<p><code>floatMin</code> computes the minimum of all metric values and Float.POSITIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatmax-aggregator"><code>floatMax</code> aggregator</h4>
<p><code>floatMax</code> computes the maximum of all metric values and Float.NEGATIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="longmin-aggregator"><code>longMin</code> aggregator</h4>
<p><code>longMin</code> computes the minimum of all metric values and Long.MAX_VALUE</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="longmax-aggregator"><code>longMax</code> aggregator</h4>
<p><code>longMax</code> computes the maximum of all metric values and Long.MIN_VALUE</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="first-last-aggregator">First / Last aggregator</h3>
@@ -228,8 +228,8 @@
<p><code>doubleFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="doublelast-aggregator"><code>doubleLast</code> aggregator</h4>
@@ -237,8 +237,8 @@
<p><code>doubleLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="floatfirst-aggregator"><code>floatFirst</code> aggregator</h4>
@@ -246,8 +246,8 @@
<p><code>floatFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="floatlast-aggregator"><code>floatLast</code> aggregator</h4>
@@ -255,8 +255,8 @@
<p><code>floatLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="longfirst-aggregator"><code>longFirst</code> aggregator</h4>
@@ -264,8 +264,8 @@
<p><code>longFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="longlast-aggregator"><code>longLast</code> aggregator</h4>
@@ -273,8 +273,8 @@
<p><code>longLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="stringfirst-aggregator"><code>stringFirst</code> aggregator</h4>
@@ -282,10 +282,10 @@
<p><code>stringFirst</code> computes the metric value with the minimum timestamp or <code>null</code> if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1024</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolea</span><span class="kc">n</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><integer></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">1024),</span>
+ <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolean></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="stringlast-aggregator"><code>stringLast</code> aggregator</h4>
@@ -293,10 +293,10 @@
<p><code>stringLast</code> computes the metric value with the maximum timestamp or <code>null</code> if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1024</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolea</span><span class="kc">n</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><integer></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">1024),</span>
+ <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolean></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<h3 id="javascript-aggregator">JavaScript aggregator</h3>
@@ -305,7 +305,7 @@
JavaScript functions are expected to return floating-point values.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><colum</span><span class="kc">n</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><colum</span><span class="kc">n</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
+ <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><column</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><column</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
<span class="nt">"fnAggregate"</span> <span class="p">:</span> <span class="s2">"function(current, column1, column2, ...) {</span>
<span class="s2"> <updates partial aggregate (current) based on the current row values></span>
<span class="s2"> return <updated partial aggregate></span>
@@ -418,10 +418,10 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"filtered"</span><span class="p">,</span>
<span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span> <span class="err">value></span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><dimension</span> <span class="err">value></span>
<span class="p">}</span>
- <span class="nt">"aggregator"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="s2">"aggregator"</span> <span class="p">:</span> <span class="err"><aggregation></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.14.1-incubating/querying/dimensionspecs.html b/docs/0.14.1-incubating/querying/dimensionspecs.html
index eab0b18..b37f108 100644
--- a/docs/0.14.1-incubating/querying/dimensionspecs.html
+++ b/docs/0.14.1-incubating/querying/dimensionspecs.html
@@ -161,8 +161,8 @@
<p>Returns dimension values as is and optionally renames the dimension.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"default"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"outputName"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"outputName"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
<span class="nt">"outputType"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"STRING"</span><span class="err">|</span><span class="s2">"LONG"</span><span class="err">|</span><span class="s2">"FLOAT"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
@@ -175,10 +175,10 @@
<p>Returns dimension values transformed using the given <a href="#extraction-functions">extraction function</a>.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"extraction"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"outputName"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"outputName"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
<span class="nt">"outputType"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"STRING"</span><span class="err">|</span><span class="s2">"LONG"</span><span class="err">|</span><span class="s2">"FLOAT"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><extraction_function></span>
<span class="p">}</span>
</code></pre></div>
<p><code>outputType</code> may also be specified in an ExtractionDimensionSpec to apply type conversion to results before merging. If left unspecified, the <code>outputType</code> defaults to STRING.</p>
@@ -195,13 +195,13 @@
<p>In addition to "query filter" which efficiently selects the rows to be processed, you can use the filtered dimension spec to filter for specific values within the values of a multi-value dimension. These dimensionSpecs take a delegate DimensionSpec and a filtering criteria. From the "exploded" rows, only rows matching the given filtering criteria are returned in the query result.</p>
<p>The following filtered dimension spec acts as a whitelist or blacklist for values as per the "isWhitelist" attribute value.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"listFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"values"</span><span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">gs></span><span class="p">,</span> <span class="nt">"isWhitelist"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">a</span><span class="kc">ttr</span><span class="err">ibu</span><span class="kc">te</span> <span class="kc">f</span><span class="err">or</span> <span class="kc">true</span><span class="err">/</span><span class="kc">false</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">is</span> <span class="kc">true</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"listFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"values"</span><span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">strings></span><span class="p">,</span> <span class="nt">"isWhitelist"</span><span class="p">:</span> <span class="err"><optional</span> <span class="err">attribute</span> <span class="err">for</span> <span class="kc">true</span><span class="err">/</span><span class="kc">false</span><span class="p">,</span> <span class="err">default</span> <span class="err">is</span> <span class="err">true></span> <span class="p">}</span>
</code></pre></div>
<p>Following filtered dimension spec retains only the values matching regex. Note that <code>listFiltered</code> is faster than this and one should use that for whitelist or blacklist usecase.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regexFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><java</span> <span class="err">regex</span> <span class="err">pa</span><span class="kc">ttern</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regexFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><java</span> <span class="err">regex</span> <span class="err">pattern></span> <span class="p">}</span>
</code></pre></div>
<p>Following filtered dimension spec retains only the values starting with the same prefix.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"prefixFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"prefix"</span><span class="p">:</span> <span class="err"><pre</span><span class="kc">f</span><span class="err">ix</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"prefixFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"prefix"</span><span class="p">:</span> <span class="err"><prefix</span> <span class="err">string></span> <span class="p">}</span>
</code></pre></div>
<p>For more details and examples, see <a href="multi-value-dimensions.html">multi-value dimensions</a>.</p>
@@ -295,8 +295,8 @@
If there is no match, it returns the dimension value as is.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span>
- <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expressio</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"index"</span> <span class="p">:</span> <span class="err"><group</span> <span class="kc">t</span><span class="err">o</span> <span class="err">ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="mi">1</span><span class="err">></span>
+ <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expression></span><span class="p">,</span>
+ <span class="nt">"index"</span> <span class="p">:</span> <span class="err"><group</span> <span class="err">to</span> <span class="err">extract</span><span class="p">,</span> <span class="err">default</span> <span class="err">1></span>
<span class="nt">"replaceMissingValue"</span> <span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
<span class="nt">"replaceMissingValueWith"</span> <span class="p">:</span> <span class="s2">"foobar"</span>
<span class="p">}</span>
@@ -316,7 +316,7 @@
<h3 id="partial-extraction-function">Partial Extraction Function</h3>
<p>Returns the dimension value unchanged if the regular expression matches, otherwise returns null.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"partial"</span><span class="p">,</span> <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expressio</span><span class="kc">n</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"partial"</span><span class="p">,</span> <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expression></span> <span class="p">}</span>
</code></pre></div>
<h3 id="search-query-extraction-function">Search Query Extraction Function</h3>
@@ -366,11 +366,11 @@
<li><code>asMillis</code> : boolean value, set to true to treat input strings as millis rather than ISO8601 strings. Additionally, if <code>format</code> is null or not specified, output will be in millis rather than ISO8601.</li>
</ul>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"timeFormat"</span><span class="p">,</span>
- <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"timeZone"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">t</span><span class="err">ime_zo</span><span class="kc">ne</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">UTC)</span><span class="p">,</span>
- <span class="nt">"locale"</span> <span class="p">:</span> <span class="err"><locale></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">curre</span><span class="kc">nt</span> <span class="err">locale)</span><span class="p">,</span>
- <span class="nt">"granularity"</span> <span class="p">:</span> <span class="err"><gra</span><span class="kc">nular</span><span class="err">i</span><span class="kc">t</span><span class="err">y></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="kc">n</span><span class="err">o</span><span class="kc">ne</span><span class="err">)</span> <span class="p">},</span>
- <span class="nt">"asMillis"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">)</span> <span class="p">}</span>
+ <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><output_format></span> <span class="err">(optional)</span><span class="p">,</span>
+ <span class="nt">"timeZone"</span> <span class="p">:</span> <span class="err"><time_zone></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">UTC),</span>
+ <span class="nt">"locale"</span> <span class="p">:</span> <span class="err"><locale></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">current</span> <span class="err">locale),</span>
+ <span class="nt">"granularity"</span> <span class="p">:</span> <span class="err"><granularity></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">none)</span> <span class="p">}</span><span class="err">,</span>
+ <span class="s2">"asMillis"</span> <span class="err">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span> <span class="err">(optional)</span> <span class="err">}</span>
</code></pre></div>
<p>For example, the following dimension spec returns the day of the week for Montréal in French:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -401,9 +401,9 @@
<p>If a value cannot be parsed using the provided timeFormat, it will be returned as-is.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"time"</span><span class="p">,</span>
- <span class="nt">"timeFormat"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"resultFormat"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"joda"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span><span class="p">,</span> <span class="kc">false</span><span class="err">></span> <span class="p">}</span>
+ <span class="nt">"timeFormat"</span> <span class="p">:</span> <span class="err"><input_format></span><span class="p">,</span>
+ <span class="nt">"resultFormat"</span> <span class="p">:</span> <span class="err"><output_format></span><span class="p">,</span>
+ <span class="nt">"joda"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span><span class="p">,</span> <span class="err">false></span> <span class="p">}</span>
</code></pre></div>
<h3 id="javascript-extraction-function">Javascript Extraction Function</h3>
@@ -574,7 +574,7 @@
<h3 id="string-format-extraction-function">String Format Extraction Function</h3>
<p>Returns the dimension value formatted according to the given format string.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFormat"</span><span class="p">,</span> <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><spri</span><span class="kc">ntf</span><span class="err">_expressio</span><span class="kc">n</span><span class="err">></span><span class="p">,</span> <span class="nt">"nullHandling"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">a</span><span class="kc">ttr</span><span class="err">ibu</span><span class="kc">te</span> <span class="kc">f</span><span class="err">or</span> <span class="err">ha</span><span class="kc">n</span><span class="err">dli</span><span class="kc">n</span><span class="err">g</span> <span class="kc">null</span> <span class="err">value></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFormat"</span><span class="p">,</span> <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><sprintf_expression></span><span class="p">,</span> <span class="nt">"nullHandling"</span> <span class="p">:</span> <span class="err"><optional</span> <span class="err">attribute</span> <span class="err">for</span> <span class="err">handling</span> <span class="kc">null</span> <span class="err">value></span> <span class="p">}</span>
</code></pre></div>
<p>For example if you want to concat "[" and "]" before and after the actual dimension value, you need to specify "[%s]" as format string. "nullHandling" can be one of <code>nullString</code>, <code>emptyString</code> or <code>returnNull</code>. With "[%s]" format, each configuration will result <code>[null]</code>, <code>[]</code>, <code>null</code>. Default is <code>nullString</code>.</p>
diff --git a/docs/0.14.1-incubating/querying/filters.html b/docs/0.14.1-incubating/querying/filters.html
index 0e22332..2f993f2 100644
--- a/docs/0.14.1-incubating/querying/filters.html
+++ b/docs/0.14.1-incubating/querying/filters.html
@@ -157,7 +157,7 @@
<p>The simplest filter is a selector filter. The selector filter will match a specific dimension with a specific value. Selector filters can be used as the base filters for more complex Boolean expressions of filters.</p>
<p>The grammar for a SELECTOR filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_value_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dimension_value_string></span> <span class="p">}</span>
</code></pre></div>
<p>This is the equivalent of <code>WHERE <dimension_string> = '<dimension_value_string>'</code>.</p>
@@ -166,7 +166,7 @@
<h3 id="column-comparison-filter">Column Comparison filter</h3>
<p>The column comparison filter is similar to the selector filter, but instead compares dimensions to each other. For example:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"columnComparison"</span><span class="p">,</span> <span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span><span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_a></span><span class="p">,</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_b></span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"columnComparison"</span><span class="p">,</span> <span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span><span class="err"><dimension_a></span><span class="p">,</span> <span class="err"><dimension_b></span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>This is the equivalent of <code>WHERE <dimension_a> = <dimension_b></code>.</p>
@@ -175,7 +175,7 @@
<h3 id="regular-expression-filter">Regular expression filter</h3>
<p>The regular expression filter is similar to the selector filter, but using regular expressions. It matches the specified dimension with the given pattern. The pattern can be any standard <a href="http://docs.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html">Java regular expression</a>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><pa</span><span class="kc">ttern</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><pattern_string></span> <span class="p">}</span>
</code></pre></div>
<p>The regex filter supports the use of extraction functions, see <a href="#filtering-with-extraction-functions">Filtering with Extraction Functions</a> for details.</p>
@@ -184,21 +184,21 @@
<h4 id="and">AND</h4>
<p>The grammar for an AND filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>The filters in fields can be any other filter defined on this page.</p>
<h4 id="or">OR</h4>
<p>The grammar for an OR filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"or"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"or"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>The filters in fields can be any other filter defined on this page.</p>
<h4 id="not">NOT</h4>
<p>The grammar for a NOT filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"not"</span><span class="p">,</span> <span class="nt">"field"</span><span class="p">:</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"not"</span><span class="p">,</span> <span class="nt">"field"</span><span class="p">:</span> <span class="err"><filter></span> <span class="p">}</span>
</code></pre></div>
<p>The filter specified at field can be any other filter defined on this page.</p>
@@ -209,7 +209,7 @@
<p>The function takes a single argument, the dimension value, and returns either true or false.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span>
<span class="nt">"function"</span> <span class="p">:</span> <span class="s2">"function(value) { <...> }"</span>
<span class="p">}</span>
</code></pre></div>
@@ -699,14 +699,14 @@
the "regex" filter) the numeric column values will be converted to strings during the scan.</p>
<p>For example, filtering on a specific value, <code>myFloatColumn = 10.1</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"myFloatColumn"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"10.1"</span>
<span class="p">}</span>
</code></pre></div>
<p>Filtering on a range of values, <code>10 <= myFloatColumn < 20</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"bound"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"myFloatColumn"</span><span class="p">,</span>
<span class="nt">"ordering"</span><span class="p">:</span> <span class="s2">"numeric"</span><span class="p">,</span>
@@ -725,14 +725,14 @@
<p>If the user wishes to interpret the timestamp with a specific format, timezone, or locale, the <a href="./dimensionspecs.html#time-format-extraction-function">Time Format Extraction Function</a> is useful.</p>
<p>For example, filtering on a long timestamp value:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"__time"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"124457387532"</span>
<span class="p">}</span>
</code></pre></div>
<p>Filtering on day of week:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"__time"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"Friday"</span><span class="p">,</span>
diff --git a/docs/0.14.1-incubating/querying/granularities.html b/docs/0.14.1-incubating/querying/granularities.html
index 43a8c38..a4d8cc5 100644
--- a/docs/0.14.1-incubating/querying/granularities.html
+++ b/docs/0.14.1-incubating/querying/granularities.html
@@ -308,10 +308,10 @@
<p>Duration granularities are specified as an exact duration in milliseconds and timestamps are returned as UTC. Duration granularity values are in millis.</p>
<p>They also support specifying an optional origin, which defines where to start counting time buckets from (defaults to 1970-01-01T00:00:00Z).</p>
-<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mf">7200000</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mi">7200000</span><span class="p">}</span>
</code></pre></div>
<p>This chunks up every 2 hours.</p>
-<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mf">3600000</span><span class="p">,</span> <span class="s2">"origin"</span><span class="o">:</span> <span class="s2">"2012-01-01T00:30:00Z"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mi">3600000</span><span class="p">,</span> <span class="s2">"origin"</span><span class="o">:</span> <span class="s2">"2012-01-01T00:30:00Z"</span><span class="p">}</span>
</code></pre></div>
<p>This chunks up every hour on the half-hour.</p>
diff --git a/docs/0.14.1-incubating/querying/groupbyquery.html b/docs/0.14.1-incubating/querying/groupbyquery.html
index bee7487..0f030b5 100644
--- a/docs/0.14.1-incubating/querying/groupbyquery.html
+++ b/docs/0.14.1-incubating/querying/groupbyquery.html
@@ -277,10 +277,10 @@
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"2012-01-01T00:00:00.000Z"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"country"</span> <span class="p">:</span> <span class="err"><some_dim_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"device"</span> <span class="p">:</span> <span class="err"><some_dim_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"total_usage"</span> <span class="p">:</span> <span class="err"><some_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"data_transfer"</span> <span class="p">:</span><span class="err"><some_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
+ <span class="nt">"country"</span> <span class="p">:</span> <span class="err"><some_dim_value_one></span><span class="p">,</span>
+ <span class="nt">"device"</span> <span class="p">:</span> <span class="err"><some_dim_value_two></span><span class="p">,</span>
+ <span class="nt">"total_usage"</span> <span class="p">:</span> <span class="err"><some_value_one></span><span class="p">,</span>
+ <span class="nt">"data_transfer"</span> <span class="p">:</span><span class="err"><some_value_two></span><span class="p">,</span>
<span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_avg_usage_value></span>
<span class="p">}</span>
<span class="p">},</span>
@@ -288,11 +288,11 @@
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"2012-01-01T00:00:12.000Z"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"dim1"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_dim_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"dim2"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_dim_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"sample_name1"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"sample_name2"</span> <span class="p">:</span><span class="err"><some_o</span><span class="kc">t</span><span class="err">her_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_avg_usage_value></span>
+ <span class="nt">"dim1"</span> <span class="p">:</span> <span class="err"><some_other_dim_value_one></span><span class="p">,</span>
+ <span class="nt">"dim2"</span> <span class="p">:</span> <span class="err"><some_other_dim_value_two></span><span class="p">,</span>
+ <span class="nt">"sample_name1"</span> <span class="p">:</span> <span class="err"><some_other_value_one></span><span class="p">,</span>
+ <span class="nt">"sample_name2"</span> <span class="p">:</span><span class="err"><some_other_value_two></span><span class="p">,</span>
+ <span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_other_avg_usage_value></span>
<span class="p">}</span>
<span class="p">},</span>
<span class="err">...</span>
@@ -326,7 +326,7 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"extraction"</span><span class="p">,</span>
<span class="nt">"dimension"</span> <span class="p">:</span> <span class="s2">"d2col"</span><span class="p">,</span>
<span class="nt">"outputName"</span> <span class="p">:</span> <span class="s2">"D2"</span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err">ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fun</span><span class="err">c</span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err">extraction_func</span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span><span class="s2">"lookup"</span><span class="p">,</span>
@@ -337,10 +337,10 @@
<span class="p">],</span>
<span class="err">...</span>
<span class="err">...</span>
-<span class="nt">"subtotalsSpec"</span><span class="p">:[</span> <span class="p">[</span><span class="s2">"D1"</span><span class="p">,</span> <span class="s2">"D2"</span><span class="p">,</span> <span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">1</span><span class="s2">", "</span><span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">3</span><span class="err">"]],</span>
+<span class="nt">"subtotalsSpec"</span><span class="p">:[</span> <span class="p">[</span><span class="s2">"D1"</span><span class="p">,</span> <span class="s2">"D2"</span><span class="p">,</span> <span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">1</span><span class="s2">", "</span><span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">3</span><span class="err">"</span><span class="p">]],</span>
<span class="err">..</span>
-<span class="err">}</span>
+<span class="p">}</span>
</code></pre></div>
<p>Response returned would be equivalent to concatenating result of 3 groupBy queries with "dimensions" field being ["D1", "D2", D3"], ["D1", "D3"] and ["D3"] with appropriate <code>DimensionSpec</code> json blob as used in above query.
Response for above query would look something like below...</p>
@@ -350,13 +350,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D2"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D2"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="err">...</span>
@@ -365,13 +365,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="err">...</span>
@@ -380,13 +380,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="p">]</span>
</code></pre></div>
diff --git a/docs/0.14.1-incubating/querying/having.html b/docs/0.14.1-incubating/querying/having.html
index c32be3c..2625b32 100644
--- a/docs/0.14.1-incubating/querying/having.html
+++ b/docs/0.14.1-incubating/querying/having.html
@@ -168,7 +168,7 @@
<span class="nt">"having"</span><span class="p">:</span>
<span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"filter"</span><span class="p">,</span>
- <span class="nt">"filter"</span> <span class="p">:</span> <span class="err"><a</span><span class="kc">n</span><span class="err">y</span> <span class="err">Druid</span> <span class="err">query</span> <span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span>
+ <span class="nt">"filter"</span> <span class="p">:</span> <span class="err"><any</span> <span class="err">Druid</span> <span class="err">query</span> <span class="err">filter></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -205,7 +205,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -221,7 +221,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -239,7 +239,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -257,7 +257,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"lessThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -277,7 +277,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimSelector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"<dimension>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dimension_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -297,12 +297,12 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"lessThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">]</span>
<span class="p">}</span>
@@ -322,12 +322,12 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">]</span>
<span class="p">}</span>
@@ -347,7 +347,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
<span class="p">}</span>
diff --git a/docs/0.14.1-incubating/querying/hll-old.html b/docs/0.14.1-incubating/querying/hll-old.html
index de86716..85e5814 100644
--- a/docs/0.14.1-incubating/querying/hll-old.html
+++ b/docs/0.14.1-incubating/querying/hll-old.html
@@ -159,9 +159,9 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"cardinality"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
- <span class="nt">"byRow"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"round"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span> <span class="err"><dimension</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><dimension</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
+ <span class="nt">"byRow"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false),</span>
+ <span class="nt">"round"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<p>Each individual element of the "fields" list can be a String or <a href="../querying/dimensionspecs.html">DimensionSpec</a>. A String dimension in the fields list is equivalent to a DefaultDimensionSpec (no transformations).</p>
@@ -233,8 +233,8 @@
<p>Uses <a href="http://algo.inria.fr/flajolet/Publications/FlFuGaMe07.pdf">HyperLogLog</a> to compute the estimated cardinality of a dimension that has been aggregated as a "hyperUnique" metric at indexing time.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUnique"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="nt">"isInputHyperUnique"</span> <span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
<span class="nt">"round"</span> <span class="p">:</span> <span class="kc">false</span>
<span class="p">}</span>
diff --git a/docs/0.14.1-incubating/querying/limitspec.html b/docs/0.14.1-incubating/querying/limitspec.html
index defbc6a..50375b3 100644
--- a/docs/0.14.1-incubating/querying/limitspec.html
+++ b/docs/0.14.1-incubating/querying/limitspec.html
@@ -157,8 +157,8 @@
<p>The default limit spec takes a limit and the list of columns to do an orderBy operation over. The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"default"</span><span class="p">,</span>
- <span class="nt">"limit"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger_value></span><span class="p">,</span>
- <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">OrderByColum</span><span class="kc">n</span><span class="err">Spec</span><span class="p">],</span>
+ <span class="nt">"limit"</span> <span class="p">:</span> <span class="err"><integer_value></span><span class="p">,</span>
+ <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err">list</span> <span class="err">of</span> <span class="err">OrderByColumnSpec</span><span class="p">],</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="orderbycolumnspec">OrderByColumnSpec</h4>
@@ -167,7 +167,7 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"dimension"</span> <span class="p">:</span> <span class="s2">"<Any dimension or metric name>"</span><span class="p">,</span>
<span class="nt">"direction"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"ascending"</span><span class="err">|</span><span class="s2">"descending"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"dimensionOrder"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"lexicographic"</span><span class="err">(de</span><span class="kc">fault</span><span class="err">)|</span><span class="s2">"alphanumeric"</span><span class="err">|</span><span class="s2">"strlen"</span><span class="err">|</span><span class="s2">"numeric"</span><span class="err">></span>
+ <span class="nt">"dimensionOrder"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"lexicographic"</span><span class="err">(default)|</span><span class="s2">"alphanumeric"</span><span class="err">|</span><span class="s2">"strlen"</span><span class="err">|</span><span class="s2">"numeric"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
<p>If only the dimension is provided (as a JSON string), the default order-by is ascending with lexicographic sorting.</p>
diff --git a/docs/0.14.1-incubating/querying/post-aggregations.html b/docs/0.14.1-incubating/querying/post-aggregations.html
index 569e42d..efacd02 100644
--- a/docs/0.14.1-incubating/querying/post-aggregations.html
+++ b/docs/0.14.1-incubating/querying/post-aggregations.html
@@ -177,12 +177,12 @@
</ul>
<p>The grammar for an arithmetic post aggregation is:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">pos</span><span class="kc">t</span><span class="err">Aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">postAggregation</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arithmetic"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fn"</span> <span class="p">:</span> <span class="err"><ari</span><span class="kc">t</span><span class="err">hme</span><span class="kc">t</span><span class="err">ic_</span><span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
- <span class="nt">"ordering"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">null</span> <span class="err">(de</span><span class="kc">fault</span><span class="err">)</span><span class="p">,</span> <span class="err">or</span> <span class="s2">"numericFirst"</span><span class="err">></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fn"</span> <span class="p">:</span> <span class="err"><arithmetic_function></span><span class="p">,</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><post_aggregator></span><span class="p">,</span> <span class="err"><post_aggregator></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
+ <span class="nt">"ordering"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">null</span> <span class="err">(default)</span><span class="p">,</span> <span class="err">or</span> <span class="nt">"numericFirst"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="field-accessor-post-aggregators">Field accessor post-aggregators</h3>
@@ -193,15 +193,15 @@
For complex aggregators, like "cardinality" and "hyperUnique", the <code>type</code> of the post-aggregator determines what
the post-aggregator will return. Use type "fieldAccess" to return the raw aggregation object, or use type
"finalizingFieldAccess" to return a finalized value, such as an estimated cardinality.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<p>or</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"finalizingFieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"finalizingFieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="constant-post-aggregator">Constant post-aggregator</h3>
<p>The constant post-aggregator always returns the specified value.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"constant"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">merical_value></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"constant"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><numerical_value></span> <span class="p">}</span>
</code></pre></div>
<h3 id="greatest-least-post-aggregators">Greatest / Least post-aggregators</h3>
@@ -216,18 +216,18 @@
<p>Example:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleGreatest"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><post_aggregator></span><span class="p">,</span> <span class="err"><post_aggregator></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span>
<span class="p">}</span>
</code></pre></div>
<h3 id="javascript-post-aggregator">JavaScript post-aggregator</h3>
<p>Applies the provided JavaScript function to the given fields. Fields are passed as arguments to the JavaScript function in the given order.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">pos</span><span class="kc">t</span><span class="err">Aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">postAggregation</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
- <span class="nt">"function"</span><span class="p">:</span> <span class="err"><javascrip</span><span class="kc">t</span> <span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><aggregator_name></span><span class="p">,</span> <span class="err"><aggregator_name></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
+ <span class="nt">"function"</span><span class="p">:</span> <span class="err"><javascript</span> <span class="err">function></span>
<span class="p">}</span>
</code></pre></div>
<p>Example JavaScript aggregator:</p>
@@ -247,16 +247,16 @@
<p>The hyperUniqueCardinality post aggregator is used to wrap a hyperUnique object such that it can be used in post aggregations.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUniqueCardinality"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">t</span><span class="err">he</span> <span class="kc">na</span><span class="err">me</span> <span class="kc">f</span><span class="err">ield</span> <span class="err">value</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hyperU</span><span class="kc">n</span><span class="err">ique</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><the</span> <span class="err">name</span> <span class="err">field</span> <span class="err">value</span> <span class="err">of</span> <span class="err">the</span> <span class="err">hyperUnique</span> <span class="err">aggregator></span>
<span class="p">}</span>
</code></pre></div>
<p>It can be used in a sample calculation as so:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"aggregations"</span> <span class="p">:</span> <span class="p">[{</span>
- <span class="p">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"rows"</span><span class="p">},</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"aggregations"</span> <span class="err">:</span> <span class="p">[{</span>
+ <span class="err">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"rows"</span><span class="p">},</span>
<span class="p">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUnique"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"unique_users"</span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="s2">"uniques"</span><span class="p">}</span>
- <span class="p">}],</span>
- <span class="nt">"postAggregations"</span> <span class="p">:</span> <span class="p">[{</span>
+ <span class="err">}</span><span class="p">]</span><span class="err">,</span>
+ <span class="s2">"postAggregations"</span> <span class="err">:</span> <span class="p">[{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arithmetic"</span><span class="p">,</span>
<span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"average_users_per_row"</span><span class="p">,</span>
<span class="nt">"fn"</span> <span class="p">:</span> <span class="s2">"/"</span><span class="p">,</span>
diff --git a/docs/0.14.1-incubating/querying/segmentmetadataquery.html b/docs/0.14.1-incubating/querying/segmentmetadataquery.html
index 2f25672..379a977 100644
--- a/docs/0.14.1-incubating/querying/segmentmetadataquery.html
+++ b/docs/0.14.1-incubating/querying/segmentmetadataquery.html
@@ -263,17 +263,17 @@
<h4 id="all">All</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"all"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"all"</span><span class="p">}</span>
</code></pre></div>
<h4 id="none">None</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
</code></pre></div>
<h4 id="list">List</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"list"</span><span class="p">,</span> <span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">colum</span><span class="kc">n</span> <span class="kc">na</span><span class="err">mes></span><span class="p">]}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"list"</span><span class="p">,</span> <span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="err"><string</span> <span class="err">list</span> <span class="err">of</span> <span class="err">column</span> <span class="err">names></span><span class="p">]}</span>
</code></pre></div>
<h3 id="analysistypes">analysisTypes</h3>
diff --git a/docs/0.14.1-incubating/querying/select-query.html b/docs/0.14.1-incubating/querying/select-query.html
index fa0d157..f709165 100644
--- a/docs/0.14.1-incubating/querying/select-query.html
+++ b/docs/0.14.1-incubating/querying/select-query.html
@@ -341,9 +341,9 @@
<p>The <code>threshold</code> determines how many hits are returned, with each hit indexed by an offset. When <code>descending</code> is true, the offset will be negative value.</p>
<p>The results above include:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"pagingIdentifiers"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"pagingIdentifiers"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"wikipedia_2012-12-29T00:00:00.000Z_2013-01-10T08:00:00.000Z_2013-01-10T08:13:47.830Z_v9"</span> <span class="p">:</span> <span class="mi">4</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<h3 id="result-pagination">Result Pagination</h3>
@@ -352,7 +352,7 @@
<p>The <code>threshold</code> option controls how many rows are returned in each block of paginated results.</p>
<p>To initiate a paginated query, the user should specify a PagingSpec with a <code>threshold</code> set and a blank <code>pagingIdentifiers</code> field, e.g.:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"pagingSpec"</span><span class="p">:{</span><span class="nt">"pagingIdentifiers"</span><span class="p">:</span> <span class="p">{},</span> <span class="nt">"threshold"</span><span class="p">:</span><span class="mi">5</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"pagingSpec"</span><span class="err">:</span><span class="p">{</span><span class="nt">"pagingIdentifiers"</span><span class="p">:</span> <span class="p">{},</span> <span class="nt">"threshold"</span><span class="p">:</span><span class="mi">5</span><span class="p">}</span>
</code></pre></div>
<p>When the query returns, the results will contain a <code>pagingIndentifers</code> field indicating the current pagination point in the result set (an identifier and an offset).</p>
@@ -381,9 +381,9 @@
<span class="p">}</span>
</code></pre></div>
<p>The paginated query with <code>fromNext</code> set to false returns a result set with the following <code>pagingIdentifiers</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"pagingIdentifiers"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"pagingIdentifiers"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"wikipedia_2012-12-29T00:00:00.000Z_2013-01-10T08:00:00.000Z_2013-01-10T08:13:47.830Z_v9"</span> <span class="p">:</span> <span class="mi">4</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<p>To retrieve the next result set, the next query must be sent with the paging offset (4) incremented by 1.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="p">{</span>
diff --git a/docs/0.14.1-incubating/querying/sql.html b/docs/0.14.1-incubating/querying/sql.html
index 6d68b4f..f0884cc 100644
--- a/docs/0.14.1-incubating/querying/sql.html
+++ b/docs/0.14.1-incubating/querying/sql.html
@@ -975,22 +975,22 @@
<p>Example code:</p>
<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="c1">// Connect to /druid/v2/sql/avatica/ on your Broker.</span>
-<span class="n">String</span> <span class="n">url</span> <span class="o">=</span> <span class="s">"jdbc:avatica:remote:url=http://localhost:8082/druid/v2/sql/avatica/"</span><span class="p">;</span>
+<span class="n">String</span> <span class="n">url</span> <span class="o">=</span> <span class="s">"jdbc:avatica:remote:url=http://localhost:8082/druid/v2/sql/avatica/"</span><span class="o">;</span>
<span class="c1">// Set any connection context parameters you need here (see "Connection context" below).</span>
<span class="c1">// Or leave empty for default behavior.</span>
-<span class="n">Properties</span> <span class="n">connectionProperties</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="p">();</span>
+<span class="n">Properties</span> <span class="n">connectionProperties</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">();</span>
-<span class="k">try</span> <span class="p">(</span><span class="n">Connection</span> <span class="n">connection</span> <span class="o">=</span> <span class="n">DriverManager</span><span class="p">.</span><span class="na">getConnection</span><span class="p">(</span><span class="n">url</span><span class="p">,</span> <span class="n">connectionProperties</span><span class="p">))</span> <span class="p">{</span>
- <span class="k">try</span> <span class="p">(</span>
- <span class="kd">final</span> <span class="n">Statement</span> <span class="n">statement</span> <span class="o">=</span> <span class="n">connection</span><span class="p">.</span><span class="na">createStatement</span><span class="p">();</span>
- <span class="kd">final</span> <span class="n">ResultSet</span> <span class="n">resultSet</span> <span class="o">=</span> <span class="n">statement</span><span class="p">.</span><span class="na">executeQuery</span><span class="p">(</span><span class="n">query</span><span class="p">)</span>
- <span class="p">)</span> <span class="p">{</span>
- <span class="k">while</span> <span class="p">(</span><span class="n">resultSet</span><span class="p">.</span><span class="na">next</span><span class="p">())</span> <span class="p">{</span>
+<span class="k">try</span> <span class="o">(</span><span class="n">Connection</span> <span class="n">connection</span> <span class="o">=</span> <span class="n">DriverManager</span><span class="o">.</span><span class="na">getConnection</span><span class="o">(</span><span class="n">url</span><span class="o">,</span> <span class="n">connectionProperties</span><span class="o">))</span> <span class="o">{</span>
+ <span class="k">try</span> <span class="o">(</span>
+ <span class="kd">final</span> <span class="n">Statement</span> <span class="n">statement</span> <span class="o">=</span> <span class="n">connection</span><span class="o">.</span><span class="na">createStatement</span><span class="o">();</span>
+ <span class="kd">final</span> <span class="n">ResultSet</span> <span class="n">resultSet</span> <span class="o">=</span> <span class="n">statement</span><span class="o">.</span><span class="na">executeQuery</span><span class="o">(</span><span class="n">query</span><span class="o">)</span>
+ <span class="o">)</span> <span class="o">{</span>
+ <span class="k">while</span> <span class="o">(</span><span class="n">resultSet</span><span class="o">.</span><span class="na">next</span><span class="o">())</span> <span class="o">{</span>
<span class="c1">// Do something</span>
- <span class="p">}</span>
- <span class="p">}</span>
-<span class="p">}</span>
+ <span class="o">}</span>
+ <span class="o">}</span>
+<span class="o">}</span>
</code></pre></div>
<p>Table metadata is available over JDBC using <code>connection.getMetaData()</code> or by querying the
<a href="#retrieving-metadata">"INFORMATION_SCHEMA" tables</a>. Parameterized queries (using <code>?</code> or other placeholders) don't work properly,
diff --git a/docs/0.14.1-incubating/querying/timeboundaryquery.html b/docs/0.14.1-incubating/querying/timeboundaryquery.html
index dfb265c..993b728 100644
--- a/docs/0.14.1-incubating/querying/timeboundaryquery.html
+++ b/docs/0.14.1-incubating/querying/timeboundaryquery.html
@@ -154,8 +154,8 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"queryType"</span> <span class="p">:</span> <span class="s2">"timeBoundary"</span><span class="p">,</span>
<span class="nt">"dataSource"</span><span class="p">:</span> <span class="s2">"sample_datasource"</span><span class="p">,</span>
- <span class="nt">"bound"</span> <span class="p">:</span> <span class="err"><</span> <span class="s2">"maxTime"</span> <span class="err">|</span> <span class="s2">"minTime"</span> <span class="err">></span> <span class="err">#</span> <span class="err">op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="err">re</span><span class="kc">turn</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">bo</span><span class="kc">t</span><span class="err">h</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mps</span> <span class="err">i</span><span class="kc">f</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="err">se</span><span class="kc">t</span>
- <span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span> <span class="err">#</span> <span class="err">op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span>
+ <span class="nt">"bound"</span> <span class="p">:</span> <span class="err"><</span> <span class="s2">"maxTime"</span> <span class="err">|</span> <span class="s2">"minTime"</span> <span class="err">></span> <span class="err">#</span> <span class="err">optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">returning</span> <span class="err">both</span> <span class="err">timestamps</span> <span class="err">if</span> <span class="err">not</span> <span class="err">set</span>
+ <span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span> <span class="err">#</span> <span class="err">optional</span>
<span class="p">}</span>
</code></pre></div>
<p>There are 3 main parts to a time boundary query:</p>
diff --git a/docs/0.14.1-incubating/querying/topnmetricspec.html b/docs/0.14.1-incubating/querying/topnmetricspec.html
index b22c4a7..037f01f 100644
--- a/docs/0.14.1-incubating/querying/topnmetricspec.html
+++ b/docs/0.14.1-incubating/querying/topnmetricspec.html
@@ -155,10 +155,10 @@
<h2 id="numeric-topnmetricspec">Numeric TopNMetricSpec</h2>
<p>The simplest metric specification is a String value indicating the metric to sort topN results by. They are included in a topN query with:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="s2">"<metric_name>"</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="s2">"<metric_name>"</span>
</code></pre></div>
<p>The metric field can also be given as a JSON object. The grammar for dimension values sorted by numeric value is shown below:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"numeric"</span><span class="p">,</span>
<span class="nt">"metric"</span><span class="p">:</span> <span class="s2">"<metric_name>"</span>
<span class="p">}</span>
@@ -215,7 +215,7 @@
</tbody></table>
<p>The following metricSpec uses lexicographic sorting.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimension"</span><span class="p">,</span>
<span class="nt">"ordering"</span><span class="p">:</span> <span class="s2">"lexicographic"</span><span class="p">,</span>
<span class="nt">"previousStop"</span><span class="p">:</span> <span class="s2">"<previousStop_value>"</span>
@@ -226,9 +226,9 @@
<h2 id="inverted-topnmetricspec">Inverted TopNMetricSpec</h2>
<p>Sort dimension values in inverted order, i.e inverts the order of the delegate metric spec. It can be used to sort the values in ascending order.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"inverted"</span><span class="p">,</span>
- <span class="nt">"metric"</span><span class="p">:</span> <span class="err"><delega</span><span class="kc">te</span><span class="err">_</span><span class="kc">t</span><span class="err">op_</span><span class="kc">n</span><span class="err">_me</span><span class="kc">tr</span><span class="err">ic_spec></span>
+ <span class="nt">"metric"</span><span class="p">:</span> <span class="err"><delegate_top_n_metric_spec></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.14.1-incubating/tutorials/tutorial-compaction.html b/docs/0.14.1-incubating/tutorials/tutorial-compaction.html
index 0f316f2..1bd8382 100644
--- a/docs/0.14.1-incubating/tutorials/tutorial-compaction.html
+++ b/docs/0.14.1-incubating/tutorials/tutorial-compaction.html
@@ -189,7 +189,7 @@
├────────┤
│ <span class="m">39244</span> │
└────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">1</span>.38s.
+Retrieved <span class="m">1</span> row in <span class="m">1</span>.38s.
</code></pre></div>
<h2 id="compact-the-data">Compact the data</h2>
@@ -236,7 +236,7 @@
├────────┤
│ <span class="m">39244</span> │
└────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">1</span>.30s.
+Retrieved <span class="m">1</span> row in <span class="m">1</span>.30s.
</code></pre></div>
<p>After the Coordinator has been running for at least 15 minutes, the <a href="http://localhost:8888/unified-console.html#segments">segments view</a> should show there are 24 segments, one per hour:</p>
diff --git a/docs/0.14.1-incubating/tutorials/tutorial-ingestion-spec.html b/docs/0.14.1-incubating/tutorials/tutorial-ingestion-spec.html
index c6876ab..e3d5c3b 100644
--- a/docs/0.14.1-incubating/tutorials/tutorial-ingestion-spec.html
+++ b/docs/0.14.1-incubating/tutorials/tutorial-ingestion-spec.html
@@ -194,14 +194,14 @@
<p>Let's start with an empty <code>dataSchema</code> and add fields to it as we progress through the tutorial.</p>
<p>Create a new file called <code>ingestion-tutorial-index.json</code> in <code>quickstart/</code> with the following contents:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{}</span>
</code></pre></div>
<p>We will be making successive edits to this ingestion spec as we progress through the tutorial.</p>
<h3 id="datasource-name">Datasource name</h3>
<p>The datasource name is specified by the <code>dataSource</code> parameter in the <code>dataSchema</code>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
@@ -212,7 +212,7 @@
<p>A <code>dataSchema</code> has a <code>parser</code> field, which defines the parser that Druid will use to interpret the input data.</p>
<p>Since our input data is represented as JSON strings, we'll use a <code>string</code> parser with <code>json</code> format:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -227,7 +227,7 @@
<p>The <code>parser</code> needs to know how to extract the main timestamp field from the input data. When using a <code>json</code> type <code>parseSpec</code>, the timestamp is defined in a <code>timestampSpec</code>. </p>
<p>The timestamp column in our input data is named "ts", containing ISO 8601 timestamps, so let's add a <code>timestampSpec</code> with that information to the <code>parseSpec</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -261,7 +261,7 @@
<p>For this tutorial, let's enable rollup. This is specified with a <code>granularitySpec</code> on the <code>dataSchema</code>. </p>
<p>Note that the <code>granularitySpec</code> lies outside of the <code>parser</code>. We will revist the <code>parser</code> soon when we define our dimensions and metrics.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -294,7 +294,7 @@
<h4 id="dimensions">Dimensions</h4>
<p>Dimensions are specified with a <code>dimensionsSpec</code> inside the <code>parseSpec</code>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -337,7 +337,7 @@
<h4 id="metrics">Metrics</h4>
<p>Metrics are specified with a <code>metricsSpec</code> inside the <code>dataSchema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -380,7 +380,7 @@
<h3 id="no-rollup">No rollup</h3>
<p>If we were not using rollup, all columns would be specified in the <code>dimensionsSpec</code>, e.g.:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"dimensionsSpec"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span>
<span class="s2">"srcIP"</span><span class="p">,</span>
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"srcPort"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"long"</span> <span class="p">},</span>
@@ -391,7 +391,7 @@
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"bytes"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"long"</span> <span class="p">},</span>
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"srcPort"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"double"</span> <span class="p">}</span>
<span class="p">]</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<h3 id="define-granularities">Define granularities</h3>
@@ -405,7 +405,7 @@
<h4 id="segment-granularity">Segment granularity</h4>
<p>Segment granularity is configured by the <code>segmentGranularity</code> property in the <code>granularitySpec</code>. For this tutorial, we'll create hourly segments:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -444,7 +444,7 @@
<h4 id="query-granularity">Query granularity</h4>
<p>The query granularity is configured by the <code>queryGranularity</code> property in the <code>granularitySpec</code>. For this tutorial, let's use minute granularity:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -474,8 +474,8 @@
<span class="nt">"granularitySpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"uniform"</span><span class="p">,</span>
<span class="nt">"segmentGranularity"</span> <span class="p">:</span> <span class="s2">"HOUR"</span><span class="p">,</span>
- <span class="nt">"queryGranularity"</span> <span class="p">:</span> <span class="nt">"MINUTE"</span>
- <span class="nt">"rollup"</span> <span class="p">:</span> <span class="kc">true</span>
+ <span class="nt">"queryGranularity"</span> <span class="p">:</span> <span class="s2">"MINUTE"</span>
+ <span class="s2">"rollup"</span> <span class="p">:</span> <span class="kc">true</span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -490,7 +490,7 @@
<p>For batch tasks, it is necessary to define a time interval. Input rows with timestamps outside of the time interval will not be ingested.</p>
<p>The interval is also specified in the <code>granularitySpec</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -575,7 +575,7 @@
<h2 id="define-the-input-source">Define the input source</h2>
<p>Now let's define our input source, which is specified in an <code>ioConfig</code> object. Each task type has its own type of <code>ioConfig</code>. The native batch task uses "firehoses" to read input data, so let's configure a "local" firehose to read the example netflow data we saved earlier:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"index"</span><span class="p">,</span>
<span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"local"</span><span class="p">,</span>
@@ -637,7 +637,7 @@
<p>Each ingestion task has a <code>tuningConfig</code> section that allows users to tune various ingestion parameters.</p>
<p>As an example, let's add a <code>tuningConfig</code> that sets a target segment size for the native batch ingestion task:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"tuningConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"tuningConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"index"</span><span class="p">,</span>
<span class="nt">"maxRowsPerSegment"</span> <span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
@@ -722,7 +722,7 @@
│ <span class="m">2018</span>-01-01T02:33:00.000Z │ <span class="m">30000</span> │ <span class="m">56</span>.9 │ <span class="m">2</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">5000</span> │ <span class="m">300</span> │ <span class="m">17</span> │ <span class="m">7</span>.7.7.7 │ <span class="m">4000</span> │
│ <span class="m">2018</span>-01-01T02:35:00.000Z │ <span class="m">30000</span> │ <span class="m">46</span>.3 │ <span class="m">1</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">5000</span> │ <span class="m">300</span> │ <span class="m">17</span> │ <span class="m">7</span>.7.7.7 │ <span class="m">4000</span> │
└──────────────────────────┴───────┴──────┴───────┴─────────┴─────────┴─────────┴──────────┴─────────┴─────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">0</span>.12s.
+Retrieved <span class="m">5</span> rows in <span class="m">0</span>.12s.
dsql>
</code></pre></div>
diff --git a/docs/0.14.1-incubating/tutorials/tutorial-query.html b/docs/0.14.1-incubating/tutorials/tutorial-query.html
index db75509..12a8792 100644
--- a/docs/0.14.1-incubating/tutorials/tutorial-query.html
+++ b/docs/0.14.1-incubating/tutorials/tutorial-query.html
@@ -302,7 +302,7 @@
│ Wikipedia:In the news/Candidates │ <span class="m">17</span> │
│ Wikipedia:Requests <span class="k">for</span> page protection │ <span class="m">17</span> │
└──────────────────────────────────────────────────────────┴───────┘
-Retrieved <span class="m">10</span> rows <span class="k">in</span> <span class="m">0</span>.06s.
+Retrieved <span class="m">10</span> rows in <span class="m">0</span>.06s.
</code></pre></div>
<h3 id="additional-druid-sql-queries">Additional Druid SQL queries</h3>
@@ -338,7 +338,7 @@
│ <span class="m">2015</span>-09-12T22:00:00.000Z │ <span class="m">16379</span> │
│ <span class="m">2015</span>-09-12T23:00:00.000Z │ <span class="m">15289</span> │
└──────────────────────────┴──────────────┘
-Retrieved <span class="m">24</span> rows <span class="k">in</span> <span class="m">0</span>.08s.
+Retrieved <span class="m">24</span> rows in <span class="m">0</span>.08s.
</code></pre></div>
<h4 id="groupby">GroupBy</h4>
@@ -353,7 +353,7 @@
│ <span class="c1">#ru.wikipedia │ 640698 │</span>
│ <span class="c1">#es.wikipedia │ 634670 │</span>
└───────────────┴─────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">0</span>.05s.
+Retrieved <span class="m">5</span> rows in <span class="m">0</span>.05s.
</code></pre></div>
<h4 id="scan">Scan</h4>
@@ -368,7 +368,7 @@
│ Lowercase sigmabot III │ User talk:ErrantX │
│ BattyBot │ Hans W. Jung │
└────────────────────────┴────────────────────────────────────────────────────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">0</span>.04s.
+Retrieved <span class="m">5</span> rows in <span class="m">0</span>.04s.
</code></pre></div>
<h4 id="explain-plan-for">EXPLAIN PLAN FOR</h4>
@@ -383,7 +383,7 @@
├─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ DruidQueryRel<span class="o">(</span><span class="nv">query</span><span class="o">=[{</span><span class="s2">"queryType"</span>:<span class="s2">"topN"</span>,<span class="s2">"dataSource"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"table"</span>,<span class="s2">"name"</span>:<span class="s2">"wikipedia"</span><span class="o">}</span>,<span class="s2">"virtualColumns"</span>:<span class="o">[]</span>,<span class="s2">"dimension"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"default"</span>,<span class="s2">"dimension"</span>:<span class="s2">"page"</span>,<span class="s2">"outputName"</span>:<span class="s2">"d0"</span>,<span class="s2">"outputType"</span>:<span class="s2">"STRING"</span><span class="o">}</span>,<span class="s2">"metric"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"numeric"</span>,<span class="s2">"metric"</span>:<span class="s2">"a0"</span><span class="o">}</span>,<span class="s2">"threshold"</span>:10,<span class="s2">"intervals"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"intervals"</span>,<span class="s2">"intervals"</span>:<span class="o">[</span><span class="s2">"2015-09-12T00:00:00.000Z/2015-09-13T00:00:00.001Z"</span><span class="o">]}</span>,<span class="s2">"filter"</span>:null,<span class="s2">"granularity"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"all"</span><span class="o">}</span>,<span class="s2">"aggregations"</span>:<span class="o">[{</span><span class="s2">"type"</span>:<span class="s2">"count"</span>,<span class="s2">"name"</span>:<span class="s2">"a0"</span><span class="o">}]</span>,<span class="s2">"postAggregations"</span>:<span class="o">[]</span>,<span class="s2">"context"</span>:<span class="o">{}</span>,<span class="s2">"descending"</span>:false<span class="o">}]</span>, <span class="nv">signature</span><span class="o">=[{</span>d0:STRING, a0:LONG<span class="o">}])</span> │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">0</span>.03s.
+Retrieved <span class="m">1</span> row in <span class="m">0</span>.03s.
</code></pre></div>
<h2 id="further-reading">Further reading</h2>
diff --git a/docs/0.14.1-incubating/tutorials/tutorial-rollup.html b/docs/0.14.1-incubating/tutorials/tutorial-rollup.html
index 9c056eb..ce1abb5 100644
--- a/docs/0.14.1-incubating/tutorials/tutorial-rollup.html
+++ b/docs/0.14.1-incubating/tutorials/tutorial-rollup.html
@@ -256,7 +256,7 @@
│ <span class="m">2018</span>-01-02T21:33:00.000Z │ <span class="m">100288</span> │ <span class="m">2</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">161</span> │ <span class="m">7</span>.7.7.7 │
│ <span class="m">2018</span>-01-02T21:35:00.000Z │ <span class="m">2818</span> │ <span class="m">1</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">12</span> │ <span class="m">7</span>.7.7.7 │
└──────────────────────────┴────────┴───────┴─────────┴─────────┴─────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">1</span>.18s.
+Retrieved <span class="m">5</span> rows in <span class="m">1</span>.18s.
dsql>
</code></pre></div>
diff --git a/docs/0.14.1-incubating/tutorials/tutorial-transform-spec.html b/docs/0.14.1-incubating/tutorials/tutorial-transform-spec.html
index 43cfc10..4d8c194 100644
--- a/docs/0.14.1-incubating/tutorials/tutorial-transform-spec.html
+++ b/docs/0.14.1-incubating/tutorials/tutorial-transform-spec.html
@@ -267,7 +267,7 @@
│ <span class="m">2018</span>-01-01T06:01:00.000Z │ super-snake │ <span class="m">1</span> │ <span class="m">3</span> │ <span class="m">300</span> │ <span class="m">900</span> │
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ super-octopus │ <span class="m">1</span> │ <span class="m">1</span> │ <span class="m">100</span> │ <span class="m">300</span> │
└──────────────────────────┴────────────────┴───────┴──────────┴────────┴───────────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">0</span>.03s.
+Retrieved <span class="m">3</span> rows in <span class="m">0</span>.03s.
</code></pre></div>
<p>The "lion" row has been discarded, the <code>animal</code> column has been transformed, and we have both the original and transformed <code>number</code> column.</p>
diff --git a/docs/0.14.1-incubating/tutorials/tutorial-update-data.html b/docs/0.14.1-incubating/tutorials/tutorial-update-data.html
index b18d373..b32ef24 100644
--- a/docs/0.14.1-incubating/tutorials/tutorial-update-data.html
+++ b/docs/0.14.1-incubating/tutorials/tutorial-update-data.html
@@ -179,7 +179,7 @@
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ aardvark │ <span class="m">1</span> │ <span class="m">42</span> │
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ giraffe │ <span class="m">1</span> │ <span class="m">14124</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">1</span>.42s.
+Retrieved <span class="m">3</span> rows in <span class="m">1</span>.42s.
</code></pre></div>
<h3 id="overwrite-the-initial-data">Overwrite the initial data</h3>
@@ -201,7 +201,7 @@
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ aardvark │ <span class="m">1</span> │ <span class="m">9999</span> │
│ <span class="m">2018</span>-01-01T04:01:00.000Z │ bear │ <span class="m">1</span> │ <span class="m">111</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">3</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<h2 id="combine-old-data-with-new-data-and-overwrite">Combine old data with new data and overwrite</h2>
@@ -224,7 +224,7 @@
│ <span class="m">2018</span>-01-01T06:01:00.000Z │ snake │ <span class="m">1</span> │ <span class="m">1234</span> │
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ octopus │ <span class="m">1</span> │ <span class="m">115</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">6</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">6</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<h2 id="append-to-the-data">Append to the data</h2>
@@ -249,7 +249,7 @@
│ <span class="m">2018</span>-01-01T04:01:00.000Z │ bear │ <span class="m">1</span> │ <span class="m">222</span> │
│ <span class="m">2018</span>-01-01T09:01:00.000Z │ falcon │ <span class="m">1</span> │ <span class="m">1241</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">8</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">8</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<p>If we run a GroupBy query instead of a <code>select *</code>, we can see that the "bear" rows will group together at query time:</p>
<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span></span>dsql> <span class="k">select</span> __time, animal, SUM<span class="o">(</span><span class="s2">"count"</span><span class="o">)</span>, SUM<span class="o">(</span><span class="s2">"number"</span><span class="o">)</span> from <span class="s2">"updates-tutorial"</span> group by __time, animal<span class="p">;</span>
@@ -264,7 +264,7 @@
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ octopus │ <span class="m">1</span> │ <span class="m">115</span> │
│ <span class="m">2018</span>-01-01T09:01:00.000Z │ falcon │ <span class="m">1</span> │ <span class="m">1241</span> │
└──────────────────────────┴──────────┴────────┴────────┘
-Retrieved <span class="m">7</span> rows <span class="k">in</span> <span class="m">0</span>.23s.
+Retrieved <span class="m">7</span> rows in <span class="m">0</span>.23s.
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.14.2-incubating/dependencies/metadata-storage.html b/docs/0.14.2-incubating/dependencies/metadata-storage.html
index 499d3f9..b744c2b 100644
--- a/docs/0.14.2-incubating/dependencies/metadata-storage.html
+++ b/docs/0.14.2-incubating/dependencies/metadata-storage.html
@@ -218,7 +218,7 @@
<span class="nt">"metrics"</span><span class="p">:</span><span class="s2">"comma-delimited-list-of-metric-names"</span><span class="p">,</span>
<span class="nt">"shardSpec"</span><span class="p">:{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"none"</span><span class="p">},</span>
<span class="nt">"binaryVersion"</span><span class="p">:</span><span class="mi">9</span><span class="p">,</span>
- <span class="nt">"size"</span><span class="p">:</span><span class="err">size_o</span><span class="kc">f</span><span class="err">_segme</span><span class="kc">nt</span><span class="p">,</span>
+ <span class="nt">"size"</span><span class="p">:</span><span class="err">size_of_segment</span><span class="p">,</span>
<span class="nt">"identifier"</span><span class="p">:</span><span class="s2">"wikipedia_2012-05-23T00:00:00.000Z_2012-05-24T00:00:00.000Z_2012-05-23T00:10:00.046Z"</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.14.2-incubating/design/auth.html b/docs/0.14.2-incubating/design/auth.html
index 1cc3dd1..6a7f69f 100644
--- a/docs/0.14.2-incubating/design/auth.html
+++ b/docs/0.14.2-incubating/design/auth.html
@@ -315,11 +315,11 @@
<p>An Authenticator implementation that is intended to support internal Druid communications must recognize credentials for the "internal system user", as provided by a corresponding Escalator implementation.</p>
<p>An Escalator must implement three methods related to the internal system user:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="kd">public</span> <span class="n">HttpClient</span> <span class="nf">createEscalatedClient</span><span class="p">(</span><span class="n">HttpClient</span> <span class="n">baseClient</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="kd">public</span> <span class="n">HttpClient</span> <span class="nf">createEscalatedClient</span><span class="o">(</span><span class="n">HttpClient</span> <span class="n">baseClient</span><span class="o">);</span>
- <span class="kd">public</span> <span class="n">org</span><span class="p">.</span><span class="na">eclipse</span><span class="p">.</span><span class="na">jetty</span><span class="p">.</span><span class="na">client</span><span class="p">.</span><span class="na">HttpClient</span> <span class="nf">createEscalatedJettyClient</span><span class="p">(</span><span class="n">org</span><span class="p">.</span><span class="na">eclipse</span><span class="p">.</span><span class="na">jetty</span><span class="p">.</span><span class="na">client</span><span class="p">.</span><span class="na">HttpClient</span> <span class="n">baseClient</span><span class="p">);</span>
+ <span class="kd">public</span> <span class="n">org</span><span class="o">.</span><span class="na">eclipse</span><span class="o">.</span><span class="na">jetty</span><span class="o">.</span><span class="na">client</span><span class="o">.</span><span class="na">HttpClient</span> <span class="nf">createEscalatedJettyClient</span><span class="o">(</span><span class="n">org</span><span class="o">.</span><span class="na">eclipse</span><span class="o">.</span><span class="na">jetty</span><span class="o">.</span><span class="na">client</span><span class="o">.</span><span class="na">HttpClient</span> <span class="n">baseClient</span><span class="o">);</span>
- <span class="kd">public</span> <span class="n">AuthenticationResult</span> <span class="nf">createEscalatedAuthenticationResult</span><span class="p">();</span>
+ <span class="kd">public</span> <span class="n">AuthenticationResult</span> <span class="nf">createEscalatedAuthenticationResult</span><span class="o">();</span>
</code></pre></div>
<p><code>createEscalatedClient</code> returns an wrapped HttpClient that attaches the credentials of the "internal system user" to requests.</p>
diff --git a/docs/0.14.2-incubating/development/extensions-contrib/ambari-metrics-emitter.html b/docs/0.14.2-incubating/development/extensions-contrib/ambari-metrics-emitter.html
index df82b20..4dddb47 100644
--- a/docs/0.14.2-incubating/development/extensions-contrib/ambari-metrics-emitter.html
+++ b/docs/0.14.2-incubating/development/extensions-contrib/ambari-metrics-emitter.html
@@ -274,7 +274,7 @@
<p>The first implementation called <code>all</code>, will send all the druid service metrics events.
The path will be in the form <code><namespacePrefix>.[<druid service name>].[<druid hostname>].<dimensions values ordered by dimension's name>.<metric></code>
User has control of <code><namespacePrefix>.[<druid service name>].[<druid hostname>].</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.ambari</span><span class="mi">-</span><span class="err">me</span><span class="kc">tr</span><span class="err">ics.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.ambari-metrics.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">}</span>
</code></pre></div>
<h4 id="white-list-based-converter">White-list based converter</h4>
@@ -285,7 +285,7 @@
<p>Although user can override the default white list map by supplying a property called <code>mapPath</code>.
This property is a String containing the path for the file containing <strong>white list map Json object</strong>.
For example the following converter will read the map from the file <code>/pathPrefix/fileName.json</code>. </p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.ambari</span><span class="mi">-</span><span class="err">me</span><span class="kc">tr</span><span class="err">ics.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.ambari-metrics.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
</code></pre></div>
<p><strong>Druid emits a huge number of metrics we highly recommend to use the <code>whiteList</code> converter</strong></p>
diff --git a/docs/0.14.2-incubating/development/extensions-contrib/azure.html b/docs/0.14.2-incubating/development/extensions-contrib/azure.html
index 66a4c15..ea6c5f8 100644
--- a/docs/0.14.2-incubating/development/extensions-contrib/azure.html
+++ b/docs/0.14.2-incubating/development/extensions-contrib/azure.html
@@ -220,7 +220,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-azure-blobstore"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
diff --git a/docs/0.14.2-incubating/development/extensions-contrib/cloudfiles.html b/docs/0.14.2-incubating/development/extensions-contrib/cloudfiles.html
index b75c398..894be4f 100644
--- a/docs/0.14.2-incubating/development/extensions-contrib/cloudfiles.html
+++ b/docs/0.14.2-incubating/development/extensions-contrib/cloudfiles.html
@@ -236,17 +236,17 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-cloudfiles"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
- <span class="nt">"region"</span><span class="p">:</span> <span class="nt">"DFW"</span>
- <span class="nt">"container"</span><span class="p">:</span> <span class="s2">"container"</span><span class="p">,</span>
+ <span class="nt">"region"</span><span class="p">:</span> <span class="s2">"DFW"</span>
+ <span class="s2">"container"</span><span class="p">:</span> <span class="s2">"container"</span><span class="p">,</span>
<span class="nt">"path"</span><span class="p">:</span> <span class="s2">"/path/to/your/file.json"</span>
<span class="p">},</span>
<span class="p">{</span>
- <span class="nt">"region"</span><span class="p">:</span> <span class="nt">"ORD"</span>
- <span class="nt">"container"</span><span class="p">:</span> <span class="s2">"anothercontainer"</span><span class="p">,</span>
+ <span class="nt">"region"</span><span class="p">:</span> <span class="s2">"ORD"</span>
+ <span class="s2">"container"</span><span class="p">:</span> <span class="s2">"anothercontainer"</span><span class="p">,</span>
<span class="nt">"path"</span><span class="p">:</span> <span class="s2">"/another/path.json"</span>
<span class="p">}</span>
<span class="p">]</span>
diff --git a/docs/0.14.2-incubating/development/extensions-contrib/google.html b/docs/0.14.2-incubating/development/extensions-contrib/google.html
index e64054e..1bd5a25 100644
--- a/docs/0.14.2-incubating/development/extensions-contrib/google.html
+++ b/docs/0.14.2-incubating/development/extensions-contrib/google.html
@@ -198,7 +198,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-google-blobstore"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
diff --git a/docs/0.14.2-incubating/development/extensions-contrib/graphite.html b/docs/0.14.2-incubating/development/extensions-contrib/graphite.html
index e04300a..a0be107 100644
--- a/docs/0.14.2-incubating/development/extensions-contrib/graphite.html
+++ b/docs/0.14.2-incubating/development/extensions-contrib/graphite.html
@@ -281,7 +281,7 @@
<p>Elements in metric name by default are separated by "/", so graphite will create all metrics on one level. If you want to have metrics in the tree structure, you have to set <code>replaceSlashWithDot=true</code>
Original: <code>druid.HOSTNAME.dataSourceName.queryType.query/time</code>
Changed: <code>druid.HOSTNAME.dataSourceName.queryType.query.time</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.graphi</span><span class="kc">te</span><span class="err">.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.graphite.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">}</span>
</code></pre></div>
<h4 id="white-list-based-converter">White-list based converter</h4>
@@ -292,7 +292,7 @@
<p>Although user can override the default white list map by supplying a property called <code>mapPath</code>.
This property is a String containing the path for the file containing <strong>white list map Json object</strong>.
For example the following converter will read the map from the file <code>/pathPrefix/fileName.json</code>. </p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.graphi</span><span class="kc">te</span><span class="err">.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.graphite.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
</code></pre></div>
<p><strong>Druid emits a huge number of metrics we highly recommend to use the <code>whiteList</code> converter</strong></p>
diff --git a/docs/0.14.2-incubating/development/extensions-contrib/kafka-simple.html b/docs/0.14.2-incubating/development/extensions-contrib/kafka-simple.html
index d9dd9c3..a02711f 100644
--- a/docs/0.14.2-incubating/development/extensions-contrib/kafka-simple.html
+++ b/docs/0.14.2-incubating/development/extensions-contrib/kafka-simple.html
@@ -156,7 +156,7 @@
<p>This is an experimental firehose to ingest data from Apache Kafka using the Kafka simple consumer api. Currently, this firehose would only work inside standalone realtime processes.
The configuration for KafkaSimpleConsumerFirehose is similar to the Kafka Eight Firehose , except <code>firehose</code> should be replaced with <code>firehoseV2</code> like this:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehoseV2"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehoseV2"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"kafka-0.8-v2"</span><span class="p">,</span>
<span class="nt">"brokerList"</span> <span class="p">:</span> <span class="p">[</span><span class="s2">"localhost:4443"</span><span class="p">],</span>
<span class="nt">"queueBufferLength"</span><span class="p">:</span><span class="mi">10001</span><span class="p">,</span>
diff --git a/docs/0.14.2-incubating/development/extensions-contrib/opentsdb-emitter.html b/docs/0.14.2-incubating/development/extensions-contrib/opentsdb-emitter.html
index 115f920..aade213 100644
--- a/docs/0.14.2-incubating/development/extensions-contrib/opentsdb-emitter.html
+++ b/docs/0.14.2-incubating/development/extensions-contrib/opentsdb-emitter.html
@@ -224,7 +224,7 @@
If the user does not specify their own JSON file, a default file is used. All metrics are expected to be configured in the JSON file. Metrics which are not configured will be logged.
Desired metrics and dimensions is organized using the following schema:<code><druid metric name> : [ <dimension list> ]</code><br />
e.g.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"query/time"</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"query/time"</span><span class="err">:</span> <span class="p">[</span>
<span class="s2">"dataSource"</span><span class="p">,</span>
<span class="s2">"type"</span>
<span class="p">]</span>
diff --git a/docs/0.14.2-incubating/development/extensions-contrib/rabbitmq.html b/docs/0.14.2-incubating/development/extensions-contrib/rabbitmq.html
index 143ff3b..20122f6 100644
--- a/docs/0.14.2-incubating/development/extensions-contrib/rabbitmq.html
+++ b/docs/0.14.2-incubating/development/extensions-contrib/rabbitmq.html
@@ -161,7 +161,7 @@
<p><strong>Note:</strong> Add <strong>amqp-client-3.2.1.jar</strong> to lib directory of druid to use this firehose.</p>
<p>A sample spec for rabbitmq firehose:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"rabbitmq"</span><span class="p">,</span>
<span class="nt">"connection"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"host"</span><span class="p">:</span> <span class="s2">"localhost"</span><span class="p">,</span>
diff --git a/docs/0.14.2-incubating/development/extensions-core/approximate-histograms.html b/docs/0.14.2-incubating/development/extensions-core/approximate-histograms.html
index 0cbaa2c..0dbd56f 100644
--- a/docs/0.14.2-incubating/development/extensions-core/approximate-histograms.html
+++ b/docs/0.14.2-incubating/development/extensions-core/approximate-histograms.html
@@ -211,12 +211,12 @@
query.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"approxHistogram or approxHistogramFold (at ingestion time), approxHistogramFold (at query time)"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"resolution"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
- <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
- <span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fl</span><span class="err">oa</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fl</span><span class="err">oa</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"resolution"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
+ <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
+ <span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><float></span><span class="p">,</span>
+ <span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><float></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -304,9 +304,9 @@
<p>An example aggregator spec is shown below:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fixedBucketsHistogram"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
<span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><double></span><span class="p">,</span>
<span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><double></span><span class="p">,</span>
<span class="nt">"outlierHandlingMode"</span><span class="p">:</span> <span class="err"><mode></span>
@@ -417,7 +417,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalBuckets"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"numBuckets"</span><span class="p">:</span> <span class="err"><cou</span><span class="kc">nt</span><span class="err">></span>
+ <span class="nt">"numBuckets"</span><span class="p">:</span> <span class="err"><count></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="buckets-post-aggregator">Buckets post-aggregator</h3>
@@ -433,8 +433,8 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"buckets"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"bucketSize"</span><span class="p">:</span> <span class="err"><bucke</span><span class="kc">t</span><span class="err">_size></span><span class="p">,</span>
- <span class="nt">"offset"</span><span class="p">:</span> <span class="err"><o</span><span class="kc">ffset</span><span class="err">></span>
+ <span class="nt">"bucketSize"</span><span class="p">:</span> <span class="err"><bucket_size></span><span class="p">,</span>
+ <span class="nt">"offset"</span><span class="p">:</span> <span class="err"><offset></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="custom-buckets-post-aggregator">Custom buckets post-aggregator</h3>
@@ -442,30 +442,30 @@
<p>Computes a visual representation of the approximate histogram with bins laid out according to the given breaks.</p>
<p>This aggregator is not supported for the fixed buckets histogram.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"customBuckets"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"customBuckets"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
<span class="nt">"breaks"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><value></span><span class="p">,</span> <span class="err"><value></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<h3 id="min-post-aggregator">min post-aggregator</h3>
<p>Returns the minimum value of the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"min"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"min"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="max-post-aggregator">max post-aggregator</h3>
<p>Returns the maximum value of the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"max"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"max"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="quantile-post-aggregator">quantile post-aggregator</h4>
<p>Computes a single quantile based on the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantile"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"probability"</span> <span class="p">:</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantile"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
+ <span class="nt">"probability"</span> <span class="p">:</span> <span class="err"><quantile></span> <span class="p">}</span>
</code></pre></div>
<h4 id="quantiles-post-aggregator">quantiles post-aggregator</h4>
<p>Computes an array of quantiles based on the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantiles"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"probabilities"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span><span class="p">,</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantiles"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
+ <span class="nt">"probabilities"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><quantile></span><span class="p">,</span> <span class="err"><quantile></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.14.2-incubating/development/extensions-core/avro.html b/docs/0.14.2-incubating/development/extensions-core/avro.html
index ff83156..65a240c 100644
--- a/docs/0.14.2-incubating/development/extensions-core/avro.html
+++ b/docs/0.14.2-incubating/development/extensions-core/avro.html
@@ -188,7 +188,7 @@
field types, which can be used to read nested Avro records. The "jq" field type is not currently supported for Avro.</p>
<p>For example, using Avro stream parser with schema repo Avro bytes decoder:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"parser"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"avro_stream"</span><span class="p">,</span>
<span class="nt">"avroBytesDecoder"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"schema_repo"</span><span class="p">,</span>
@@ -203,9 +203,9 @@
<span class="p">},</span>
<span class="nt">"parseSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"avro"</span><span class="p">,</span>
- <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mpSpec></span><span class="p">,</span>
- <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
- <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">></span>
+ <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">timestampSpec></span><span class="p">,</span>
+ <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
+ <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><optional></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -433,9 +433,9 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"avro_hadoop"</span><span class="p">,</span>
<span class="nt">"parseSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"avro"</span><span class="p">,</span>
- <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mpSpec></span><span class="p">,</span>
- <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
- <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">></span>
+ <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">timestampSpec></span><span class="p">,</span>
+ <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
+ <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><optional></span>
<span class="p">}</span>
<span class="p">}</span>
<span class="p">},</span>
diff --git a/docs/0.14.2-incubating/development/extensions-core/bloom-filter.html b/docs/0.14.2-incubating/development/extensions-core/bloom-filter.html
index b2bd348..9bdad6a 100644
--- a/docs/0.14.2-incubating/development/extensions-core/bloom-filter.html
+++ b/docs/0.14.2-incubating/development/extensions-core/bloom-filter.html
@@ -172,13 +172,13 @@
this implementation uses Murmur3 as the hash algorithm.</p>
<p>To construct a BloomKFilter externally with Java to use as a filter in a Druid query:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">BloomKFilter</span> <span class="n">bloomFilter</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BloomKFilter</span><span class="p">(</span><span class="mi">1500</span><span class="p">);</span>
-<span class="n">bloomFilter</span><span class="p">.</span><span class="na">addString</span><span class="p">(</span><span class="s">"value 1"</span><span class="p">);</span>
-<span class="n">bloomFilter</span><span class="p">.</span><span class="na">addString</span><span class="p">(</span><span class="s">"value 2"</span><span class="p">);</span>
-<span class="n">bloomFilter</span><span class="p">.</span><span class="na">addString</span><span class="p">(</span><span class="s">"value 3"</span><span class="p">);</span>
-<span class="n">ByteArrayOutputStream</span> <span class="n">byteArrayOutputStream</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ByteArrayOutputStream</span><span class="p">();</span>
-<span class="n">BloomKFilter</span><span class="p">.</span><span class="na">serialize</span><span class="p">(</span><span class="n">byteArrayOutputStream</span><span class="p">,</span> <span class="n">bloomFilter</span><span class="p">);</span>
-<span class="n">String</span> <span class="n">base64Serialized</span> <span class="o">=</span> <span class="n">Base64</span><span class="p">.</span><span class="na">encodeBase64String</span><span class="p">(</span><span class="n">byteArrayOutputStream</span><span class="p">.</span><span class="na">toByteArray</span><span class="p">());</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">BloomKFilter</span> <span class="n">bloomFilter</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BloomKFilter</span><span class="o">(</span><span class="mi">1500</span><span class="o">);</span>
+<span class="n">bloomFilter</span><span class="o">.</span><span class="na">addString</span><span class="o">(</span><span class="s">"value 1"</span><span class="o">);</span>
+<span class="n">bloomFilter</span><span class="o">.</span><span class="na">addString</span><span class="o">(</span><span class="s">"value 2"</span><span class="o">);</span>
+<span class="n">bloomFilter</span><span class="o">.</span><span class="na">addString</span><span class="o">(</span><span class="s">"value 3"</span><span class="o">);</span>
+<span class="n">ByteArrayOutputStream</span> <span class="n">byteArrayOutputStream</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ByteArrayOutputStream</span><span class="o">();</span>
+<span class="n">BloomKFilter</span><span class="o">.</span><span class="na">serialize</span><span class="o">(</span><span class="n">byteArrayOutputStream</span><span class="o">,</span> <span class="n">bloomFilter</span><span class="o">);</span>
+<span class="n">String</span> <span class="n">base64Serialized</span> <span class="o">=</span> <span class="n">Base64</span><span class="o">.</span><span class="na">encodeBase64String</span><span class="o">(</span><span class="n">byteArrayOutputStream</span><span class="o">.</span><span class="na">toByteArray</span><span class="o">());</span>
</code></pre></div>
<p>This string can then be used in the native or sql Druid query.</p>
@@ -187,9 +187,9 @@
<h3 id="json-specification-of-bloom-filter">JSON Specification of Bloom Filter</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"bloom"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"bloomKFilter"</span> <span class="p">:</span> <span class="err"><serialized_by</span><span class="kc">tes</span><span class="err">_</span><span class="kc">f</span><span class="err">or_BloomKFil</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fn</span><span class="err">></span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension_name></span><span class="p">,</span>
+ <span class="nt">"bloomKFilter"</span> <span class="p">:</span> <span class="err"><serialized_bytes_for_BloomKFilter></span><span class="p">,</span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><extraction_fn></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -255,9 +255,9 @@
<h3 id="json-specification-of-bloom-filter-aggregator">JSON Specification of Bloom Filter Aggregator</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"bloom"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">ield_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxNumEntries"</span><span class="p">:</span> <span class="err"><maximum_</span><span class="kc">nu</span><span class="err">mber_o</span><span class="kc">f</span><span class="err">_eleme</span><span class="kc">nts</span><span class="err">_</span><span class="kc">f</span><span class="err">or_BloomKFil</span><span class="kc">ter</span><span class="err">></span>
- <span class="nt">"field"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_spec></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_field_name></span><span class="p">,</span>
+ <span class="nt">"maxNumEntries"</span><span class="p">:</span> <span class="err"><maximum_number_of_elements_for_BloomKFilter></span>
+ <span class="s2">"field"</span><span class="p">:</span> <span class="err"><dimension_spec></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.14.2-incubating/development/extensions-core/datasketches-quantiles.html b/docs/0.14.2-incubating/development/extensions-core/datasketches-quantiles.html
index 585eae3..fee2ce5 100644
--- a/docs/0.14.2-incubating/development/extensions-core/datasketches-quantiles.html
+++ b/docs/0.14.2-incubating/development/extensions-core/datasketches-quantiles.html
@@ -168,9 +168,9 @@
<p>The result of the aggregation is a DoublesSketch that is the union of all sketches either built from raw data or read from the segments.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"k"</span><span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">co</span><span class="kc">ntr</span><span class="err">ols</span> <span class="err">size</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">accuracy></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"k"</span><span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">controls</span> <span class="err">size</span> <span class="err">and</span> <span class="err">accuracy></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -209,9 +209,9 @@
<p>This returns an approximation to the value that would be preceded by a given fraction of a hypothetical sorted version of the input stream.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToQuantile"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"fraction"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">posi</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hypo</span><span class="kc">t</span><span class="err">he</span><span class="kc">t</span><span class="err">ical</span> <span class="err">sor</span><span class="kc">te</span><span class="err">d</span> <span class="err">s</span><span class="kc">trea</span><span class="err">m</span><span class="p">,</span> <span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">0</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1</span> <span class="err">i</span><span class="kc">n</span><span class="err">clusive></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"fraction"</span> <span class="p">:</span> <span class="err"><fractional</span> <span class="err">position</span> <span class="err">in</span> <span class="err">the</span> <span class="err">hypothetical</span> <span class="err">sorted</span> <span class="err">stream</span><span class="p">,</span> <span class="err">number</span> <span class="err">from</span> <span class="err">0</span> <span class="err">to</span> <span class="err">1</span> <span class="err">inclusive></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="quantiles">Quantiles</h4>
@@ -219,9 +219,9 @@
<p>This returns an array of quantiles corresponding to a given array of fractions</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToQuantiles"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"fractions"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">fra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">posi</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hypo</span><span class="kc">t</span><span class="err">he</span><span class="kc">t</span><span class="err">ical</span> <span class="err">sor</span><span class="kc">te</span><span class="err">d</span> <span class="err">s</span><span class="kc">trea</span><span class="err">m</span><span class="p">,</span> <span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">0</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1</span> <span class="err">i</span><span class="kc">n</span><span class="err">clusive></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"fractions"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">fractional</span> <span class="err">positions</span> <span class="err">in</span> <span class="err">the</span> <span class="err">hypothetical</span> <span class="err">sorted</span> <span class="err">stream</span><span class="p">,</span> <span class="err">number</span> <span class="err">from</span> <span class="err">0</span> <span class="err">to</span> <span class="err">1</span> <span class="err">inclusive></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="histogram">Histogram</h4>
@@ -229,9 +229,9 @@
<p>This returns an approximation to the histogram given an array of split points that define the histogram bins. An array of <i>m</i> unique, monotonically increasing split points divide the real number line into <i>m+1</i> consecutive disjoint intervals. The definition of an interval is inclusive of the left split point and exclusive of the right split point.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToHistogram"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"splitPoints"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">spli</span><span class="kc">t</span> <span class="err">poi</span><span class="kc">nts</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"splitPoints"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">split</span> <span class="err">points></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-summary">Sketch Summary</h4>
@@ -239,8 +239,8 @@
<p>This returns a summary of the sketch that can be used for debugging. This is the result of calling toString() method.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToString"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.14.2-incubating/development/extensions-core/datasketches-theta.html b/docs/0.14.2-incubating/development/extensions-core/datasketches-theta.html
index a2d3f83..7abb321 100644
--- a/docs/0.14.2-incubating/development/extensions-core/datasketches-theta.html
+++ b/docs/0.14.2-incubating/development/extensions-core/datasketches-theta.html
@@ -160,8 +160,8 @@
<h3 id="aggregators">Aggregators</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="nt">"isInputThetaSketch"</span><span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
<span class="nt">"size"</span><span class="p">:</span> <span class="mi">16384</span>
<span class="p">}</span>
@@ -205,17 +205,17 @@
<h4 id="sketch-estimator">Sketch Estimator</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketchEstimate"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">ype</span> <span class="kc">f</span><span class="err">ieldAccess</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">ype</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">chSe</span><span class="kc">t</span><span class="err">Op></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">of</span> <span class="err">type</span> <span class="err">fieldAccess</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">thetaSketch</span> <span class="err">aggregator</span> <span class="err">or</span> <span class="err">that</span> <span class="err">of</span> <span class="err">type</span> <span class="err">thetaSketchSetOp></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-operations">Sketch Operations</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketchSetOp"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
<span class="nt">"func"</span><span class="p">:</span> <span class="err"><UNION|INTERSECT|NOT></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">f</span><span class="err">ieldAccess</span> <span class="kc">t</span><span class="err">ype</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="kc">t</span><span class="err">he</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">chSe</span><span class="kc">t</span><span class="err">Op</span> <span class="kc">t</span><span class="err">ype</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">allow</span> <span class="err">arbi</span><span class="kc">trar</span><span class="err">y</span> <span class="err">combi</span><span class="kc">nat</span><span class="err">io</span><span class="kc">n</span> <span class="err">o</span><span class="kc">f</span> <span class="err">se</span><span class="kc">t</span> <span class="err">opera</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"size"</span><span class="p">:</span> <span class="err"><</span><span class="mi">16384</span> <span class="err">by</span> <span class="err">de</span><span class="kc">fault</span><span class="p">,</span> <span class="err">mus</span><span class="kc">t</span> <span class="err">be</span> <span class="err">max</span> <span class="err">o</span><span class="kc">f</span> <span class="err">size</span> <span class="kc">fr</span><span class="err">om</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ches</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">f</span><span class="err">ields</span> <span class="err">i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">fieldAccess</span> <span class="err">type</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">the</span> <span class="err">thetaSketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">thetaSketchSetOp</span> <span class="err">type</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">allow</span> <span class="err">arbitrary</span> <span class="err">combination</span> <span class="err">of</span> <span class="err">set</span> <span class="err">operations></span><span class="p">,</span>
+ <span class="nt">"size"</span><span class="p">:</span> <span class="err"><</span><span class="mi">16384</span> <span class="err">by</span> <span class="err">default</span><span class="p">,</span> <span class="err">must</span> <span class="err">be</span> <span class="err">max</span> <span class="err">of</span> <span class="err">size</span> <span class="err">from</span> <span class="err">sketches</span> <span class="err">in</span> <span class="err">fields</span> <span class="err">input></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="examples">Examples</h3>
diff --git a/docs/0.14.2-incubating/development/extensions-core/datasketches-tuple.html b/docs/0.14.2-incubating/development/extensions-core/datasketches-tuple.html
index d56d2a8..ad6b1a3 100644
--- a/docs/0.14.2-incubating/development/extensions-core/datasketches-tuple.html
+++ b/docs/0.14.2-incubating/development/extensions-core/datasketches-tuple.html
@@ -158,11 +158,11 @@
<h3 id="aggregators">Aggregators</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"nominalEntries"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"metricColumns"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">gs></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"nominalEntries"</span><span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"metricColumns"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">strings></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -211,8 +211,8 @@
<p>Returns a distinct count estimate from a given ArrayOfDoublesSketch.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToEstimate"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="estimate-of-the-number-of-distinct-keys-with-error-bounds">Estimate of the number of distinct keys with error bounds</h4>
@@ -220,9 +220,9 @@
<p>Returns a distinct count estimate and error bounds from a given ArrayOfDoublesSketch. The result will be three double values: estimate of the number of distinct keys, lower bound and upper bound. The bounds are provided at the given number of standard deviations (optional, defaults to 1). This must be an integer value of 1, 2 or 3 corresponding to approximately 68.3%, 95.4% and 99.7% confidence intervals.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToEstimateAndBounds"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="s2">"numStdDevs"</span><span class="p">,</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">1</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">3</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"numStdDevs"</span><span class="p">,</span> <span class="err"><number</span> <span class="err">from</span> <span class="err">1</span> <span class="err">to</span> <span class="err">3></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="number-of-retained-entries">Number of retained entries</h4>
@@ -230,8 +230,8 @@
<p>Returns the number of retained entries from a given ArrayOfDoublesSketch.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToNumEntries"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="mean-values-for-each-column">Mean values for each column</h4>
@@ -239,8 +239,8 @@
<p>Returns a list of mean values from a given ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToMeans"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="variance-values-for-each-column">Variance values for each column</h4>
@@ -248,8 +248,8 @@
<p>Returns a list of variance values from a given ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToVariances"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="quantiles-sketch-from-a-column">Quantiles sketch from a column</h4>
@@ -263,10 +263,10 @@
</ul>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToQuantilesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"column"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"k"</span> <span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">de</span><span class="kc">ter</span><span class="err">mi</span><span class="kc">nes</span> <span class="kc">t</span><span class="err">he</span> <span class="err">accuracy</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">qua</span><span class="kc">nt</span><span class="err">iles</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"column"</span> <span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"k"</span> <span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">determines</span> <span class="err">the</span> <span class="err">accuracy</span> <span class="err">and</span> <span class="err">size</span> <span class="err">of</span> <span class="err">the</span> <span class="err">quantiles</span> <span class="err">sketch></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="set-operations">Set Operations</h4>
@@ -274,11 +274,11 @@
<p>Returns a result of a specified set operation on the given array of sketches. Supported operations are: union, intersection and set difference (UNION, INTERSECT, NOT).</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchSetOp"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
<span class="nt">"operation"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"UNION"</span><span class="err">|</span><span class="s2">"INTERSECT"</span><span class="err">|</span><span class="s2">"NOT"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">allow</span> <span class="err">arbi</span><span class="kc">trar</span><span class="err">y</span> <span class="err">combi</span><span class="kc">nat</span><span class="err">io</span><span class="kc">n</span> <span class="err">o</span><span class="kc">f</span> <span class="err">se</span><span class="kc">t</span> <span class="err">opera</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"nominalEntries"</span> <span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">de</span><span class="kc">ter</span><span class="err">mi</span><span class="kc">nes</span> <span class="kc">t</span><span class="err">he</span> <span class="err">accuracy</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch></span><span class="p">,</span>
- <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber</span> <span class="err">o</span><span class="kc">f</span> <span class="err">values</span> <span class="err">associa</span><span class="kc">te</span><span class="err">d</span> <span class="err">wi</span><span class="kc">t</span><span class="err">h</span> <span class="err">each</span> <span class="err">dis</span><span class="kc">t</span><span class="err">i</span><span class="kc">n</span><span class="err">c</span><span class="kc">t</span> <span class="err">key></span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">sketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">allow</span> <span class="err">arbitrary</span> <span class="err">combination</span> <span class="err">of</span> <span class="err">set</span> <span class="err">operations></span><span class="p">,</span>
+ <span class="nt">"nominalEntries"</span> <span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">determines</span> <span class="err">the</span> <span class="err">accuracy</span> <span class="err">and</span> <span class="err">size</span> <span class="err">of</span> <span class="err">the</span> <span class="err">sketch></span><span class="p">,</span>
+ <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><number</span> <span class="err">of</span> <span class="err">values</span> <span class="err">associated</span> <span class="err">with</span> <span class="err">each</span> <span class="err">distinct</span> <span class="err">key></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="students-t-test">Student's t-test</h4>
@@ -286,8 +286,8 @@
<p>Performs Student's t-test and returns a list of p-values given two instances of ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key. See <a href="http://commons.apache.org/proper/commons-math/javadocs/api-3.4/org/apache/commons/math3/stat/inference/TTest.html">t-test documentation</a>.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchTTest"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">wi</span><span class="kc">t</span><span class="err">h</span> <span class="kc">t</span><span class="err">wo</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">re</span><span class="kc">ferr</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">with</span> <span class="err">two</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">sketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">referring</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch></span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-summary">Sketch summary</h4>
@@ -295,8 +295,8 @@
<p>Returns a human-readable summary of a given ArrayOfDoublesSketch. This is a string returned by toString() method of the sketch. This can be useful for debugging.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToString"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.14.2-incubating/development/extensions-core/examples.html b/docs/0.14.2-incubating/development/extensions-core/examples.html
index f163737..dd17711 100644
--- a/docs/0.14.2-incubating/development/extensions-core/examples.html
+++ b/docs/0.14.2-incubating/development/extensions-core/examples.html
@@ -155,7 +155,7 @@
<p>This firehose connects directly to the twitter spritzer data stream.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"twitzer"</span><span class="p">,</span>
<span class="nt">"maxEventCount"</span><span class="p">:</span> <span class="mi">-1</span><span class="p">,</span>
<span class="nt">"maxRunMinutes"</span><span class="p">:</span> <span class="mi">0</span>
diff --git a/docs/0.14.2-incubating/development/extensions-core/kafka-eight-firehose.html b/docs/0.14.2-incubating/development/extensions-core/kafka-eight-firehose.html
index b6cf80a..a9876a9 100644
--- a/docs/0.14.2-incubating/development/extensions-core/kafka-eight-firehose.html
+++ b/docs/0.14.2-incubating/development/extensions-core/kafka-eight-firehose.html
@@ -155,7 +155,7 @@
<p>This firehose acts as a Kafka 0.8.x consumer and ingests data from Kafka.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"kafka-0.8"</span><span class="p">,</span>
<span class="nt">"consumerProps"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"zookeeper.connect"</span><span class="p">:</span> <span class="s2">"localhost:2181"</span><span class="p">,</span>
diff --git a/docs/0.14.2-incubating/development/extensions-core/lookups-cached-global.html b/docs/0.14.2-incubating/development/extensions-core/lookups-cached-global.html
index bb74d08..41c6ef0 100644
--- a/docs/0.14.2-incubating/development/extensions-core/lookups-cached-global.html
+++ b/docs/0.14.2-incubating/development/extensions-core/lookups-cached-global.html
@@ -459,7 +459,7 @@
truck,something3,buck
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"csv"</span><span class="p">,</span>
<span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"value"</span><span class="p">,</span><span class="s2">"somethingElse"</span><span class="p">,</span><span class="s2">"key"</span><span class="p">],</span>
<span class="nt">"keyColumn"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
@@ -530,7 +530,7 @@
truck|something,3|buck
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"tsv"</span><span class="p">,</span>
<span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"value"</span><span class="p">,</span><span class="s2">"somethingElse"</span><span class="p">,</span><span class="s2">"key"</span><span class="p">],</span>
<span class="nt">"keyColumn"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
@@ -568,7 +568,7 @@
<span class="p">{</span><span class="nt">"key"</span><span class="p">:</span> <span class="s2">"buck"</span><span class="p">,</span> <span class="nt">"somethingElse"</span><span class="p">:</span> <span class="s2">"something"</span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="s2">"truck"</span><span class="p">}</span>
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"customJson"</span><span class="p">,</span>
<span class="nt">"keyFieldName"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
<span class="nt">"valueFieldName"</span><span class="p">:</span> <span class="s2">"value"</span>
@@ -587,7 +587,7 @@
<span class="p">{</span><span class="nt">"buck"</span><span class="p">:</span> <span class="s2">"truck"</span><span class="p">}</span>
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"simpleJson"</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.14.2-incubating/development/extensions-core/parquet.html b/docs/0.14.2-incubating/development/extensions-core/parquet.html
index c2fc4f8..bc8202b 100644
--- a/docs/0.14.2-incubating/development/extensions-core/parquet.html
+++ b/docs/0.14.2-incubating/development/extensions-core/parquet.html
@@ -259,10 +259,10 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
-<span class="p">}</span>
+<span class="err">}</span>
</code></pre></div>
<h4 id="parquet-parser-timeanddims-parsespec"><code>parquet</code> parser, <code>timeAndDims</code> parseSpec</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -301,7 +301,7 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -352,10 +352,10 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
-<span class="p">}</span>
+<span class="err">}</span>
</code></pre></div>
<p>For additional details see <a href="../../ingestion/hadoop.html">hadoop ingestion</a> and <a href="../../ingestion/ingestion-spec.html">general ingestion spec</a> documentation.</p>
diff --git a/docs/0.14.2-incubating/development/extensions-core/s3.html b/docs/0.14.2-incubating/development/extensions-core/s3.html
index ea54234..15c4391 100644
--- a/docs/0.14.2-incubating/development/extensions-core/s3.html
+++ b/docs/0.14.2-incubating/development/extensions-core/s3.html
@@ -279,7 +279,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-s3"</span><span class="p">,</span>
<span class="nt">"uris"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"s3://foo/bar/file.gz"</span><span class="p">,</span> <span class="s2">"s3://bar/foo/file2.gz"</span><span class="p">]</span>
<span class="p">}</span>
diff --git a/docs/0.14.2-incubating/development/extensions-core/stats.html b/docs/0.14.2-incubating/development/extensions-core/stats.html
index af70918..4714aab 100644
--- a/docs/0.14.2-incubating/development/extensions-core/stats.html
+++ b/docs/0.14.2-incubating/development/extensions-core/stats.html
@@ -180,18 +180,18 @@
<p>User can specify expected input type as one of "float", "long", "variance" for ingestion, which is by default "float".</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"variance"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"inputType"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">t</span><span class="err">ype></span><span class="p">,</span>
- <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"inputType"</span> <span class="p">:</span> <span class="err"><input_type></span><span class="p">,</span>
+ <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<p>To query for results, "variance" aggregator with "variance" input type or simply a "varianceFold" aggregator must be included in the query.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"varianceFold"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -215,7 +215,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"stddev"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"estimator"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"estimator"</span><span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="query-examples">Query Examples:</h2>
diff --git a/docs/0.14.2-incubating/development/extensions-core/test-stats.html b/docs/0.14.2-incubating/development/extensions-core/test-stats.html
index 548899f..26c5135 100644
--- a/docs/0.14.2-incubating/development/extensions-core/test-stats.html
+++ b/docs/0.14.2-incubating/development/extensions-core/test-stats.html
@@ -175,10 +175,10 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"zscore2sample"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"successCount1"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">success</span> <span class="err">cou</span><span class="kc">nt</span> <span class="err">o</span><span class="kc">f</span> <span class="err">sample</span> <span class="mi">1</span><span class="p">,</span>
- <span class="nt">"sample1Size"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggregaror></span> <span class="err">sample</span> <span class="mi">1</span> <span class="err">size</span><span class="p">,</span>
- <span class="nt">"successCount2"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">success</span> <span class="err">cou</span><span class="kc">nt</span> <span class="err">o</span><span class="kc">f</span> <span class="err">sample</span> <span class="mi">2</span><span class="p">,</span>
- <span class="nt">"sample2Size"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">sample</span> <span class="mi">2</span> <span class="err">size</span>
+ <span class="nt">"successCount1"</span><span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">success</span> <span class="err">count</span> <span class="err">of</span> <span class="err">sample</span> <span class="mi">1</span><span class="p">,</span>
+ <span class="nt">"sample1Size"</span><span class="p">:</span> <span class="err"><post_aggregaror></span> <span class="err">sample</span> <span class="mi">1</span> <span class="err">size</span><span class="p">,</span>
+ <span class="nt">"successCount2"</span><span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">success</span> <span class="err">count</span> <span class="err">of</span> <span class="err">sample</span> <span class="mi">2</span><span class="p">,</span>
+ <span class="nt">"sample2Size"</span> <span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">sample</span> <span class="mi">2</span> <span class="err">size</span>
<span class="p">}</span>
</code></pre></div>
<p>Please note the post aggregator will be converting binary variables to continuous variables for two population proportions. Specifically</p>
@@ -199,7 +199,7 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"pvalue2tailedZtest"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"zScore"</span><span class="p">:</span> <span class="err"><zscore</span> <span class="err">pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span>
+ <span class="nt">"zScore"</span><span class="p">:</span> <span class="err"><zscore</span> <span class="err">post_aggregator></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="example-usage">Example Usage</h2>
diff --git a/docs/0.14.2-incubating/development/geo.html b/docs/0.14.2-incubating/development/geo.html
index 83cff1c..cd77c8d 100644
--- a/docs/0.14.2-incubating/development/geo.html
+++ b/docs/0.14.2-incubating/development/geo.html
@@ -201,7 +201,7 @@
<h1 id="spatial-filters">Spatial Filters</h1>
<p>The grammar for a spatial filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"spatial"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"spatialDim"</span><span class="p">,</span>
<span class="nt">"bound"</span><span class="p">:</span> <span class="p">{</span>
diff --git a/docs/0.14.2-incubating/development/modules.html b/docs/0.14.2-incubating/development/modules.html
index 9124283..b663580 100644
--- a/docs/0.14.2-incubating/development/modules.html
+++ b/docs/0.14.2-incubating/development/modules.html
@@ -208,13 +208,13 @@
<p>Check the <code>azure-storage</code>, <code>google-storage</code>, <code>cassandra-storage</code>, <code>hdfs-storage</code> and <code>s3-extensions</code> modules for examples of how to do this.</p>
<p>The basic idea behind the extension is that you need to add bindings for your DataSegmentPusher and DataSegmentPuller objects. The way to add them is something like (taken from HdfsStorageDruidModule)</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Binders</span><span class="p">.</span><span class="na">dataSegmentPullerBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="s">"hdfs"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">HdfsDataSegmentPuller</span><span class="p">.</span><span class="na">class</span><span class="p">).</span><span class="na">in</span><span class="p">(</span><span class="n">LazySingleton</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Binders</span><span class="o">.</span><span class="na">dataSegmentPullerBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="s">"hdfs"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">HdfsDataSegmentPuller</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">in</span><span class="o">(</span><span class="n">LazySingleton</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-<span class="n">Binders</span><span class="p">.</span><span class="na">dataSegmentPusherBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="s">"hdfs"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">HdfsDataSegmentPusher</span><span class="p">.</span><span class="na">class</span><span class="p">).</span><span class="na">in</span><span class="p">(</span><span class="n">LazySingleton</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<span class="n">Binders</span><span class="o">.</span><span class="na">dataSegmentPusherBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="s">"hdfs"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">HdfsDataSegmentPusher</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">in</span><span class="o">(</span><span class="n">LazySingleton</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<p><code>Binders.dataSegment*Binder()</code> is a call provided by the druid-core jar which sets up a Guice multibind "MapBinder". If that doesn't make sense, don't worry about it, just think of it as a magical incantation.</p>
@@ -284,12 +284,12 @@
<p>Adding a Firehose is done almost entirely through the Jackson Modules instead of Guice. Specifically, note the implementation</p>
<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="nd">@Override</span>
-<span class="kd">public</span> <span class="n">List</span><span class="o"><?</span> <span class="kd">extends</span> <span class="n">Module</span><span class="o">></span> <span class="nf">getJacksonModules</span><span class="p">()</span>
-<span class="p">{</span>
- <span class="k">return</span> <span class="n">ImmutableList</span><span class="p">.</span><span class="na">of</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">SimpleModule</span><span class="p">().</span><span class="na">registerSubtypes</span><span class="p">(</span><span class="k">new</span> <span class="n">NamedType</span><span class="p">(</span><span class="n">StaticS3FirehoseFactory</span><span class="p">.</span><span class="na">class</span><span class="p">,</span> <span class="s">"static-s3"</span><span class="p">))</span>
- <span class="p">);</span>
-<span class="p">}</span>
+<span class="kd">public</span> <span class="n">List</span><span class="o"><?</span> <span class="kd">extends</span> <span class="n">Module</span><span class="o">></span> <span class="nf">getJacksonModules</span><span class="o">()</span>
+<span class="o">{</span>
+ <span class="k">return</span> <span class="n">ImmutableList</span><span class="o">.</span><span class="na">of</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">SimpleModule</span><span class="o">().</span><span class="na">registerSubtypes</span><span class="o">(</span><span class="k">new</span> <span class="n">NamedType</span><span class="o">(</span><span class="n">StaticS3FirehoseFactory</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="s">"static-s3"</span><span class="o">))</span>
+ <span class="o">);</span>
+<span class="o">}</span>
</code></pre></div>
<p>This is registering the FirehoseFactory with Jackson's polymorphic serde layer. More concretely, having this will mean that if you specify a <code>"firehose": { "type": "static-s3", ... }</code> in your realtime config, then the system will load this FirehoseFactory for your firehose.</p>
@@ -314,32 +314,32 @@
</ol>
<p>Registering these uses the same general strategy as a deep storage mechanism does. You do something like</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">DruidBinders</span><span class="p">.</span><span class="na">queryToolChestBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="n">SegmentMetadataQuery</span><span class="p">.</span><span class="na">class</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">SegmentMetadataQueryQueryToolChest</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">DruidBinders</span><span class="o">.</span><span class="na">queryToolChestBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="n">SegmentMetadataQuery</span><span class="o">.</span><span class="na">class</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">SegmentMetadataQueryQueryToolChest</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-<span class="n">DruidBinders</span><span class="p">.</span><span class="na">queryRunnerFactoryBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="n">SegmentMetadataQuery</span><span class="p">.</span><span class="na">class</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">SegmentMetadataQueryRunnerFactory</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<span class="n">DruidBinders</span><span class="o">.</span><span class="na">queryRunnerFactoryBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="n">SegmentMetadataQuery</span><span class="o">.</span><span class="na">class</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">SegmentMetadataQueryRunnerFactory</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<p>The first one binds the SegmentMetadataQueryQueryToolChest for usage when a SegmentMetadataQuery is used. The second one does the same thing but for the QueryRunnerFactory instead.</p>
<h3 id="adding-new-jersey-resources">Adding new Jersey resources</h3>
<p>Adding new Jersey resources to a module requires calling the following code to bind the resource in the module:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Jerseys</span><span class="p">.</span><span class="na">addResource</span><span class="p">(</span><span class="n">binder</span><span class="p">,</span> <span class="n">NewResource</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Jerseys</span><span class="o">.</span><span class="na">addResource</span><span class="o">(</span><span class="n">binder</span><span class="o">,</span> <span class="n">NewResource</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<h3 id="adding-a-new-password-provider-implementation">Adding a new Password Provider implementation</h3>
<p>You will need to implement <code>org.apache.druid.metadata.PasswordProvider</code> interface. For every place where Druid uses PasswordProvider, a new instance of the implementation will be created,
thus make sure all the necessary information required for fetching each password is supplied during object instantiation.
In your implementation of <code>org.apache.druid.initialization.DruidModule</code>, <code>getJacksonModules</code> should look something like this -</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="k">return</span> <span class="n">ImmutableList</span><span class="p">.</span><span class="na">of</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">SimpleModule</span><span class="p">(</span><span class="s">"SomePasswordProviderModule"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">registerSubtypes</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">NamedType</span><span class="p">(</span><span class="n">SomePasswordProvider</span><span class="p">.</span><span class="na">class</span><span class="p">,</span> <span class="s">"some"</span><span class="p">)</span>
- <span class="p">)</span>
- <span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="k">return</span> <span class="n">ImmutableList</span><span class="o">.</span><span class="na">of</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">SimpleModule</span><span class="o">(</span><span class="s">"SomePasswordProviderModule"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">registerSubtypes</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">NamedType</span><span class="o">(</span><span class="n">SomePasswordProvider</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="s">"some"</span><span class="o">)</span>
+ <span class="o">)</span>
+ <span class="o">);</span>
</code></pre></div>
<p>where <code>SomePasswordProvider</code> is the implementation of <code>PasswordProvider</code> interface, you can have a look at <code>org.apache.druid.metadata.EnvironmentVariablePasswordProvider</code> for example.</p>
diff --git a/docs/0.14.2-incubating/ingestion/compaction.html b/docs/0.14.2-incubating/ingestion/compaction.html
index 2b5e7a3..b3d565c 100644
--- a/docs/0.14.2-incubating/ingestion/compaction.html
+++ b/docs/0.14.2-incubating/ingestion/compaction.html
@@ -153,15 +153,15 @@
<p>Compaction tasks merge all segments of the given interval. The syntax is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"compact"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><i</span><span class="kc">nter</span><span class="err">val</span> <span class="kc">t</span><span class="err">o</span> <span class="err">speci</span><span class="kc">f</span><span class="err">y</span> <span class="err">segme</span><span class="kc">nts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
- <span class="s2">"dimensions"</span> <span class="err"><cus</span><span class="kc">t</span><span class="err">om</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><interval</span> <span class="err">to</span> <span class="err">specify</span> <span class="err">segments</span> <span class="err">to</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
+ <span class="nt">"dimensions"</span> <span class="err"><custom</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
<span class="nt">"keepSegmentGranularity"</span><span class="p">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"segmentGranularity"</span><span class="p">:</span> <span class="err"><segme</span><span class="kc">nt</span> <span class="err">gra</span><span class="kc">nular</span><span class="err">i</span><span class="kc">t</span><span class="err">y</span> <span class="err">a</span><span class="kc">fter</span> <span class="err">compac</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"targetCompactionSizeBytes"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tar</span><span class="err">ge</span><span class="kc">t</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="err">compac</span><span class="kc">te</span><span class="err">d</span> <span class="err">segme</span><span class="kc">nts</span><span class="err">></span>
- <span class="s2">"tuningConfig"</span> <span class="err"><i</span><span class="kc">n</span><span class="err">dex</span> <span class="kc">tas</span><span class="err">k</span> <span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">gCo</span><span class="kc">nf</span><span class="err">ig></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"segmentGranularity"</span><span class="p">:</span> <span class="err"><segment</span> <span class="err">granularity</span> <span class="err">after</span> <span class="err">compaction></span><span class="p">,</span>
+ <span class="nt">"targetCompactionSizeBytes"</span><span class="p">:</span> <span class="err"><target</span> <span class="err">size</span> <span class="err">of</span> <span class="err">compacted</span> <span class="err">segments></span>
+ <span class="s2">"tuningConfig"</span> <span class="err"><index</span> <span class="err">task</span> <span class="err">tuningConfig></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.14.2-incubating/ingestion/data-formats.html b/docs/0.14.2-incubating/ingestion/data-formats.html
index a7d04f3..401d7cc 100644
--- a/docs/0.14.2-incubating/ingestion/data-formats.html
+++ b/docs/0.14.2-incubating/ingestion/data-formats.html
@@ -192,7 +192,7 @@
<p>All forms of Druid ingestion require some form of schema object. The format of the data to be ingested is specified using the<code>parseSpec</code> entry in your <code>dataSchema</code>.</p>
<h3 id="json">JSON</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"json"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -205,7 +205,7 @@
<p>If you have nested JSON, <a href="flatten-json.html">Druid can automatically flatten it for you</a>.</p>
<h3 id="csv">CSV</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"csv"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -234,7 +234,7 @@
<p>The <code>columns</code> field must be included and and ensure that the order of the fields matches the columns of your input data in the same order.</p>
<h3 id="tsv-delimited">TSV (Delimited)</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"tsv"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -266,23 +266,23 @@
<p>The <code>columns</code> field must be included and and ensure that the order of the fields matches the columns of your input data in the same order.</p>
<h3 id="regex">Regex</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
<span class="p">},</span>
<span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"dimensions"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_lis</span><span class="kc">t</span><span class="err">_o</span><span class="kc">f</span><span class="err">_dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">]</span>
+ <span class="nt">"dimensions"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_list_of_dimensions></span><span class="p">]</span>
<span class="p">},</span>
- <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_colum</span><span class="kc">ns</span><span class="err">_here></span><span class="p">],</span>
- <span class="nt">"pattern"</span> <span class="p">:</span> <span class="err"><regex</span> <span class="err">pa</span><span class="kc">ttern</span> <span class="kc">f</span><span class="err">or</span> <span class="err">par</span><span class="kc">t</span><span class="err">i</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">da</span><span class="kc">ta</span><span class="err">></span>
+ <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_columns_here></span><span class="p">],</span>
+ <span class="nt">"pattern"</span> <span class="p">:</span> <span class="err"><regex</span> <span class="err">pattern</span> <span class="err">for</span> <span class="err">partitioning</span> <span class="err">data></span>
<span class="p">}</span>
</code></pre></div>
<p>The <code>columns</code> field must match the columns of your regex matching groups in the same order. If columns are not provided, default
columns names ("column_1", "column2", ... "column_n") will be assigned. Ensure that your column names include all your dimensions. </p>
<h3 id="javascript">JavaScript</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
diff --git a/docs/0.14.2-incubating/ingestion/delete-data.html b/docs/0.14.2-incubating/ingestion/delete-data.html
index fdc1c22..3192ca2 100644
--- a/docs/0.14.2-incubating/ingestion/delete-data.html
+++ b/docs/0.14.2-incubating/ingestion/delete-data.html
@@ -168,10 +168,10 @@
<p>Kill tasks delete all information about a segment and removes it from deep storage. Killable segments must be disabled (used==0) in the Druid segment table. The available grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"kill"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><all_segme</span><span class="kc">nts</span><span class="err">_i</span><span class="kc">n</span><span class="err">_</span><span class="kc">t</span><span class="err">his_i</span><span class="kc">nter</span><span class="err">val_will_die!></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><all_segments_in_this_interval_will_die!></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.14.2-incubating/ingestion/firehose.html b/docs/0.14.2-incubating/ingestion/firehose.html
index dad82c0..d7435bf 100644
--- a/docs/0.14.2-incubating/ingestion/firehose.html
+++ b/docs/0.14.2-incubating/ingestion/firehose.html
@@ -391,7 +391,7 @@
This can be used to merge data from more than one firehose.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"combining"</span><span class="p">,</span>
- <span class="nt">"delegates"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span> <span class="kc">f</span><span class="err">irehose</span><span class="mi">1</span> <span class="p">},</span> <span class="p">{</span> <span class="kc">f</span><span class="err">irehose</span><span class="mi">2</span> <span class="p">},</span> <span class="err">.....</span> <span class="p">]</span>
+ <span class="nt">"delegates"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span> <span class="err">firehose1</span> <span class="p">},</span> <span class="p">{</span> <span class="err">firehose2</span> <span class="p">},</span> <span class="err">.....</span> <span class="p">]</span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.14.2-incubating/ingestion/flatten-json.html b/docs/0.14.2-incubating/ingestion/flatten-json.html
index 834e9a2..1c27b5b 100644
--- a/docs/0.14.2-incubating/ingestion/flatten-json.html
+++ b/docs/0.14.2-incubating/ingestion/flatten-json.html
@@ -226,7 +226,7 @@
<p>The column "metrica" is a Long metric column, "hello" is an array of Double metrics, and "nestmet.val" is a nested Long metric. All other columns are dimensions.</p>
<p>To flatten this JSON, the parseSpec could be defined as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"json"</span><span class="p">,</span>
<span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"useFieldDiscovery"</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
@@ -307,7 +307,7 @@
<p>"ignore_me" will be automatically discovered but excluded as specified by dimensionsExclusions.</p>
<p>Aggregators should use the metric column names as defined in the flattenSpec. Using the example above:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metricsSpec"</span> <span class="p">:</span> <span class="p">[</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metricsSpec"</span> <span class="err">:</span> <span class="p">[</span>
<span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span>
<span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"path-metric-sum"</span><span class="p">,</span>
diff --git a/docs/0.14.2-incubating/ingestion/hadoop.html b/docs/0.14.2-incubating/ingestion/hadoop.html
index 5388ef6..3d12bd5 100644
--- a/docs/0.14.2-incubating/ingestion/hadoop.html
+++ b/docs/0.14.2-incubating/ingestion/hadoop.html
@@ -222,7 +222,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hadoop"</span>
<span class="p">}</span>
<span class="p">},</span>
- <span class="nt">"hadoopDependencyCoordinates"</span><span class="p">:</span> <span class="err"><my_hadoop_versio</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"hadoopDependencyCoordinates"</span><span class="p">:</span> <span class="err"><my_hadoop_version></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -512,7 +512,7 @@
</tbody></table>
<h3 id="jobproperties-field-of-tuningconfig">jobProperties field of TuningConfig</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"tuningConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"tuningConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"jobProperties"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"<hadoop-property-a>"</span><span class="p">:</span> <span class="s2">"<value-a>"</span><span class="p">,</span>
@@ -616,7 +616,7 @@
sized data segments relative to single-dimension partitioning.</p>
<h3 id="hash-based-partitioning">Hash-based partitioning</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"partitionsSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"partitionsSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hashed"</span><span class="p">,</span>
<span class="nt">"targetPartitionSize"</span><span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
@@ -657,7 +657,7 @@
</tbody></table>
<h3 id="single-dimension-partitioning">Single-dimension partitioning</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"partitionsSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"partitionsSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimension"</span><span class="p">,</span>
<span class="nt">"targetPartitionSize"</span><span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
diff --git a/docs/0.14.2-incubating/ingestion/ingestion-spec.html b/docs/0.14.2-incubating/ingestion/ingestion-spec.html
index 0b8b4c5..e457443 100644
--- a/docs/0.14.2-incubating/ingestion/ingestion-spec.html
+++ b/docs/0.14.2-incubating/ingestion/ingestion-spec.html
@@ -188,7 +188,7 @@
<h1 id="dataschema">DataSchema</h1>
<p>An example dataSchema is shown below:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"wikipedia"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -602,7 +602,7 @@
<p>For example, the following <code>dimensionsSpec</code> section from a <code>dataSchema</code> ingests one column as Long (<code>countryNum</code>), two
columns as Float (<code>userLatitude</code>, <code>userLongitude</code>), and the other columns as Strings, with bitmap indexes disabled
for the <code>comment</code> column.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dimensionsSpec"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span>
<span class="s2">"page"</span><span class="p">,</span>
<span class="s2">"language"</span><span class="p">,</span>
diff --git a/docs/0.14.2-incubating/ingestion/locking-and-priority.html b/docs/0.14.2-incubating/ingestion/locking-and-priority.html
index 2a9430e..8a6c58a 100644
--- a/docs/0.14.2-incubating/ingestion/locking-and-priority.html
+++ b/docs/0.14.2-incubating/ingestion/locking-and-priority.html
@@ -202,7 +202,7 @@
</tbody></table>
<p>You can override the task priority by setting your priority in the task context like below.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"context"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"context"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"priority"</span> <span class="p">:</span> <span class="mi">100</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.14.2-incubating/ingestion/misc-tasks.html b/docs/0.14.2-incubating/ingestion/misc-tasks.html
index 5e6caca..7902298 100644
--- a/docs/0.14.2-incubating/ingestion/misc-tasks.html
+++ b/docs/0.14.2-incubating/ingestion/misc-tasks.html
@@ -155,10 +155,10 @@
<p>These tasks start, sleep for a time and are used only for testing. The available grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"noop"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_segme</span><span class="kc">nt</span><span class="err">_i</span><span class="kc">nter</span><span class="err">val></span><span class="p">,</span>
- <span class="nt">"runTime"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_millis_</span><span class="kc">t</span><span class="err">o_sleep></span><span class="p">,</span>
- <span class="nt">"firehose"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_</span><span class="kc">f</span><span class="err">irehose_</span><span class="kc">t</span><span class="err">o_</span><span class="kc">test</span><span class="err">_co</span><span class="kc">nne</span><span class="err">c</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><optional_task_id></span><span class="p">,</span>
+ <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><optional_segment_interval></span><span class="p">,</span>
+ <span class="nt">"runTime"</span> <span class="p">:</span> <span class="err"><optional_millis_to_sleep></span><span class="p">,</span>
+ <span class="nt">"firehose"</span><span class="p">:</span> <span class="err"><optional_firehose_to_test_connect></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="segment-merging-tasks-deprecated">Segment Merging Tasks (Deprecated)</h2>
@@ -168,11 +168,11 @@
<p>Append tasks append a list of segments together into a single segment (one after the other). The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"append"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">appe</span><span class="kc">n</span><span class="err">d></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">list</span> <span class="err">of</span> <span class="err">DataSegment</span> <span class="err">objects</span> <span class="err">to</span> <span class="err">append></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><optional</span> <span class="err">list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="merge-task">Merge Task</h3>
@@ -183,12 +183,12 @@
<p>The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"merge"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whe</span><span class="kc">t</span><span class="err">her</span> <span class="err">or</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="kc">t</span><span class="err">o</span> <span class="err">rollup</span> <span class="err">da</span><span class="kc">ta</span> <span class="err">duri</span><span class="kc">n</span><span class="err">g</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whether</span> <span class="err">or</span> <span class="err">not</span> <span class="err">to</span> <span class="err">rollup</span> <span class="err">data</span> <span class="err">during</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">list</span> <span class="err">of</span> <span class="err">DataSegment</span> <span class="err">objects</span> <span class="err">to</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="same-interval-merge-task">Same Interval Merge Task</h3>
@@ -198,12 +198,12 @@
<p>The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"same_interval_merge"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whe</span><span class="kc">t</span><span class="err">her</span> <span class="err">or</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="kc">t</span><span class="err">o</span> <span class="err">rollup</span> <span class="err">da</span><span class="kc">ta</span> <span class="err">duri</span><span class="kc">n</span><span class="err">g</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">his</span> <span class="err">i</span><span class="kc">nter</span><span class="err">val</span> <span class="err">are</span> <span class="err">goi</span><span class="kc">n</span><span class="err">g</span> <span class="kc">t</span><span class="err">o</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whether</span> <span class="err">or</span> <span class="err">not</span> <span class="err">to</span> <span class="err">rollup</span> <span class="err">data</span> <span class="err">during</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><DataSegment</span> <span class="err">objects</span> <span class="err">in</span> <span class="err">this</span> <span class="err">interval</span> <span class="err">are</span> <span class="err">going</span> <span class="err">to</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.14.2-incubating/ingestion/stream-pull.html b/docs/0.14.2-incubating/ingestion/stream-pull.html
index 5a2459c..484df1b 100644
--- a/docs/0.14.2-incubating/ingestion/stream-pull.html
+++ b/docs/0.14.2-incubating/ingestion/stream-pull.html
@@ -547,7 +547,7 @@
<p>Segments are identified by datasource, time interval, and version. With sharding, a segment is also identified by a partition number. Typically, each shard will have the same version but a different partition number to uniquely identify it.</p>
<p>In small-data scenarios, sharding is unnecessary and can be set to none (the default):</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span><span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span><span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
</code></pre></div>
<p>However, in scenarios with multiple realtime processes, <code>none</code> is less useful as it cannot help with scaling data volume (see below). Note that for the batch indexing service, no explicit configuration is required; sharding is provided automatically.</p>
@@ -565,7 +565,7 @@
</ul>
<p>Configure <code>linear</code> under <code>schema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
@@ -575,7 +575,7 @@
<p>This strategy is similar to <code>linear</code> except that it does not tolerate non-sequential partition numbering (it will <em>not</em> allow querying of partitions 0 and 2 if partition 1 is missing). It also requires explicitly setting the total number of partitions.</p>
<p>Configure <code>numbered</code> under <code>schema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"numbered"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span><span class="p">,</span>
<span class="nt">"partitions"</span><span class="p">:</span> <span class="mi">2</span>
@@ -586,13 +586,13 @@
<p>The <code>shardSpec</code> configuration can be used to create redundancy by having the same <code>partitionNum</code> values on different processes.</p>
<p>For example, if RealTimeProcess1 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
</code></pre></div>
<p>and RealTimeProcess2 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
@@ -600,7 +600,7 @@
<p>then two realtime processes can store segments with the same datasource, version, time interval, and partition number. Brokers that query for data in such segments will assume that they hold the same data, and the query will target only one of the segments.</p>
<p><code>shardSpec</code> can also help achieve scale. For this, add processes with a different <code>partionNum</code>. Continuing with the example, if RealTimeProcess3 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">1</span>
<span class="p">}</span>
diff --git a/docs/0.14.2-incubating/ingestion/update-existing-data.html b/docs/0.14.2-incubating/ingestion/update-existing-data.html
index 674caaf..9aa3322 100644
--- a/docs/0.14.2-incubating/ingestion/update-existing-data.html
+++ b/docs/0.14.2-incubating/ingestion/update-existing-data.html
@@ -275,7 +275,7 @@
</tbody></table>
<p>For example</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"inputSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"dataSource"</span><span class="p">,</span>
@@ -309,7 +309,7 @@
</tbody></table>
<p>For example:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"inputSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"multi"</span><span class="p">,</span>
diff --git a/docs/0.14.2-incubating/operations/use_sbt_to_build_fat_jar.html b/docs/0.14.2-incubating/operations/use_sbt_to_build_fat_jar.html
index a802180..ef77e63 100644
--- a/docs/0.14.2-incubating/operations/use_sbt_to_build_fat_jar.html
+++ b/docs/0.14.2-incubating/operations/use_sbt_to_build_fat_jar.html
@@ -149,106 +149,106 @@
-->
<h1 id="content-for-build-sbt">Content for build.sbt</h1>
-<div class="highlight"><pre><code class="language-scala" data-lang="scala"><span></span><span class="n">libraryDependencies</span> <span class="o">++=</span> <span class="nc">Seq</span><span class="p">(</span>
- <span class="s">"com.amazonaws"</span> <span class="o">%</span> <span class="s">"aws-java-sdk"</span> <span class="o">%</span> <span class="s">"1.9.23"</span> <span class="n">exclude</span><span class="p">(</span><span class="s">"common-logging"</span><span class="p">,</span> <span class="s">"common-logging"</span><span class="p">),</span>
- <span class="s">"org.joda"</span> <span class="o">%</span> <span class="s">"joda-convert"</span> <span class="o">%</span> <span class="s">"1.7"</span><span class="p">,</span>
- <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"2.7"</span><span class="p">,</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-services"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-service"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-hadoop"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"mysql-metadata-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-s3-extensions"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-histogram"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-hdfs-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-core"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-databind"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-guava"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-joda"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-base"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-json-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-smile-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.module"</span> <span class="o">%</span> <span class="s">"jackson-module-jaxb-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.sun.jersey"</span> <span class="o">%</span> <span class="s">"jersey-servlet"</span> <span class="o">%</span> <span class="s">"1.17.1"</span><span class="p">,</span>
- <span class="s">"mysql"</span> <span class="o">%</span> <span class="s">"mysql-connector-java"</span> <span class="o">%</span> <span class="s">"5.1.34"</span><span class="p">,</span>
- <span class="s">"org.scalatest"</span> <span class="o">%%</span> <span class="s">"scalatest"</span> <span class="o">%</span> <span class="s">"2.2.3"</span> <span class="o">%</span> <span class="s">"test"</span><span class="p">,</span>
+<div class="highlight"><pre><code class="language-scala" data-lang="scala"><span></span><span class="n">libraryDependencies</span> <span class="o">++=</span> <span class="nc">Seq</span><span class="o">(</span>
+ <span class="s">"com.amazonaws"</span> <span class="o">%</span> <span class="s">"aws-java-sdk"</span> <span class="o">%</span> <span class="s">"1.9.23"</span> <span class="n">exclude</span><span class="o">(</span><span class="s">"common-logging"</span><span class="o">,</span> <span class="s">"common-logging"</span><span class="o">),</span>
+ <span class="s">"org.joda"</span> <span class="o">%</span> <span class="s">"joda-convert"</span> <span class="o">%</span> <span class="s">"1.7"</span><span class="o">,</span>
+ <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"2.7"</span><span class="o">,</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-services"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-service"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-hadoop"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"mysql-metadata-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-s3-extensions"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-histogram"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-hdfs-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-core"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-databind"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-guava"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-joda"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-base"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-json-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-smile-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.module"</span> <span class="o">%</span> <span class="s">"jackson-module-jaxb-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.sun.jersey"</span> <span class="o">%</span> <span class="s">"jersey-servlet"</span> <span class="o">%</span> <span class="s">"1.17.1"</span><span class="o">,</span>
+ <span class="s">"mysql"</span> <span class="o">%</span> <span class="s">"mysql-connector-java"</span> <span class="o">%</span> <span class="s">"5.1.34"</span><span class="o">,</span>
+ <span class="s">"org.scalatest"</span> <span class="o">%%</span> <span class="s">"scalatest"</span> <span class="o">%</span> <span class="s">"2.2.3"</span> <span class="o">%</span> <span class="s">"test"</span><span class="o">,</span>
<span class="s">"org.mockito"</span> <span class="o">%</span> <span class="s">"mockito-core"</span> <span class="o">%</span> <span class="s">"1.10.19"</span> <span class="o">%</span> <span class="s">"test"</span>
-<span class="p">)</span>
+<span class="o">)</span>
-<span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span> <span class="o">:=</span> <span class="p">{</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"pom."</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"javax.inject.Named"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"mime.types"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog$1.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/NoOpLog.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogFactory.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogConfigurationException.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/Log.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"META-INF/jersey-module-version"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".properties"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">x</span> <span class="o">=></span>
- <span class="kd">val</span> <span class="n">oldStrategy</span> <span class="o">=</span> <span class="p">(</span><span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span><span class="p">).</span><span class="n">value</span>
- <span class="n">oldStrategy</span><span class="p">(</span><span class="n">x</span><span class="p">)</span>
-<span class="p">}</span>
+<span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span> <span class="o">:=</span> <span class="o">{</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"pom."</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"javax.inject.Named"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"mime.types"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog$1.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/NoOpLog.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogFactory.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogConfigurationException.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/Log.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"META-INF/jersey-module-version"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".properties"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">x</span> <span class="k">=></span>
+ <span class="k">val</span> <span class="n">oldStrategy</span> <span class="k">=</span> <span class="o">(</span><span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span><span class="o">).</span><span class="n">value</span>
+ <span class="n">oldStrategy</span><span class="o">(</span><span class="n">x</span><span class="o">)</span>
+<span class="o">}</span>
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.14.2-incubating/querying/aggregations.html b/docs/0.14.2-incubating/querying/aggregations.html
index 0994800..37d1c68 100644
--- a/docs/0.14.2-incubating/querying/aggregations.html
+++ b/docs/0.14.2-incubating/querying/aggregations.html
@@ -158,7 +158,7 @@
<h3 id="count-aggregator">Count aggregator</h3>
<p><code>count</code> computes the count of Druid rows that match the filters.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span> <span class="p">}</span>
</code></pre></div>
<p>Please note the count aggregator counts the number of Druid rows, which does not always reflect the number of raw events ingested.
This is because Druid can be configured to roll up data at ingestion time. To
@@ -170,7 +170,7 @@
<h4 id="longsum-aggregator"><code>longSum</code> aggregator</h4>
<p>computes the sum of values as a 64-bit, signed integer</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<p><code>name</code> – output name for the summed value
<code>fieldName</code> – name of the metric column to sum over</p>
@@ -178,44 +178,44 @@
<h4 id="doublesum-aggregator"><code>doubleSum</code> aggregator</h4>
<p>Computes and stores the sum of values as 64-bit floating point value. Similar to <code>longSum</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatsum-aggregator"><code>floatSum</code> aggregator</h4>
<p>Computes and stores the sum of values as 32-bit floating point value. Similar to <code>longSum</code> and <code>doubleSum</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="min-max-aggregators">Min / Max aggregators</h3>
<h4 id="doublemin-aggregator"><code>doubleMin</code> aggregator</h4>
<p><code>doubleMin</code> computes the minimum of all metric values and Double.POSITIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="doublemax-aggregator"><code>doubleMax</code> aggregator</h4>
<p><code>doubleMax</code> computes the maximum of all metric values and Double.NEGATIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatmin-aggregator"><code>floatMin</code> aggregator</h4>
<p><code>floatMin</code> computes the minimum of all metric values and Float.POSITIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatmax-aggregator"><code>floatMax</code> aggregator</h4>
<p><code>floatMax</code> computes the maximum of all metric values and Float.NEGATIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="longmin-aggregator"><code>longMin</code> aggregator</h4>
<p><code>longMin</code> computes the minimum of all metric values and Long.MAX_VALUE</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="longmax-aggregator"><code>longMax</code> aggregator</h4>
<p><code>longMax</code> computes the maximum of all metric values and Long.MIN_VALUE</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="first-last-aggregator">First / Last aggregator</h3>
@@ -228,8 +228,8 @@
<p><code>doubleFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="doublelast-aggregator"><code>doubleLast</code> aggregator</h4>
@@ -237,8 +237,8 @@
<p><code>doubleLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="floatfirst-aggregator"><code>floatFirst</code> aggregator</h4>
@@ -246,8 +246,8 @@
<p><code>floatFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="floatlast-aggregator"><code>floatLast</code> aggregator</h4>
@@ -255,8 +255,8 @@
<p><code>floatLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="longfirst-aggregator"><code>longFirst</code> aggregator</h4>
@@ -264,8 +264,8 @@
<p><code>longFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="longlast-aggregator"><code>longLast</code> aggregator</h4>
@@ -273,8 +273,8 @@
<p><code>longLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="stringfirst-aggregator"><code>stringFirst</code> aggregator</h4>
@@ -282,10 +282,10 @@
<p><code>stringFirst</code> computes the metric value with the minimum timestamp or <code>null</code> if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1024</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolea</span><span class="kc">n</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><integer></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">1024),</span>
+ <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolean></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="stringlast-aggregator"><code>stringLast</code> aggregator</h4>
@@ -293,10 +293,10 @@
<p><code>stringLast</code> computes the metric value with the maximum timestamp or <code>null</code> if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1024</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolea</span><span class="kc">n</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><integer></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">1024),</span>
+ <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolean></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<h3 id="javascript-aggregator">JavaScript aggregator</h3>
@@ -305,7 +305,7 @@
JavaScript functions are expected to return floating-point values.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><colum</span><span class="kc">n</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><colum</span><span class="kc">n</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
+ <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><column</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><column</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
<span class="nt">"fnAggregate"</span> <span class="p">:</span> <span class="s2">"function(current, column1, column2, ...) {</span>
<span class="s2"> <updates partial aggregate (current) based on the current row values></span>
<span class="s2"> return <updated partial aggregate></span>
@@ -418,10 +418,10 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"filtered"</span><span class="p">,</span>
<span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span> <span class="err">value></span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><dimension</span> <span class="err">value></span>
<span class="p">}</span>
- <span class="nt">"aggregator"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="s2">"aggregator"</span> <span class="p">:</span> <span class="err"><aggregation></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.14.2-incubating/querying/dimensionspecs.html b/docs/0.14.2-incubating/querying/dimensionspecs.html
index e98d903..822091e 100644
--- a/docs/0.14.2-incubating/querying/dimensionspecs.html
+++ b/docs/0.14.2-incubating/querying/dimensionspecs.html
@@ -161,8 +161,8 @@
<p>Returns dimension values as is and optionally renames the dimension.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"default"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"outputName"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"outputName"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
<span class="nt">"outputType"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"STRING"</span><span class="err">|</span><span class="s2">"LONG"</span><span class="err">|</span><span class="s2">"FLOAT"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
@@ -175,10 +175,10 @@
<p>Returns dimension values transformed using the given <a href="#extraction-functions">extraction function</a>.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"extraction"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"outputName"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"outputName"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
<span class="nt">"outputType"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"STRING"</span><span class="err">|</span><span class="s2">"LONG"</span><span class="err">|</span><span class="s2">"FLOAT"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><extraction_function></span>
<span class="p">}</span>
</code></pre></div>
<p><code>outputType</code> may also be specified in an ExtractionDimensionSpec to apply type conversion to results before merging. If left unspecified, the <code>outputType</code> defaults to STRING.</p>
@@ -195,13 +195,13 @@
<p>In addition to "query filter" which efficiently selects the rows to be processed, you can use the filtered dimension spec to filter for specific values within the values of a multi-value dimension. These dimensionSpecs take a delegate DimensionSpec and a filtering criteria. From the "exploded" rows, only rows matching the given filtering criteria are returned in the query result.</p>
<p>The following filtered dimension spec acts as a whitelist or blacklist for values as per the "isWhitelist" attribute value.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"listFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"values"</span><span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">gs></span><span class="p">,</span> <span class="nt">"isWhitelist"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">a</span><span class="kc">ttr</span><span class="err">ibu</span><span class="kc">te</span> <span class="kc">f</span><span class="err">or</span> <span class="kc">true</span><span class="err">/</span><span class="kc">false</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">is</span> <span class="kc">true</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"listFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"values"</span><span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">strings></span><span class="p">,</span> <span class="nt">"isWhitelist"</span><span class="p">:</span> <span class="err"><optional</span> <span class="err">attribute</span> <span class="err">for</span> <span class="kc">true</span><span class="err">/</span><span class="kc">false</span><span class="p">,</span> <span class="err">default</span> <span class="err">is</span> <span class="err">true></span> <span class="p">}</span>
</code></pre></div>
<p>Following filtered dimension spec retains only the values matching regex. Note that <code>listFiltered</code> is faster than this and one should use that for whitelist or blacklist usecase.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regexFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><java</span> <span class="err">regex</span> <span class="err">pa</span><span class="kc">ttern</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regexFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><java</span> <span class="err">regex</span> <span class="err">pattern></span> <span class="p">}</span>
</code></pre></div>
<p>Following filtered dimension spec retains only the values starting with the same prefix.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"prefixFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"prefix"</span><span class="p">:</span> <span class="err"><pre</span><span class="kc">f</span><span class="err">ix</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"prefixFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"prefix"</span><span class="p">:</span> <span class="err"><prefix</span> <span class="err">string></span> <span class="p">}</span>
</code></pre></div>
<p>For more details and examples, see <a href="multi-value-dimensions.html">multi-value dimensions</a>.</p>
@@ -295,8 +295,8 @@
If there is no match, it returns the dimension value as is.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span>
- <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expressio</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"index"</span> <span class="p">:</span> <span class="err"><group</span> <span class="kc">t</span><span class="err">o</span> <span class="err">ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="mi">1</span><span class="err">></span>
+ <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expression></span><span class="p">,</span>
+ <span class="nt">"index"</span> <span class="p">:</span> <span class="err"><group</span> <span class="err">to</span> <span class="err">extract</span><span class="p">,</span> <span class="err">default</span> <span class="err">1></span>
<span class="nt">"replaceMissingValue"</span> <span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
<span class="nt">"replaceMissingValueWith"</span> <span class="p">:</span> <span class="s2">"foobar"</span>
<span class="p">}</span>
@@ -316,7 +316,7 @@
<h3 id="partial-extraction-function">Partial Extraction Function</h3>
<p>Returns the dimension value unchanged if the regular expression matches, otherwise returns null.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"partial"</span><span class="p">,</span> <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expressio</span><span class="kc">n</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"partial"</span><span class="p">,</span> <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expression></span> <span class="p">}</span>
</code></pre></div>
<h3 id="search-query-extraction-function">Search Query Extraction Function</h3>
@@ -366,11 +366,11 @@
<li><code>asMillis</code> : boolean value, set to true to treat input strings as millis rather than ISO8601 strings. Additionally, if <code>format</code> is null or not specified, output will be in millis rather than ISO8601.</li>
</ul>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"timeFormat"</span><span class="p">,</span>
- <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"timeZone"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">t</span><span class="err">ime_zo</span><span class="kc">ne</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">UTC)</span><span class="p">,</span>
- <span class="nt">"locale"</span> <span class="p">:</span> <span class="err"><locale></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">curre</span><span class="kc">nt</span> <span class="err">locale)</span><span class="p">,</span>
- <span class="nt">"granularity"</span> <span class="p">:</span> <span class="err"><gra</span><span class="kc">nular</span><span class="err">i</span><span class="kc">t</span><span class="err">y></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="kc">n</span><span class="err">o</span><span class="kc">ne</span><span class="err">)</span> <span class="p">},</span>
- <span class="nt">"asMillis"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">)</span> <span class="p">}</span>
+ <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><output_format></span> <span class="err">(optional)</span><span class="p">,</span>
+ <span class="nt">"timeZone"</span> <span class="p">:</span> <span class="err"><time_zone></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">UTC),</span>
+ <span class="nt">"locale"</span> <span class="p">:</span> <span class="err"><locale></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">current</span> <span class="err">locale),</span>
+ <span class="nt">"granularity"</span> <span class="p">:</span> <span class="err"><granularity></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">none)</span> <span class="p">}</span><span class="err">,</span>
+ <span class="s2">"asMillis"</span> <span class="err">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span> <span class="err">(optional)</span> <span class="err">}</span>
</code></pre></div>
<p>For example, the following dimension spec returns the day of the week for Montréal in French:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -401,9 +401,9 @@
<p>If a value cannot be parsed using the provided timeFormat, it will be returned as-is.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"time"</span><span class="p">,</span>
- <span class="nt">"timeFormat"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"resultFormat"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"joda"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span><span class="p">,</span> <span class="kc">false</span><span class="err">></span> <span class="p">}</span>
+ <span class="nt">"timeFormat"</span> <span class="p">:</span> <span class="err"><input_format></span><span class="p">,</span>
+ <span class="nt">"resultFormat"</span> <span class="p">:</span> <span class="err"><output_format></span><span class="p">,</span>
+ <span class="nt">"joda"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span><span class="p">,</span> <span class="err">false></span> <span class="p">}</span>
</code></pre></div>
<h3 id="javascript-extraction-function">Javascript Extraction Function</h3>
@@ -574,7 +574,7 @@
<h3 id="string-format-extraction-function">String Format Extraction Function</h3>
<p>Returns the dimension value formatted according to the given format string.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFormat"</span><span class="p">,</span> <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><spri</span><span class="kc">ntf</span><span class="err">_expressio</span><span class="kc">n</span><span class="err">></span><span class="p">,</span> <span class="nt">"nullHandling"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">a</span><span class="kc">ttr</span><span class="err">ibu</span><span class="kc">te</span> <span class="kc">f</span><span class="err">or</span> <span class="err">ha</span><span class="kc">n</span><span class="err">dli</span><span class="kc">n</span><span class="err">g</span> <span class="kc">null</span> <span class="err">value></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFormat"</span><span class="p">,</span> <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><sprintf_expression></span><span class="p">,</span> <span class="nt">"nullHandling"</span> <span class="p">:</span> <span class="err"><optional</span> <span class="err">attribute</span> <span class="err">for</span> <span class="err">handling</span> <span class="kc">null</span> <span class="err">value></span> <span class="p">}</span>
</code></pre></div>
<p>For example if you want to concat "[" and "]" before and after the actual dimension value, you need to specify "[%s]" as format string. "nullHandling" can be one of <code>nullString</code>, <code>emptyString</code> or <code>returnNull</code>. With "[%s]" format, each configuration will result <code>[null]</code>, <code>[]</code>, <code>null</code>. Default is <code>nullString</code>.</p>
diff --git a/docs/0.14.2-incubating/querying/filters.html b/docs/0.14.2-incubating/querying/filters.html
index 6e4fb4d..3642ce1 100644
--- a/docs/0.14.2-incubating/querying/filters.html
+++ b/docs/0.14.2-incubating/querying/filters.html
@@ -157,7 +157,7 @@
<p>The simplest filter is a selector filter. The selector filter will match a specific dimension with a specific value. Selector filters can be used as the base filters for more complex Boolean expressions of filters.</p>
<p>The grammar for a SELECTOR filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_value_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dimension_value_string></span> <span class="p">}</span>
</code></pre></div>
<p>This is the equivalent of <code>WHERE <dimension_string> = '<dimension_value_string>'</code>.</p>
@@ -166,7 +166,7 @@
<h3 id="column-comparison-filter">Column Comparison filter</h3>
<p>The column comparison filter is similar to the selector filter, but instead compares dimensions to each other. For example:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"columnComparison"</span><span class="p">,</span> <span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span><span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_a></span><span class="p">,</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_b></span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"columnComparison"</span><span class="p">,</span> <span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span><span class="err"><dimension_a></span><span class="p">,</span> <span class="err"><dimension_b></span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>This is the equivalent of <code>WHERE <dimension_a> = <dimension_b></code>.</p>
@@ -175,7 +175,7 @@
<h3 id="regular-expression-filter">Regular expression filter</h3>
<p>The regular expression filter is similar to the selector filter, but using regular expressions. It matches the specified dimension with the given pattern. The pattern can be any standard <a href="http://docs.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html">Java regular expression</a>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><pa</span><span class="kc">ttern</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><pattern_string></span> <span class="p">}</span>
</code></pre></div>
<p>The regex filter supports the use of extraction functions, see <a href="#filtering-with-extraction-functions">Filtering with Extraction Functions</a> for details.</p>
@@ -184,21 +184,21 @@
<h4 id="and">AND</h4>
<p>The grammar for an AND filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>The filters in fields can be any other filter defined on this page.</p>
<h4 id="or">OR</h4>
<p>The grammar for an OR filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"or"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"or"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>The filters in fields can be any other filter defined on this page.</p>
<h4 id="not">NOT</h4>
<p>The grammar for a NOT filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"not"</span><span class="p">,</span> <span class="nt">"field"</span><span class="p">:</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"not"</span><span class="p">,</span> <span class="nt">"field"</span><span class="p">:</span> <span class="err"><filter></span> <span class="p">}</span>
</code></pre></div>
<p>The filter specified at field can be any other filter defined on this page.</p>
@@ -209,7 +209,7 @@
<p>The function takes a single argument, the dimension value, and returns either true or false.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span>
<span class="nt">"function"</span> <span class="p">:</span> <span class="s2">"function(value) { <...> }"</span>
<span class="p">}</span>
</code></pre></div>
@@ -699,14 +699,14 @@
the "regex" filter) the numeric column values will be converted to strings during the scan.</p>
<p>For example, filtering on a specific value, <code>myFloatColumn = 10.1</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"myFloatColumn"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"10.1"</span>
<span class="p">}</span>
</code></pre></div>
<p>Filtering on a range of values, <code>10 <= myFloatColumn < 20</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"bound"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"myFloatColumn"</span><span class="p">,</span>
<span class="nt">"ordering"</span><span class="p">:</span> <span class="s2">"numeric"</span><span class="p">,</span>
@@ -725,14 +725,14 @@
<p>If the user wishes to interpret the timestamp with a specific format, timezone, or locale, the <a href="./dimensionspecs.html#time-format-extraction-function">Time Format Extraction Function</a> is useful.</p>
<p>For example, filtering on a long timestamp value:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"__time"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"124457387532"</span>
<span class="p">}</span>
</code></pre></div>
<p>Filtering on day of week:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"__time"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"Friday"</span><span class="p">,</span>
diff --git a/docs/0.14.2-incubating/querying/granularities.html b/docs/0.14.2-incubating/querying/granularities.html
index 62b1af4..3f8ee67 100644
--- a/docs/0.14.2-incubating/querying/granularities.html
+++ b/docs/0.14.2-incubating/querying/granularities.html
@@ -308,10 +308,10 @@
<p>Duration granularities are specified as an exact duration in milliseconds and timestamps are returned as UTC. Duration granularity values are in millis.</p>
<p>They also support specifying an optional origin, which defines where to start counting time buckets from (defaults to 1970-01-01T00:00:00Z).</p>
-<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mf">7200000</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mi">7200000</span><span class="p">}</span>
</code></pre></div>
<p>This chunks up every 2 hours.</p>
-<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mf">3600000</span><span class="p">,</span> <span class="s2">"origin"</span><span class="o">:</span> <span class="s2">"2012-01-01T00:30:00Z"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mi">3600000</span><span class="p">,</span> <span class="s2">"origin"</span><span class="o">:</span> <span class="s2">"2012-01-01T00:30:00Z"</span><span class="p">}</span>
</code></pre></div>
<p>This chunks up every hour on the half-hour.</p>
diff --git a/docs/0.14.2-incubating/querying/groupbyquery.html b/docs/0.14.2-incubating/querying/groupbyquery.html
index e3ec614..e946ba1 100644
--- a/docs/0.14.2-incubating/querying/groupbyquery.html
+++ b/docs/0.14.2-incubating/querying/groupbyquery.html
@@ -277,10 +277,10 @@
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"2012-01-01T00:00:00.000Z"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"country"</span> <span class="p">:</span> <span class="err"><some_dim_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"device"</span> <span class="p">:</span> <span class="err"><some_dim_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"total_usage"</span> <span class="p">:</span> <span class="err"><some_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"data_transfer"</span> <span class="p">:</span><span class="err"><some_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
+ <span class="nt">"country"</span> <span class="p">:</span> <span class="err"><some_dim_value_one></span><span class="p">,</span>
+ <span class="nt">"device"</span> <span class="p">:</span> <span class="err"><some_dim_value_two></span><span class="p">,</span>
+ <span class="nt">"total_usage"</span> <span class="p">:</span> <span class="err"><some_value_one></span><span class="p">,</span>
+ <span class="nt">"data_transfer"</span> <span class="p">:</span><span class="err"><some_value_two></span><span class="p">,</span>
<span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_avg_usage_value></span>
<span class="p">}</span>
<span class="p">},</span>
@@ -288,11 +288,11 @@
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"2012-01-01T00:00:12.000Z"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"dim1"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_dim_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"dim2"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_dim_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"sample_name1"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"sample_name2"</span> <span class="p">:</span><span class="err"><some_o</span><span class="kc">t</span><span class="err">her_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_avg_usage_value></span>
+ <span class="nt">"dim1"</span> <span class="p">:</span> <span class="err"><some_other_dim_value_one></span><span class="p">,</span>
+ <span class="nt">"dim2"</span> <span class="p">:</span> <span class="err"><some_other_dim_value_two></span><span class="p">,</span>
+ <span class="nt">"sample_name1"</span> <span class="p">:</span> <span class="err"><some_other_value_one></span><span class="p">,</span>
+ <span class="nt">"sample_name2"</span> <span class="p">:</span><span class="err"><some_other_value_two></span><span class="p">,</span>
+ <span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_other_avg_usage_value></span>
<span class="p">}</span>
<span class="p">},</span>
<span class="err">...</span>
@@ -326,7 +326,7 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"extraction"</span><span class="p">,</span>
<span class="nt">"dimension"</span> <span class="p">:</span> <span class="s2">"d2col"</span><span class="p">,</span>
<span class="nt">"outputName"</span> <span class="p">:</span> <span class="s2">"D2"</span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err">ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fun</span><span class="err">c</span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err">extraction_func</span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span><span class="s2">"lookup"</span><span class="p">,</span>
@@ -337,10 +337,10 @@
<span class="p">],</span>
<span class="err">...</span>
<span class="err">...</span>
-<span class="nt">"subtotalsSpec"</span><span class="p">:[</span> <span class="p">[</span><span class="s2">"D1"</span><span class="p">,</span> <span class="s2">"D2"</span><span class="p">,</span> <span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">1</span><span class="s2">", "</span><span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">3</span><span class="err">"]],</span>
+<span class="nt">"subtotalsSpec"</span><span class="p">:[</span> <span class="p">[</span><span class="s2">"D1"</span><span class="p">,</span> <span class="s2">"D2"</span><span class="p">,</span> <span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">1</span><span class="s2">", "</span><span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">3</span><span class="err">"</span><span class="p">]],</span>
<span class="err">..</span>
-<span class="err">}</span>
+<span class="p">}</span>
</code></pre></div>
<p>Response returned would be equivalent to concatenating result of 3 groupBy queries with "dimensions" field being ["D1", "D2", D3"], ["D1", "D3"] and ["D3"] with appropriate <code>DimensionSpec</code> json blob as used in above query.
Response for above query would look something like below...</p>
@@ -350,13 +350,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D2"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D2"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="err">...</span>
@@ -365,13 +365,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="err">...</span>
@@ -380,13 +380,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="p">]</span>
</code></pre></div>
diff --git a/docs/0.14.2-incubating/querying/having.html b/docs/0.14.2-incubating/querying/having.html
index a885ec7..0d45da9 100644
--- a/docs/0.14.2-incubating/querying/having.html
+++ b/docs/0.14.2-incubating/querying/having.html
@@ -168,7 +168,7 @@
<span class="nt">"having"</span><span class="p">:</span>
<span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"filter"</span><span class="p">,</span>
- <span class="nt">"filter"</span> <span class="p">:</span> <span class="err"><a</span><span class="kc">n</span><span class="err">y</span> <span class="err">Druid</span> <span class="err">query</span> <span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span>
+ <span class="nt">"filter"</span> <span class="p">:</span> <span class="err"><any</span> <span class="err">Druid</span> <span class="err">query</span> <span class="err">filter></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -205,7 +205,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -221,7 +221,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -239,7 +239,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -257,7 +257,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"lessThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -277,7 +277,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimSelector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"<dimension>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dimension_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -297,12 +297,12 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"lessThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">]</span>
<span class="p">}</span>
@@ -322,12 +322,12 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">]</span>
<span class="p">}</span>
@@ -347,7 +347,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
<span class="p">}</span>
diff --git a/docs/0.14.2-incubating/querying/hll-old.html b/docs/0.14.2-incubating/querying/hll-old.html
index 512081d..10bc86c 100644
--- a/docs/0.14.2-incubating/querying/hll-old.html
+++ b/docs/0.14.2-incubating/querying/hll-old.html
@@ -159,9 +159,9 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"cardinality"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
- <span class="nt">"byRow"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"round"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span> <span class="err"><dimension</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><dimension</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
+ <span class="nt">"byRow"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false),</span>
+ <span class="nt">"round"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<p>Each individual element of the "fields" list can be a String or <a href="../querying/dimensionspecs.html">DimensionSpec</a>. A String dimension in the fields list is equivalent to a DefaultDimensionSpec (no transformations).</p>
@@ -233,8 +233,8 @@
<p>Uses <a href="http://algo.inria.fr/flajolet/Publications/FlFuGaMe07.pdf">HyperLogLog</a> to compute the estimated cardinality of a dimension that has been aggregated as a "hyperUnique" metric at indexing time.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUnique"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="nt">"isInputHyperUnique"</span> <span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
<span class="nt">"round"</span> <span class="p">:</span> <span class="kc">false</span>
<span class="p">}</span>
diff --git a/docs/0.14.2-incubating/querying/limitspec.html b/docs/0.14.2-incubating/querying/limitspec.html
index 4509852..ddb7442 100644
--- a/docs/0.14.2-incubating/querying/limitspec.html
+++ b/docs/0.14.2-incubating/querying/limitspec.html
@@ -157,8 +157,8 @@
<p>The default limit spec takes a limit and the list of columns to do an orderBy operation over. The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"default"</span><span class="p">,</span>
- <span class="nt">"limit"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger_value></span><span class="p">,</span>
- <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">OrderByColum</span><span class="kc">n</span><span class="err">Spec</span><span class="p">],</span>
+ <span class="nt">"limit"</span> <span class="p">:</span> <span class="err"><integer_value></span><span class="p">,</span>
+ <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err">list</span> <span class="err">of</span> <span class="err">OrderByColumnSpec</span><span class="p">],</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="orderbycolumnspec">OrderByColumnSpec</h4>
@@ -167,7 +167,7 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"dimension"</span> <span class="p">:</span> <span class="s2">"<Any dimension or metric name>"</span><span class="p">,</span>
<span class="nt">"direction"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"ascending"</span><span class="err">|</span><span class="s2">"descending"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"dimensionOrder"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"lexicographic"</span><span class="err">(de</span><span class="kc">fault</span><span class="err">)|</span><span class="s2">"alphanumeric"</span><span class="err">|</span><span class="s2">"strlen"</span><span class="err">|</span><span class="s2">"numeric"</span><span class="err">></span>
+ <span class="nt">"dimensionOrder"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"lexicographic"</span><span class="err">(default)|</span><span class="s2">"alphanumeric"</span><span class="err">|</span><span class="s2">"strlen"</span><span class="err">|</span><span class="s2">"numeric"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
<p>If only the dimension is provided (as a JSON string), the default order-by is ascending with lexicographic sorting.</p>
diff --git a/docs/0.14.2-incubating/querying/post-aggregations.html b/docs/0.14.2-incubating/querying/post-aggregations.html
index 70c0c4d..770f5e5 100644
--- a/docs/0.14.2-incubating/querying/post-aggregations.html
+++ b/docs/0.14.2-incubating/querying/post-aggregations.html
@@ -177,12 +177,12 @@
</ul>
<p>The grammar for an arithmetic post aggregation is:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">pos</span><span class="kc">t</span><span class="err">Aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">postAggregation</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arithmetic"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fn"</span> <span class="p">:</span> <span class="err"><ari</span><span class="kc">t</span><span class="err">hme</span><span class="kc">t</span><span class="err">ic_</span><span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
- <span class="nt">"ordering"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">null</span> <span class="err">(de</span><span class="kc">fault</span><span class="err">)</span><span class="p">,</span> <span class="err">or</span> <span class="s2">"numericFirst"</span><span class="err">></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fn"</span> <span class="p">:</span> <span class="err"><arithmetic_function></span><span class="p">,</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><post_aggregator></span><span class="p">,</span> <span class="err"><post_aggregator></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
+ <span class="nt">"ordering"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">null</span> <span class="err">(default)</span><span class="p">,</span> <span class="err">or</span> <span class="nt">"numericFirst"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="field-accessor-post-aggregators">Field accessor post-aggregators</h3>
@@ -193,15 +193,15 @@
For complex aggregators, like "cardinality" and "hyperUnique", the <code>type</code> of the post-aggregator determines what
the post-aggregator will return. Use type "fieldAccess" to return the raw aggregation object, or use type
"finalizingFieldAccess" to return a finalized value, such as an estimated cardinality.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<p>or</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"finalizingFieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"finalizingFieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="constant-post-aggregator">Constant post-aggregator</h3>
<p>The constant post-aggregator always returns the specified value.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"constant"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">merical_value></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"constant"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><numerical_value></span> <span class="p">}</span>
</code></pre></div>
<h3 id="greatest-least-post-aggregators">Greatest / Least post-aggregators</h3>
@@ -216,18 +216,18 @@
<p>Example:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleGreatest"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><post_aggregator></span><span class="p">,</span> <span class="err"><post_aggregator></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span>
<span class="p">}</span>
</code></pre></div>
<h3 id="javascript-post-aggregator">JavaScript post-aggregator</h3>
<p>Applies the provided JavaScript function to the given fields. Fields are passed as arguments to the JavaScript function in the given order.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">pos</span><span class="kc">t</span><span class="err">Aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">postAggregation</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
- <span class="nt">"function"</span><span class="p">:</span> <span class="err"><javascrip</span><span class="kc">t</span> <span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><aggregator_name></span><span class="p">,</span> <span class="err"><aggregator_name></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
+ <span class="nt">"function"</span><span class="p">:</span> <span class="err"><javascript</span> <span class="err">function></span>
<span class="p">}</span>
</code></pre></div>
<p>Example JavaScript aggregator:</p>
@@ -247,16 +247,16 @@
<p>The hyperUniqueCardinality post aggregator is used to wrap a hyperUnique object such that it can be used in post aggregations.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUniqueCardinality"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">t</span><span class="err">he</span> <span class="kc">na</span><span class="err">me</span> <span class="kc">f</span><span class="err">ield</span> <span class="err">value</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hyperU</span><span class="kc">n</span><span class="err">ique</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><the</span> <span class="err">name</span> <span class="err">field</span> <span class="err">value</span> <span class="err">of</span> <span class="err">the</span> <span class="err">hyperUnique</span> <span class="err">aggregator></span>
<span class="p">}</span>
</code></pre></div>
<p>It can be used in a sample calculation as so:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"aggregations"</span> <span class="p">:</span> <span class="p">[{</span>
- <span class="p">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"rows"</span><span class="p">},</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"aggregations"</span> <span class="err">:</span> <span class="p">[{</span>
+ <span class="err">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"rows"</span><span class="p">},</span>
<span class="p">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUnique"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"unique_users"</span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="s2">"uniques"</span><span class="p">}</span>
- <span class="p">}],</span>
- <span class="nt">"postAggregations"</span> <span class="p">:</span> <span class="p">[{</span>
+ <span class="err">}</span><span class="p">]</span><span class="err">,</span>
+ <span class="s2">"postAggregations"</span> <span class="err">:</span> <span class="p">[{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arithmetic"</span><span class="p">,</span>
<span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"average_users_per_row"</span><span class="p">,</span>
<span class="nt">"fn"</span> <span class="p">:</span> <span class="s2">"/"</span><span class="p">,</span>
diff --git a/docs/0.14.2-incubating/querying/segmentmetadataquery.html b/docs/0.14.2-incubating/querying/segmentmetadataquery.html
index a5dc564..e04807b 100644
--- a/docs/0.14.2-incubating/querying/segmentmetadataquery.html
+++ b/docs/0.14.2-incubating/querying/segmentmetadataquery.html
@@ -263,17 +263,17 @@
<h4 id="all">All</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"all"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"all"</span><span class="p">}</span>
</code></pre></div>
<h4 id="none">None</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
</code></pre></div>
<h4 id="list">List</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"list"</span><span class="p">,</span> <span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">colum</span><span class="kc">n</span> <span class="kc">na</span><span class="err">mes></span><span class="p">]}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"list"</span><span class="p">,</span> <span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="err"><string</span> <span class="err">list</span> <span class="err">of</span> <span class="err">column</span> <span class="err">names></span><span class="p">]}</span>
</code></pre></div>
<h3 id="analysistypes">analysisTypes</h3>
diff --git a/docs/0.14.2-incubating/querying/select-query.html b/docs/0.14.2-incubating/querying/select-query.html
index 75dcbc2..a8a0a98 100644
--- a/docs/0.14.2-incubating/querying/select-query.html
+++ b/docs/0.14.2-incubating/querying/select-query.html
@@ -341,9 +341,9 @@
<p>The <code>threshold</code> determines how many hits are returned, with each hit indexed by an offset. When <code>descending</code> is true, the offset will be negative value.</p>
<p>The results above include:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"pagingIdentifiers"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"pagingIdentifiers"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"wikipedia_2012-12-29T00:00:00.000Z_2013-01-10T08:00:00.000Z_2013-01-10T08:13:47.830Z_v9"</span> <span class="p">:</span> <span class="mi">4</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<h3 id="result-pagination">Result Pagination</h3>
@@ -352,7 +352,7 @@
<p>The <code>threshold</code> option controls how many rows are returned in each block of paginated results.</p>
<p>To initiate a paginated query, the user should specify a PagingSpec with a <code>threshold</code> set and a blank <code>pagingIdentifiers</code> field, e.g.:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"pagingSpec"</span><span class="p">:{</span><span class="nt">"pagingIdentifiers"</span><span class="p">:</span> <span class="p">{},</span> <span class="nt">"threshold"</span><span class="p">:</span><span class="mi">5</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"pagingSpec"</span><span class="err">:</span><span class="p">{</span><span class="nt">"pagingIdentifiers"</span><span class="p">:</span> <span class="p">{},</span> <span class="nt">"threshold"</span><span class="p">:</span><span class="mi">5</span><span class="p">}</span>
</code></pre></div>
<p>When the query returns, the results will contain a <code>pagingIndentifers</code> field indicating the current pagination point in the result set (an identifier and an offset).</p>
@@ -381,9 +381,9 @@
<span class="p">}</span>
</code></pre></div>
<p>The paginated query with <code>fromNext</code> set to false returns a result set with the following <code>pagingIdentifiers</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"pagingIdentifiers"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"pagingIdentifiers"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"wikipedia_2012-12-29T00:00:00.000Z_2013-01-10T08:00:00.000Z_2013-01-10T08:13:47.830Z_v9"</span> <span class="p">:</span> <span class="mi">4</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<p>To retrieve the next result set, the next query must be sent with the paging offset (4) incremented by 1.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="p">{</span>
diff --git a/docs/0.14.2-incubating/querying/sql.html b/docs/0.14.2-incubating/querying/sql.html
index af2885d..1c7307a 100644
--- a/docs/0.14.2-incubating/querying/sql.html
+++ b/docs/0.14.2-incubating/querying/sql.html
@@ -975,22 +975,22 @@
<p>Example code:</p>
<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="c1">// Connect to /druid/v2/sql/avatica/ on your Broker.</span>
-<span class="n">String</span> <span class="n">url</span> <span class="o">=</span> <span class="s">"jdbc:avatica:remote:url=http://localhost:8082/druid/v2/sql/avatica/"</span><span class="p">;</span>
+<span class="n">String</span> <span class="n">url</span> <span class="o">=</span> <span class="s">"jdbc:avatica:remote:url=http://localhost:8082/druid/v2/sql/avatica/"</span><span class="o">;</span>
<span class="c1">// Set any connection context parameters you need here (see "Connection context" below).</span>
<span class="c1">// Or leave empty for default behavior.</span>
-<span class="n">Properties</span> <span class="n">connectionProperties</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="p">();</span>
+<span class="n">Properties</span> <span class="n">connectionProperties</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">();</span>
-<span class="k">try</span> <span class="p">(</span><span class="n">Connection</span> <span class="n">connection</span> <span class="o">=</span> <span class="n">DriverManager</span><span class="p">.</span><span class="na">getConnection</span><span class="p">(</span><span class="n">url</span><span class="p">,</span> <span class="n">connectionProperties</span><span class="p">))</span> <span class="p">{</span>
- <span class="k">try</span> <span class="p">(</span>
- <span class="kd">final</span> <span class="n">Statement</span> <span class="n">statement</span> <span class="o">=</span> <span class="n">connection</span><span class="p">.</span><span class="na">createStatement</span><span class="p">();</span>
- <span class="kd">final</span> <span class="n">ResultSet</span> <span class="n">resultSet</span> <span class="o">=</span> <span class="n">statement</span><span class="p">.</span><span class="na">executeQuery</span><span class="p">(</span><span class="n">query</span><span class="p">)</span>
- <span class="p">)</span> <span class="p">{</span>
- <span class="k">while</span> <span class="p">(</span><span class="n">resultSet</span><span class="p">.</span><span class="na">next</span><span class="p">())</span> <span class="p">{</span>
+<span class="k">try</span> <span class="o">(</span><span class="n">Connection</span> <span class="n">connection</span> <span class="o">=</span> <span class="n">DriverManager</span><span class="o">.</span><span class="na">getConnection</span><span class="o">(</span><span class="n">url</span><span class="o">,</span> <span class="n">connectionProperties</span><span class="o">))</span> <span class="o">{</span>
+ <span class="k">try</span> <span class="o">(</span>
+ <span class="kd">final</span> <span class="n">Statement</span> <span class="n">statement</span> <span class="o">=</span> <span class="n">connection</span><span class="o">.</span><span class="na">createStatement</span><span class="o">();</span>
+ <span class="kd">final</span> <span class="n">ResultSet</span> <span class="n">resultSet</span> <span class="o">=</span> <span class="n">statement</span><span class="o">.</span><span class="na">executeQuery</span><span class="o">(</span><span class="n">query</span><span class="o">)</span>
+ <span class="o">)</span> <span class="o">{</span>
+ <span class="k">while</span> <span class="o">(</span><span class="n">resultSet</span><span class="o">.</span><span class="na">next</span><span class="o">())</span> <span class="o">{</span>
<span class="c1">// Do something</span>
- <span class="p">}</span>
- <span class="p">}</span>
-<span class="p">}</span>
+ <span class="o">}</span>
+ <span class="o">}</span>
+<span class="o">}</span>
</code></pre></div>
<p>Table metadata is available over JDBC using <code>connection.getMetaData()</code> or by querying the
<a href="#retrieving-metadata">"INFORMATION_SCHEMA" tables</a>. Parameterized queries (using <code>?</code> or other placeholders) don't work properly,
diff --git a/docs/0.14.2-incubating/querying/timeboundaryquery.html b/docs/0.14.2-incubating/querying/timeboundaryquery.html
index 5101556..77987a6 100644
--- a/docs/0.14.2-incubating/querying/timeboundaryquery.html
+++ b/docs/0.14.2-incubating/querying/timeboundaryquery.html
@@ -154,8 +154,8 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"queryType"</span> <span class="p">:</span> <span class="s2">"timeBoundary"</span><span class="p">,</span>
<span class="nt">"dataSource"</span><span class="p">:</span> <span class="s2">"sample_datasource"</span><span class="p">,</span>
- <span class="nt">"bound"</span> <span class="p">:</span> <span class="err"><</span> <span class="s2">"maxTime"</span> <span class="err">|</span> <span class="s2">"minTime"</span> <span class="err">></span> <span class="err">#</span> <span class="err">op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="err">re</span><span class="kc">turn</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">bo</span><span class="kc">t</span><span class="err">h</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mps</span> <span class="err">i</span><span class="kc">f</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="err">se</span><span class="kc">t</span>
- <span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span> <span class="err">#</span> <span class="err">op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span>
+ <span class="nt">"bound"</span> <span class="p">:</span> <span class="err"><</span> <span class="s2">"maxTime"</span> <span class="err">|</span> <span class="s2">"minTime"</span> <span class="err">></span> <span class="err">#</span> <span class="err">optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">returning</span> <span class="err">both</span> <span class="err">timestamps</span> <span class="err">if</span> <span class="err">not</span> <span class="err">set</span>
+ <span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span> <span class="err">#</span> <span class="err">optional</span>
<span class="p">}</span>
</code></pre></div>
<p>There are 3 main parts to a time boundary query:</p>
diff --git a/docs/0.14.2-incubating/querying/topnmetricspec.html b/docs/0.14.2-incubating/querying/topnmetricspec.html
index 0295ba1..c5009f5 100644
--- a/docs/0.14.2-incubating/querying/topnmetricspec.html
+++ b/docs/0.14.2-incubating/querying/topnmetricspec.html
@@ -155,10 +155,10 @@
<h2 id="numeric-topnmetricspec">Numeric TopNMetricSpec</h2>
<p>The simplest metric specification is a String value indicating the metric to sort topN results by. They are included in a topN query with:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="s2">"<metric_name>"</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="s2">"<metric_name>"</span>
</code></pre></div>
<p>The metric field can also be given as a JSON object. The grammar for dimension values sorted by numeric value is shown below:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"numeric"</span><span class="p">,</span>
<span class="nt">"metric"</span><span class="p">:</span> <span class="s2">"<metric_name>"</span>
<span class="p">}</span>
@@ -215,7 +215,7 @@
</tbody></table>
<p>The following metricSpec uses lexicographic sorting.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimension"</span><span class="p">,</span>
<span class="nt">"ordering"</span><span class="p">:</span> <span class="s2">"lexicographic"</span><span class="p">,</span>
<span class="nt">"previousStop"</span><span class="p">:</span> <span class="s2">"<previousStop_value>"</span>
@@ -226,9 +226,9 @@
<h2 id="inverted-topnmetricspec">Inverted TopNMetricSpec</h2>
<p>Sort dimension values in inverted order, i.e inverts the order of the delegate metric spec. It can be used to sort the values in ascending order.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"inverted"</span><span class="p">,</span>
- <span class="nt">"metric"</span><span class="p">:</span> <span class="err"><delega</span><span class="kc">te</span><span class="err">_</span><span class="kc">t</span><span class="err">op_</span><span class="kc">n</span><span class="err">_me</span><span class="kc">tr</span><span class="err">ic_spec></span>
+ <span class="nt">"metric"</span><span class="p">:</span> <span class="err"><delegate_top_n_metric_spec></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.14.2-incubating/tutorials/tutorial-compaction.html b/docs/0.14.2-incubating/tutorials/tutorial-compaction.html
index 5f1b7de..bb42daa 100644
--- a/docs/0.14.2-incubating/tutorials/tutorial-compaction.html
+++ b/docs/0.14.2-incubating/tutorials/tutorial-compaction.html
@@ -189,7 +189,7 @@
├────────┤
│ <span class="m">39244</span> │
└────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">1</span>.38s.
+Retrieved <span class="m">1</span> row in <span class="m">1</span>.38s.
</code></pre></div>
<h2 id="compact-the-data">Compact the data</h2>
@@ -236,7 +236,7 @@
├────────┤
│ <span class="m">39244</span> │
└────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">1</span>.30s.
+Retrieved <span class="m">1</span> row in <span class="m">1</span>.30s.
</code></pre></div>
<p>After the Coordinator has been running for at least 15 minutes, the <a href="http://localhost:8888/unified-console.html#segments">segments view</a> should show there are 24 segments, one per hour:</p>
diff --git a/docs/0.14.2-incubating/tutorials/tutorial-ingestion-spec.html b/docs/0.14.2-incubating/tutorials/tutorial-ingestion-spec.html
index 94b9aa9..dcc380d 100644
--- a/docs/0.14.2-incubating/tutorials/tutorial-ingestion-spec.html
+++ b/docs/0.14.2-incubating/tutorials/tutorial-ingestion-spec.html
@@ -194,14 +194,14 @@
<p>Let's start with an empty <code>dataSchema</code> and add fields to it as we progress through the tutorial.</p>
<p>Create a new file called <code>ingestion-tutorial-index.json</code> in <code>quickstart/</code> with the following contents:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{}</span>
</code></pre></div>
<p>We will be making successive edits to this ingestion spec as we progress through the tutorial.</p>
<h3 id="datasource-name">Datasource name</h3>
<p>The datasource name is specified by the <code>dataSource</code> parameter in the <code>dataSchema</code>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
@@ -212,7 +212,7 @@
<p>A <code>dataSchema</code> has a <code>parser</code> field, which defines the parser that Druid will use to interpret the input data.</p>
<p>Since our input data is represented as JSON strings, we'll use a <code>string</code> parser with <code>json</code> format:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -227,7 +227,7 @@
<p>The <code>parser</code> needs to know how to extract the main timestamp field from the input data. When using a <code>json</code> type <code>parseSpec</code>, the timestamp is defined in a <code>timestampSpec</code>. </p>
<p>The timestamp column in our input data is named "ts", containing ISO 8601 timestamps, so let's add a <code>timestampSpec</code> with that information to the <code>parseSpec</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -261,7 +261,7 @@
<p>For this tutorial, let's enable rollup. This is specified with a <code>granularitySpec</code> on the <code>dataSchema</code>. </p>
<p>Note that the <code>granularitySpec</code> lies outside of the <code>parser</code>. We will revist the <code>parser</code> soon when we define our dimensions and metrics.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -294,7 +294,7 @@
<h4 id="dimensions">Dimensions</h4>
<p>Dimensions are specified with a <code>dimensionsSpec</code> inside the <code>parseSpec</code>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -337,7 +337,7 @@
<h4 id="metrics">Metrics</h4>
<p>Metrics are specified with a <code>metricsSpec</code> inside the <code>dataSchema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -380,7 +380,7 @@
<h3 id="no-rollup">No rollup</h3>
<p>If we were not using rollup, all columns would be specified in the <code>dimensionsSpec</code>, e.g.:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"dimensionsSpec"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span>
<span class="s2">"srcIP"</span><span class="p">,</span>
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"srcPort"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"long"</span> <span class="p">},</span>
@@ -391,7 +391,7 @@
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"bytes"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"long"</span> <span class="p">},</span>
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"srcPort"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"double"</span> <span class="p">}</span>
<span class="p">]</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<h3 id="define-granularities">Define granularities</h3>
@@ -405,7 +405,7 @@
<h4 id="segment-granularity">Segment granularity</h4>
<p>Segment granularity is configured by the <code>segmentGranularity</code> property in the <code>granularitySpec</code>. For this tutorial, we'll create hourly segments:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -444,7 +444,7 @@
<h4 id="query-granularity">Query granularity</h4>
<p>The query granularity is configured by the <code>queryGranularity</code> property in the <code>granularitySpec</code>. For this tutorial, let's use minute granularity:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -474,8 +474,8 @@
<span class="nt">"granularitySpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"uniform"</span><span class="p">,</span>
<span class="nt">"segmentGranularity"</span> <span class="p">:</span> <span class="s2">"HOUR"</span><span class="p">,</span>
- <span class="nt">"queryGranularity"</span> <span class="p">:</span> <span class="nt">"MINUTE"</span>
- <span class="nt">"rollup"</span> <span class="p">:</span> <span class="kc">true</span>
+ <span class="nt">"queryGranularity"</span> <span class="p">:</span> <span class="s2">"MINUTE"</span>
+ <span class="s2">"rollup"</span> <span class="p">:</span> <span class="kc">true</span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -490,7 +490,7 @@
<p>For batch tasks, it is necessary to define a time interval. Input rows with timestamps outside of the time interval will not be ingested.</p>
<p>The interval is also specified in the <code>granularitySpec</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -575,7 +575,7 @@
<h2 id="define-the-input-source">Define the input source</h2>
<p>Now let's define our input source, which is specified in an <code>ioConfig</code> object. Each task type has its own type of <code>ioConfig</code>. The native batch task uses "firehoses" to read input data, so let's configure a "local" firehose to read the example netflow data we saved earlier:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"index"</span><span class="p">,</span>
<span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"local"</span><span class="p">,</span>
@@ -637,7 +637,7 @@
<p>Each ingestion task has a <code>tuningConfig</code> section that allows users to tune various ingestion parameters.</p>
<p>As an example, let's add a <code>tuningConfig</code> that sets a target segment size for the native batch ingestion task:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"tuningConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"tuningConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"index"</span><span class="p">,</span>
<span class="nt">"maxRowsPerSegment"</span> <span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
@@ -722,7 +722,7 @@
│ <span class="m">2018</span>-01-01T02:33:00.000Z │ <span class="m">30000</span> │ <span class="m">56</span>.9 │ <span class="m">2</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">5000</span> │ <span class="m">300</span> │ <span class="m">17</span> │ <span class="m">7</span>.7.7.7 │ <span class="m">4000</span> │
│ <span class="m">2018</span>-01-01T02:35:00.000Z │ <span class="m">30000</span> │ <span class="m">46</span>.3 │ <span class="m">1</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">5000</span> │ <span class="m">300</span> │ <span class="m">17</span> │ <span class="m">7</span>.7.7.7 │ <span class="m">4000</span> │
└──────────────────────────┴───────┴──────┴───────┴─────────┴─────────┴─────────┴──────────┴─────────┴─────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">0</span>.12s.
+Retrieved <span class="m">5</span> rows in <span class="m">0</span>.12s.
dsql>
</code></pre></div>
diff --git a/docs/0.14.2-incubating/tutorials/tutorial-query.html b/docs/0.14.2-incubating/tutorials/tutorial-query.html
index d36a62e..64de9bc 100644
--- a/docs/0.14.2-incubating/tutorials/tutorial-query.html
+++ b/docs/0.14.2-incubating/tutorials/tutorial-query.html
@@ -302,7 +302,7 @@
│ Wikipedia:In the news/Candidates │ <span class="m">17</span> │
│ Wikipedia:Requests <span class="k">for</span> page protection │ <span class="m">17</span> │
└──────────────────────────────────────────────────────────┴───────┘
-Retrieved <span class="m">10</span> rows <span class="k">in</span> <span class="m">0</span>.06s.
+Retrieved <span class="m">10</span> rows in <span class="m">0</span>.06s.
</code></pre></div>
<h3 id="additional-druid-sql-queries">Additional Druid SQL queries</h3>
@@ -338,7 +338,7 @@
│ <span class="m">2015</span>-09-12T22:00:00.000Z │ <span class="m">16379</span> │
│ <span class="m">2015</span>-09-12T23:00:00.000Z │ <span class="m">15289</span> │
└──────────────────────────┴──────────────┘
-Retrieved <span class="m">24</span> rows <span class="k">in</span> <span class="m">0</span>.08s.
+Retrieved <span class="m">24</span> rows in <span class="m">0</span>.08s.
</code></pre></div>
<h4 id="groupby">GroupBy</h4>
@@ -353,7 +353,7 @@
│ <span class="c1">#ru.wikipedia │ 640698 │</span>
│ <span class="c1">#es.wikipedia │ 634670 │</span>
└───────────────┴─────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">0</span>.05s.
+Retrieved <span class="m">5</span> rows in <span class="m">0</span>.05s.
</code></pre></div>
<h4 id="scan">Scan</h4>
@@ -368,7 +368,7 @@
│ Lowercase sigmabot III │ User talk:ErrantX │
│ BattyBot │ Hans W. Jung │
└────────────────────────┴────────────────────────────────────────────────────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">0</span>.04s.
+Retrieved <span class="m">5</span> rows in <span class="m">0</span>.04s.
</code></pre></div>
<h4 id="explain-plan-for">EXPLAIN PLAN FOR</h4>
@@ -383,7 +383,7 @@
├─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ DruidQueryRel<span class="o">(</span><span class="nv">query</span><span class="o">=[{</span><span class="s2">"queryType"</span>:<span class="s2">"topN"</span>,<span class="s2">"dataSource"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"table"</span>,<span class="s2">"name"</span>:<span class="s2">"wikipedia"</span><span class="o">}</span>,<span class="s2">"virtualColumns"</span>:<span class="o">[]</span>,<span class="s2">"dimension"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"default"</span>,<span class="s2">"dimension"</span>:<span class="s2">"page"</span>,<span class="s2">"outputName"</span>:<span class="s2">"d0"</span>,<span class="s2">"outputType"</span>:<span class="s2">"STRING"</span><span class="o">}</span>,<span class="s2">"metric"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"numeric"</span>,<span class="s2">"metric"</span>:<span class="s2">"a0"</span><span class="o">}</span>,<span class="s2">"threshold"</span>:10,<span class="s2">"intervals"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"intervals"</span>,<span class="s2">"intervals"</span>:<span class="o">[</span><span class="s2">"2015-09-12T00:00:00.000Z/2015-09-13T00:00:00.001Z"</span><span class="o">]}</span>,<span class="s2">"filter"</span>:null,<span class="s2">"granularity"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"all"</span><span class="o">}</span>,<span class="s2">"aggregations"</span>:<span class="o">[{</span><span class="s2">"type"</span>:<span class="s2">"count"</span>,<span class="s2">"name"</span>:<span class="s2">"a0"</span><span class="o">}]</span>,<span class="s2">"postAggregations"</span>:<span class="o">[]</span>,<span class="s2">"context"</span>:<span class="o">{}</span>,<span class="s2">"descending"</span>:false<span class="o">}]</span>, <span class="nv">signature</span><span class="o">=[{</span>d0:STRING, a0:LONG<span class="o">}])</span> │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">0</span>.03s.
+Retrieved <span class="m">1</span> row in <span class="m">0</span>.03s.
</code></pre></div>
<h2 id="further-reading">Further reading</h2>
diff --git a/docs/0.14.2-incubating/tutorials/tutorial-rollup.html b/docs/0.14.2-incubating/tutorials/tutorial-rollup.html
index 8d97a66..51743c4 100644
--- a/docs/0.14.2-incubating/tutorials/tutorial-rollup.html
+++ b/docs/0.14.2-incubating/tutorials/tutorial-rollup.html
@@ -256,7 +256,7 @@
│ <span class="m">2018</span>-01-02T21:33:00.000Z │ <span class="m">100288</span> │ <span class="m">2</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">161</span> │ <span class="m">7</span>.7.7.7 │
│ <span class="m">2018</span>-01-02T21:35:00.000Z │ <span class="m">2818</span> │ <span class="m">1</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">12</span> │ <span class="m">7</span>.7.7.7 │
└──────────────────────────┴────────┴───────┴─────────┴─────────┴─────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">1</span>.18s.
+Retrieved <span class="m">5</span> rows in <span class="m">1</span>.18s.
dsql>
</code></pre></div>
diff --git a/docs/0.14.2-incubating/tutorials/tutorial-transform-spec.html b/docs/0.14.2-incubating/tutorials/tutorial-transform-spec.html
index 8a132f6..26d4298 100644
--- a/docs/0.14.2-incubating/tutorials/tutorial-transform-spec.html
+++ b/docs/0.14.2-incubating/tutorials/tutorial-transform-spec.html
@@ -267,7 +267,7 @@
│ <span class="m">2018</span>-01-01T06:01:00.000Z │ super-snake │ <span class="m">1</span> │ <span class="m">3</span> │ <span class="m">300</span> │ <span class="m">900</span> │
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ super-octopus │ <span class="m">1</span> │ <span class="m">1</span> │ <span class="m">100</span> │ <span class="m">300</span> │
└──────────────────────────┴────────────────┴───────┴──────────┴────────┴───────────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">0</span>.03s.
+Retrieved <span class="m">3</span> rows in <span class="m">0</span>.03s.
</code></pre></div>
<p>The "lion" row has been discarded, the <code>animal</code> column has been transformed, and we have both the original and transformed <code>number</code> column.</p>
diff --git a/docs/0.14.2-incubating/tutorials/tutorial-update-data.html b/docs/0.14.2-incubating/tutorials/tutorial-update-data.html
index a1f2e12..109b02b 100644
--- a/docs/0.14.2-incubating/tutorials/tutorial-update-data.html
+++ b/docs/0.14.2-incubating/tutorials/tutorial-update-data.html
@@ -179,7 +179,7 @@
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ aardvark │ <span class="m">1</span> │ <span class="m">42</span> │
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ giraffe │ <span class="m">1</span> │ <span class="m">14124</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">1</span>.42s.
+Retrieved <span class="m">3</span> rows in <span class="m">1</span>.42s.
</code></pre></div>
<h3 id="overwrite-the-initial-data">Overwrite the initial data</h3>
@@ -201,7 +201,7 @@
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ aardvark │ <span class="m">1</span> │ <span class="m">9999</span> │
│ <span class="m">2018</span>-01-01T04:01:00.000Z │ bear │ <span class="m">1</span> │ <span class="m">111</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">3</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<h2 id="combine-old-data-with-new-data-and-overwrite">Combine old data with new data and overwrite</h2>
@@ -224,7 +224,7 @@
│ <span class="m">2018</span>-01-01T06:01:00.000Z │ snake │ <span class="m">1</span> │ <span class="m">1234</span> │
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ octopus │ <span class="m">1</span> │ <span class="m">115</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">6</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">6</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<h2 id="append-to-the-data">Append to the data</h2>
@@ -249,7 +249,7 @@
│ <span class="m">2018</span>-01-01T04:01:00.000Z │ bear │ <span class="m">1</span> │ <span class="m">222</span> │
│ <span class="m">2018</span>-01-01T09:01:00.000Z │ falcon │ <span class="m">1</span> │ <span class="m">1241</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">8</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">8</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<p>If we run a GroupBy query instead of a <code>select *</code>, we can see that the "bear" rows will group together at query time:</p>
<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span></span>dsql> <span class="k">select</span> __time, animal, SUM<span class="o">(</span><span class="s2">"count"</span><span class="o">)</span>, SUM<span class="o">(</span><span class="s2">"number"</span><span class="o">)</span> from <span class="s2">"updates-tutorial"</span> group by __time, animal<span class="p">;</span>
@@ -264,7 +264,7 @@
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ octopus │ <span class="m">1</span> │ <span class="m">115</span> │
│ <span class="m">2018</span>-01-01T09:01:00.000Z │ falcon │ <span class="m">1</span> │ <span class="m">1241</span> │
└──────────────────────────┴──────────┴────────┴────────┘
-Retrieved <span class="m">7</span> rows <span class="k">in</span> <span class="m">0</span>.23s.
+Retrieved <span class="m">7</span> rows in <span class="m">0</span>.23s.
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.15.0-incubating/dependencies/metadata-storage.html b/docs/0.15.0-incubating/dependencies/metadata-storage.html
index 1b0d022..1a258dc 100644
--- a/docs/0.15.0-incubating/dependencies/metadata-storage.html
+++ b/docs/0.15.0-incubating/dependencies/metadata-storage.html
@@ -221,7 +221,7 @@
<span class="nt">"metrics"</span><span class="p">:</span><span class="s2">"comma-delimited-list-of-metric-names"</span><span class="p">,</span>
<span class="nt">"shardSpec"</span><span class="p">:{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"none"</span><span class="p">},</span>
<span class="nt">"binaryVersion"</span><span class="p">:</span><span class="mi">9</span><span class="p">,</span>
- <span class="nt">"size"</span><span class="p">:</span><span class="err">size_o</span><span class="kc">f</span><span class="err">_segme</span><span class="kc">nt</span><span class="p">,</span>
+ <span class="nt">"size"</span><span class="p">:</span><span class="err">size_of_segment</span><span class="p">,</span>
<span class="nt">"identifier"</span><span class="p">:</span><span class="s2">"wikipedia_2012-05-23T00:00:00.000Z_2012-05-24T00:00:00.000Z_2012-05-23T00:10:00.046Z"</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.15.0-incubating/design/auth.html b/docs/0.15.0-incubating/design/auth.html
index cb9eecc..62a7a51 100644
--- a/docs/0.15.0-incubating/design/auth.html
+++ b/docs/0.15.0-incubating/design/auth.html
@@ -315,11 +315,11 @@
<p>An Authenticator implementation that is intended to support internal Druid communications must recognize credentials for the "internal system user", as provided by a corresponding Escalator implementation.</p>
<p>An Escalator must implement three methods related to the internal system user:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="kd">public</span> <span class="n">HttpClient</span> <span class="nf">createEscalatedClient</span><span class="p">(</span><span class="n">HttpClient</span> <span class="n">baseClient</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="kd">public</span> <span class="n">HttpClient</span> <span class="nf">createEscalatedClient</span><span class="o">(</span><span class="n">HttpClient</span> <span class="n">baseClient</span><span class="o">);</span>
- <span class="kd">public</span> <span class="n">org</span><span class="p">.</span><span class="na">eclipse</span><span class="p">.</span><span class="na">jetty</span><span class="p">.</span><span class="na">client</span><span class="p">.</span><span class="na">HttpClient</span> <span class="nf">createEscalatedJettyClient</span><span class="p">(</span><span class="n">org</span><span class="p">.</span><span class="na">eclipse</span><span class="p">.</span><span class="na">jetty</span><span class="p">.</span><span class="na">client</span><span class="p">.</span><span class="na">HttpClient</span> <span class="n">baseClient</span><span class="p">);</span>
+ <span class="kd">public</span> <span class="n">org</span><span class="o">.</span><span class="na">eclipse</span><span class="o">.</span><span class="na">jetty</span><span class="o">.</span><span class="na">client</span><span class="o">.</span><span class="na">HttpClient</span> <span class="nf">createEscalatedJettyClient</span><span class="o">(</span><span class="n">org</span><span class="o">.</span><span class="na">eclipse</span><span class="o">.</span><span class="na">jetty</span><span class="o">.</span><span class="na">client</span><span class="o">.</span><span class="na">HttpClient</span> <span class="n">baseClient</span><span class="o">);</span>
- <span class="kd">public</span> <span class="n">AuthenticationResult</span> <span class="nf">createEscalatedAuthenticationResult</span><span class="p">();</span>
+ <span class="kd">public</span> <span class="n">AuthenticationResult</span> <span class="nf">createEscalatedAuthenticationResult</span><span class="o">();</span>
</code></pre></div>
<p><code>createEscalatedClient</code> returns an wrapped HttpClient that attaches the credentials of the "internal system user" to requests.</p>
diff --git a/docs/0.15.0-incubating/development/extensions-contrib/ambari-metrics-emitter.html b/docs/0.15.0-incubating/development/extensions-contrib/ambari-metrics-emitter.html
index 63376fe..e225fd9 100644
--- a/docs/0.15.0-incubating/development/extensions-contrib/ambari-metrics-emitter.html
+++ b/docs/0.15.0-incubating/development/extensions-contrib/ambari-metrics-emitter.html
@@ -274,7 +274,7 @@
<p>The first implementation called <code>all</code>, will send all the druid service metrics events.
The path will be in the form <code><namespacePrefix>.[<druid service name>].[<druid hostname>].<dimensions values ordered by dimension's name>.<metric></code>
User has control of <code><namespacePrefix>.[<druid service name>].[<druid hostname>].</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.ambari</span><span class="mi">-</span><span class="err">me</span><span class="kc">tr</span><span class="err">ics.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.ambari-metrics.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">}</span>
</code></pre></div>
<h4 id="white-list-based-converter">White-list based converter</h4>
@@ -285,7 +285,7 @@
<p>Although user can override the default white list map by supplying a property called <code>mapPath</code>.
This property is a String containing the path for the file containing <strong>white list map Json object</strong>.
For example the following converter will read the map from the file <code>/pathPrefix/fileName.json</code>. </p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.ambari</span><span class="mi">-</span><span class="err">me</span><span class="kc">tr</span><span class="err">ics.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.ambari-metrics.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
</code></pre></div>
<p><strong>Druid emits a huge number of metrics we highly recommend to use the <code>whiteList</code> converter</strong></p>
diff --git a/docs/0.15.0-incubating/development/extensions-contrib/azure.html b/docs/0.15.0-incubating/development/extensions-contrib/azure.html
index 7eb6236..aaa2daf 100644
--- a/docs/0.15.0-incubating/development/extensions-contrib/azure.html
+++ b/docs/0.15.0-incubating/development/extensions-contrib/azure.html
@@ -220,7 +220,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-azure-blobstore"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
diff --git a/docs/0.15.0-incubating/development/extensions-contrib/cloudfiles.html b/docs/0.15.0-incubating/development/extensions-contrib/cloudfiles.html
index fc0ebd2..7247b92 100644
--- a/docs/0.15.0-incubating/development/extensions-contrib/cloudfiles.html
+++ b/docs/0.15.0-incubating/development/extensions-contrib/cloudfiles.html
@@ -236,17 +236,17 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-cloudfiles"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
- <span class="nt">"region"</span><span class="p">:</span> <span class="nt">"DFW"</span>
- <span class="nt">"container"</span><span class="p">:</span> <span class="s2">"container"</span><span class="p">,</span>
+ <span class="nt">"region"</span><span class="p">:</span> <span class="s2">"DFW"</span>
+ <span class="s2">"container"</span><span class="p">:</span> <span class="s2">"container"</span><span class="p">,</span>
<span class="nt">"path"</span><span class="p">:</span> <span class="s2">"/path/to/your/file.json"</span>
<span class="p">},</span>
<span class="p">{</span>
- <span class="nt">"region"</span><span class="p">:</span> <span class="nt">"ORD"</span>
- <span class="nt">"container"</span><span class="p">:</span> <span class="s2">"anothercontainer"</span><span class="p">,</span>
+ <span class="nt">"region"</span><span class="p">:</span> <span class="s2">"ORD"</span>
+ <span class="s2">"container"</span><span class="p">:</span> <span class="s2">"anothercontainer"</span><span class="p">,</span>
<span class="nt">"path"</span><span class="p">:</span> <span class="s2">"/another/path.json"</span>
<span class="p">}</span>
<span class="p">]</span>
diff --git a/docs/0.15.0-incubating/development/extensions-contrib/google.html b/docs/0.15.0-incubating/development/extensions-contrib/google.html
index d1c5723..3cbb596 100644
--- a/docs/0.15.0-incubating/development/extensions-contrib/google.html
+++ b/docs/0.15.0-incubating/development/extensions-contrib/google.html
@@ -198,7 +198,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-google-blobstore"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
diff --git a/docs/0.15.0-incubating/development/extensions-contrib/graphite.html b/docs/0.15.0-incubating/development/extensions-contrib/graphite.html
index f22dc93..9dca2b5 100644
--- a/docs/0.15.0-incubating/development/extensions-contrib/graphite.html
+++ b/docs/0.15.0-incubating/development/extensions-contrib/graphite.html
@@ -281,7 +281,7 @@
<p>Elements in metric name by default are separated by "/", so graphite will create all metrics on one level. If you want to have metrics in the tree structure, you have to set <code>replaceSlashWithDot=true</code>
Original: <code>druid.HOSTNAME.dataSourceName.queryType.query/time</code>
Changed: <code>druid.HOSTNAME.dataSourceName.queryType.query.time</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.graphi</span><span class="kc">te</span><span class="err">.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.graphite.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">}</span>
</code></pre></div>
<h4 id="white-list-based-converter">White-list based converter</h4>
@@ -292,7 +292,7 @@
<p>Although user can override the default white list map by supplying a property called <code>mapPath</code>.
This property is a String containing the path for the file containing <strong>white list map Json object</strong>.
For example the following converter will read the map from the file <code>/pathPrefix/fileName.json</code>. </p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.graphi</span><span class="kc">te</span><span class="err">.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.graphite.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
</code></pre></div>
<p><strong>Druid emits a huge number of metrics we highly recommend to use the <code>whiteList</code> converter</strong></p>
diff --git a/docs/0.15.0-incubating/development/extensions-contrib/kafka-simple.html b/docs/0.15.0-incubating/development/extensions-contrib/kafka-simple.html
index 082f558..cee272f 100644
--- a/docs/0.15.0-incubating/development/extensions-contrib/kafka-simple.html
+++ b/docs/0.15.0-incubating/development/extensions-contrib/kafka-simple.html
@@ -156,7 +156,7 @@
<p>This is an experimental firehose to ingest data from Apache Kafka using the Kafka simple consumer api. Currently, this firehose would only work inside standalone realtime processes.
The configuration for KafkaSimpleConsumerFirehose is similar to the Kafka Eight Firehose , except <code>firehose</code> should be replaced with <code>firehoseV2</code> like this:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehoseV2"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehoseV2"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"kafka-0.8-v2"</span><span class="p">,</span>
<span class="nt">"brokerList"</span> <span class="p">:</span> <span class="p">[</span><span class="s2">"localhost:4443"</span><span class="p">],</span>
<span class="nt">"queueBufferLength"</span><span class="p">:</span><span class="mi">10001</span><span class="p">,</span>
diff --git a/docs/0.15.0-incubating/development/extensions-contrib/opentsdb-emitter.html b/docs/0.15.0-incubating/development/extensions-contrib/opentsdb-emitter.html
index d9bb0a3..7c519fd 100644
--- a/docs/0.15.0-incubating/development/extensions-contrib/opentsdb-emitter.html
+++ b/docs/0.15.0-incubating/development/extensions-contrib/opentsdb-emitter.html
@@ -224,7 +224,7 @@
If the user does not specify their own JSON file, a default file is used. All metrics are expected to be configured in the JSON file. Metrics which are not configured will be logged.
Desired metrics and dimensions is organized using the following schema:<code><druid metric name> : [ <dimension list> ]</code><br />
e.g.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"query/time"</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"query/time"</span><span class="err">:</span> <span class="p">[</span>
<span class="s2">"dataSource"</span><span class="p">,</span>
<span class="s2">"type"</span>
<span class="p">]</span>
diff --git a/docs/0.15.0-incubating/development/extensions-contrib/rabbitmq.html b/docs/0.15.0-incubating/development/extensions-contrib/rabbitmq.html
index 1d598e9..8db6f7a 100644
--- a/docs/0.15.0-incubating/development/extensions-contrib/rabbitmq.html
+++ b/docs/0.15.0-incubating/development/extensions-contrib/rabbitmq.html
@@ -161,7 +161,7 @@
<p><strong>Note:</strong> Add <strong>amqp-client-3.2.1.jar</strong> to lib directory of druid to use this firehose.</p>
<p>A sample spec for rabbitmq firehose:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"rabbitmq"</span><span class="p">,</span>
<span class="nt">"connection"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"host"</span><span class="p">:</span> <span class="s2">"localhost"</span><span class="p">,</span>
diff --git a/docs/0.15.0-incubating/development/extensions-core/approximate-histograms.html b/docs/0.15.0-incubating/development/extensions-core/approximate-histograms.html
index 848b5dc..b8a7eb2 100644
--- a/docs/0.15.0-incubating/development/extensions-core/approximate-histograms.html
+++ b/docs/0.15.0-incubating/development/extensions-core/approximate-histograms.html
@@ -211,12 +211,12 @@
query.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"approxHistogram or approxHistogramFold (at ingestion time), approxHistogramFold (at query time)"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"resolution"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
- <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
- <span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fl</span><span class="err">oa</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fl</span><span class="err">oa</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"resolution"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
+ <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
+ <span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><float></span><span class="p">,</span>
+ <span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><float></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -304,9 +304,9 @@
<p>An example aggregator spec is shown below:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fixedBucketsHistogram"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
<span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><double></span><span class="p">,</span>
<span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><double></span><span class="p">,</span>
<span class="nt">"outlierHandlingMode"</span><span class="p">:</span> <span class="err"><mode></span>
@@ -417,7 +417,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalBuckets"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"numBuckets"</span><span class="p">:</span> <span class="err"><cou</span><span class="kc">nt</span><span class="err">></span>
+ <span class="nt">"numBuckets"</span><span class="p">:</span> <span class="err"><count></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="buckets-post-aggregator">Buckets post-aggregator</h3>
@@ -433,8 +433,8 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"buckets"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"bucketSize"</span><span class="p">:</span> <span class="err"><bucke</span><span class="kc">t</span><span class="err">_size></span><span class="p">,</span>
- <span class="nt">"offset"</span><span class="p">:</span> <span class="err"><o</span><span class="kc">ffset</span><span class="err">></span>
+ <span class="nt">"bucketSize"</span><span class="p">:</span> <span class="err"><bucket_size></span><span class="p">,</span>
+ <span class="nt">"offset"</span><span class="p">:</span> <span class="err"><offset></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="custom-buckets-post-aggregator">Custom buckets post-aggregator</h3>
@@ -442,30 +442,30 @@
<p>Computes a visual representation of the approximate histogram with bins laid out according to the given breaks.</p>
<p>This aggregator is not supported for the fixed buckets histogram.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"customBuckets"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"customBuckets"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
<span class="nt">"breaks"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><value></span><span class="p">,</span> <span class="err"><value></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<h3 id="min-post-aggregator">min post-aggregator</h3>
<p>Returns the minimum value of the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"min"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"min"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="max-post-aggregator">max post-aggregator</h3>
<p>Returns the maximum value of the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"max"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"max"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="quantile-post-aggregator">quantile post-aggregator</h4>
<p>Computes a single quantile based on the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantile"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"probability"</span> <span class="p">:</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantile"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
+ <span class="nt">"probability"</span> <span class="p">:</span> <span class="err"><quantile></span> <span class="p">}</span>
</code></pre></div>
<h4 id="quantiles-post-aggregator">quantiles post-aggregator</h4>
<p>Computes an array of quantiles based on the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantiles"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"probabilities"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span><span class="p">,</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantiles"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
+ <span class="nt">"probabilities"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><quantile></span><span class="p">,</span> <span class="err"><quantile></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.15.0-incubating/development/extensions-core/avro.html b/docs/0.15.0-incubating/development/extensions-core/avro.html
index b5f01fb..2336061 100644
--- a/docs/0.15.0-incubating/development/extensions-core/avro.html
+++ b/docs/0.15.0-incubating/development/extensions-core/avro.html
@@ -188,7 +188,7 @@
field types, which can be used to read nested Avro records. The "jq" field type is not currently supported for Avro.</p>
<p>For example, using Avro stream parser with schema repo Avro bytes decoder:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"parser"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"avro_stream"</span><span class="p">,</span>
<span class="nt">"avroBytesDecoder"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"schema_repo"</span><span class="p">,</span>
@@ -203,9 +203,9 @@
<span class="p">},</span>
<span class="nt">"parseSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"avro"</span><span class="p">,</span>
- <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mpSpec></span><span class="p">,</span>
- <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
- <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">></span>
+ <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">timestampSpec></span><span class="p">,</span>
+ <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
+ <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><optional></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -433,9 +433,9 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"avro_hadoop"</span><span class="p">,</span>
<span class="nt">"parseSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"avro"</span><span class="p">,</span>
- <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mpSpec></span><span class="p">,</span>
- <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
- <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">></span>
+ <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">timestampSpec></span><span class="p">,</span>
+ <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
+ <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><optional></span>
<span class="p">}</span>
<span class="p">}</span>
<span class="p">},</span>
diff --git a/docs/0.15.0-incubating/development/extensions-core/bloom-filter.html b/docs/0.15.0-incubating/development/extensions-core/bloom-filter.html
index 5275cf1..74a6ca2 100644
--- a/docs/0.15.0-incubating/development/extensions-core/bloom-filter.html
+++ b/docs/0.15.0-incubating/development/extensions-core/bloom-filter.html
@@ -172,13 +172,13 @@
this implementation uses Murmur3 as the hash algorithm.</p>
<p>To construct a BloomKFilter externally with Java to use as a filter in a Druid query:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">BloomKFilter</span> <span class="n">bloomFilter</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BloomKFilter</span><span class="p">(</span><span class="mi">1500</span><span class="p">);</span>
-<span class="n">bloomFilter</span><span class="p">.</span><span class="na">addString</span><span class="p">(</span><span class="s">"value 1"</span><span class="p">);</span>
-<span class="n">bloomFilter</span><span class="p">.</span><span class="na">addString</span><span class="p">(</span><span class="s">"value 2"</span><span class="p">);</span>
-<span class="n">bloomFilter</span><span class="p">.</span><span class="na">addString</span><span class="p">(</span><span class="s">"value 3"</span><span class="p">);</span>
-<span class="n">ByteArrayOutputStream</span> <span class="n">byteArrayOutputStream</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ByteArrayOutputStream</span><span class="p">();</span>
-<span class="n">BloomKFilter</span><span class="p">.</span><span class="na">serialize</span><span class="p">(</span><span class="n">byteArrayOutputStream</span><span class="p">,</span> <span class="n">bloomFilter</span><span class="p">);</span>
-<span class="n">String</span> <span class="n">base64Serialized</span> <span class="o">=</span> <span class="n">Base64</span><span class="p">.</span><span class="na">encodeBase64String</span><span class="p">(</span><span class="n">byteArrayOutputStream</span><span class="p">.</span><span class="na">toByteArray</span><span class="p">());</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">BloomKFilter</span> <span class="n">bloomFilter</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BloomKFilter</span><span class="o">(</span><span class="mi">1500</span><span class="o">);</span>
+<span class="n">bloomFilter</span><span class="o">.</span><span class="na">addString</span><span class="o">(</span><span class="s">"value 1"</span><span class="o">);</span>
+<span class="n">bloomFilter</span><span class="o">.</span><span class="na">addString</span><span class="o">(</span><span class="s">"value 2"</span><span class="o">);</span>
+<span class="n">bloomFilter</span><span class="o">.</span><span class="na">addString</span><span class="o">(</span><span class="s">"value 3"</span><span class="o">);</span>
+<span class="n">ByteArrayOutputStream</span> <span class="n">byteArrayOutputStream</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ByteArrayOutputStream</span><span class="o">();</span>
+<span class="n">BloomKFilter</span><span class="o">.</span><span class="na">serialize</span><span class="o">(</span><span class="n">byteArrayOutputStream</span><span class="o">,</span> <span class="n">bloomFilter</span><span class="o">);</span>
+<span class="n">String</span> <span class="n">base64Serialized</span> <span class="o">=</span> <span class="n">Base64</span><span class="o">.</span><span class="na">encodeBase64String</span><span class="o">(</span><span class="n">byteArrayOutputStream</span><span class="o">.</span><span class="na">toByteArray</span><span class="o">());</span>
</code></pre></div>
<p>This string can then be used in the native or sql Druid query.</p>
@@ -187,9 +187,9 @@
<h3 id="json-specification-of-bloom-filter">JSON Specification of Bloom Filter</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"bloom"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"bloomKFilter"</span> <span class="p">:</span> <span class="err"><serialized_by</span><span class="kc">tes</span><span class="err">_</span><span class="kc">f</span><span class="err">or_BloomKFil</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fn</span><span class="err">></span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension_name></span><span class="p">,</span>
+ <span class="nt">"bloomKFilter"</span> <span class="p">:</span> <span class="err"><serialized_bytes_for_BloomKFilter></span><span class="p">,</span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><extraction_fn></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -255,9 +255,9 @@
<h3 id="json-specification-of-bloom-filter-aggregator">JSON Specification of Bloom Filter Aggregator</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"bloom"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">ield_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxNumEntries"</span><span class="p">:</span> <span class="err"><maximum_</span><span class="kc">nu</span><span class="err">mber_o</span><span class="kc">f</span><span class="err">_eleme</span><span class="kc">nts</span><span class="err">_</span><span class="kc">f</span><span class="err">or_BloomKFil</span><span class="kc">ter</span><span class="err">></span>
- <span class="nt">"field"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_spec></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_field_name></span><span class="p">,</span>
+ <span class="nt">"maxNumEntries"</span><span class="p">:</span> <span class="err"><maximum_number_of_elements_for_BloomKFilter></span>
+ <span class="s2">"field"</span><span class="p">:</span> <span class="err"><dimension_spec></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.15.0-incubating/development/extensions-core/datasketches-quantiles.html b/docs/0.15.0-incubating/development/extensions-core/datasketches-quantiles.html
index feb9ec2..d621a6c 100644
--- a/docs/0.15.0-incubating/development/extensions-core/datasketches-quantiles.html
+++ b/docs/0.15.0-incubating/development/extensions-core/datasketches-quantiles.html
@@ -168,9 +168,9 @@
<p>The result of the aggregation is a DoublesSketch that is the union of all sketches either built from raw data or read from the segments.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"k"</span><span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">co</span><span class="kc">ntr</span><span class="err">ols</span> <span class="err">size</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">accuracy></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"k"</span><span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">controls</span> <span class="err">size</span> <span class="err">and</span> <span class="err">accuracy></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -209,9 +209,9 @@
<p>This returns an approximation to the value that would be preceded by a given fraction of a hypothetical sorted version of the input stream.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToQuantile"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"fraction"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">posi</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hypo</span><span class="kc">t</span><span class="err">he</span><span class="kc">t</span><span class="err">ical</span> <span class="err">sor</span><span class="kc">te</span><span class="err">d</span> <span class="err">s</span><span class="kc">trea</span><span class="err">m</span><span class="p">,</span> <span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">0</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1</span> <span class="err">i</span><span class="kc">n</span><span class="err">clusive></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"fraction"</span> <span class="p">:</span> <span class="err"><fractional</span> <span class="err">position</span> <span class="err">in</span> <span class="err">the</span> <span class="err">hypothetical</span> <span class="err">sorted</span> <span class="err">stream</span><span class="p">,</span> <span class="err">number</span> <span class="err">from</span> <span class="err">0</span> <span class="err">to</span> <span class="err">1</span> <span class="err">inclusive></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="quantiles">Quantiles</h4>
@@ -219,9 +219,9 @@
<p>This returns an array of quantiles corresponding to a given array of fractions</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToQuantiles"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"fractions"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">fra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">posi</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hypo</span><span class="kc">t</span><span class="err">he</span><span class="kc">t</span><span class="err">ical</span> <span class="err">sor</span><span class="kc">te</span><span class="err">d</span> <span class="err">s</span><span class="kc">trea</span><span class="err">m</span><span class="p">,</span> <span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">0</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1</span> <span class="err">i</span><span class="kc">n</span><span class="err">clusive></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"fractions"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">fractional</span> <span class="err">positions</span> <span class="err">in</span> <span class="err">the</span> <span class="err">hypothetical</span> <span class="err">sorted</span> <span class="err">stream</span><span class="p">,</span> <span class="err">number</span> <span class="err">from</span> <span class="err">0</span> <span class="err">to</span> <span class="err">1</span> <span class="err">inclusive></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="histogram">Histogram</h4>
@@ -229,9 +229,9 @@
<p>This returns an approximation to the histogram given an array of split points that define the histogram bins. An array of <i>m</i> unique, monotonically increasing split points divide the real number line into <i>m+1</i> consecutive disjoint intervals. The definition of an interval is inclusive of the left split point and exclusive of the right split point.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToHistogram"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"splitPoints"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">spli</span><span class="kc">t</span> <span class="err">poi</span><span class="kc">nts</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"splitPoints"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">split</span> <span class="err">points></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-summary">Sketch Summary</h4>
@@ -239,8 +239,8 @@
<p>This returns a summary of the sketch that can be used for debugging. This is the result of calling toString() method.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToString"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.15.0-incubating/development/extensions-core/datasketches-theta.html b/docs/0.15.0-incubating/development/extensions-core/datasketches-theta.html
index 847c4d2..a50312e 100644
--- a/docs/0.15.0-incubating/development/extensions-core/datasketches-theta.html
+++ b/docs/0.15.0-incubating/development/extensions-core/datasketches-theta.html
@@ -160,8 +160,8 @@
<h3 id="aggregators">Aggregators</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="nt">"isInputThetaSketch"</span><span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
<span class="nt">"size"</span><span class="p">:</span> <span class="mi">16384</span>
<span class="p">}</span>
@@ -205,17 +205,17 @@
<h4 id="sketch-estimator">Sketch Estimator</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketchEstimate"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">ype</span> <span class="kc">f</span><span class="err">ieldAccess</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">ype</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">chSe</span><span class="kc">t</span><span class="err">Op></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">of</span> <span class="err">type</span> <span class="err">fieldAccess</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">thetaSketch</span> <span class="err">aggregator</span> <span class="err">or</span> <span class="err">that</span> <span class="err">of</span> <span class="err">type</span> <span class="err">thetaSketchSetOp></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-operations">Sketch Operations</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketchSetOp"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
<span class="nt">"func"</span><span class="p">:</span> <span class="err"><UNION|INTERSECT|NOT></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">f</span><span class="err">ieldAccess</span> <span class="kc">t</span><span class="err">ype</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="kc">t</span><span class="err">he</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">chSe</span><span class="kc">t</span><span class="err">Op</span> <span class="kc">t</span><span class="err">ype</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">allow</span> <span class="err">arbi</span><span class="kc">trar</span><span class="err">y</span> <span class="err">combi</span><span class="kc">nat</span><span class="err">io</span><span class="kc">n</span> <span class="err">o</span><span class="kc">f</span> <span class="err">se</span><span class="kc">t</span> <span class="err">opera</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"size"</span><span class="p">:</span> <span class="err"><</span><span class="mi">16384</span> <span class="err">by</span> <span class="err">de</span><span class="kc">fault</span><span class="p">,</span> <span class="err">mus</span><span class="kc">t</span> <span class="err">be</span> <span class="err">max</span> <span class="err">o</span><span class="kc">f</span> <span class="err">size</span> <span class="kc">fr</span><span class="err">om</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ches</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">f</span><span class="err">ields</span> <span class="err">i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">fieldAccess</span> <span class="err">type</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">the</span> <span class="err">thetaSketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">thetaSketchSetOp</span> <span class="err">type</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">allow</span> <span class="err">arbitrary</span> <span class="err">combination</span> <span class="err">of</span> <span class="err">set</span> <span class="err">operations></span><span class="p">,</span>
+ <span class="nt">"size"</span><span class="p">:</span> <span class="err"><</span><span class="mi">16384</span> <span class="err">by</span> <span class="err">default</span><span class="p">,</span> <span class="err">must</span> <span class="err">be</span> <span class="err">max</span> <span class="err">of</span> <span class="err">size</span> <span class="err">from</span> <span class="err">sketches</span> <span class="err">in</span> <span class="err">fields</span> <span class="err">input></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="examples">Examples</h3>
diff --git a/docs/0.15.0-incubating/development/extensions-core/datasketches-tuple.html b/docs/0.15.0-incubating/development/extensions-core/datasketches-tuple.html
index 7d1d975..59262b2 100644
--- a/docs/0.15.0-incubating/development/extensions-core/datasketches-tuple.html
+++ b/docs/0.15.0-incubating/development/extensions-core/datasketches-tuple.html
@@ -158,11 +158,11 @@
<h3 id="aggregators">Aggregators</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"nominalEntries"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"metricColumns"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">gs></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"nominalEntries"</span><span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"metricColumns"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">strings></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -211,8 +211,8 @@
<p>Returns a distinct count estimate from a given ArrayOfDoublesSketch.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToEstimate"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="estimate-of-the-number-of-distinct-keys-with-error-bounds">Estimate of the number of distinct keys with error bounds</h4>
@@ -220,9 +220,9 @@
<p>Returns a distinct count estimate and error bounds from a given ArrayOfDoublesSketch. The result will be three double values: estimate of the number of distinct keys, lower bound and upper bound. The bounds are provided at the given number of standard deviations (optional, defaults to 1). This must be an integer value of 1, 2 or 3 corresponding to approximately 68.3%, 95.4% and 99.7% confidence intervals.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToEstimateAndBounds"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="s2">"numStdDevs"</span><span class="p">,</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">1</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">3</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"numStdDevs"</span><span class="p">,</span> <span class="err"><number</span> <span class="err">from</span> <span class="err">1</span> <span class="err">to</span> <span class="err">3></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="number-of-retained-entries">Number of retained entries</h4>
@@ -230,8 +230,8 @@
<p>Returns the number of retained entries from a given ArrayOfDoublesSketch.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToNumEntries"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="mean-values-for-each-column">Mean values for each column</h4>
@@ -239,8 +239,8 @@
<p>Returns a list of mean values from a given ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToMeans"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="variance-values-for-each-column">Variance values for each column</h4>
@@ -248,8 +248,8 @@
<p>Returns a list of variance values from a given ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToVariances"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="quantiles-sketch-from-a-column">Quantiles sketch from a column</h4>
@@ -263,10 +263,10 @@
</ul>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToQuantilesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"column"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"k"</span> <span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">de</span><span class="kc">ter</span><span class="err">mi</span><span class="kc">nes</span> <span class="kc">t</span><span class="err">he</span> <span class="err">accuracy</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">qua</span><span class="kc">nt</span><span class="err">iles</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"column"</span> <span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"k"</span> <span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">determines</span> <span class="err">the</span> <span class="err">accuracy</span> <span class="err">and</span> <span class="err">size</span> <span class="err">of</span> <span class="err">the</span> <span class="err">quantiles</span> <span class="err">sketch></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="set-operations">Set Operations</h4>
@@ -274,11 +274,11 @@
<p>Returns a result of a specified set operation on the given array of sketches. Supported operations are: union, intersection and set difference (UNION, INTERSECT, NOT).</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchSetOp"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
<span class="nt">"operation"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"UNION"</span><span class="err">|</span><span class="s2">"INTERSECT"</span><span class="err">|</span><span class="s2">"NOT"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">allow</span> <span class="err">arbi</span><span class="kc">trar</span><span class="err">y</span> <span class="err">combi</span><span class="kc">nat</span><span class="err">io</span><span class="kc">n</span> <span class="err">o</span><span class="kc">f</span> <span class="err">se</span><span class="kc">t</span> <span class="err">opera</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"nominalEntries"</span> <span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">de</span><span class="kc">ter</span><span class="err">mi</span><span class="kc">nes</span> <span class="kc">t</span><span class="err">he</span> <span class="err">accuracy</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch></span><span class="p">,</span>
- <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber</span> <span class="err">o</span><span class="kc">f</span> <span class="err">values</span> <span class="err">associa</span><span class="kc">te</span><span class="err">d</span> <span class="err">wi</span><span class="kc">t</span><span class="err">h</span> <span class="err">each</span> <span class="err">dis</span><span class="kc">t</span><span class="err">i</span><span class="kc">n</span><span class="err">c</span><span class="kc">t</span> <span class="err">key></span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">sketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">allow</span> <span class="err">arbitrary</span> <span class="err">combination</span> <span class="err">of</span> <span class="err">set</span> <span class="err">operations></span><span class="p">,</span>
+ <span class="nt">"nominalEntries"</span> <span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">determines</span> <span class="err">the</span> <span class="err">accuracy</span> <span class="err">and</span> <span class="err">size</span> <span class="err">of</span> <span class="err">the</span> <span class="err">sketch></span><span class="p">,</span>
+ <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><number</span> <span class="err">of</span> <span class="err">values</span> <span class="err">associated</span> <span class="err">with</span> <span class="err">each</span> <span class="err">distinct</span> <span class="err">key></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="students-t-test">Student's t-test</h4>
@@ -286,8 +286,8 @@
<p>Performs Student's t-test and returns a list of p-values given two instances of ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key. See <a href="http://commons.apache.org/proper/commons-math/javadocs/api-3.4/org/apache/commons/math3/stat/inference/TTest.html">t-test documentation</a>.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchTTest"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">wi</span><span class="kc">t</span><span class="err">h</span> <span class="kc">t</span><span class="err">wo</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">re</span><span class="kc">ferr</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">with</span> <span class="err">two</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">sketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">referring</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch></span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-summary">Sketch summary</h4>
@@ -295,8 +295,8 @@
<p>Returns a human-readable summary of a given ArrayOfDoublesSketch. This is a string returned by toString() method of the sketch. This can be useful for debugging.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToString"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.15.0-incubating/development/extensions-core/examples.html b/docs/0.15.0-incubating/development/extensions-core/examples.html
index 9d46579..a9efec1 100644
--- a/docs/0.15.0-incubating/development/extensions-core/examples.html
+++ b/docs/0.15.0-incubating/development/extensions-core/examples.html
@@ -155,7 +155,7 @@
<p>This firehose connects directly to the twitter spritzer data stream.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"twitzer"</span><span class="p">,</span>
<span class="nt">"maxEventCount"</span><span class="p">:</span> <span class="mi">-1</span><span class="p">,</span>
<span class="nt">"maxRunMinutes"</span><span class="p">:</span> <span class="mi">0</span>
diff --git a/docs/0.15.0-incubating/development/extensions-core/kafka-eight-firehose.html b/docs/0.15.0-incubating/development/extensions-core/kafka-eight-firehose.html
index ab92956..f084aa4 100644
--- a/docs/0.15.0-incubating/development/extensions-core/kafka-eight-firehose.html
+++ b/docs/0.15.0-incubating/development/extensions-core/kafka-eight-firehose.html
@@ -155,7 +155,7 @@
<p>This firehose acts as a Kafka 0.8.x consumer and ingests data from Kafka.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"kafka-0.8"</span><span class="p">,</span>
<span class="nt">"consumerProps"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"zookeeper.connect"</span><span class="p">:</span> <span class="s2">"localhost:2181"</span><span class="p">,</span>
diff --git a/docs/0.15.0-incubating/development/extensions-core/lookups-cached-global.html b/docs/0.15.0-incubating/development/extensions-core/lookups-cached-global.html
index 4fe6298..b124210 100644
--- a/docs/0.15.0-incubating/development/extensions-core/lookups-cached-global.html
+++ b/docs/0.15.0-incubating/development/extensions-core/lookups-cached-global.html
@@ -459,7 +459,7 @@
truck,something3,buck
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"csv"</span><span class="p">,</span>
<span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"value"</span><span class="p">,</span><span class="s2">"somethingElse"</span><span class="p">,</span><span class="s2">"key"</span><span class="p">],</span>
<span class="nt">"keyColumn"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
@@ -530,7 +530,7 @@
truck|something,3|buck
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"tsv"</span><span class="p">,</span>
<span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"value"</span><span class="p">,</span><span class="s2">"somethingElse"</span><span class="p">,</span><span class="s2">"key"</span><span class="p">],</span>
<span class="nt">"keyColumn"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
@@ -568,7 +568,7 @@
<span class="p">{</span><span class="nt">"key"</span><span class="p">:</span> <span class="s2">"buck"</span><span class="p">,</span> <span class="nt">"somethingElse"</span><span class="p">:</span> <span class="s2">"something"</span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="s2">"truck"</span><span class="p">}</span>
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"customJson"</span><span class="p">,</span>
<span class="nt">"keyFieldName"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
<span class="nt">"valueFieldName"</span><span class="p">:</span> <span class="s2">"value"</span>
@@ -587,7 +587,7 @@
<span class="p">{</span><span class="nt">"buck"</span><span class="p">:</span> <span class="s2">"truck"</span><span class="p">}</span>
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"simpleJson"</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.15.0-incubating/development/extensions-core/orc.html b/docs/0.15.0-incubating/development/extensions-core/orc.html
index 6c2010d..8d881cb 100644
--- a/docs/0.15.0-incubating/development/extensions-core/orc.html
+++ b/docs/0.15.0-incubating/development/extensions-core/orc.html
@@ -204,8 +204,8 @@
<code>-org.apache.hadoop.hive.</code> to instruct Hadoop to load <code>org.apache.hadoop.hive</code> classes from the application jars instead
of system jars, e.g.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">...</span>
- <span class="nt">"mapreduce.job.classloader"</span><span class="p">:</span> <span class="s2">"true"</span><span class="p">,</span>
- <span class="nt">"mapreduce.job.classloader.system.classes"</span> <span class="p">:</span> <span class="s2">"java., javax.accessibility., javax.activation., javax.activity., javax.annotation., javax.annotation.processing., javax.crypto., javax.imageio., javax.jws., javax.lang.model., -javax.management.j2ee., javax.management., javax.naming., javax.net., javax.print., javax.rmi., javax.script., -javax.security.auth.message., javax.security.auth., javax.security.cert., javax.security.sasl., javax.sound., javax.sql., javax.swing., javax.tools., javax.transaction., -javax.xml.registry., -javax.xml.rpc., javax.xml., org.w3c.dom., org.xml.sax., org.apache.commons.logging., org.apache.log4j., -org.apache.hadoop.hbase., -org.apache.hadoop.hive., org.apache.hadoop., core-default.xml, hdfs-default.xml, mapred-default.xml, yarn-default.xml"</span><span class="p">,</span>
+ <span class="s2">"mapreduce.job.classloader"</span><span class="err">:</span> <span class="s2">"true"</span><span class="err">,</span>
+ <span class="s2">"mapreduce.job.classloader.system.classes"</span> <span class="err">:</span> <span class="s2">"java., javax.accessibility., javax.activation., javax.activity., javax.annotation., javax.annotation.processing., javax.crypto., javax.imageio., javax.jws., javax.lang.model., -javax.management.j2ee., javax.management., javax.naming., javax.net., javax.print., javax.rmi., javax.script., -javax.security.auth.message., javax.security.auth., javax.security.cert., javax.security.sasl., javax.sound., javax.sql., javax.swing., javax.tools., javax.transaction., -javax.xml.registry., -javax.xml.rpc., javax.xml., org.w3c.dom., org.xml.sax., org.apache.commons.logging., org.apache.log4j., -org.apache.hadoop.hbase., -org.apache.hadoop.hive., org.apache.hadoop., core-default.xml, hdfs-default.xml, mapred-default.xml, yarn-default.xml"</span><span class="err">,</span>
<span class="err">...</span>
</code></pre></div>
<p>This is due to the <code>hive-storage-api</code> dependency of the
@@ -256,10 +256,10 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
-<span class="p">}</span>
+<span class="err">}</span>
</code></pre></div>
<h4 id="orc-parser-orc-parsespec-field-discovery-with-no-flattenspec-or-dimensionspec"><code>orc</code> parser, <code>orc</code> parseSpec, field discovery with no flattenSpec or dimensionSpec</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -288,10 +288,10 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
-<span class="p">}</span>
+<span class="err">}</span>
</code></pre></div>
<h4 id="orc-parser-orc-parsespec-no-autodiscovery"><code>orc</code> parser, <code>orc</code> parseSpec, no autodiscovery</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -345,10 +345,10 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
-<span class="p">}</span>
+<span class="err">}</span>
</code></pre></div>
<h4 id="orc-parser-timeanddims-parsespec"><code>orc</code> parser, <code>timeAndDims</code> parseSpec</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -387,7 +387,7 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.15.0-incubating/development/extensions-core/parquet.html b/docs/0.15.0-incubating/development/extensions-core/parquet.html
index d083fd1..66772e6 100644
--- a/docs/0.15.0-incubating/development/extensions-core/parquet.html
+++ b/docs/0.15.0-incubating/development/extensions-core/parquet.html
@@ -266,10 +266,10 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
-<span class="p">}</span>
+<span class="err">}</span>
</code></pre></div>
<h4 id="parquet-parser-timeanddims-parsespec"><code>parquet</code> parser, <code>timeAndDims</code> parseSpec</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -308,7 +308,7 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -359,10 +359,10 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
-<span class="p">}</span>
+<span class="err">}</span>
</code></pre></div>
<p>For additional details see <a href="../../ingestion/hadoop.html">hadoop ingestion</a> and <a href="../../ingestion/ingestion-spec.html">general ingestion spec</a> documentation.</p>
diff --git a/docs/0.15.0-incubating/development/extensions-core/s3.html b/docs/0.15.0-incubating/development/extensions-core/s3.html
index 17e2870..dec9a93 100644
--- a/docs/0.15.0-incubating/development/extensions-core/s3.html
+++ b/docs/0.15.0-incubating/development/extensions-core/s3.html
@@ -289,7 +289,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-s3"</span><span class="p">,</span>
<span class="nt">"uris"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"s3://foo/bar/file.gz"</span><span class="p">,</span> <span class="s2">"s3://bar/foo/file2.gz"</span><span class="p">]</span>
<span class="p">}</span>
diff --git a/docs/0.15.0-incubating/development/extensions-core/stats.html b/docs/0.15.0-incubating/development/extensions-core/stats.html
index 55f55ca..494ec94 100644
--- a/docs/0.15.0-incubating/development/extensions-core/stats.html
+++ b/docs/0.15.0-incubating/development/extensions-core/stats.html
@@ -180,18 +180,18 @@
<p>User can specify expected input type as one of "float", "long", "variance" for ingestion, which is by default "float".</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"variance"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"inputType"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">t</span><span class="err">ype></span><span class="p">,</span>
- <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"inputType"</span> <span class="p">:</span> <span class="err"><input_type></span><span class="p">,</span>
+ <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<p>To query for results, "variance" aggregator with "variance" input type or simply a "varianceFold" aggregator must be included in the query.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"varianceFold"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -215,7 +215,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"stddev"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"estimator"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"estimator"</span><span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="query-examples">Query Examples:</h2>
diff --git a/docs/0.15.0-incubating/development/extensions-core/test-stats.html b/docs/0.15.0-incubating/development/extensions-core/test-stats.html
index 01aa06d..4725825 100644
--- a/docs/0.15.0-incubating/development/extensions-core/test-stats.html
+++ b/docs/0.15.0-incubating/development/extensions-core/test-stats.html
@@ -175,10 +175,10 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"zscore2sample"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"successCount1"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">success</span> <span class="err">cou</span><span class="kc">nt</span> <span class="err">o</span><span class="kc">f</span> <span class="err">sample</span> <span class="mi">1</span><span class="p">,</span>
- <span class="nt">"sample1Size"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggregaror></span> <span class="err">sample</span> <span class="mi">1</span> <span class="err">size</span><span class="p">,</span>
- <span class="nt">"successCount2"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">success</span> <span class="err">cou</span><span class="kc">nt</span> <span class="err">o</span><span class="kc">f</span> <span class="err">sample</span> <span class="mi">2</span><span class="p">,</span>
- <span class="nt">"sample2Size"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">sample</span> <span class="mi">2</span> <span class="err">size</span>
+ <span class="nt">"successCount1"</span><span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">success</span> <span class="err">count</span> <span class="err">of</span> <span class="err">sample</span> <span class="mi">1</span><span class="p">,</span>
+ <span class="nt">"sample1Size"</span><span class="p">:</span> <span class="err"><post_aggregaror></span> <span class="err">sample</span> <span class="mi">1</span> <span class="err">size</span><span class="p">,</span>
+ <span class="nt">"successCount2"</span><span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">success</span> <span class="err">count</span> <span class="err">of</span> <span class="err">sample</span> <span class="mi">2</span><span class="p">,</span>
+ <span class="nt">"sample2Size"</span> <span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">sample</span> <span class="mi">2</span> <span class="err">size</span>
<span class="p">}</span>
</code></pre></div>
<p>Please note the post aggregator will be converting binary variables to continuous variables for two population proportions. Specifically</p>
@@ -199,7 +199,7 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"pvalue2tailedZtest"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"zScore"</span><span class="p">:</span> <span class="err"><zscore</span> <span class="err">pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span>
+ <span class="nt">"zScore"</span><span class="p">:</span> <span class="err"><zscore</span> <span class="err">post_aggregator></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="example-usage">Example Usage</h2>
diff --git a/docs/0.15.0-incubating/development/geo.html b/docs/0.15.0-incubating/development/geo.html
index c0c6db6..8be293c 100644
--- a/docs/0.15.0-incubating/development/geo.html
+++ b/docs/0.15.0-incubating/development/geo.html
@@ -201,7 +201,7 @@
<h1 id="spatial-filters">Spatial Filters</h1>
<p>The grammar for a spatial filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"spatial"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"spatialDim"</span><span class="p">,</span>
<span class="nt">"bound"</span><span class="p">:</span> <span class="p">{</span>
diff --git a/docs/0.15.0-incubating/development/modules.html b/docs/0.15.0-incubating/development/modules.html
index 9d17183..cda8b75 100644
--- a/docs/0.15.0-incubating/development/modules.html
+++ b/docs/0.15.0-incubating/development/modules.html
@@ -208,13 +208,13 @@
<p>Check the <code>azure-storage</code>, <code>google-storage</code>, <code>cassandra-storage</code>, <code>hdfs-storage</code> and <code>s3-extensions</code> modules for examples of how to do this.</p>
<p>The basic idea behind the extension is that you need to add bindings for your DataSegmentPusher and DataSegmentPuller objects. The way to add them is something like (taken from HdfsStorageDruidModule)</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Binders</span><span class="p">.</span><span class="na">dataSegmentPullerBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="s">"hdfs"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">HdfsDataSegmentPuller</span><span class="p">.</span><span class="na">class</span><span class="p">).</span><span class="na">in</span><span class="p">(</span><span class="n">LazySingleton</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Binders</span><span class="o">.</span><span class="na">dataSegmentPullerBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="s">"hdfs"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">HdfsDataSegmentPuller</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">in</span><span class="o">(</span><span class="n">LazySingleton</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-<span class="n">Binders</span><span class="p">.</span><span class="na">dataSegmentPusherBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="s">"hdfs"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">HdfsDataSegmentPusher</span><span class="p">.</span><span class="na">class</span><span class="p">).</span><span class="na">in</span><span class="p">(</span><span class="n">LazySingleton</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<span class="n">Binders</span><span class="o">.</span><span class="na">dataSegmentPusherBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="s">"hdfs"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">HdfsDataSegmentPusher</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">in</span><span class="o">(</span><span class="n">LazySingleton</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<p><code>Binders.dataSegment*Binder()</code> is a call provided by the druid-core jar which sets up a Guice multibind "MapBinder". If that doesn't make sense, don't worry about it, just think of it as a magical incantation.</p>
@@ -284,12 +284,12 @@
<p>Adding a Firehose is done almost entirely through the Jackson Modules instead of Guice. Specifically, note the implementation</p>
<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="nd">@Override</span>
-<span class="kd">public</span> <span class="n">List</span><span class="o"><?</span> <span class="kd">extends</span> <span class="n">Module</span><span class="o">></span> <span class="nf">getJacksonModules</span><span class="p">()</span>
-<span class="p">{</span>
- <span class="k">return</span> <span class="n">ImmutableList</span><span class="p">.</span><span class="na">of</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">SimpleModule</span><span class="p">().</span><span class="na">registerSubtypes</span><span class="p">(</span><span class="k">new</span> <span class="n">NamedType</span><span class="p">(</span><span class="n">StaticS3FirehoseFactory</span><span class="p">.</span><span class="na">class</span><span class="p">,</span> <span class="s">"static-s3"</span><span class="p">))</span>
- <span class="p">);</span>
-<span class="p">}</span>
+<span class="kd">public</span> <span class="n">List</span><span class="o"><?</span> <span class="kd">extends</span> <span class="n">Module</span><span class="o">></span> <span class="nf">getJacksonModules</span><span class="o">()</span>
+<span class="o">{</span>
+ <span class="k">return</span> <span class="n">ImmutableList</span><span class="o">.</span><span class="na">of</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">SimpleModule</span><span class="o">().</span><span class="na">registerSubtypes</span><span class="o">(</span><span class="k">new</span> <span class="n">NamedType</span><span class="o">(</span><span class="n">StaticS3FirehoseFactory</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="s">"static-s3"</span><span class="o">))</span>
+ <span class="o">);</span>
+<span class="o">}</span>
</code></pre></div>
<p>This is registering the FirehoseFactory with Jackson's polymorphic serde layer. More concretely, having this will mean that if you specify a <code>"firehose": { "type": "static-s3", ... }</code> in your realtime config, then the system will load this FirehoseFactory for your firehose.</p>
@@ -314,32 +314,32 @@
</ol>
<p>Registering these uses the same general strategy as a deep storage mechanism does. You do something like</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">DruidBinders</span><span class="p">.</span><span class="na">queryToolChestBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="n">SegmentMetadataQuery</span><span class="p">.</span><span class="na">class</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">SegmentMetadataQueryQueryToolChest</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">DruidBinders</span><span class="o">.</span><span class="na">queryToolChestBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="n">SegmentMetadataQuery</span><span class="o">.</span><span class="na">class</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">SegmentMetadataQueryQueryToolChest</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-<span class="n">DruidBinders</span><span class="p">.</span><span class="na">queryRunnerFactoryBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="n">SegmentMetadataQuery</span><span class="p">.</span><span class="na">class</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">SegmentMetadataQueryRunnerFactory</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<span class="n">DruidBinders</span><span class="o">.</span><span class="na">queryRunnerFactoryBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="n">SegmentMetadataQuery</span><span class="o">.</span><span class="na">class</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">SegmentMetadataQueryRunnerFactory</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<p>The first one binds the SegmentMetadataQueryQueryToolChest for usage when a SegmentMetadataQuery is used. The second one does the same thing but for the QueryRunnerFactory instead.</p>
<h3 id="adding-new-jersey-resources">Adding new Jersey resources</h3>
<p>Adding new Jersey resources to a module requires calling the following code to bind the resource in the module:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Jerseys</span><span class="p">.</span><span class="na">addResource</span><span class="p">(</span><span class="n">binder</span><span class="p">,</span> <span class="n">NewResource</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Jerseys</span><span class="o">.</span><span class="na">addResource</span><span class="o">(</span><span class="n">binder</span><span class="o">,</span> <span class="n">NewResource</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<h3 id="adding-a-new-password-provider-implementation">Adding a new Password Provider implementation</h3>
<p>You will need to implement <code>org.apache.druid.metadata.PasswordProvider</code> interface. For every place where Druid uses PasswordProvider, a new instance of the implementation will be created,
thus make sure all the necessary information required for fetching each password is supplied during object instantiation.
In your implementation of <code>org.apache.druid.initialization.DruidModule</code>, <code>getJacksonModules</code> should look something like this -</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="k">return</span> <span class="n">ImmutableList</span><span class="p">.</span><span class="na">of</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">SimpleModule</span><span class="p">(</span><span class="s">"SomePasswordProviderModule"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">registerSubtypes</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">NamedType</span><span class="p">(</span><span class="n">SomePasswordProvider</span><span class="p">.</span><span class="na">class</span><span class="p">,</span> <span class="s">"some"</span><span class="p">)</span>
- <span class="p">)</span>
- <span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="k">return</span> <span class="n">ImmutableList</span><span class="o">.</span><span class="na">of</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">SimpleModule</span><span class="o">(</span><span class="s">"SomePasswordProviderModule"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">registerSubtypes</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">NamedType</span><span class="o">(</span><span class="n">SomePasswordProvider</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="s">"some"</span><span class="o">)</span>
+ <span class="o">)</span>
+ <span class="o">);</span>
</code></pre></div>
<p>where <code>SomePasswordProvider</code> is the implementation of <code>PasswordProvider</code> interface, you can have a look at <code>org.apache.druid.metadata.EnvironmentVariablePasswordProvider</code> for example.</p>
diff --git a/docs/0.15.0-incubating/ingestion/compaction.html b/docs/0.15.0-incubating/ingestion/compaction.html
index 5e921eb..9f9486d 100644
--- a/docs/0.15.0-incubating/ingestion/compaction.html
+++ b/docs/0.15.0-incubating/ingestion/compaction.html
@@ -153,15 +153,15 @@
<p>Compaction tasks merge all segments of the given interval. The syntax is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"compact"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><i</span><span class="kc">nter</span><span class="err">val</span> <span class="kc">t</span><span class="err">o</span> <span class="err">speci</span><span class="kc">f</span><span class="err">y</span> <span class="err">segme</span><span class="kc">nts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
- <span class="s2">"dimensions"</span> <span class="err"><cus</span><span class="kc">t</span><span class="err">om</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><interval</span> <span class="err">to</span> <span class="err">specify</span> <span class="err">segments</span> <span class="err">to</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
+ <span class="nt">"dimensions"</span> <span class="err"><custom</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
<span class="nt">"keepSegmentGranularity"</span><span class="p">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"segmentGranularity"</span><span class="p">:</span> <span class="err"><segme</span><span class="kc">nt</span> <span class="err">gra</span><span class="kc">nular</span><span class="err">i</span><span class="kc">t</span><span class="err">y</span> <span class="err">a</span><span class="kc">fter</span> <span class="err">compac</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"targetCompactionSizeBytes"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tar</span><span class="err">ge</span><span class="kc">t</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="err">compac</span><span class="kc">te</span><span class="err">d</span> <span class="err">segme</span><span class="kc">nts</span><span class="err">></span>
- <span class="s2">"tuningConfig"</span> <span class="err"><i</span><span class="kc">n</span><span class="err">dex</span> <span class="kc">tas</span><span class="err">k</span> <span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">gCo</span><span class="kc">nf</span><span class="err">ig></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"segmentGranularity"</span><span class="p">:</span> <span class="err"><segment</span> <span class="err">granularity</span> <span class="err">after</span> <span class="err">compaction></span><span class="p">,</span>
+ <span class="nt">"targetCompactionSizeBytes"</span><span class="p">:</span> <span class="err"><target</span> <span class="err">size</span> <span class="err">of</span> <span class="err">compacted</span> <span class="err">segments></span>
+ <span class="s2">"tuningConfig"</span> <span class="err"><index</span> <span class="err">task</span> <span class="err">tuningConfig></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.15.0-incubating/ingestion/data-formats.html b/docs/0.15.0-incubating/ingestion/data-formats.html
index 54c2210..75f1958 100644
--- a/docs/0.15.0-incubating/ingestion/data-formats.html
+++ b/docs/0.15.0-incubating/ingestion/data-formats.html
@@ -192,7 +192,7 @@
<p>All forms of Druid ingestion require some form of schema object. The format of the data to be ingested is specified using the<code>parseSpec</code> entry in your <code>dataSchema</code>.</p>
<h3 id="json">JSON</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"json"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -205,7 +205,7 @@
<p>If you have nested JSON, <a href="flatten-json.html">Druid can automatically flatten it for you</a>.</p>
<h3 id="csv">CSV</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"csv"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -234,7 +234,7 @@
<p>The <code>columns</code> field must be included and and ensure that the order of the fields matches the columns of your input data in the same order.</p>
<h3 id="tsv-delimited">TSV (Delimited)</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"tsv"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -266,23 +266,23 @@
<p>The <code>columns</code> field must be included and and ensure that the order of the fields matches the columns of your input data in the same order.</p>
<h3 id="regex">Regex</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
<span class="p">},</span>
<span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"dimensions"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_lis</span><span class="kc">t</span><span class="err">_o</span><span class="kc">f</span><span class="err">_dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">]</span>
+ <span class="nt">"dimensions"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_list_of_dimensions></span><span class="p">]</span>
<span class="p">},</span>
- <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_colum</span><span class="kc">ns</span><span class="err">_here></span><span class="p">],</span>
- <span class="nt">"pattern"</span> <span class="p">:</span> <span class="err"><regex</span> <span class="err">pa</span><span class="kc">ttern</span> <span class="kc">f</span><span class="err">or</span> <span class="err">par</span><span class="kc">t</span><span class="err">i</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">da</span><span class="kc">ta</span><span class="err">></span>
+ <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_columns_here></span><span class="p">],</span>
+ <span class="nt">"pattern"</span> <span class="p">:</span> <span class="err"><regex</span> <span class="err">pattern</span> <span class="err">for</span> <span class="err">partitioning</span> <span class="err">data></span>
<span class="p">}</span>
</code></pre></div>
<p>The <code>columns</code> field must match the columns of your regex matching groups in the same order. If columns are not provided, default
columns names ("column_1", "column2", ... "column_n") will be assigned. Ensure that your column names include all your dimensions. </p>
<h3 id="javascript">JavaScript</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
diff --git a/docs/0.15.0-incubating/ingestion/delete-data.html b/docs/0.15.0-incubating/ingestion/delete-data.html
index 7da476a..8014825 100644
--- a/docs/0.15.0-incubating/ingestion/delete-data.html
+++ b/docs/0.15.0-incubating/ingestion/delete-data.html
@@ -168,10 +168,10 @@
<p>Kill tasks delete all information about a segment and removes it from deep storage. Killable segments must be disabled (used==0) in the Druid segment table. The available grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"kill"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><all_segme</span><span class="kc">nts</span><span class="err">_i</span><span class="kc">n</span><span class="err">_</span><span class="kc">t</span><span class="err">his_i</span><span class="kc">nter</span><span class="err">val_will_die!></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><all_segments_in_this_interval_will_die!></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.15.0-incubating/ingestion/firehose.html b/docs/0.15.0-incubating/ingestion/firehose.html
index 394fd1a..036776a 100644
--- a/docs/0.15.0-incubating/ingestion/firehose.html
+++ b/docs/0.15.0-incubating/ingestion/firehose.html
@@ -465,7 +465,7 @@
This can be used to merge data from more than one firehose.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"combining"</span><span class="p">,</span>
- <span class="nt">"delegates"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span> <span class="kc">f</span><span class="err">irehose</span><span class="mi">1</span> <span class="p">},</span> <span class="p">{</span> <span class="kc">f</span><span class="err">irehose</span><span class="mi">2</span> <span class="p">},</span> <span class="err">.....</span> <span class="p">]</span>
+ <span class="nt">"delegates"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span> <span class="err">firehose1</span> <span class="p">},</span> <span class="p">{</span> <span class="err">firehose2</span> <span class="p">},</span> <span class="err">.....</span> <span class="p">]</span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.15.0-incubating/ingestion/flatten-json.html b/docs/0.15.0-incubating/ingestion/flatten-json.html
index a2ce97f..34967b7 100644
--- a/docs/0.15.0-incubating/ingestion/flatten-json.html
+++ b/docs/0.15.0-incubating/ingestion/flatten-json.html
@@ -226,7 +226,7 @@
<p>The column "metrica" is a Long metric column, "hello" is an array of Double metrics, and "nestmet.val" is a nested Long metric. All other columns are dimensions.</p>
<p>To flatten this JSON, the parseSpec could be defined as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"json"</span><span class="p">,</span>
<span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"useFieldDiscovery"</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
@@ -307,7 +307,7 @@
<p>"ignore_me" will be automatically discovered but excluded as specified by dimensionsExclusions.</p>
<p>Aggregators should use the metric column names as defined in the flattenSpec. Using the example above:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metricsSpec"</span> <span class="p">:</span> <span class="p">[</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metricsSpec"</span> <span class="err">:</span> <span class="p">[</span>
<span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span>
<span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"path-metric-sum"</span><span class="p">,</span>
diff --git a/docs/0.15.0-incubating/ingestion/hadoop.html b/docs/0.15.0-incubating/ingestion/hadoop.html
index 074f204..1903adf 100644
--- a/docs/0.15.0-incubating/ingestion/hadoop.html
+++ b/docs/0.15.0-incubating/ingestion/hadoop.html
@@ -222,7 +222,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hadoop"</span>
<span class="p">}</span>
<span class="p">},</span>
- <span class="nt">"hadoopDependencyCoordinates"</span><span class="p">:</span> <span class="err"><my_hadoop_versio</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"hadoopDependencyCoordinates"</span><span class="p">:</span> <span class="err"><my_hadoop_version></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -512,7 +512,7 @@
</tbody></table>
<h3 id="jobproperties-field-of-tuningconfig">jobProperties field of TuningConfig</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"tuningConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"tuningConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"jobProperties"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"<hadoop-property-a>"</span><span class="p">:</span> <span class="s2">"<value-a>"</span><span class="p">,</span>
@@ -616,7 +616,7 @@
sized data segments relative to single-dimension partitioning.</p>
<h3 id="hash-based-partitioning">Hash-based partitioning</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"partitionsSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"partitionsSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hashed"</span><span class="p">,</span>
<span class="nt">"targetPartitionSize"</span><span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
@@ -657,7 +657,7 @@
</tbody></table>
<h3 id="single-dimension-partitioning">Single-dimension partitioning</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"partitionsSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"partitionsSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimension"</span><span class="p">,</span>
<span class="nt">"targetPartitionSize"</span><span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
diff --git a/docs/0.15.0-incubating/ingestion/ingestion-spec.html b/docs/0.15.0-incubating/ingestion/ingestion-spec.html
index afe4f25..21f781f 100644
--- a/docs/0.15.0-incubating/ingestion/ingestion-spec.html
+++ b/docs/0.15.0-incubating/ingestion/ingestion-spec.html
@@ -188,7 +188,7 @@
<h1 id="dataschema">DataSchema</h1>
<p>An example dataSchema is shown below:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"wikipedia"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -602,7 +602,7 @@
<p>For example, the following <code>dimensionsSpec</code> section from a <code>dataSchema</code> ingests one column as Long (<code>countryNum</code>), two
columns as Float (<code>userLatitude</code>, <code>userLongitude</code>), and the other columns as Strings, with bitmap indexes disabled
for the <code>comment</code> column.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dimensionsSpec"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span>
<span class="s2">"page"</span><span class="p">,</span>
<span class="s2">"language"</span><span class="p">,</span>
diff --git a/docs/0.15.0-incubating/ingestion/locking-and-priority.html b/docs/0.15.0-incubating/ingestion/locking-and-priority.html
index 82be49f..8f97f6d 100644
--- a/docs/0.15.0-incubating/ingestion/locking-and-priority.html
+++ b/docs/0.15.0-incubating/ingestion/locking-and-priority.html
@@ -202,7 +202,7 @@
</tbody></table>
<p>You can override the task priority by setting your priority in the task context like below.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"context"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"context"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"priority"</span> <span class="p">:</span> <span class="mi">100</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.15.0-incubating/ingestion/misc-tasks.html b/docs/0.15.0-incubating/ingestion/misc-tasks.html
index c3c6d41..a086626 100644
--- a/docs/0.15.0-incubating/ingestion/misc-tasks.html
+++ b/docs/0.15.0-incubating/ingestion/misc-tasks.html
@@ -155,10 +155,10 @@
<p>These tasks start, sleep for a time and are used only for testing. The available grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"noop"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_segme</span><span class="kc">nt</span><span class="err">_i</span><span class="kc">nter</span><span class="err">val></span><span class="p">,</span>
- <span class="nt">"runTime"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_millis_</span><span class="kc">t</span><span class="err">o_sleep></span><span class="p">,</span>
- <span class="nt">"firehose"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_</span><span class="kc">f</span><span class="err">irehose_</span><span class="kc">t</span><span class="err">o_</span><span class="kc">test</span><span class="err">_co</span><span class="kc">nne</span><span class="err">c</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><optional_task_id></span><span class="p">,</span>
+ <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><optional_segment_interval></span><span class="p">,</span>
+ <span class="nt">"runTime"</span> <span class="p">:</span> <span class="err"><optional_millis_to_sleep></span><span class="p">,</span>
+ <span class="nt">"firehose"</span><span class="p">:</span> <span class="err"><optional_firehose_to_test_connect></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="segment-merging-tasks-deprecated">Segment Merging Tasks (Deprecated)</h2>
@@ -168,11 +168,11 @@
<p>Append tasks append a list of segments together into a single segment (one after the other). The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"append"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">appe</span><span class="kc">n</span><span class="err">d></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">list</span> <span class="err">of</span> <span class="err">DataSegment</span> <span class="err">objects</span> <span class="err">to</span> <span class="err">append></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><optional</span> <span class="err">list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="merge-task">Merge Task</h3>
@@ -183,12 +183,12 @@
<p>The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"merge"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whe</span><span class="kc">t</span><span class="err">her</span> <span class="err">or</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="kc">t</span><span class="err">o</span> <span class="err">rollup</span> <span class="err">da</span><span class="kc">ta</span> <span class="err">duri</span><span class="kc">n</span><span class="err">g</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whether</span> <span class="err">or</span> <span class="err">not</span> <span class="err">to</span> <span class="err">rollup</span> <span class="err">data</span> <span class="err">during</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">list</span> <span class="err">of</span> <span class="err">DataSegment</span> <span class="err">objects</span> <span class="err">to</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="same-interval-merge-task">Same Interval Merge Task</h3>
@@ -198,12 +198,12 @@
<p>The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"same_interval_merge"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whe</span><span class="kc">t</span><span class="err">her</span> <span class="err">or</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="kc">t</span><span class="err">o</span> <span class="err">rollup</span> <span class="err">da</span><span class="kc">ta</span> <span class="err">duri</span><span class="kc">n</span><span class="err">g</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">his</span> <span class="err">i</span><span class="kc">nter</span><span class="err">val</span> <span class="err">are</span> <span class="err">goi</span><span class="kc">n</span><span class="err">g</span> <span class="kc">t</span><span class="err">o</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whether</span> <span class="err">or</span> <span class="err">not</span> <span class="err">to</span> <span class="err">rollup</span> <span class="err">data</span> <span class="err">during</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><DataSegment</span> <span class="err">objects</span> <span class="err">in</span> <span class="err">this</span> <span class="err">interval</span> <span class="err">are</span> <span class="err">going</span> <span class="err">to</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.15.0-incubating/ingestion/stream-pull.html b/docs/0.15.0-incubating/ingestion/stream-pull.html
index f0d814e..408bcaf 100644
--- a/docs/0.15.0-incubating/ingestion/stream-pull.html
+++ b/docs/0.15.0-incubating/ingestion/stream-pull.html
@@ -547,7 +547,7 @@
<p>Segments are identified by datasource, time interval, and version. With sharding, a segment is also identified by a partition number. Typically, each shard will have the same version but a different partition number to uniquely identify it.</p>
<p>In small-data scenarios, sharding is unnecessary and can be set to none (the default):</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span><span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span><span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
</code></pre></div>
<p>However, in scenarios with multiple realtime processes, <code>none</code> is less useful as it cannot help with scaling data volume (see below). Note that for the batch indexing service, no explicit configuration is required; sharding is provided automatically.</p>
@@ -565,7 +565,7 @@
</ul>
<p>Configure <code>linear</code> under <code>schema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
@@ -575,7 +575,7 @@
<p>This strategy is similar to <code>linear</code> except that it does not tolerate non-sequential partition numbering (it will <em>not</em> allow querying of partitions 0 and 2 if partition 1 is missing). It also requires explicitly setting the total number of partitions.</p>
<p>Configure <code>numbered</code> under <code>schema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"numbered"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span><span class="p">,</span>
<span class="nt">"partitions"</span><span class="p">:</span> <span class="mi">2</span>
@@ -586,13 +586,13 @@
<p>The <code>shardSpec</code> configuration can be used to create redundancy by having the same <code>partitionNum</code> values on different processes.</p>
<p>For example, if RealTimeProcess1 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
</code></pre></div>
<p>and RealTimeProcess2 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
@@ -600,7 +600,7 @@
<p>then two realtime processes can store segments with the same datasource, version, time interval, and partition number. Brokers that query for data in such segments will assume that they hold the same data, and the query will target only one of the segments.</p>
<p><code>shardSpec</code> can also help achieve scale. For this, add processes with a different <code>partionNum</code>. Continuing with the example, if RealTimeProcess3 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">1</span>
<span class="p">}</span>
diff --git a/docs/0.15.0-incubating/ingestion/update-existing-data.html b/docs/0.15.0-incubating/ingestion/update-existing-data.html
index cd52049..a8d0a3e 100644
--- a/docs/0.15.0-incubating/ingestion/update-existing-data.html
+++ b/docs/0.15.0-incubating/ingestion/update-existing-data.html
@@ -275,7 +275,7 @@
</tbody></table>
<p>For example</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"inputSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"dataSource"</span><span class="p">,</span>
@@ -309,7 +309,7 @@
</tbody></table>
<p>For example:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"inputSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"multi"</span><span class="p">,</span>
diff --git a/docs/0.15.0-incubating/operations/use_sbt_to_build_fat_jar.html b/docs/0.15.0-incubating/operations/use_sbt_to_build_fat_jar.html
index 71e22bb..0945614 100644
--- a/docs/0.15.0-incubating/operations/use_sbt_to_build_fat_jar.html
+++ b/docs/0.15.0-incubating/operations/use_sbt_to_build_fat_jar.html
@@ -149,106 +149,106 @@
-->
<h1 id="content-for-build-sbt">Content for build.sbt</h1>
-<div class="highlight"><pre><code class="language-scala" data-lang="scala"><span></span><span class="n">libraryDependencies</span> <span class="o">++=</span> <span class="nc">Seq</span><span class="p">(</span>
- <span class="s">"com.amazonaws"</span> <span class="o">%</span> <span class="s">"aws-java-sdk"</span> <span class="o">%</span> <span class="s">"1.9.23"</span> <span class="n">exclude</span><span class="p">(</span><span class="s">"common-logging"</span><span class="p">,</span> <span class="s">"common-logging"</span><span class="p">),</span>
- <span class="s">"org.joda"</span> <span class="o">%</span> <span class="s">"joda-convert"</span> <span class="o">%</span> <span class="s">"1.7"</span><span class="p">,</span>
- <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"2.7"</span><span class="p">,</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-services"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-service"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-hadoop"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"mysql-metadata-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-s3-extensions"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-histogram"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-hdfs-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-core"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-databind"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-guava"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-joda"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-base"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-json-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-smile-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.module"</span> <span class="o">%</span> <span class="s">"jackson-module-jaxb-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.sun.jersey"</span> <span class="o">%</span> <span class="s">"jersey-servlet"</span> <span class="o">%</span> <span class="s">"1.17.1"</span><span class="p">,</span>
- <span class="s">"mysql"</span> <span class="o">%</span> <span class="s">"mysql-connector-java"</span> <span class="o">%</span> <span class="s">"5.1.34"</span><span class="p">,</span>
- <span class="s">"org.scalatest"</span> <span class="o">%%</span> <span class="s">"scalatest"</span> <span class="o">%</span> <span class="s">"2.2.3"</span> <span class="o">%</span> <span class="s">"test"</span><span class="p">,</span>
+<div class="highlight"><pre><code class="language-scala" data-lang="scala"><span></span><span class="n">libraryDependencies</span> <span class="o">++=</span> <span class="nc">Seq</span><span class="o">(</span>
+ <span class="s">"com.amazonaws"</span> <span class="o">%</span> <span class="s">"aws-java-sdk"</span> <span class="o">%</span> <span class="s">"1.9.23"</span> <span class="n">exclude</span><span class="o">(</span><span class="s">"common-logging"</span><span class="o">,</span> <span class="s">"common-logging"</span><span class="o">),</span>
+ <span class="s">"org.joda"</span> <span class="o">%</span> <span class="s">"joda-convert"</span> <span class="o">%</span> <span class="s">"1.7"</span><span class="o">,</span>
+ <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"2.7"</span><span class="o">,</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-services"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-service"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-hadoop"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"mysql-metadata-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-s3-extensions"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-histogram"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-hdfs-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-core"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-databind"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-guava"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-joda"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-base"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-json-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-smile-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.module"</span> <span class="o">%</span> <span class="s">"jackson-module-jaxb-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.sun.jersey"</span> <span class="o">%</span> <span class="s">"jersey-servlet"</span> <span class="o">%</span> <span class="s">"1.17.1"</span><span class="o">,</span>
+ <span class="s">"mysql"</span> <span class="o">%</span> <span class="s">"mysql-connector-java"</span> <span class="o">%</span> <span class="s">"5.1.34"</span><span class="o">,</span>
+ <span class="s">"org.scalatest"</span> <span class="o">%%</span> <span class="s">"scalatest"</span> <span class="o">%</span> <span class="s">"2.2.3"</span> <span class="o">%</span> <span class="s">"test"</span><span class="o">,</span>
<span class="s">"org.mockito"</span> <span class="o">%</span> <span class="s">"mockito-core"</span> <span class="o">%</span> <span class="s">"1.10.19"</span> <span class="o">%</span> <span class="s">"test"</span>
-<span class="p">)</span>
+<span class="o">)</span>
-<span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span> <span class="o">:=</span> <span class="p">{</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"pom."</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"javax.inject.Named"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"mime.types"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog$1.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/NoOpLog.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogFactory.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogConfigurationException.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/Log.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"META-INF/jersey-module-version"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".properties"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">x</span> <span class="o">=></span>
- <span class="kd">val</span> <span class="n">oldStrategy</span> <span class="o">=</span> <span class="p">(</span><span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span><span class="p">).</span><span class="n">value</span>
- <span class="n">oldStrategy</span><span class="p">(</span><span class="n">x</span><span class="p">)</span>
-<span class="p">}</span>
+<span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span> <span class="o">:=</span> <span class="o">{</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"pom."</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"javax.inject.Named"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"mime.types"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog$1.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/NoOpLog.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogFactory.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogConfigurationException.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/Log.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"META-INF/jersey-module-version"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".properties"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">x</span> <span class="k">=></span>
+ <span class="k">val</span> <span class="n">oldStrategy</span> <span class="k">=</span> <span class="o">(</span><span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span><span class="o">).</span><span class="n">value</span>
+ <span class="n">oldStrategy</span><span class="o">(</span><span class="n">x</span><span class="o">)</span>
+<span class="o">}</span>
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.15.0-incubating/querying/aggregations.html b/docs/0.15.0-incubating/querying/aggregations.html
index b924d3e..1edfa7f 100644
--- a/docs/0.15.0-incubating/querying/aggregations.html
+++ b/docs/0.15.0-incubating/querying/aggregations.html
@@ -158,7 +158,7 @@
<h3 id="count-aggregator">Count aggregator</h3>
<p><code>count</code> computes the count of Druid rows that match the filters.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span> <span class="p">}</span>
</code></pre></div>
<p>Please note the count aggregator counts the number of Druid rows, which does not always reflect the number of raw events ingested.
This is because Druid can be configured to roll up data at ingestion time. To
@@ -170,7 +170,7 @@
<h4 id="longsum-aggregator"><code>longSum</code> aggregator</h4>
<p>computes the sum of values as a 64-bit, signed integer</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<p><code>name</code> – output name for the summed value
<code>fieldName</code> – name of the metric column to sum over</p>
@@ -178,44 +178,44 @@
<h4 id="doublesum-aggregator"><code>doubleSum</code> aggregator</h4>
<p>Computes and stores the sum of values as 64-bit floating point value. Similar to <code>longSum</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatsum-aggregator"><code>floatSum</code> aggregator</h4>
<p>Computes and stores the sum of values as 32-bit floating point value. Similar to <code>longSum</code> and <code>doubleSum</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="min-max-aggregators">Min / Max aggregators</h3>
<h4 id="doublemin-aggregator"><code>doubleMin</code> aggregator</h4>
<p><code>doubleMin</code> computes the minimum of all metric values and Double.POSITIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="doublemax-aggregator"><code>doubleMax</code> aggregator</h4>
<p><code>doubleMax</code> computes the maximum of all metric values and Double.NEGATIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatmin-aggregator"><code>floatMin</code> aggregator</h4>
<p><code>floatMin</code> computes the minimum of all metric values and Float.POSITIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatmax-aggregator"><code>floatMax</code> aggregator</h4>
<p><code>floatMax</code> computes the maximum of all metric values and Float.NEGATIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="longmin-aggregator"><code>longMin</code> aggregator</h4>
<p><code>longMin</code> computes the minimum of all metric values and Long.MAX_VALUE</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="longmax-aggregator"><code>longMax</code> aggregator</h4>
<p><code>longMax</code> computes the maximum of all metric values and Long.MIN_VALUE</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="first-last-aggregator">First / Last aggregator</h3>
@@ -228,8 +228,8 @@
<p><code>doubleFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="doublelast-aggregator"><code>doubleLast</code> aggregator</h4>
@@ -237,8 +237,8 @@
<p><code>doubleLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="floatfirst-aggregator"><code>floatFirst</code> aggregator</h4>
@@ -246,8 +246,8 @@
<p><code>floatFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="floatlast-aggregator"><code>floatLast</code> aggregator</h4>
@@ -255,8 +255,8 @@
<p><code>floatLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="longfirst-aggregator"><code>longFirst</code> aggregator</h4>
@@ -264,8 +264,8 @@
<p><code>longFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="longlast-aggregator"><code>longLast</code> aggregator</h4>
@@ -273,8 +273,8 @@
<p><code>longLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="stringfirst-aggregator"><code>stringFirst</code> aggregator</h4>
@@ -282,10 +282,10 @@
<p><code>stringFirst</code> computes the metric value with the minimum timestamp or <code>null</code> if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1024</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolea</span><span class="kc">n</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><integer></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">1024),</span>
+ <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolean></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="stringlast-aggregator"><code>stringLast</code> aggregator</h4>
@@ -293,10 +293,10 @@
<p><code>stringLast</code> computes the metric value with the maximum timestamp or <code>null</code> if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1024</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolea</span><span class="kc">n</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><integer></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">1024),</span>
+ <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolean></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<h3 id="javascript-aggregator">JavaScript aggregator</h3>
@@ -305,7 +305,7 @@
JavaScript functions are expected to return floating-point values.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><colum</span><span class="kc">n</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><colum</span><span class="kc">n</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
+ <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><column</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><column</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
<span class="nt">"fnAggregate"</span> <span class="p">:</span> <span class="s2">"function(current, column1, column2, ...) {</span>
<span class="s2"> <updates partial aggregate (current) based on the current row values></span>
<span class="s2"> return <updated partial aggregate></span>
@@ -425,10 +425,10 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"filtered"</span><span class="p">,</span>
<span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span> <span class="err">value></span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><dimension</span> <span class="err">value></span>
<span class="p">}</span>
- <span class="nt">"aggregator"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="s2">"aggregator"</span> <span class="p">:</span> <span class="err"><aggregation></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.15.0-incubating/querying/dimensionspecs.html b/docs/0.15.0-incubating/querying/dimensionspecs.html
index c74efac..60689a4 100644
--- a/docs/0.15.0-incubating/querying/dimensionspecs.html
+++ b/docs/0.15.0-incubating/querying/dimensionspecs.html
@@ -161,8 +161,8 @@
<p>Returns dimension values as is and optionally renames the dimension.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"default"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"outputName"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"outputName"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
<span class="nt">"outputType"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"STRING"</span><span class="err">|</span><span class="s2">"LONG"</span><span class="err">|</span><span class="s2">"FLOAT"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
@@ -175,10 +175,10 @@
<p>Returns dimension values transformed using the given <a href="#extraction-functions">extraction function</a>.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"extraction"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"outputName"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"outputName"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
<span class="nt">"outputType"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"STRING"</span><span class="err">|</span><span class="s2">"LONG"</span><span class="err">|</span><span class="s2">"FLOAT"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><extraction_function></span>
<span class="p">}</span>
</code></pre></div>
<p><code>outputType</code> may also be specified in an ExtractionDimensionSpec to apply type conversion to results before merging. If left unspecified, the <code>outputType</code> defaults to STRING.</p>
@@ -195,13 +195,13 @@
<p>In addition to "query filter" which efficiently selects the rows to be processed, you can use the filtered dimension spec to filter for specific values within the values of a multi-value dimension. These dimensionSpecs take a delegate DimensionSpec and a filtering criteria. From the "exploded" rows, only rows matching the given filtering criteria are returned in the query result.</p>
<p>The following filtered dimension spec acts as a whitelist or blacklist for values as per the "isWhitelist" attribute value.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"listFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"values"</span><span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">gs></span><span class="p">,</span> <span class="nt">"isWhitelist"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">a</span><span class="kc">ttr</span><span class="err">ibu</span><span class="kc">te</span> <span class="kc">f</span><span class="err">or</span> <span class="kc">true</span><span class="err">/</span><span class="kc">false</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">is</span> <span class="kc">true</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"listFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"values"</span><span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">strings></span><span class="p">,</span> <span class="nt">"isWhitelist"</span><span class="p">:</span> <span class="err"><optional</span> <span class="err">attribute</span> <span class="err">for</span> <span class="kc">true</span><span class="err">/</span><span class="kc">false</span><span class="p">,</span> <span class="err">default</span> <span class="err">is</span> <span class="err">true></span> <span class="p">}</span>
</code></pre></div>
<p>Following filtered dimension spec retains only the values matching regex. Note that <code>listFiltered</code> is faster than this and one should use that for whitelist or blacklist usecase.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regexFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><java</span> <span class="err">regex</span> <span class="err">pa</span><span class="kc">ttern</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regexFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><java</span> <span class="err">regex</span> <span class="err">pattern></span> <span class="p">}</span>
</code></pre></div>
<p>Following filtered dimension spec retains only the values starting with the same prefix.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"prefixFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"prefix"</span><span class="p">:</span> <span class="err"><pre</span><span class="kc">f</span><span class="err">ix</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"prefixFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"prefix"</span><span class="p">:</span> <span class="err"><prefix</span> <span class="err">string></span> <span class="p">}</span>
</code></pre></div>
<p>For more details and examples, see <a href="multi-value-dimensions.html">multi-value dimensions</a>.</p>
@@ -295,8 +295,8 @@
If there is no match, it returns the dimension value as is.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span>
- <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expressio</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"index"</span> <span class="p">:</span> <span class="err"><group</span> <span class="kc">t</span><span class="err">o</span> <span class="err">ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="mi">1</span><span class="err">></span>
+ <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expression></span><span class="p">,</span>
+ <span class="nt">"index"</span> <span class="p">:</span> <span class="err"><group</span> <span class="err">to</span> <span class="err">extract</span><span class="p">,</span> <span class="err">default</span> <span class="err">1></span>
<span class="nt">"replaceMissingValue"</span> <span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
<span class="nt">"replaceMissingValueWith"</span> <span class="p">:</span> <span class="s2">"foobar"</span>
<span class="p">}</span>
@@ -316,7 +316,7 @@
<h3 id="partial-extraction-function">Partial Extraction Function</h3>
<p>Returns the dimension value unchanged if the regular expression matches, otherwise returns null.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"partial"</span><span class="p">,</span> <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expressio</span><span class="kc">n</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"partial"</span><span class="p">,</span> <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expression></span> <span class="p">}</span>
</code></pre></div>
<h3 id="search-query-extraction-function">Search Query Extraction Function</h3>
@@ -366,11 +366,11 @@
<li><code>asMillis</code> : boolean value, set to true to treat input strings as millis rather than ISO8601 strings. Additionally, if <code>format</code> is null or not specified, output will be in millis rather than ISO8601.</li>
</ul>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"timeFormat"</span><span class="p">,</span>
- <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"timeZone"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">t</span><span class="err">ime_zo</span><span class="kc">ne</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">UTC)</span><span class="p">,</span>
- <span class="nt">"locale"</span> <span class="p">:</span> <span class="err"><locale></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">curre</span><span class="kc">nt</span> <span class="err">locale)</span><span class="p">,</span>
- <span class="nt">"granularity"</span> <span class="p">:</span> <span class="err"><gra</span><span class="kc">nular</span><span class="err">i</span><span class="kc">t</span><span class="err">y></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="kc">n</span><span class="err">o</span><span class="kc">ne</span><span class="err">)</span> <span class="p">},</span>
- <span class="nt">"asMillis"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">)</span> <span class="p">}</span>
+ <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><output_format></span> <span class="err">(optional)</span><span class="p">,</span>
+ <span class="nt">"timeZone"</span> <span class="p">:</span> <span class="err"><time_zone></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">UTC),</span>
+ <span class="nt">"locale"</span> <span class="p">:</span> <span class="err"><locale></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">current</span> <span class="err">locale),</span>
+ <span class="nt">"granularity"</span> <span class="p">:</span> <span class="err"><granularity></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">none)</span> <span class="p">}</span><span class="err">,</span>
+ <span class="s2">"asMillis"</span> <span class="err">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span> <span class="err">(optional)</span> <span class="err">}</span>
</code></pre></div>
<p>For example, the following dimension spec returns the day of the week for Montréal in French:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -401,9 +401,9 @@
<p>If a value cannot be parsed using the provided timeFormat, it will be returned as-is.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"time"</span><span class="p">,</span>
- <span class="nt">"timeFormat"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"resultFormat"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"joda"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span><span class="p">,</span> <span class="kc">false</span><span class="err">></span> <span class="p">}</span>
+ <span class="nt">"timeFormat"</span> <span class="p">:</span> <span class="err"><input_format></span><span class="p">,</span>
+ <span class="nt">"resultFormat"</span> <span class="p">:</span> <span class="err"><output_format></span><span class="p">,</span>
+ <span class="nt">"joda"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span><span class="p">,</span> <span class="err">false></span> <span class="p">}</span>
</code></pre></div>
<h3 id="javascript-extraction-function">Javascript Extraction Function</h3>
@@ -574,7 +574,7 @@
<h3 id="string-format-extraction-function">String Format Extraction Function</h3>
<p>Returns the dimension value formatted according to the given format string.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFormat"</span><span class="p">,</span> <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><spri</span><span class="kc">ntf</span><span class="err">_expressio</span><span class="kc">n</span><span class="err">></span><span class="p">,</span> <span class="nt">"nullHandling"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">a</span><span class="kc">ttr</span><span class="err">ibu</span><span class="kc">te</span> <span class="kc">f</span><span class="err">or</span> <span class="err">ha</span><span class="kc">n</span><span class="err">dli</span><span class="kc">n</span><span class="err">g</span> <span class="kc">null</span> <span class="err">value></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFormat"</span><span class="p">,</span> <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><sprintf_expression></span><span class="p">,</span> <span class="nt">"nullHandling"</span> <span class="p">:</span> <span class="err"><optional</span> <span class="err">attribute</span> <span class="err">for</span> <span class="err">handling</span> <span class="kc">null</span> <span class="err">value></span> <span class="p">}</span>
</code></pre></div>
<p>For example if you want to concat "[" and "]" before and after the actual dimension value, you need to specify "[%s]" as format string. "nullHandling" can be one of <code>nullString</code>, <code>emptyString</code> or <code>returnNull</code>. With "[%s]" format, each configuration will result <code>[null]</code>, <code>[]</code>, <code>null</code>. Default is <code>nullString</code>.</p>
diff --git a/docs/0.15.0-incubating/querying/filters.html b/docs/0.15.0-incubating/querying/filters.html
index 83e533f..60304f9 100644
--- a/docs/0.15.0-incubating/querying/filters.html
+++ b/docs/0.15.0-incubating/querying/filters.html
@@ -157,7 +157,7 @@
<p>The simplest filter is a selector filter. The selector filter will match a specific dimension with a specific value. Selector filters can be used as the base filters for more complex Boolean expressions of filters.</p>
<p>The grammar for a SELECTOR filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_value_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dimension_value_string></span> <span class="p">}</span>
</code></pre></div>
<p>This is the equivalent of <code>WHERE <dimension_string> = '<dimension_value_string>'</code>.</p>
@@ -166,7 +166,7 @@
<h3 id="column-comparison-filter">Column Comparison filter</h3>
<p>The column comparison filter is similar to the selector filter, but instead compares dimensions to each other. For example:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"columnComparison"</span><span class="p">,</span> <span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span><span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_a></span><span class="p">,</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_b></span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"columnComparison"</span><span class="p">,</span> <span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span><span class="err"><dimension_a></span><span class="p">,</span> <span class="err"><dimension_b></span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>This is the equivalent of <code>WHERE <dimension_a> = <dimension_b></code>.</p>
@@ -175,7 +175,7 @@
<h3 id="regular-expression-filter">Regular expression filter</h3>
<p>The regular expression filter is similar to the selector filter, but using regular expressions. It matches the specified dimension with the given pattern. The pattern can be any standard <a href="http://docs.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html">Java regular expression</a>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><pa</span><span class="kc">ttern</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><pattern_string></span> <span class="p">}</span>
</code></pre></div>
<p>The regex filter supports the use of extraction functions, see <a href="#filtering-with-extraction-functions">Filtering with Extraction Functions</a> for details.</p>
@@ -184,21 +184,21 @@
<h4 id="and">AND</h4>
<p>The grammar for an AND filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>The filters in fields can be any other filter defined on this page.</p>
<h4 id="or">OR</h4>
<p>The grammar for an OR filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"or"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"or"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>The filters in fields can be any other filter defined on this page.</p>
<h4 id="not">NOT</h4>
<p>The grammar for a NOT filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"not"</span><span class="p">,</span> <span class="nt">"field"</span><span class="p">:</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"not"</span><span class="p">,</span> <span class="nt">"field"</span><span class="p">:</span> <span class="err"><filter></span> <span class="p">}</span>
</code></pre></div>
<p>The filter specified at field can be any other filter defined on this page.</p>
@@ -209,7 +209,7 @@
<p>The function takes a single argument, the dimension value, and returns either true or false.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span>
<span class="nt">"function"</span> <span class="p">:</span> <span class="s2">"function(value) { <...> }"</span>
<span class="p">}</span>
</code></pre></div>
@@ -699,14 +699,14 @@
the "regex" filter) the numeric column values will be converted to strings during the scan.</p>
<p>For example, filtering on a specific value, <code>myFloatColumn = 10.1</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"myFloatColumn"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"10.1"</span>
<span class="p">}</span>
</code></pre></div>
<p>Filtering on a range of values, <code>10 <= myFloatColumn < 20</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"bound"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"myFloatColumn"</span><span class="p">,</span>
<span class="nt">"ordering"</span><span class="p">:</span> <span class="s2">"numeric"</span><span class="p">,</span>
@@ -725,14 +725,14 @@
<p>If the user wishes to interpret the timestamp with a specific format, timezone, or locale, the <a href="./dimensionspecs.html#time-format-extraction-function">Time Format Extraction Function</a> is useful.</p>
<p>For example, filtering on a long timestamp value:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"__time"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"124457387532"</span>
<span class="p">}</span>
</code></pre></div>
<p>Filtering on day of week:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"__time"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"Friday"</span><span class="p">,</span>
diff --git a/docs/0.15.0-incubating/querying/granularities.html b/docs/0.15.0-incubating/querying/granularities.html
index da60b92..85702ca 100644
--- a/docs/0.15.0-incubating/querying/granularities.html
+++ b/docs/0.15.0-incubating/querying/granularities.html
@@ -308,10 +308,10 @@
<p>Duration granularities are specified as an exact duration in milliseconds and timestamps are returned as UTC. Duration granularity values are in millis.</p>
<p>They also support specifying an optional origin, which defines where to start counting time buckets from (defaults to 1970-01-01T00:00:00Z).</p>
-<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mf">7200000</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mi">7200000</span><span class="p">}</span>
</code></pre></div>
<p>This chunks up every 2 hours.</p>
-<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mf">3600000</span><span class="p">,</span> <span class="s2">"origin"</span><span class="o">:</span> <span class="s2">"2012-01-01T00:30:00Z"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mi">3600000</span><span class="p">,</span> <span class="s2">"origin"</span><span class="o">:</span> <span class="s2">"2012-01-01T00:30:00Z"</span><span class="p">}</span>
</code></pre></div>
<p>This chunks up every hour on the half-hour.</p>
diff --git a/docs/0.15.0-incubating/querying/groupbyquery.html b/docs/0.15.0-incubating/querying/groupbyquery.html
index 6d330e8..9aee3d8 100644
--- a/docs/0.15.0-incubating/querying/groupbyquery.html
+++ b/docs/0.15.0-incubating/querying/groupbyquery.html
@@ -277,10 +277,10 @@
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"2012-01-01T00:00:00.000Z"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"country"</span> <span class="p">:</span> <span class="err"><some_dim_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"device"</span> <span class="p">:</span> <span class="err"><some_dim_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"total_usage"</span> <span class="p">:</span> <span class="err"><some_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"data_transfer"</span> <span class="p">:</span><span class="err"><some_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
+ <span class="nt">"country"</span> <span class="p">:</span> <span class="err"><some_dim_value_one></span><span class="p">,</span>
+ <span class="nt">"device"</span> <span class="p">:</span> <span class="err"><some_dim_value_two></span><span class="p">,</span>
+ <span class="nt">"total_usage"</span> <span class="p">:</span> <span class="err"><some_value_one></span><span class="p">,</span>
+ <span class="nt">"data_transfer"</span> <span class="p">:</span><span class="err"><some_value_two></span><span class="p">,</span>
<span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_avg_usage_value></span>
<span class="p">}</span>
<span class="p">},</span>
@@ -288,11 +288,11 @@
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"2012-01-01T00:00:12.000Z"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"dim1"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_dim_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"dim2"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_dim_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"sample_name1"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"sample_name2"</span> <span class="p">:</span><span class="err"><some_o</span><span class="kc">t</span><span class="err">her_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_avg_usage_value></span>
+ <span class="nt">"dim1"</span> <span class="p">:</span> <span class="err"><some_other_dim_value_one></span><span class="p">,</span>
+ <span class="nt">"dim2"</span> <span class="p">:</span> <span class="err"><some_other_dim_value_two></span><span class="p">,</span>
+ <span class="nt">"sample_name1"</span> <span class="p">:</span> <span class="err"><some_other_value_one></span><span class="p">,</span>
+ <span class="nt">"sample_name2"</span> <span class="p">:</span><span class="err"><some_other_value_two></span><span class="p">,</span>
+ <span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_other_avg_usage_value></span>
<span class="p">}</span>
<span class="p">},</span>
<span class="err">...</span>
@@ -326,7 +326,7 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"extraction"</span><span class="p">,</span>
<span class="nt">"dimension"</span> <span class="p">:</span> <span class="s2">"d2col"</span><span class="p">,</span>
<span class="nt">"outputName"</span> <span class="p">:</span> <span class="s2">"D2"</span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err">ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fun</span><span class="err">c</span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err">extraction_func</span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span><span class="s2">"lookup"</span><span class="p">,</span>
@@ -337,10 +337,10 @@
<span class="p">],</span>
<span class="err">...</span>
<span class="err">...</span>
-<span class="nt">"subtotalsSpec"</span><span class="p">:[</span> <span class="p">[</span><span class="s2">"D1"</span><span class="p">,</span> <span class="s2">"D2"</span><span class="p">,</span> <span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">1</span><span class="s2">", "</span><span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">3</span><span class="err">"]],</span>
+<span class="nt">"subtotalsSpec"</span><span class="p">:[</span> <span class="p">[</span><span class="s2">"D1"</span><span class="p">,</span> <span class="s2">"D2"</span><span class="p">,</span> <span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">1</span><span class="s2">", "</span><span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">3</span><span class="err">"</span><span class="p">]],</span>
<span class="err">..</span>
-<span class="err">}</span>
+<span class="p">}</span>
</code></pre></div>
<p>Response returned would be equivalent to concatenating result of 3 groupBy queries with "dimensions" field being ["D1", "D2", D3"], ["D1", "D3"] and ["D3"] with appropriate <code>DimensionSpec</code> json blob as used in above query.
Response for above query would look something like below...</p>
@@ -350,13 +350,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D2"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D2"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="err">...</span>
@@ -365,13 +365,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="err">...</span>
@@ -380,13 +380,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="p">]</span>
</code></pre></div>
diff --git a/docs/0.15.0-incubating/querying/having.html b/docs/0.15.0-incubating/querying/having.html
index c94451e..c123f7d 100644
--- a/docs/0.15.0-incubating/querying/having.html
+++ b/docs/0.15.0-incubating/querying/having.html
@@ -168,7 +168,7 @@
<span class="nt">"having"</span><span class="p">:</span>
<span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"filter"</span><span class="p">,</span>
- <span class="nt">"filter"</span> <span class="p">:</span> <span class="err"><a</span><span class="kc">n</span><span class="err">y</span> <span class="err">Druid</span> <span class="err">query</span> <span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span>
+ <span class="nt">"filter"</span> <span class="p">:</span> <span class="err"><any</span> <span class="err">Druid</span> <span class="err">query</span> <span class="err">filter></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -205,7 +205,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -221,7 +221,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -239,7 +239,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -257,7 +257,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"lessThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -277,7 +277,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimSelector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"<dimension>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dimension_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -297,12 +297,12 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"lessThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">]</span>
<span class="p">}</span>
@@ -322,12 +322,12 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">]</span>
<span class="p">}</span>
@@ -347,7 +347,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
<span class="p">}</span>
diff --git a/docs/0.15.0-incubating/querying/hll-old.html b/docs/0.15.0-incubating/querying/hll-old.html
index e74de44..8691f8c 100644
--- a/docs/0.15.0-incubating/querying/hll-old.html
+++ b/docs/0.15.0-incubating/querying/hll-old.html
@@ -159,9 +159,9 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"cardinality"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
- <span class="nt">"byRow"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"round"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span> <span class="err"><dimension</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><dimension</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
+ <span class="nt">"byRow"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false),</span>
+ <span class="nt">"round"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<p>Each individual element of the "fields" list can be a String or <a href="../querying/dimensionspecs.html">DimensionSpec</a>. A String dimension in the fields list is equivalent to a DefaultDimensionSpec (no transformations).</p>
@@ -233,8 +233,8 @@
<p>Uses <a href="http://algo.inria.fr/flajolet/Publications/FlFuGaMe07.pdf">HyperLogLog</a> to compute the estimated cardinality of a dimension that has been aggregated as a "hyperUnique" metric at indexing time.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUnique"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="nt">"isInputHyperUnique"</span> <span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
<span class="nt">"round"</span> <span class="p">:</span> <span class="kc">false</span>
<span class="p">}</span>
diff --git a/docs/0.15.0-incubating/querying/limitspec.html b/docs/0.15.0-incubating/querying/limitspec.html
index 69afde4..f25f310 100644
--- a/docs/0.15.0-incubating/querying/limitspec.html
+++ b/docs/0.15.0-incubating/querying/limitspec.html
@@ -157,8 +157,8 @@
<p>The default limit spec takes a limit and the list of columns to do an orderBy operation over. The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"default"</span><span class="p">,</span>
- <span class="nt">"limit"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger_value></span><span class="p">,</span>
- <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">OrderByColum</span><span class="kc">n</span><span class="err">Spec</span><span class="p">],</span>
+ <span class="nt">"limit"</span> <span class="p">:</span> <span class="err"><integer_value></span><span class="p">,</span>
+ <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err">list</span> <span class="err">of</span> <span class="err">OrderByColumnSpec</span><span class="p">],</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="orderbycolumnspec">OrderByColumnSpec</h4>
@@ -167,7 +167,7 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"dimension"</span> <span class="p">:</span> <span class="s2">"<Any dimension or metric name>"</span><span class="p">,</span>
<span class="nt">"direction"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"ascending"</span><span class="err">|</span><span class="s2">"descending"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"dimensionOrder"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"lexicographic"</span><span class="err">(de</span><span class="kc">fault</span><span class="err">)|</span><span class="s2">"alphanumeric"</span><span class="err">|</span><span class="s2">"strlen"</span><span class="err">|</span><span class="s2">"numeric"</span><span class="err">></span>
+ <span class="nt">"dimensionOrder"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"lexicographic"</span><span class="err">(default)|</span><span class="s2">"alphanumeric"</span><span class="err">|</span><span class="s2">"strlen"</span><span class="err">|</span><span class="s2">"numeric"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
<p>If only the dimension is provided (as a JSON string), the default order-by is ascending with lexicographic sorting.</p>
diff --git a/docs/0.15.0-incubating/querying/post-aggregations.html b/docs/0.15.0-incubating/querying/post-aggregations.html
index ea24fb1..a720990 100644
--- a/docs/0.15.0-incubating/querying/post-aggregations.html
+++ b/docs/0.15.0-incubating/querying/post-aggregations.html
@@ -177,12 +177,12 @@
</ul>
<p>The grammar for an arithmetic post aggregation is:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">pos</span><span class="kc">t</span><span class="err">Aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">postAggregation</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arithmetic"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fn"</span> <span class="p">:</span> <span class="err"><ari</span><span class="kc">t</span><span class="err">hme</span><span class="kc">t</span><span class="err">ic_</span><span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
- <span class="nt">"ordering"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">null</span> <span class="err">(de</span><span class="kc">fault</span><span class="err">)</span><span class="p">,</span> <span class="err">or</span> <span class="s2">"numericFirst"</span><span class="err">></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fn"</span> <span class="p">:</span> <span class="err"><arithmetic_function></span><span class="p">,</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><post_aggregator></span><span class="p">,</span> <span class="err"><post_aggregator></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
+ <span class="nt">"ordering"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">null</span> <span class="err">(default)</span><span class="p">,</span> <span class="err">or</span> <span class="nt">"numericFirst"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="field-accessor-post-aggregators">Field accessor post-aggregators</h3>
@@ -193,15 +193,15 @@
For complex aggregators, like "cardinality" and "hyperUnique", the <code>type</code> of the post-aggregator determines what
the post-aggregator will return. Use type "fieldAccess" to return the raw aggregation object, or use type
"finalizingFieldAccess" to return a finalized value, such as an estimated cardinality.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<p>or</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"finalizingFieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"finalizingFieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="constant-post-aggregator">Constant post-aggregator</h3>
<p>The constant post-aggregator always returns the specified value.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"constant"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">merical_value></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"constant"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><numerical_value></span> <span class="p">}</span>
</code></pre></div>
<h3 id="greatest-least-post-aggregators">Greatest / Least post-aggregators</h3>
@@ -216,18 +216,18 @@
<p>Example:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleGreatest"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><post_aggregator></span><span class="p">,</span> <span class="err"><post_aggregator></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span>
<span class="p">}</span>
</code></pre></div>
<h3 id="javascript-post-aggregator">JavaScript post-aggregator</h3>
<p>Applies the provided JavaScript function to the given fields. Fields are passed as arguments to the JavaScript function in the given order.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">pos</span><span class="kc">t</span><span class="err">Aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">postAggregation</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
- <span class="nt">"function"</span><span class="p">:</span> <span class="err"><javascrip</span><span class="kc">t</span> <span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><aggregator_name></span><span class="p">,</span> <span class="err"><aggregator_name></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
+ <span class="nt">"function"</span><span class="p">:</span> <span class="err"><javascript</span> <span class="err">function></span>
<span class="p">}</span>
</code></pre></div>
<p>Example JavaScript aggregator:</p>
@@ -247,16 +247,16 @@
<p>The hyperUniqueCardinality post aggregator is used to wrap a hyperUnique object such that it can be used in post aggregations.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUniqueCardinality"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">t</span><span class="err">he</span> <span class="kc">na</span><span class="err">me</span> <span class="kc">f</span><span class="err">ield</span> <span class="err">value</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hyperU</span><span class="kc">n</span><span class="err">ique</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><the</span> <span class="err">name</span> <span class="err">field</span> <span class="err">value</span> <span class="err">of</span> <span class="err">the</span> <span class="err">hyperUnique</span> <span class="err">aggregator></span>
<span class="p">}</span>
</code></pre></div>
<p>It can be used in a sample calculation as so:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"aggregations"</span> <span class="p">:</span> <span class="p">[{</span>
- <span class="p">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"rows"</span><span class="p">},</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"aggregations"</span> <span class="err">:</span> <span class="p">[{</span>
+ <span class="err">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"rows"</span><span class="p">},</span>
<span class="p">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUnique"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"unique_users"</span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="s2">"uniques"</span><span class="p">}</span>
- <span class="p">}],</span>
- <span class="nt">"postAggregations"</span> <span class="p">:</span> <span class="p">[{</span>
+ <span class="err">}</span><span class="p">]</span><span class="err">,</span>
+ <span class="s2">"postAggregations"</span> <span class="err">:</span> <span class="p">[{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arithmetic"</span><span class="p">,</span>
<span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"average_users_per_row"</span><span class="p">,</span>
<span class="nt">"fn"</span> <span class="p">:</span> <span class="s2">"/"</span><span class="p">,</span>
diff --git a/docs/0.15.0-incubating/querying/segmentmetadataquery.html b/docs/0.15.0-incubating/querying/segmentmetadataquery.html
index 035292c..6a0627e 100644
--- a/docs/0.15.0-incubating/querying/segmentmetadataquery.html
+++ b/docs/0.15.0-incubating/querying/segmentmetadataquery.html
@@ -263,17 +263,17 @@
<h4 id="all">All</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"all"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"all"</span><span class="p">}</span>
</code></pre></div>
<h4 id="none">None</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
</code></pre></div>
<h4 id="list">List</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"list"</span><span class="p">,</span> <span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">colum</span><span class="kc">n</span> <span class="kc">na</span><span class="err">mes></span><span class="p">]}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"list"</span><span class="p">,</span> <span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="err"><string</span> <span class="err">list</span> <span class="err">of</span> <span class="err">column</span> <span class="err">names></span><span class="p">]}</span>
</code></pre></div>
<h3 id="analysistypes">analysisTypes</h3>
diff --git a/docs/0.15.0-incubating/querying/select-query.html b/docs/0.15.0-incubating/querying/select-query.html
index 1fe4f31..1169233 100644
--- a/docs/0.15.0-incubating/querying/select-query.html
+++ b/docs/0.15.0-incubating/querying/select-query.html
@@ -342,9 +342,9 @@
<p>The <code>threshold</code> determines how many hits are returned, with each hit indexed by an offset. When <code>descending</code> is true, the offset will be negative value.</p>
<p>The results above include:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"pagingIdentifiers"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"pagingIdentifiers"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"wikipedia_2012-12-29T00:00:00.000Z_2013-01-10T08:00:00.000Z_2013-01-10T08:13:47.830Z_v9"</span> <span class="p">:</span> <span class="mi">4</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<h3 id="result-pagination">Result Pagination</h3>
@@ -353,7 +353,7 @@
<p>The <code>threshold</code> option controls how many rows are returned in each block of paginated results.</p>
<p>To initiate a paginated query, the user should specify a PagingSpec with a <code>threshold</code> set and a blank <code>pagingIdentifiers</code> field, e.g.:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"pagingSpec"</span><span class="p">:{</span><span class="nt">"pagingIdentifiers"</span><span class="p">:</span> <span class="p">{},</span> <span class="nt">"threshold"</span><span class="p">:</span><span class="mi">5</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"pagingSpec"</span><span class="err">:</span><span class="p">{</span><span class="nt">"pagingIdentifiers"</span><span class="p">:</span> <span class="p">{},</span> <span class="nt">"threshold"</span><span class="p">:</span><span class="mi">5</span><span class="p">}</span>
</code></pre></div>
<p>When the query returns, the results will contain a <code>pagingIndentifers</code> field indicating the current pagination point in the result set (an identifier and an offset).</p>
@@ -382,9 +382,9 @@
<span class="p">}</span>
</code></pre></div>
<p>The paginated query with <code>fromNext</code> set to false returns a result set with the following <code>pagingIdentifiers</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"pagingIdentifiers"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"pagingIdentifiers"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"wikipedia_2012-12-29T00:00:00.000Z_2013-01-10T08:00:00.000Z_2013-01-10T08:13:47.830Z_v9"</span> <span class="p">:</span> <span class="mi">4</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<p>To retrieve the next result set, the next query must be sent with the paging offset (4) incremented by 1.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="p">{</span>
diff --git a/docs/0.15.0-incubating/querying/sql.html b/docs/0.15.0-incubating/querying/sql.html
index 9f5608f..4f51e50 100644
--- a/docs/0.15.0-incubating/querying/sql.html
+++ b/docs/0.15.0-incubating/querying/sql.html
@@ -1058,22 +1058,22 @@
<p>Example code:</p>
<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="c1">// Connect to /druid/v2/sql/avatica/ on your Broker.</span>
-<span class="n">String</span> <span class="n">url</span> <span class="o">=</span> <span class="s">"jdbc:avatica:remote:url=http://localhost:8082/druid/v2/sql/avatica/"</span><span class="p">;</span>
+<span class="n">String</span> <span class="n">url</span> <span class="o">=</span> <span class="s">"jdbc:avatica:remote:url=http://localhost:8082/druid/v2/sql/avatica/"</span><span class="o">;</span>
<span class="c1">// Set any connection context parameters you need here (see "Connection context" below).</span>
<span class="c1">// Or leave empty for default behavior.</span>
-<span class="n">Properties</span> <span class="n">connectionProperties</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="p">();</span>
+<span class="n">Properties</span> <span class="n">connectionProperties</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">();</span>
-<span class="k">try</span> <span class="p">(</span><span class="n">Connection</span> <span class="n">connection</span> <span class="o">=</span> <span class="n">DriverManager</span><span class="p">.</span><span class="na">getConnection</span><span class="p">(</span><span class="n">url</span><span class="p">,</span> <span class="n">connectionProperties</span><span class="p">))</span> <span class="p">{</span>
- <span class="k">try</span> <span class="p">(</span>
- <span class="kd">final</span> <span class="n">Statement</span> <span class="n">statement</span> <span class="o">=</span> <span class="n">connection</span><span class="p">.</span><span class="na">createStatement</span><span class="p">();</span>
- <span class="kd">final</span> <span class="n">ResultSet</span> <span class="n">resultSet</span> <span class="o">=</span> <span class="n">statement</span><span class="p">.</span><span class="na">executeQuery</span><span class="p">(</span><span class="n">query</span><span class="p">)</span>
- <span class="p">)</span> <span class="p">{</span>
- <span class="k">while</span> <span class="p">(</span><span class="n">resultSet</span><span class="p">.</span><span class="na">next</span><span class="p">())</span> <span class="p">{</span>
+<span class="k">try</span> <span class="o">(</span><span class="n">Connection</span> <span class="n">connection</span> <span class="o">=</span> <span class="n">DriverManager</span><span class="o">.</span><span class="na">getConnection</span><span class="o">(</span><span class="n">url</span><span class="o">,</span> <span class="n">connectionProperties</span><span class="o">))</span> <span class="o">{</span>
+ <span class="k">try</span> <span class="o">(</span>
+ <span class="kd">final</span> <span class="n">Statement</span> <span class="n">statement</span> <span class="o">=</span> <span class="n">connection</span><span class="o">.</span><span class="na">createStatement</span><span class="o">();</span>
+ <span class="kd">final</span> <span class="n">ResultSet</span> <span class="n">resultSet</span> <span class="o">=</span> <span class="n">statement</span><span class="o">.</span><span class="na">executeQuery</span><span class="o">(</span><span class="n">query</span><span class="o">)</span>
+ <span class="o">)</span> <span class="o">{</span>
+ <span class="k">while</span> <span class="o">(</span><span class="n">resultSet</span><span class="o">.</span><span class="na">next</span><span class="o">())</span> <span class="o">{</span>
<span class="c1">// Do something</span>
- <span class="p">}</span>
- <span class="p">}</span>
-<span class="p">}</span>
+ <span class="o">}</span>
+ <span class="o">}</span>
+<span class="o">}</span>
</code></pre></div>
<p>Table metadata is available over JDBC using <code>connection.getMetaData()</code> or by querying the
<a href="#retrieving-metadata">"INFORMATION_SCHEMA" tables</a>. Parameterized queries (using <code>?</code> or other placeholders) don't work properly,
diff --git a/docs/0.15.0-incubating/querying/timeboundaryquery.html b/docs/0.15.0-incubating/querying/timeboundaryquery.html
index c2476b4..1acb564 100644
--- a/docs/0.15.0-incubating/querying/timeboundaryquery.html
+++ b/docs/0.15.0-incubating/querying/timeboundaryquery.html
@@ -154,8 +154,8 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"queryType"</span> <span class="p">:</span> <span class="s2">"timeBoundary"</span><span class="p">,</span>
<span class="nt">"dataSource"</span><span class="p">:</span> <span class="s2">"sample_datasource"</span><span class="p">,</span>
- <span class="nt">"bound"</span> <span class="p">:</span> <span class="err"><</span> <span class="s2">"maxTime"</span> <span class="err">|</span> <span class="s2">"minTime"</span> <span class="err">></span> <span class="err">#</span> <span class="err">op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="err">re</span><span class="kc">turn</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">bo</span><span class="kc">t</span><span class="err">h</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mps</span> <span class="err">i</span><span class="kc">f</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="err">se</span><span class="kc">t</span>
- <span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span> <span class="err">#</span> <span class="err">op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span>
+ <span class="nt">"bound"</span> <span class="p">:</span> <span class="err"><</span> <span class="s2">"maxTime"</span> <span class="err">|</span> <span class="s2">"minTime"</span> <span class="err">></span> <span class="err">#</span> <span class="err">optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">returning</span> <span class="err">both</span> <span class="err">timestamps</span> <span class="err">if</span> <span class="err">not</span> <span class="err">set</span>
+ <span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span> <span class="err">#</span> <span class="err">optional</span>
<span class="p">}</span>
</code></pre></div>
<p>There are 3 main parts to a time boundary query:</p>
diff --git a/docs/0.15.0-incubating/querying/topnmetricspec.html b/docs/0.15.0-incubating/querying/topnmetricspec.html
index 7f6a834..eec9f21 100644
--- a/docs/0.15.0-incubating/querying/topnmetricspec.html
+++ b/docs/0.15.0-incubating/querying/topnmetricspec.html
@@ -155,10 +155,10 @@
<h2 id="numeric-topnmetricspec">Numeric TopNMetricSpec</h2>
<p>The simplest metric specification is a String value indicating the metric to sort topN results by. They are included in a topN query with:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="s2">"<metric_name>"</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="s2">"<metric_name>"</span>
</code></pre></div>
<p>The metric field can also be given as a JSON object. The grammar for dimension values sorted by numeric value is shown below:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"numeric"</span><span class="p">,</span>
<span class="nt">"metric"</span><span class="p">:</span> <span class="s2">"<metric_name>"</span>
<span class="p">}</span>
@@ -215,7 +215,7 @@
</tbody></table>
<p>The following metricSpec uses lexicographic sorting.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimension"</span><span class="p">,</span>
<span class="nt">"ordering"</span><span class="p">:</span> <span class="s2">"lexicographic"</span><span class="p">,</span>
<span class="nt">"previousStop"</span><span class="p">:</span> <span class="s2">"<previousStop_value>"</span>
@@ -226,9 +226,9 @@
<h2 id="inverted-topnmetricspec">Inverted TopNMetricSpec</h2>
<p>Sort dimension values in inverted order, i.e inverts the order of the delegate metric spec. It can be used to sort the values in ascending order.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"inverted"</span><span class="p">,</span>
- <span class="nt">"metric"</span><span class="p">:</span> <span class="err"><delega</span><span class="kc">te</span><span class="err">_</span><span class="kc">t</span><span class="err">op_</span><span class="kc">n</span><span class="err">_me</span><span class="kc">tr</span><span class="err">ic_spec></span>
+ <span class="nt">"metric"</span><span class="p">:</span> <span class="err"><delegate_top_n_metric_spec></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.15.0-incubating/tutorials/tutorial-compaction.html b/docs/0.15.0-incubating/tutorials/tutorial-compaction.html
index c0a2070..4ba3c54 100644
--- a/docs/0.15.0-incubating/tutorials/tutorial-compaction.html
+++ b/docs/0.15.0-incubating/tutorials/tutorial-compaction.html
@@ -189,7 +189,7 @@
├────────┤
│ <span class="m">39244</span> │
└────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">1</span>.38s.
+Retrieved <span class="m">1</span> row in <span class="m">1</span>.38s.
</code></pre></div>
<h2 id="compact-the-data">Compact the data</h2>
@@ -235,7 +235,7 @@
├────────┤
│ <span class="m">39244</span> │
└────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">1</span>.30s.
+Retrieved <span class="m">1</span> row in <span class="m">1</span>.30s.
</code></pre></div>
<p>After the Coordinator has been running for at least 15 minutes, the <a href="http://localhost:8888/unified-console.html#segments">segments view</a> should show there are 24 segments, one per hour:</p>
diff --git a/docs/0.15.0-incubating/tutorials/tutorial-ingestion-spec.html b/docs/0.15.0-incubating/tutorials/tutorial-ingestion-spec.html
index 86276a3..e0ab596 100644
--- a/docs/0.15.0-incubating/tutorials/tutorial-ingestion-spec.html
+++ b/docs/0.15.0-incubating/tutorials/tutorial-ingestion-spec.html
@@ -194,14 +194,14 @@
<p>Let's start with an empty <code>dataSchema</code> and add fields to it as we progress through the tutorial.</p>
<p>Create a new file called <code>ingestion-tutorial-index.json</code> in <code>quickstart/</code> with the following contents:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{}</span>
</code></pre></div>
<p>We will be making successive edits to this ingestion spec as we progress through the tutorial.</p>
<h3 id="datasource-name">Datasource name</h3>
<p>The datasource name is specified by the <code>dataSource</code> parameter in the <code>dataSchema</code>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
@@ -212,7 +212,7 @@
<p>A <code>dataSchema</code> has a <code>parser</code> field, which defines the parser that Druid will use to interpret the input data.</p>
<p>Since our input data is represented as JSON strings, we'll use a <code>string</code> parser with <code>json</code> format:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -227,7 +227,7 @@
<p>The <code>parser</code> needs to know how to extract the main timestamp field from the input data. When using a <code>json</code> type <code>parseSpec</code>, the timestamp is defined in a <code>timestampSpec</code>. </p>
<p>The timestamp column in our input data is named "ts", containing ISO 8601 timestamps, so let's add a <code>timestampSpec</code> with that information to the <code>parseSpec</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -261,7 +261,7 @@
<p>For this tutorial, let's enable rollup. This is specified with a <code>granularitySpec</code> on the <code>dataSchema</code>. </p>
<p>Note that the <code>granularitySpec</code> lies outside of the <code>parser</code>. We will revist the <code>parser</code> soon when we define our dimensions and metrics.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -294,7 +294,7 @@
<h4 id="dimensions">Dimensions</h4>
<p>Dimensions are specified with a <code>dimensionsSpec</code> inside the <code>parseSpec</code>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -337,7 +337,7 @@
<h4 id="metrics">Metrics</h4>
<p>Metrics are specified with a <code>metricsSpec</code> inside the <code>dataSchema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -380,7 +380,7 @@
<h3 id="no-rollup">No rollup</h3>
<p>If we were not using rollup, all columns would be specified in the <code>dimensionsSpec</code>, e.g.:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"dimensionsSpec"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span>
<span class="s2">"srcIP"</span><span class="p">,</span>
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"srcPort"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"long"</span> <span class="p">},</span>
@@ -391,7 +391,7 @@
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"bytes"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"long"</span> <span class="p">},</span>
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"srcPort"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"double"</span> <span class="p">}</span>
<span class="p">]</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<h3 id="define-granularities">Define granularities</h3>
@@ -405,7 +405,7 @@
<h4 id="segment-granularity">Segment granularity</h4>
<p>Segment granularity is configured by the <code>segmentGranularity</code> property in the <code>granularitySpec</code>. For this tutorial, we'll create hourly segments:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -444,7 +444,7 @@
<h4 id="query-granularity">Query granularity</h4>
<p>The query granularity is configured by the <code>queryGranularity</code> property in the <code>granularitySpec</code>. For this tutorial, let's use minute granularity:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -474,8 +474,8 @@
<span class="nt">"granularitySpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"uniform"</span><span class="p">,</span>
<span class="nt">"segmentGranularity"</span> <span class="p">:</span> <span class="s2">"HOUR"</span><span class="p">,</span>
- <span class="nt">"queryGranularity"</span> <span class="p">:</span> <span class="nt">"MINUTE"</span>
- <span class="nt">"rollup"</span> <span class="p">:</span> <span class="kc">true</span>
+ <span class="nt">"queryGranularity"</span> <span class="p">:</span> <span class="s2">"MINUTE"</span>
+ <span class="s2">"rollup"</span> <span class="p">:</span> <span class="kc">true</span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -490,7 +490,7 @@
<p>For batch tasks, it is necessary to define a time interval. Input rows with timestamps outside of the time interval will not be ingested.</p>
<p>The interval is also specified in the <code>granularitySpec</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -575,7 +575,7 @@
<h2 id="define-the-input-source">Define the input source</h2>
<p>Now let's define our input source, which is specified in an <code>ioConfig</code> object. Each task type has its own type of <code>ioConfig</code>. The native batch task uses "firehoses" to read input data, so let's configure a "local" firehose to read the example netflow data we saved earlier:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"index"</span><span class="p">,</span>
<span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"local"</span><span class="p">,</span>
@@ -637,7 +637,7 @@
<p>Each ingestion task has a <code>tuningConfig</code> section that allows users to tune various ingestion parameters.</p>
<p>As an example, let's add a <code>tuningConfig</code> that sets a target segment size for the native batch ingestion task:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"tuningConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"tuningConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"index"</span><span class="p">,</span>
<span class="nt">"maxRowsPerSegment"</span> <span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
@@ -722,7 +722,7 @@
│ <span class="m">2018</span>-01-01T02:33:00.000Z │ <span class="m">30000</span> │ <span class="m">56</span>.9 │ <span class="m">2</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">5000</span> │ <span class="m">300</span> │ <span class="m">17</span> │ <span class="m">7</span>.7.7.7 │ <span class="m">4000</span> │
│ <span class="m">2018</span>-01-01T02:35:00.000Z │ <span class="m">30000</span> │ <span class="m">46</span>.3 │ <span class="m">1</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">5000</span> │ <span class="m">300</span> │ <span class="m">17</span> │ <span class="m">7</span>.7.7.7 │ <span class="m">4000</span> │
└──────────────────────────┴───────┴──────┴───────┴─────────┴─────────┴─────────┴──────────┴─────────┴─────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">0</span>.12s.
+Retrieved <span class="m">5</span> rows in <span class="m">0</span>.12s.
dsql>
</code></pre></div>
diff --git a/docs/0.15.0-incubating/tutorials/tutorial-query.html b/docs/0.15.0-incubating/tutorials/tutorial-query.html
index ebf9c12..c754f21 100644
--- a/docs/0.15.0-incubating/tutorials/tutorial-query.html
+++ b/docs/0.15.0-incubating/tutorials/tutorial-query.html
@@ -215,7 +215,7 @@
│ Wikipedia:In the news/Candidates │ <span class="m">17</span> │
│ Wikipedia:Requests <span class="k">for</span> page protection │ <span class="m">17</span> │
└──────────────────────────────────────────────────────────┴───────┘
-Retrieved <span class="m">10</span> rows <span class="k">in</span> <span class="m">0</span>.06s.
+Retrieved <span class="m">10</span> rows in <span class="m">0</span>.06s.
</code></pre></div>
<h3 id="query-sql-over-http">Query SQL over HTTP</h3>
@@ -312,7 +312,7 @@
├─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ DruidQueryRel<span class="o">(</span><span class="nv">query</span><span class="o">=[{</span><span class="s2">"queryType"</span>:<span class="s2">"topN"</span>,<span class="s2">"dataSource"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"table"</span>,<span class="s2">"name"</span>:<span class="s2">"wikipedia"</span><span class="o">}</span>,<span class="s2">"virtualColumns"</span>:<span class="o">[]</span>,<span class="s2">"dimension"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"default"</span>,<span class="s2">"dimension"</span>:<span class="s2">"page"</span>,<span class="s2">"outputName"</span>:<span class="s2">"d0"</span>,<span class="s2">"outputType"</span>:<span class="s2">"STRING"</span><span class="o">}</span>,<span class="s2">"metric"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"numeric"</span>,<span class="s2">"metric"</span>:<span class="s2">"a0"</span><span class="o">}</span>,<span class="s2">"threshold"</span>:10,<span class="s2">"intervals"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"intervals"</span>,<span class="s2">"intervals"</span>:<span class="o">[</span><span class="s2">"2015-09-12T00:00:00.000Z/2015-09-13T00:00:00.001Z"</span><span class="o">]}</span>,<span class="s2">"filter"</span>:null,<span class="s2">"granularity"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"all"</span><span class="o">}</span>,<span class="s2">"aggregations"</span>:<span class="o">[{</span><span class="s2">"type"</span>:<span class="s2">"count"</span>,<span class="s2">"name"</span>:<span class="s2">"a0"</span><span class="o">}]</span>,<span class="s2">"postAggregations"</span>:<span class="o">[]</span>,<span class="s2">"context"</span>:<span class="o">{}</span>,<span class="s2">"descending"</span>:false<span class="o">}]</span>, <span class="nv">signature</span><span class="o">=[{</span>d0:STRING, a0:LONG<span class="o">}])</span> │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">0</span>.03s.
+Retrieved <span class="m">1</span> row in <span class="m">0</span>.03s.
</code></pre></div>
<h2 id="native-json-queries">Native JSON queries</h2>
diff --git a/docs/0.15.0-incubating/tutorials/tutorial-rollup.html b/docs/0.15.0-incubating/tutorials/tutorial-rollup.html
index 452982d..e585c88 100644
--- a/docs/0.15.0-incubating/tutorials/tutorial-rollup.html
+++ b/docs/0.15.0-incubating/tutorials/tutorial-rollup.html
@@ -255,7 +255,7 @@
│ <span class="m">2018</span>-01-02T21:33:00.000Z │ <span class="m">100288</span> │ <span class="m">2</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">161</span> │ <span class="m">7</span>.7.7.7 │
│ <span class="m">2018</span>-01-02T21:35:00.000Z │ <span class="m">2818</span> │ <span class="m">1</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">12</span> │ <span class="m">7</span>.7.7.7 │
└──────────────────────────┴────────┴───────┴─────────┴─────────┴─────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">1</span>.18s.
+Retrieved <span class="m">5</span> rows in <span class="m">1</span>.18s.
dsql>
</code></pre></div>
diff --git a/docs/0.15.0-incubating/tutorials/tutorial-transform-spec.html b/docs/0.15.0-incubating/tutorials/tutorial-transform-spec.html
index dc18235..16e0e18 100644
--- a/docs/0.15.0-incubating/tutorials/tutorial-transform-spec.html
+++ b/docs/0.15.0-incubating/tutorials/tutorial-transform-spec.html
@@ -266,7 +266,7 @@
│ <span class="m">2018</span>-01-01T06:01:00.000Z │ super-snake │ <span class="m">1</span> │ <span class="m">3</span> │ <span class="m">300</span> │ <span class="m">900</span> │
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ super-octopus │ <span class="m">1</span> │ <span class="m">1</span> │ <span class="m">100</span> │ <span class="m">300</span> │
└──────────────────────────┴────────────────┴───────┴──────────┴────────┴───────────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">0</span>.03s.
+Retrieved <span class="m">3</span> rows in <span class="m">0</span>.03s.
</code></pre></div>
<p>The "lion" row has been discarded, the <code>animal</code> column has been transformed, and we have both the original and transformed <code>number</code> column.</p>
diff --git a/docs/0.15.0-incubating/tutorials/tutorial-update-data.html b/docs/0.15.0-incubating/tutorials/tutorial-update-data.html
index 3ef1d88..f87d289 100644
--- a/docs/0.15.0-incubating/tutorials/tutorial-update-data.html
+++ b/docs/0.15.0-incubating/tutorials/tutorial-update-data.html
@@ -179,7 +179,7 @@
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ aardvark │ <span class="m">1</span> │ <span class="m">42</span> │
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ giraffe │ <span class="m">1</span> │ <span class="m">14124</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">1</span>.42s.
+Retrieved <span class="m">3</span> rows in <span class="m">1</span>.42s.
</code></pre></div>
<h3 id="overwrite-the-initial-data">Overwrite the initial data</h3>
@@ -201,7 +201,7 @@
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ aardvark │ <span class="m">1</span> │ <span class="m">9999</span> │
│ <span class="m">2018</span>-01-01T04:01:00.000Z │ bear │ <span class="m">1</span> │ <span class="m">111</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">3</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<h2 id="combine-old-data-with-new-data-and-overwrite">Combine old data with new data and overwrite</h2>
@@ -224,7 +224,7 @@
│ <span class="m">2018</span>-01-01T06:01:00.000Z │ snake │ <span class="m">1</span> │ <span class="m">1234</span> │
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ octopus │ <span class="m">1</span> │ <span class="m">115</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">6</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">6</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<h2 id="append-to-the-data">Append to the data</h2>
@@ -249,7 +249,7 @@
│ <span class="m">2018</span>-01-01T04:01:00.000Z │ bear │ <span class="m">1</span> │ <span class="m">222</span> │
│ <span class="m">2018</span>-01-01T09:01:00.000Z │ falcon │ <span class="m">1</span> │ <span class="m">1241</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">8</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">8</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<p>If we run a GroupBy query instead of a <code>select *</code>, we can see that the "bear" rows will group together at query time:</p>
<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span></span>dsql> <span class="k">select</span> __time, animal, SUM<span class="o">(</span><span class="s2">"count"</span><span class="o">)</span>, SUM<span class="o">(</span><span class="s2">"number"</span><span class="o">)</span> from <span class="s2">"updates-tutorial"</span> group by __time, animal<span class="p">;</span>
@@ -264,7 +264,7 @@
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ octopus │ <span class="m">1</span> │ <span class="m">115</span> │
│ <span class="m">2018</span>-01-01T09:01:00.000Z │ falcon │ <span class="m">1</span> │ <span class="m">1241</span> │
└──────────────────────────┴──────────┴────────┴────────┘
-Retrieved <span class="m">7</span> rows <span class="k">in</span> <span class="m">0</span>.23s.
+Retrieved <span class="m">7</span> rows in <span class="m">0</span>.23s.
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.15.1-incubating/dependencies/metadata-storage.html b/docs/0.15.1-incubating/dependencies/metadata-storage.html
index 5e7968f..762c474 100644
--- a/docs/0.15.1-incubating/dependencies/metadata-storage.html
+++ b/docs/0.15.1-incubating/dependencies/metadata-storage.html
@@ -221,7 +221,7 @@
<span class="nt">"metrics"</span><span class="p">:</span><span class="s2">"comma-delimited-list-of-metric-names"</span><span class="p">,</span>
<span class="nt">"shardSpec"</span><span class="p">:{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"none"</span><span class="p">},</span>
<span class="nt">"binaryVersion"</span><span class="p">:</span><span class="mi">9</span><span class="p">,</span>
- <span class="nt">"size"</span><span class="p">:</span><span class="err">size_o</span><span class="kc">f</span><span class="err">_segme</span><span class="kc">nt</span><span class="p">,</span>
+ <span class="nt">"size"</span><span class="p">:</span><span class="err">size_of_segment</span><span class="p">,</span>
<span class="nt">"identifier"</span><span class="p">:</span><span class="s2">"wikipedia_2012-05-23T00:00:00.000Z_2012-05-24T00:00:00.000Z_2012-05-23T00:10:00.046Z"</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.15.1-incubating/design/auth.html b/docs/0.15.1-incubating/design/auth.html
index 2fcffe6..2d56c73 100644
--- a/docs/0.15.1-incubating/design/auth.html
+++ b/docs/0.15.1-incubating/design/auth.html
@@ -315,11 +315,11 @@
<p>An Authenticator implementation that is intended to support internal Druid communications must recognize credentials for the "internal system user", as provided by a corresponding Escalator implementation.</p>
<p>An Escalator must implement three methods related to the internal system user:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="kd">public</span> <span class="n">HttpClient</span> <span class="nf">createEscalatedClient</span><span class="p">(</span><span class="n">HttpClient</span> <span class="n">baseClient</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="kd">public</span> <span class="n">HttpClient</span> <span class="nf">createEscalatedClient</span><span class="o">(</span><span class="n">HttpClient</span> <span class="n">baseClient</span><span class="o">);</span>
- <span class="kd">public</span> <span class="n">org</span><span class="p">.</span><span class="na">eclipse</span><span class="p">.</span><span class="na">jetty</span><span class="p">.</span><span class="na">client</span><span class="p">.</span><span class="na">HttpClient</span> <span class="nf">createEscalatedJettyClient</span><span class="p">(</span><span class="n">org</span><span class="p">.</span><span class="na">eclipse</span><span class="p">.</span><span class="na">jetty</span><span class="p">.</span><span class="na">client</span><span class="p">.</span><span class="na">HttpClient</span> <span class="n">baseClient</span><span class="p">);</span>
+ <span class="kd">public</span> <span class="n">org</span><span class="o">.</span><span class="na">eclipse</span><span class="o">.</span><span class="na">jetty</span><span class="o">.</span><span class="na">client</span><span class="o">.</span><span class="na">HttpClient</span> <span class="nf">createEscalatedJettyClient</span><span class="o">(</span><span class="n">org</span><span class="o">.</span><span class="na">eclipse</span><span class="o">.</span><span class="na">jetty</span><span class="o">.</span><span class="na">client</span><span class="o">.</span><span class="na">HttpClient</span> <span class="n">baseClient</span><span class="o">);</span>
- <span class="kd">public</span> <span class="n">AuthenticationResult</span> <span class="nf">createEscalatedAuthenticationResult</span><span class="p">();</span>
+ <span class="kd">public</span> <span class="n">AuthenticationResult</span> <span class="nf">createEscalatedAuthenticationResult</span><span class="o">();</span>
</code></pre></div>
<p><code>createEscalatedClient</code> returns an wrapped HttpClient that attaches the credentials of the "internal system user" to requests.</p>
diff --git a/docs/0.15.1-incubating/development/extensions-contrib/ambari-metrics-emitter.html b/docs/0.15.1-incubating/development/extensions-contrib/ambari-metrics-emitter.html
index abe5303..5c59ef1 100644
--- a/docs/0.15.1-incubating/development/extensions-contrib/ambari-metrics-emitter.html
+++ b/docs/0.15.1-incubating/development/extensions-contrib/ambari-metrics-emitter.html
@@ -274,7 +274,7 @@
<p>The first implementation called <code>all</code>, will send all the druid service metrics events.
The path will be in the form <code><namespacePrefix>.[<druid service name>].[<druid hostname>].<dimensions values ordered by dimension's name>.<metric></code>
User has control of <code><namespacePrefix>.[<druid service name>].[<druid hostname>].</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.ambari</span><span class="mi">-</span><span class="err">me</span><span class="kc">tr</span><span class="err">ics.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.ambari-metrics.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">}</span>
</code></pre></div>
<h4 id="white-list-based-converter">White-list based converter</h4>
@@ -285,7 +285,7 @@
<p>Although user can override the default white list map by supplying a property called <code>mapPath</code>.
This property is a String containing the path for the file containing <strong>white list map Json object</strong>.
For example the following converter will read the map from the file <code>/pathPrefix/fileName.json</code>. </p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.ambari</span><span class="mi">-</span><span class="err">me</span><span class="kc">tr</span><span class="err">ics.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.ambari-metrics.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"appName"</span><span class="p">:</span><span class="s2">"druid"</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
</code></pre></div>
<p><strong>Druid emits a huge number of metrics we highly recommend to use the <code>whiteList</code> converter</strong></p>
diff --git a/docs/0.15.1-incubating/development/extensions-contrib/azure.html b/docs/0.15.1-incubating/development/extensions-contrib/azure.html
index b4c2af7..946ae0f 100644
--- a/docs/0.15.1-incubating/development/extensions-contrib/azure.html
+++ b/docs/0.15.1-incubating/development/extensions-contrib/azure.html
@@ -220,7 +220,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-azure-blobstore"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
diff --git a/docs/0.15.1-incubating/development/extensions-contrib/cloudfiles.html b/docs/0.15.1-incubating/development/extensions-contrib/cloudfiles.html
index 15200bd..ee4dd6e 100644
--- a/docs/0.15.1-incubating/development/extensions-contrib/cloudfiles.html
+++ b/docs/0.15.1-incubating/development/extensions-contrib/cloudfiles.html
@@ -236,17 +236,17 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-cloudfiles"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
- <span class="nt">"region"</span><span class="p">:</span> <span class="nt">"DFW"</span>
- <span class="nt">"container"</span><span class="p">:</span> <span class="s2">"container"</span><span class="p">,</span>
+ <span class="nt">"region"</span><span class="p">:</span> <span class="s2">"DFW"</span>
+ <span class="s2">"container"</span><span class="p">:</span> <span class="s2">"container"</span><span class="p">,</span>
<span class="nt">"path"</span><span class="p">:</span> <span class="s2">"/path/to/your/file.json"</span>
<span class="p">},</span>
<span class="p">{</span>
- <span class="nt">"region"</span><span class="p">:</span> <span class="nt">"ORD"</span>
- <span class="nt">"container"</span><span class="p">:</span> <span class="s2">"anothercontainer"</span><span class="p">,</span>
+ <span class="nt">"region"</span><span class="p">:</span> <span class="s2">"ORD"</span>
+ <span class="s2">"container"</span><span class="p">:</span> <span class="s2">"anothercontainer"</span><span class="p">,</span>
<span class="nt">"path"</span><span class="p">:</span> <span class="s2">"/another/path.json"</span>
<span class="p">}</span>
<span class="p">]</span>
diff --git a/docs/0.15.1-incubating/development/extensions-contrib/google.html b/docs/0.15.1-incubating/development/extensions-contrib/google.html
index b1a7f9d..a71421e 100644
--- a/docs/0.15.1-incubating/development/extensions-contrib/google.html
+++ b/docs/0.15.1-incubating/development/extensions-contrib/google.html
@@ -198,7 +198,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-google-blobstore"</span><span class="p">,</span>
<span class="nt">"blobs"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
diff --git a/docs/0.15.1-incubating/development/extensions-contrib/graphite.html b/docs/0.15.1-incubating/development/extensions-contrib/graphite.html
index 7510cd5..13d3307 100644
--- a/docs/0.15.1-incubating/development/extensions-contrib/graphite.html
+++ b/docs/0.15.1-incubating/development/extensions-contrib/graphite.html
@@ -281,7 +281,7 @@
<p>Elements in metric name by default are separated by "/", so graphite will create all metrics on one level. If you want to have metrics in the tree structure, you have to set <code>replaceSlashWithDot=true</code>
Original: <code>druid.HOSTNAME.dataSourceName.queryType.query/time</code>
Changed: <code>druid.HOSTNAME.dataSourceName.queryType.query.time</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.graphi</span><span class="kc">te</span><span class="err">.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.graphite.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"all"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">}</span>
</code></pre></div>
<h4 id="white-list-based-converter">White-list based converter</h4>
@@ -292,7 +292,7 @@
<p>Although user can override the default white list map by supplying a property called <code>mapPath</code>.
This property is a String containing the path for the file containing <strong>white list map Json object</strong>.
For example the following converter will read the map from the file <code>/pathPrefix/fileName.json</code>. </p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emi</span><span class="kc">tter</span><span class="err">.graphi</span><span class="kc">te</span><span class="err">.eve</span><span class="kc">nt</span><span class="err">Co</span><span class="kc">n</span><span class="err">ver</span><span class="kc">ter</span><span class="err">=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">druid.emitter.graphite.eventConverter=</span><span class="p">{</span><span class="nt">"type"</span><span class="p">:</span><span class="s2">"whiteList"</span><span class="p">,</span> <span class="nt">"namespacePrefix"</span><span class="p">:</span> <span class="s2">"druid.test"</span><span class="p">,</span> <span class="nt">"ignoreHostname"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"ignoreServiceName"</span><span class="p">:</span><span class="kc">true</span><span class="p">,</span> <span class="nt">"mapPath"</span><span class="p">:</span><span class="s2">"/pathPrefix/fileName.json"</span><span class="p">}</span>
</code></pre></div>
<p><strong>Druid emits a huge number of metrics we highly recommend to use the <code>whiteList</code> converter</strong></p>
diff --git a/docs/0.15.1-incubating/development/extensions-contrib/influx.html b/docs/0.15.1-incubating/development/extensions-contrib/influx.html
index 1f6dada..45ca731 100644
--- a/docs/0.15.1-incubating/development/extensions-contrib/influx.html
+++ b/docs/0.15.1-incubating/development/extensions-contrib/influx.html
@@ -172,7 +172,7 @@
<p>The parser extracts these fields into a map, giving the measurement the key <code>measurement</code> and the timestamp the key <code>_ts</code>. The tag and measurement keys are copied verbatim, so users should take care to avoid name collisions. It is up to the ingestion spec to decide which fields should be treated as dimensions and which should be treated as metrics (typically tags correspond to dimensions and measurements correspond to metrics).</p>
<p>The parser is configured like so:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"parser"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"parser"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
<span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"influx"</span><span class="p">,</span>
diff --git a/docs/0.15.1-incubating/development/extensions-contrib/kafka-simple.html b/docs/0.15.1-incubating/development/extensions-contrib/kafka-simple.html
index 7afc654..2b1daad 100644
--- a/docs/0.15.1-incubating/development/extensions-contrib/kafka-simple.html
+++ b/docs/0.15.1-incubating/development/extensions-contrib/kafka-simple.html
@@ -156,7 +156,7 @@
<p>This is an experimental firehose to ingest data from Apache Kafka using the Kafka simple consumer api. Currently, this firehose would only work inside standalone realtime processes.
The configuration for KafkaSimpleConsumerFirehose is similar to the Kafka Eight Firehose , except <code>firehose</code> should be replaced with <code>firehoseV2</code> like this:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehoseV2"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehoseV2"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"kafka-0.8-v2"</span><span class="p">,</span>
<span class="nt">"brokerList"</span> <span class="p">:</span> <span class="p">[</span><span class="s2">"localhost:4443"</span><span class="p">],</span>
<span class="nt">"queueBufferLength"</span><span class="p">:</span><span class="mi">10001</span><span class="p">,</span>
diff --git a/docs/0.15.1-incubating/development/extensions-contrib/momentsketch-quantiles.html b/docs/0.15.1-incubating/development/extensions-contrib/momentsketch-quantiles.html
index ab09fa9..cba4db8 100644
--- a/docs/0.15.1-incubating/development/extensions-contrib/momentsketch-quantiles.html
+++ b/docs/0.15.1-incubating/development/extensions-contrib/momentsketch-quantiles.html
@@ -162,11 +162,11 @@
<p>The <code>momentSketch</code> aggregator operates over raw data while the <code>momentSketchMerge</code> aggregator should be used when aggregating pre-computed sketches.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
- <span class="nt">"type"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">t</span><span class="err">ype></span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"k"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nt</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"compress"</span> <span class="p">:</span> <span class="err"><boolea</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"type"</span> <span class="p">:</span> <span class="err"><aggregator_type></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><input_name></span><span class="p">,</span>
+ <span class="nt">"k"</span> <span class="p">:</span> <span class="err"><int></span><span class="p">,</span>
+ <span class="nt">"compress"</span> <span class="p">:</span> <span class="err"><boolean></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -208,16 +208,16 @@
<p>Users can query for a set of quantiles using the <code>momentSketchSolveQuantiles</code> post-aggregator on the sketches created by the <code>momentSketch</code> or <code>momentSketchMerge</code> aggregators.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"momentSketchSolveQuantiles"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><re</span><span class="kc">feren</span><span class="err">ce</span> <span class="kc">t</span><span class="err">o</span> <span class="err">mome</span><span class="kc">nt</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch></span><span class="p">,</span>
- <span class="nt">"fractions"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">doubles</span> <span class="err">i</span><span class="kc">n</span> <span class="p">[</span><span class="mi">0</span><span class="p">,</span><span class="mi">1</span><span class="p">]</span><span class="err">></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><reference</span> <span class="err">to</span> <span class="err">moment</span> <span class="err">sketch></span><span class="p">,</span>
+ <span class="nt">"fractions"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">doubles</span> <span class="err">in</span> <span class="p">[</span><span class="mi">0</span><span class="p">,</span><span class="mi">1</span><span class="p">]</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
<p>Users can also query for the min/max of a distribution:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"momentSketchMin"</span> <span class="err">|</span> <span class="s2">"momentSketchMax"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><re</span><span class="kc">feren</span><span class="err">ce</span> <span class="kc">t</span><span class="err">o</span> <span class="err">mome</span><span class="kc">nt</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><reference</span> <span class="err">to</span> <span class="err">moment</span> <span class="err">sketch></span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
<h3 id="example">Example</h3>
diff --git a/docs/0.15.1-incubating/development/extensions-contrib/moving-average-query.html b/docs/0.15.1-incubating/development/extensions-contrib/moving-average-query.html
index 5d5cbff..b16c7a0 100644
--- a/docs/0.15.1-incubating/development/extensions-contrib/moving-average-query.html
+++ b/docs/0.15.1-incubating/development/extensions-contrib/moving-average-query.html
@@ -354,7 +354,7 @@
However, this also means that empty days in a sparse dataset will also be ignored.</p>
<p>Example of usage:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMean"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span><span class="p">:</span> <span class="err"><i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMean"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span><span class="p">:</span> <span class="err"><input_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="cycle-size-day-of-week">Cycle size (Day of Week)</h3>
diff --git a/docs/0.15.1-incubating/development/extensions-contrib/opentsdb-emitter.html b/docs/0.15.1-incubating/development/extensions-contrib/opentsdb-emitter.html
index 4cb4790..efbe2a9 100644
--- a/docs/0.15.1-incubating/development/extensions-contrib/opentsdb-emitter.html
+++ b/docs/0.15.1-incubating/development/extensions-contrib/opentsdb-emitter.html
@@ -224,7 +224,7 @@
If the user does not specify their own JSON file, a default file is used. All metrics are expected to be configured in the JSON file. Metrics which are not configured will be logged.
Desired metrics and dimensions is organized using the following schema:<code><druid metric name> : [ <dimension list> ]</code><br />
e.g.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"query/time"</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"query/time"</span><span class="err">:</span> <span class="p">[</span>
<span class="s2">"dataSource"</span><span class="p">,</span>
<span class="s2">"type"</span>
<span class="p">]</span>
diff --git a/docs/0.15.1-incubating/development/extensions-contrib/rabbitmq.html b/docs/0.15.1-incubating/development/extensions-contrib/rabbitmq.html
index 3fcd64a..21486e1 100644
--- a/docs/0.15.1-incubating/development/extensions-contrib/rabbitmq.html
+++ b/docs/0.15.1-incubating/development/extensions-contrib/rabbitmq.html
@@ -161,7 +161,7 @@
<p><strong>Note:</strong> Add <strong>amqp-client-3.2.1.jar</strong> to lib directory of druid to use this firehose.</p>
<p>A sample spec for rabbitmq firehose:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"rabbitmq"</span><span class="p">,</span>
<span class="nt">"connection"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"host"</span><span class="p">:</span> <span class="s2">"localhost"</span><span class="p">,</span>
diff --git a/docs/0.15.1-incubating/development/extensions-core/approximate-histograms.html b/docs/0.15.1-incubating/development/extensions-core/approximate-histograms.html
index fe0c848..50aa3a8 100644
--- a/docs/0.15.1-incubating/development/extensions-core/approximate-histograms.html
+++ b/docs/0.15.1-incubating/development/extensions-core/approximate-histograms.html
@@ -211,12 +211,12 @@
query.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"approxHistogram or approxHistogramFold (at ingestion time), approxHistogramFold (at query time)"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"resolution"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
- <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
- <span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fl</span><span class="err">oa</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fl</span><span class="err">oa</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"resolution"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
+ <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
+ <span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><float></span><span class="p">,</span>
+ <span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><float></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -304,9 +304,9 @@
<p>An example aggregator spec is shown below:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fixedBucketsHistogram"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"numBuckets"</span> <span class="p">:</span> <span class="err"><integer></span><span class="p">,</span>
<span class="nt">"lowerLimit"</span> <span class="p">:</span> <span class="err"><double></span><span class="p">,</span>
<span class="nt">"upperLimit"</span> <span class="p">:</span> <span class="err"><double></span><span class="p">,</span>
<span class="nt">"outlierHandlingMode"</span><span class="p">:</span> <span class="err"><mode></span>
@@ -417,7 +417,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalBuckets"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"numBuckets"</span><span class="p">:</span> <span class="err"><cou</span><span class="kc">nt</span><span class="err">></span>
+ <span class="nt">"numBuckets"</span><span class="p">:</span> <span class="err"><count></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="buckets-post-aggregator">Buckets post-aggregator</h3>
@@ -433,8 +433,8 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"buckets"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"bucketSize"</span><span class="p">:</span> <span class="err"><bucke</span><span class="kc">t</span><span class="err">_size></span><span class="p">,</span>
- <span class="nt">"offset"</span><span class="p">:</span> <span class="err"><o</span><span class="kc">ffset</span><span class="err">></span>
+ <span class="nt">"bucketSize"</span><span class="p">:</span> <span class="err"><bucket_size></span><span class="p">,</span>
+ <span class="nt">"offset"</span><span class="p">:</span> <span class="err"><offset></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="custom-buckets-post-aggregator">Custom buckets post-aggregator</h3>
@@ -442,30 +442,30 @@
<p>Computes a visual representation of the approximate histogram with bins laid out according to the given breaks.</p>
<p>This aggregator is not supported for the fixed buckets histogram.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"customBuckets"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"customBuckets"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
<span class="nt">"breaks"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><value></span><span class="p">,</span> <span class="err"><value></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<h3 id="min-post-aggregator">min post-aggregator</h3>
<p>Returns the minimum value of the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"min"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"min"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="max-post-aggregator">max post-aggregator</h3>
<p>Returns the maximum value of the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"max"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"max"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="quantile-post-aggregator">quantile post-aggregator</h4>
<p>Computes a single quantile based on the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantile"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"probability"</span> <span class="p">:</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantile"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
+ <span class="nt">"probability"</span> <span class="p">:</span> <span class="err"><quantile></span> <span class="p">}</span>
</code></pre></div>
<h4 id="quantiles-post-aggregator">quantiles post-aggregator</h4>
<p>Computes an array of quantiles based on the underlying approximate or fixed buckets histogram aggregator</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantiles"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"probabilities"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span><span class="p">,</span> <span class="err"><qua</span><span class="kc">nt</span><span class="err">ile></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantiles"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span><span class="p">,</span>
+ <span class="nt">"probabilities"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><quantile></span><span class="p">,</span> <span class="err"><quantile></span><span class="p">,</span> <span class="err">...</span> <span class="p">]</span> <span class="p">}</span>
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.15.1-incubating/development/extensions-core/avro.html b/docs/0.15.1-incubating/development/extensions-core/avro.html
index 155ef12..a75c3dc 100644
--- a/docs/0.15.1-incubating/development/extensions-core/avro.html
+++ b/docs/0.15.1-incubating/development/extensions-core/avro.html
@@ -188,7 +188,7 @@
field types, which can be used to read nested Avro records. The "jq" field type is not currently supported for Avro.</p>
<p>For example, using Avro stream parser with schema repo Avro bytes decoder:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"parser"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"avro_stream"</span><span class="p">,</span>
<span class="nt">"avroBytesDecoder"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"schema_repo"</span><span class="p">,</span>
@@ -203,9 +203,9 @@
<span class="p">},</span>
<span class="nt">"parseSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"avro"</span><span class="p">,</span>
- <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mpSpec></span><span class="p">,</span>
- <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
- <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">></span>
+ <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">timestampSpec></span><span class="p">,</span>
+ <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
+ <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><optional></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -433,9 +433,9 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"avro_hadoop"</span><span class="p">,</span>
<span class="nt">"parseSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"avro"</span><span class="p">,</span>
- <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mpSpec></span><span class="p">,</span>
- <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tan</span><span class="err">dard</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
- <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">></span>
+ <span class="nt">"timestampSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">timestampSpec></span><span class="p">,</span>
+ <span class="nt">"dimensionsSpec"</span><span class="p">:</span> <span class="err"><standard</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
+ <span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="err"><optional></span>
<span class="p">}</span>
<span class="p">}</span>
<span class="p">},</span>
diff --git a/docs/0.15.1-incubating/development/extensions-core/bloom-filter.html b/docs/0.15.1-incubating/development/extensions-core/bloom-filter.html
index 75288c9..3ed24ca 100644
--- a/docs/0.15.1-incubating/development/extensions-core/bloom-filter.html
+++ b/docs/0.15.1-incubating/development/extensions-core/bloom-filter.html
@@ -172,13 +172,13 @@
this implementation uses Murmur3 as the hash algorithm.</p>
<p>To construct a BloomKFilter externally with Java to use as a filter in a Druid query:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">BloomKFilter</span> <span class="n">bloomFilter</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BloomKFilter</span><span class="p">(</span><span class="mi">1500</span><span class="p">);</span>
-<span class="n">bloomFilter</span><span class="p">.</span><span class="na">addString</span><span class="p">(</span><span class="s">"value 1"</span><span class="p">);</span>
-<span class="n">bloomFilter</span><span class="p">.</span><span class="na">addString</span><span class="p">(</span><span class="s">"value 2"</span><span class="p">);</span>
-<span class="n">bloomFilter</span><span class="p">.</span><span class="na">addString</span><span class="p">(</span><span class="s">"value 3"</span><span class="p">);</span>
-<span class="n">ByteArrayOutputStream</span> <span class="n">byteArrayOutputStream</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ByteArrayOutputStream</span><span class="p">();</span>
-<span class="n">BloomKFilter</span><span class="p">.</span><span class="na">serialize</span><span class="p">(</span><span class="n">byteArrayOutputStream</span><span class="p">,</span> <span class="n">bloomFilter</span><span class="p">);</span>
-<span class="n">String</span> <span class="n">base64Serialized</span> <span class="o">=</span> <span class="n">Base64</span><span class="p">.</span><span class="na">encodeBase64String</span><span class="p">(</span><span class="n">byteArrayOutputStream</span><span class="p">.</span><span class="na">toByteArray</span><span class="p">());</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">BloomKFilter</span> <span class="n">bloomFilter</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BloomKFilter</span><span class="o">(</span><span class="mi">1500</span><span class="o">);</span>
+<span class="n">bloomFilter</span><span class="o">.</span><span class="na">addString</span><span class="o">(</span><span class="s">"value 1"</span><span class="o">);</span>
+<span class="n">bloomFilter</span><span class="o">.</span><span class="na">addString</span><span class="o">(</span><span class="s">"value 2"</span><span class="o">);</span>
+<span class="n">bloomFilter</span><span class="o">.</span><span class="na">addString</span><span class="o">(</span><span class="s">"value 3"</span><span class="o">);</span>
+<span class="n">ByteArrayOutputStream</span> <span class="n">byteArrayOutputStream</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ByteArrayOutputStream</span><span class="o">();</span>
+<span class="n">BloomKFilter</span><span class="o">.</span><span class="na">serialize</span><span class="o">(</span><span class="n">byteArrayOutputStream</span><span class="o">,</span> <span class="n">bloomFilter</span><span class="o">);</span>
+<span class="n">String</span> <span class="n">base64Serialized</span> <span class="o">=</span> <span class="n">Base64</span><span class="o">.</span><span class="na">encodeBase64String</span><span class="o">(</span><span class="n">byteArrayOutputStream</span><span class="o">.</span><span class="na">toByteArray</span><span class="o">());</span>
</code></pre></div>
<p>This string can then be used in the native or sql Druid query.</p>
@@ -187,9 +187,9 @@
<h3 id="json-specification-of-bloom-filter">JSON Specification of Bloom Filter</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"bloom"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"bloomKFilter"</span> <span class="p">:</span> <span class="err"><serialized_by</span><span class="kc">tes</span><span class="err">_</span><span class="kc">f</span><span class="err">or_BloomKFil</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fn</span><span class="err">></span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension_name></span><span class="p">,</span>
+ <span class="nt">"bloomKFilter"</span> <span class="p">:</span> <span class="err"><serialized_bytes_for_BloomKFilter></span><span class="p">,</span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><extraction_fn></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -255,9 +255,9 @@
<h3 id="json-specification-of-bloom-filter-aggregator">JSON Specification of Bloom Filter Aggregator</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"bloom"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">ield_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxNumEntries"</span><span class="p">:</span> <span class="err"><maximum_</span><span class="kc">nu</span><span class="err">mber_o</span><span class="kc">f</span><span class="err">_eleme</span><span class="kc">nts</span><span class="err">_</span><span class="kc">f</span><span class="err">or_BloomKFil</span><span class="kc">ter</span><span class="err">></span>
- <span class="nt">"field"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_spec></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_field_name></span><span class="p">,</span>
+ <span class="nt">"maxNumEntries"</span><span class="p">:</span> <span class="err"><maximum_number_of_elements_for_BloomKFilter></span>
+ <span class="s2">"field"</span><span class="p">:</span> <span class="err"><dimension_spec></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.15.1-incubating/development/extensions-core/datasketches-quantiles.html b/docs/0.15.1-incubating/development/extensions-core/datasketches-quantiles.html
index 0c8e7c8..f4cda5b 100644
--- a/docs/0.15.1-incubating/development/extensions-core/datasketches-quantiles.html
+++ b/docs/0.15.1-incubating/development/extensions-core/datasketches-quantiles.html
@@ -168,9 +168,9 @@
<p>The result of the aggregation is a DoublesSketch that is the union of all sketches either built from raw data or read from the segments.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"k"</span><span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">co</span><span class="kc">ntr</span><span class="err">ols</span> <span class="err">size</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">accuracy></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"k"</span><span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">controls</span> <span class="err">size</span> <span class="err">and</span> <span class="err">accuracy></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -209,9 +209,9 @@
<p>This returns an approximation to the value that would be preceded by a given fraction of a hypothetical sorted version of the input stream.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToQuantile"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"fraction"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">fra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">posi</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hypo</span><span class="kc">t</span><span class="err">he</span><span class="kc">t</span><span class="err">ical</span> <span class="err">sor</span><span class="kc">te</span><span class="err">d</span> <span class="err">s</span><span class="kc">trea</span><span class="err">m</span><span class="p">,</span> <span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">0</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1</span> <span class="err">i</span><span class="kc">n</span><span class="err">clusive></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"fraction"</span> <span class="p">:</span> <span class="err"><fractional</span> <span class="err">position</span> <span class="err">in</span> <span class="err">the</span> <span class="err">hypothetical</span> <span class="err">sorted</span> <span class="err">stream</span><span class="p">,</span> <span class="err">number</span> <span class="err">from</span> <span class="err">0</span> <span class="err">to</span> <span class="err">1</span> <span class="err">inclusive></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="quantiles">Quantiles</h4>
@@ -219,9 +219,9 @@
<p>This returns an array of quantiles corresponding to a given array of fractions</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToQuantiles"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"fractions"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">fra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">posi</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hypo</span><span class="kc">t</span><span class="err">he</span><span class="kc">t</span><span class="err">ical</span> <span class="err">sor</span><span class="kc">te</span><span class="err">d</span> <span class="err">s</span><span class="kc">trea</span><span class="err">m</span><span class="p">,</span> <span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">0</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1</span> <span class="err">i</span><span class="kc">n</span><span class="err">clusive></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"fractions"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">fractional</span> <span class="err">positions</span> <span class="err">in</span> <span class="err">the</span> <span class="err">hypothetical</span> <span class="err">sorted</span> <span class="err">stream</span><span class="p">,</span> <span class="err">number</span> <span class="err">from</span> <span class="err">0</span> <span class="err">to</span> <span class="err">1</span> <span class="err">inclusive></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="histogram">Histogram</h4>
@@ -229,9 +229,9 @@
<p>This returns an approximation to the histogram given an array of split points that define the histogram bins. An array of <i>m</i> unique, monotonically increasing split points divide the real number line into <i>m+1</i> consecutive disjoint intervals. The definition of an interval is inclusive of the left split point and exclusive of the right split point.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToHistogram"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"splitPoints"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">spli</span><span class="kc">t</span> <span class="err">poi</span><span class="kc">nts</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"splitPoints"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">split</span> <span class="err">points></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-summary">Sketch Summary</h4>
@@ -239,8 +239,8 @@
<p>This returns a summary of the sketch that can be used for debugging. This is the result of calling toString() method.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"quantilesDoublesSketchToString"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.15.1-incubating/development/extensions-core/datasketches-theta.html b/docs/0.15.1-incubating/development/extensions-core/datasketches-theta.html
index 9ed04fa..4d5c3b7 100644
--- a/docs/0.15.1-incubating/development/extensions-core/datasketches-theta.html
+++ b/docs/0.15.1-incubating/development/extensions-core/datasketches-theta.html
@@ -160,8 +160,8 @@
<h3 id="aggregators">Aggregators</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="nt">"isInputThetaSketch"</span><span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
<span class="nt">"size"</span><span class="p">:</span> <span class="mi">16384</span>
<span class="p">}</span>
@@ -205,17 +205,17 @@
<h4 id="sketch-estimator">Sketch Estimator</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketchEstimate"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">ype</span> <span class="kc">f</span><span class="err">ieldAccess</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">ype</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">chSe</span><span class="kc">t</span><span class="err">Op></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">of</span> <span class="err">type</span> <span class="err">fieldAccess</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">thetaSketch</span> <span class="err">aggregator</span> <span class="err">or</span> <span class="err">that</span> <span class="err">of</span> <span class="err">type</span> <span class="err">thetaSketchSetOp></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-operations">Sketch Operations</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"thetaSketchSetOp"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
<span class="nt">"func"</span><span class="p">:</span> <span class="err"><UNION|INTERSECT|NOT></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">f</span><span class="err">ieldAccess</span> <span class="kc">t</span><span class="err">ype</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="kc">t</span><span class="err">he</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="kc">t</span><span class="err">he</span><span class="kc">ta</span><span class="err">Ske</span><span class="kc">t</span><span class="err">chSe</span><span class="kc">t</span><span class="err">Op</span> <span class="kc">t</span><span class="err">ype</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">allow</span> <span class="err">arbi</span><span class="kc">trar</span><span class="err">y</span> <span class="err">combi</span><span class="kc">nat</span><span class="err">io</span><span class="kc">n</span> <span class="err">o</span><span class="kc">f</span> <span class="err">se</span><span class="kc">t</span> <span class="err">opera</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"size"</span><span class="p">:</span> <span class="err"><</span><span class="mi">16384</span> <span class="err">by</span> <span class="err">de</span><span class="kc">fault</span><span class="p">,</span> <span class="err">mus</span><span class="kc">t</span> <span class="err">be</span> <span class="err">max</span> <span class="err">o</span><span class="kc">f</span> <span class="err">size</span> <span class="kc">fr</span><span class="err">om</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ches</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">f</span><span class="err">ields</span> <span class="err">i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">fieldAccess</span> <span class="err">type</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">the</span> <span class="err">thetaSketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">thetaSketchSetOp</span> <span class="err">type</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">allow</span> <span class="err">arbitrary</span> <span class="err">combination</span> <span class="err">of</span> <span class="err">set</span> <span class="err">operations></span><span class="p">,</span>
+ <span class="nt">"size"</span><span class="p">:</span> <span class="err"><</span><span class="mi">16384</span> <span class="err">by</span> <span class="err">default</span><span class="p">,</span> <span class="err">must</span> <span class="err">be</span> <span class="err">max</span> <span class="err">of</span> <span class="err">size</span> <span class="err">from</span> <span class="err">sketches</span> <span class="err">in</span> <span class="err">fields</span> <span class="err">input></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="examples">Examples</h3>
diff --git a/docs/0.15.1-incubating/development/extensions-core/datasketches-tuple.html b/docs/0.15.1-incubating/development/extensions-core/datasketches-tuple.html
index 97eef54..8f68efc 100644
--- a/docs/0.15.1-incubating/development/extensions-core/datasketches-tuple.html
+++ b/docs/0.15.1-incubating/development/extensions-core/datasketches-tuple.html
@@ -158,11 +158,11 @@
<h3 id="aggregators">Aggregators</h3>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"nominalEntries"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"metricColumns"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">gs></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"nominalEntries"</span><span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"metricColumns"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">strings></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -211,8 +211,8 @@
<p>Returns a distinct count estimate from a given ArrayOfDoublesSketch.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToEstimate"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="estimate-of-the-number-of-distinct-keys-with-error-bounds">Estimate of the number of distinct keys with error bounds</h4>
@@ -220,9 +220,9 @@
<p>Returns a distinct count estimate and error bounds from a given ArrayOfDoublesSketch. The result will be three double values: estimate of the number of distinct keys, lower bound and upper bound. The bounds are provided at the given number of standard deviations (optional, defaults to 1). This must be an integer value of 1, 2 or 3 corresponding to approximately 68.3%, 95.4% and 99.7% confidence intervals.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToEstimateAndBounds"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="s2">"numStdDevs"</span><span class="p">,</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber</span> <span class="kc">fr</span><span class="err">om</span> <span class="mi">1</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">3</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"numStdDevs"</span><span class="p">,</span> <span class="err"><number</span> <span class="err">from</span> <span class="err">1</span> <span class="err">to</span> <span class="err">3></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="number-of-retained-entries">Number of retained entries</h4>
@@ -230,8 +230,8 @@
<p>Returns the number of retained entries from a given ArrayOfDoublesSketch.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToNumEntries"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="mean-values-for-each-column">Mean values for each column</h4>
@@ -239,8 +239,8 @@
<p>Returns a list of mean values from a given ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToMeans"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="variance-values-for-each-column">Variance values for each column</h4>
@@ -248,8 +248,8 @@
<p>Returns a list of variance values from a given ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToVariances"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="quantiles-sketch-from-a-column">Quantiles sketch from a column</h4>
@@ -263,10 +263,10 @@
</ul>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToQuantilesSketch"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span> <span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span><span class="p">,</span>
- <span class="nt">"column"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber></span><span class="p">,</span>
- <span class="nt">"k"</span> <span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">de</span><span class="kc">ter</span><span class="err">mi</span><span class="kc">nes</span> <span class="kc">t</span><span class="err">he</span> <span class="err">accuracy</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">qua</span><span class="kc">nt</span><span class="err">iles</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">a</span> <span class="err">DoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span><span class="p">,</span>
+ <span class="nt">"column"</span> <span class="p">:</span> <span class="err"><number></span><span class="p">,</span>
+ <span class="nt">"k"</span> <span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">determines</span> <span class="err">the</span> <span class="err">accuracy</span> <span class="err">and</span> <span class="err">size</span> <span class="err">of</span> <span class="err">the</span> <span class="err">quantiles</span> <span class="err">sketch></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="set-operations">Set Operations</h4>
@@ -274,11 +274,11 @@
<p>Returns a result of a specified set operation on the given array of sketches. Supported operations are: union, intersection and set difference (UNION, INTERSECT, NOT).</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchSetOp"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
<span class="nt">"operation"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"UNION"</span><span class="err">|</span><span class="s2">"INTERSECT"</span><span class="err">|</span><span class="s2">"NOT"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">allow</span> <span class="err">arbi</span><span class="kc">trar</span><span class="err">y</span> <span class="err">combi</span><span class="kc">nat</span><span class="err">io</span><span class="kc">n</span> <span class="err">o</span><span class="kc">f</span> <span class="err">se</span><span class="kc">t</span> <span class="err">opera</span><span class="kc">t</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"nominalEntries"</span> <span class="p">:</span> <span class="err"><parame</span><span class="kc">ter</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">de</span><span class="kc">ter</span><span class="err">mi</span><span class="kc">nes</span> <span class="kc">t</span><span class="err">he</span> <span class="err">accuracy</span> <span class="err">a</span><span class="kc">n</span><span class="err">d</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch></span><span class="p">,</span>
- <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">mber</span> <span class="err">o</span><span class="kc">f</span> <span class="err">values</span> <span class="err">associa</span><span class="kc">te</span><span class="err">d</span> <span class="err">wi</span><span class="kc">t</span><span class="err">h</span> <span class="err">each</span> <span class="err">dis</span><span class="kc">t</span><span class="err">i</span><span class="kc">n</span><span class="err">c</span><span class="kc">t</span> <span class="err">key></span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">sketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">allow</span> <span class="err">arbitrary</span> <span class="err">combination</span> <span class="err">of</span> <span class="err">set</span> <span class="err">operations></span><span class="p">,</span>
+ <span class="nt">"nominalEntries"</span> <span class="p">:</span> <span class="err"><parameter</span> <span class="err">that</span> <span class="err">determines</span> <span class="err">the</span> <span class="err">accuracy</span> <span class="err">and</span> <span class="err">size</span> <span class="err">of</span> <span class="err">the</span> <span class="err">sketch></span><span class="p">,</span>
+ <span class="nt">"numberOfValues"</span> <span class="p">:</span> <span class="err"><number</span> <span class="err">of</span> <span class="err">values</span> <span class="err">associated</span> <span class="err">with</span> <span class="err">each</span> <span class="err">distinct</span> <span class="err">key></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="students-t-test">Student's t-test</h4>
@@ -286,8 +286,8 @@
<p>Performs Student's t-test and returns a list of p-values given two instances of ArrayOfDoublesSketch. The result will be N double values, where N is the number of double values kept in the sketch per key. See <a href="http://commons.apache.org/proper/commons-math/javadocs/api-3.4/org/apache/commons/math3/stat/inference/TTest.html">t-test documentation</a>.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchTTest"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">wi</span><span class="kc">t</span><span class="err">h</span> <span class="kc">t</span><span class="err">wo</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="kc">t</span><span class="err">o</span> <span class="err">access</span> <span class="err">ske</span><span class="kc">t</span><span class="err">ch</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">or</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors</span> <span class="err">re</span><span class="kc">ferr</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch></span><span class="p">,</span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"fields"</span> <span class="p">:</span> <span class="err"><array</span> <span class="err">with</span> <span class="err">two</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">to</span> <span class="err">access</span> <span class="err">sketch</span> <span class="err">aggregators</span> <span class="err">or</span> <span class="err">post</span> <span class="err">aggregators</span> <span class="err">referring</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch></span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="sketch-summary">Sketch summary</h4>
@@ -295,8 +295,8 @@
<p>Returns a human-readable summary of a given ArrayOfDoublesSketch. This is a string returned by toString() method of the sketch. This can be useful for debugging.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arrayOfDoublesSketchToString"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or</span> <span class="kc">t</span><span class="err">ha</span><span class="kc">t</span> <span class="err">re</span><span class="kc">fers</span> <span class="kc">t</span><span class="err">o</span> <span class="err">a</span><span class="kc">n</span> <span class="err">ArrayO</span><span class="kc">f</span><span class="err">DoublesSke</span><span class="kc">t</span><span class="err">ch</span> <span class="err">(</span><span class="kc">f</span><span class="err">ieldAccess</span> <span class="err">or</span> <span class="err">a</span><span class="kc">n</span><span class="err">o</span><span class="kc">t</span><span class="err">her</span> <span class="err">pos</span><span class="kc">t</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or)></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"field"</span> <span class="p">:</span> <span class="err"><post</span> <span class="err">aggregator</span> <span class="err">that</span> <span class="err">refers</span> <span class="err">to</span> <span class="err">an</span> <span class="err">ArrayOfDoublesSketch</span> <span class="err">(fieldAccess</span> <span class="err">or</span> <span class="err">another</span> <span class="err">post</span> <span class="err">aggregator)></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.15.1-incubating/development/extensions-core/druid-basic-security.html b/docs/0.15.1-incubating/development/extensions-core/druid-basic-security.html
index 0beebbb..d3b5fbc 100644
--- a/docs/0.15.1-incubating/development/extensions-core/druid-basic-security.html
+++ b/docs/0.15.1-incubating/development/extensions-core/druid-basic-security.html
@@ -507,7 +507,7 @@
<ul>
<li><code>?full</code>: The output will contain an extra <code>users</code> list, containing the users that currently have this role.</li>
</ul>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"users"</span><span class="p">:[</span><span class="s2">"druid"</span><span class="p">]</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"users"</span><span class="err">:</span><span class="p">[</span><span class="s2">"druid"</span><span class="p">]</span>
</code></pre></div>
<ul>
<li><code>?simplifyPermissions</code>: The permissions in the output will contain only a list of <code>resourceAction</code> objects, without the extraneous <code>resourceNamePattern</code> field. The <code>users</code> field will be null when <code>?full</code> is not specified.</li>
diff --git a/docs/0.15.1-incubating/development/extensions-core/examples.html b/docs/0.15.1-incubating/development/extensions-core/examples.html
index 2440f4d..78ef6e1 100644
--- a/docs/0.15.1-incubating/development/extensions-core/examples.html
+++ b/docs/0.15.1-incubating/development/extensions-core/examples.html
@@ -155,7 +155,7 @@
<p>This firehose connects directly to the twitter spritzer data stream.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"twitzer"</span><span class="p">,</span>
<span class="nt">"maxEventCount"</span><span class="p">:</span> <span class="mi">-1</span><span class="p">,</span>
<span class="nt">"maxRunMinutes"</span><span class="p">:</span> <span class="mi">0</span>
diff --git a/docs/0.15.1-incubating/development/extensions-core/kafka-eight-firehose.html b/docs/0.15.1-incubating/development/extensions-core/kafka-eight-firehose.html
index 0b534d8..b49263e 100644
--- a/docs/0.15.1-incubating/development/extensions-core/kafka-eight-firehose.html
+++ b/docs/0.15.1-incubating/development/extensions-core/kafka-eight-firehose.html
@@ -155,7 +155,7 @@
<p>This firehose acts as a Kafka 0.8.x consumer and ingests data from Kafka.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"kafka-0.8"</span><span class="p">,</span>
<span class="nt">"consumerProps"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"zookeeper.connect"</span><span class="p">:</span> <span class="s2">"localhost:2181"</span><span class="p">,</span>
diff --git a/docs/0.15.1-incubating/development/extensions-core/lookups-cached-global.html b/docs/0.15.1-incubating/development/extensions-core/lookups-cached-global.html
index 34fe3e7..03ff9f8 100644
--- a/docs/0.15.1-incubating/development/extensions-core/lookups-cached-global.html
+++ b/docs/0.15.1-incubating/development/extensions-core/lookups-cached-global.html
@@ -459,7 +459,7 @@
truck,something3,buck
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"csv"</span><span class="p">,</span>
<span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"value"</span><span class="p">,</span><span class="s2">"somethingElse"</span><span class="p">,</span><span class="s2">"key"</span><span class="p">],</span>
<span class="nt">"keyColumn"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
@@ -530,7 +530,7 @@
truck|something,3|buck
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"tsv"</span><span class="p">,</span>
<span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"value"</span><span class="p">,</span><span class="s2">"somethingElse"</span><span class="p">,</span><span class="s2">"key"</span><span class="p">],</span>
<span class="nt">"keyColumn"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
@@ -568,7 +568,7 @@
<span class="p">{</span><span class="nt">"key"</span><span class="p">:</span> <span class="s2">"buck"</span><span class="p">,</span> <span class="nt">"somethingElse"</span><span class="p">:</span> <span class="s2">"something"</span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="s2">"truck"</span><span class="p">}</span>
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"customJson"</span><span class="p">,</span>
<span class="nt">"keyFieldName"</span><span class="p">:</span> <span class="s2">"key"</span><span class="p">,</span>
<span class="nt">"valueFieldName"</span><span class="p">:</span> <span class="s2">"value"</span>
@@ -587,7 +587,7 @@
<span class="p">{</span><span class="nt">"buck"</span><span class="p">:</span> <span class="s2">"truck"</span><span class="p">}</span>
</code></pre></div>
<p><em>example namespaceParseSpec</em></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"namespaceParseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"namespaceParseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"simpleJson"</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.15.1-incubating/development/extensions-core/orc.html b/docs/0.15.1-incubating/development/extensions-core/orc.html
index b79db7a..28715be 100644
--- a/docs/0.15.1-incubating/development/extensions-core/orc.html
+++ b/docs/0.15.1-incubating/development/extensions-core/orc.html
@@ -204,8 +204,8 @@
<code>-org.apache.hadoop.hive.</code> to instruct Hadoop to load <code>org.apache.hadoop.hive</code> classes from the application jars instead
of system jars, e.g.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">...</span>
- <span class="nt">"mapreduce.job.classloader"</span><span class="p">:</span> <span class="s2">"true"</span><span class="p">,</span>
- <span class="nt">"mapreduce.job.classloader.system.classes"</span> <span class="p">:</span> <span class="s2">"java., javax.accessibility., javax.activation., javax.activity., javax.annotation., javax.annotation.processing., javax.crypto., javax.imageio., javax.jws., javax.lang.model., -javax.management.j2ee., javax.management., javax.naming., javax.net., javax.print., javax.rmi., javax.script., -javax.security.auth.message., javax.security.auth., javax.security.cert., javax.security.sasl., javax.sound., javax.sql., javax.swing., javax.tools., javax.transaction., -javax.xml.registry., -javax.xml.rpc., javax.xml., org.w3c.dom., org.xml.sax., org.apache.commons.logging., org.apache.log4j., -org.apache.hadoop.hbase., -org.apache.hadoop.hive., org.apache.hadoop., core-default.xml, hdfs-default.xml, mapred-default.xml, yarn-default.xml"</span><span class="p">,</span>
+ <span class="s2">"mapreduce.job.classloader"</span><span class="err">:</span> <span class="s2">"true"</span><span class="err">,</span>
+ <span class="s2">"mapreduce.job.classloader.system.classes"</span> <span class="err">:</span> <span class="s2">"java., javax.accessibility., javax.activation., javax.activity., javax.annotation., javax.annotation.processing., javax.crypto., javax.imageio., javax.jws., javax.lang.model., -javax.management.j2ee., javax.management., javax.naming., javax.net., javax.print., javax.rmi., javax.script., -javax.security.auth.message., javax.security.auth., javax.security.cert., javax.security.sasl., javax.sound., javax.sql., javax.swing., javax.tools., javax.transaction., -javax.xml.registry., -javax.xml.rpc., javax.xml., org.w3c.dom., org.xml.sax., org.apache.commons.logging., org.apache.log4j., -org.apache.hadoop.hbase., -org.apache.hadoop.hive., org.apache.hadoop., core-default.xml, hdfs-default.xml, mapred-default.xml, yarn-default.xml"</span><span class="err">,</span>
<span class="err">...</span>
</code></pre></div>
<p>This is due to the <code>hive-storage-api</code> dependency of the
@@ -256,10 +256,10 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
-<span class="p">}</span>
+<span class="err">}</span>
</code></pre></div>
<h4 id="orc-parser-orc-parsespec-field-discovery-with-no-flattenspec-or-dimensionspec"><code>orc</code> parser, <code>orc</code> parseSpec, field discovery with no flattenSpec or dimensionSpec</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -288,10 +288,10 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
-<span class="p">}</span>
+<span class="err">}</span>
</code></pre></div>
<h4 id="orc-parser-orc-parsespec-no-autodiscovery"><code>orc</code> parser, <code>orc</code> parseSpec, no autodiscovery</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -345,10 +345,10 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
-<span class="p">}</span>
+<span class="err">}</span>
</code></pre></div>
<h4 id="orc-parser-timeanddims-parsespec"><code>orc</code> parser, <code>timeAndDims</code> parseSpec</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -387,7 +387,7 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -408,7 +408,7 @@
<a href="../../ingestion/flatten-json.html"><code>flattenSpec</code> expressions</a>. For example, <code>"typeString":"struct<time:string,name:string>"</code>
with the actual schema <code>struct<_col0:string,_col1:string></code>, to preserve Druid schema would need replaced with:</li>
</ul>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"flattenSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"path"</span><span class="p">,</span>
@@ -430,7 +430,7 @@
<a href="../../ingestion/flatten-json.html"><code>flattenSpec</code> expressions</a>. For example: <code>"mapFieldNameFormat": "<PARENT>_<CHILD>"</code>
for a dimension <code>nestedData_dim1</code>, to preserve Druid schema could be replaced with </li>
</ul>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"flattenSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"path"</span><span class="p">,</span>
diff --git a/docs/0.15.1-incubating/development/extensions-core/parquet.html b/docs/0.15.1-incubating/development/extensions-core/parquet.html
index 499be22..d35c40f 100644
--- a/docs/0.15.1-incubating/development/extensions-core/parquet.html
+++ b/docs/0.15.1-incubating/development/extensions-core/parquet.html
@@ -266,10 +266,10 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
-<span class="p">}</span>
+<span class="err">}</span>
</code></pre></div>
<h4 id="parquet-parser-timeanddims-parsespec"><code>parquet</code> parser, <code>timeAndDims</code> parseSpec</h4>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -308,7 +308,7 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -359,10 +359,10 @@
<span class="p">},</span>
<span class="err">...</span>
<span class="p">},</span>
- <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop</span><span class="mi">-</span><span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span><span class="mi">-</span><span class="err">co</span><span class="kc">nf</span><span class="err">ig></span>
+ <span class="nt">"tuningConfig"</span><span class="p">:</span> <span class="err"><hadoop-tuning-config></span>
<span class="p">}</span>
<span class="p">}</span>
-<span class="p">}</span>
+<span class="err">}</span>
</code></pre></div>
<p>For additional details see <a href="../../ingestion/hadoop.html">hadoop ingestion</a> and <a href="../../ingestion/ingestion-spec.html">general ingestion spec</a> documentation.</p>
diff --git a/docs/0.15.1-incubating/development/extensions-core/s3.html b/docs/0.15.1-incubating/development/extensions-core/s3.html
index eb3884a..0e76f09 100644
--- a/docs/0.15.1-incubating/development/extensions-core/s3.html
+++ b/docs/0.15.1-incubating/development/extensions-core/s3.html
@@ -289,7 +289,7 @@
Since each split represents an object in this firehose, each worker task of <code>index_parallel</code> will read an object.</p>
<p>Sample spec:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"firehose"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"static-s3"</span><span class="p">,</span>
<span class="nt">"uris"</span><span class="p">:</span> <span class="p">[</span><span class="s2">"s3://foo/bar/file.gz"</span><span class="p">,</span> <span class="s2">"s3://bar/foo/file2.gz"</span><span class="p">]</span>
<span class="p">}</span>
diff --git a/docs/0.15.1-incubating/development/extensions-core/stats.html b/docs/0.15.1-incubating/development/extensions-core/stats.html
index 8031e04..139a796 100644
--- a/docs/0.15.1-incubating/development/extensions-core/stats.html
+++ b/docs/0.15.1-incubating/development/extensions-core/stats.html
@@ -180,18 +180,18 @@
<p>User can specify expected input type as one of "float", "long", "variance" for ingestion, which is by default "float".</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"variance"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"inputType"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">t</span><span class="err">ype></span><span class="p">,</span>
- <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"inputType"</span> <span class="p">:</span> <span class="err"><input_type></span><span class="p">,</span>
+ <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<p>To query for results, "variance" aggregator with "variance" input type or simply a "varianceFold" aggregator must be included in the query.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"varianceFold"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"estimator"</span> <span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -215,7 +215,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"stddev"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
<span class="nt">"fieldName"</span><span class="p">:</span> <span class="s2">"<aggregator_name>"</span><span class="p">,</span>
- <span class="nt">"estimator"</span><span class="p">:</span> <span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span>
+ <span class="nt">"estimator"</span><span class="p">:</span> <span class="err"><string></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="query-examples">Query Examples:</h2>
diff --git a/docs/0.15.1-incubating/development/extensions-core/test-stats.html b/docs/0.15.1-incubating/development/extensions-core/test-stats.html
index 24a2bd2..a0bc9b2 100644
--- a/docs/0.15.1-incubating/development/extensions-core/test-stats.html
+++ b/docs/0.15.1-incubating/development/extensions-core/test-stats.html
@@ -175,10 +175,10 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"zscore2sample"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"successCount1"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">success</span> <span class="err">cou</span><span class="kc">nt</span> <span class="err">o</span><span class="kc">f</span> <span class="err">sample</span> <span class="mi">1</span><span class="p">,</span>
- <span class="nt">"sample1Size"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggregaror></span> <span class="err">sample</span> <span class="mi">1</span> <span class="err">size</span><span class="p">,</span>
- <span class="nt">"successCount2"</span><span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">success</span> <span class="err">cou</span><span class="kc">nt</span> <span class="err">o</span><span class="kc">f</span> <span class="err">sample</span> <span class="mi">2</span><span class="p">,</span>
- <span class="nt">"sample2Size"</span> <span class="p">:</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span> <span class="err">sample</span> <span class="mi">2</span> <span class="err">size</span>
+ <span class="nt">"successCount1"</span><span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">success</span> <span class="err">count</span> <span class="err">of</span> <span class="err">sample</span> <span class="mi">1</span><span class="p">,</span>
+ <span class="nt">"sample1Size"</span><span class="p">:</span> <span class="err"><post_aggregaror></span> <span class="err">sample</span> <span class="mi">1</span> <span class="err">size</span><span class="p">,</span>
+ <span class="nt">"successCount2"</span><span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">success</span> <span class="err">count</span> <span class="err">of</span> <span class="err">sample</span> <span class="mi">2</span><span class="p">,</span>
+ <span class="nt">"sample2Size"</span> <span class="p">:</span> <span class="err"><post_aggregator></span> <span class="err">sample</span> <span class="mi">2</span> <span class="err">size</span>
<span class="p">}</span>
</code></pre></div>
<p>Please note the post aggregator will be converting binary variables to continuous variables for two population proportions. Specifically</p>
@@ -199,7 +199,7 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"pvalue2tailedZtest"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"zScore"</span><span class="p">:</span> <span class="err"><zscore</span> <span class="err">pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span>
+ <span class="nt">"zScore"</span><span class="p">:</span> <span class="err"><zscore</span> <span class="err">post_aggregator></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="example-usage">Example Usage</h2>
diff --git a/docs/0.15.1-incubating/development/geo.html b/docs/0.15.1-incubating/development/geo.html
index cf735f1..b3b12a9 100644
--- a/docs/0.15.1-incubating/development/geo.html
+++ b/docs/0.15.1-incubating/development/geo.html
@@ -201,7 +201,7 @@
<h1 id="spatial-filters">Spatial Filters</h1>
<p>The grammar for a spatial filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"spatial"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"spatialDim"</span><span class="p">,</span>
<span class="nt">"bound"</span><span class="p">:</span> <span class="p">{</span>
diff --git a/docs/0.15.1-incubating/development/modules.html b/docs/0.15.1-incubating/development/modules.html
index ea02c6e..1c94f1a 100644
--- a/docs/0.15.1-incubating/development/modules.html
+++ b/docs/0.15.1-incubating/development/modules.html
@@ -208,13 +208,13 @@
<p>Check the <code>azure-storage</code>, <code>google-storage</code>, <code>cassandra-storage</code>, <code>hdfs-storage</code> and <code>s3-extensions</code> modules for examples of how to do this.</p>
<p>The basic idea behind the extension is that you need to add bindings for your DataSegmentPusher and DataSegmentPuller objects. The way to add them is something like (taken from HdfsStorageDruidModule)</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Binders</span><span class="p">.</span><span class="na">dataSegmentPullerBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="s">"hdfs"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">HdfsDataSegmentPuller</span><span class="p">.</span><span class="na">class</span><span class="p">).</span><span class="na">in</span><span class="p">(</span><span class="n">LazySingleton</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Binders</span><span class="o">.</span><span class="na">dataSegmentPullerBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="s">"hdfs"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">HdfsDataSegmentPuller</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">in</span><span class="o">(</span><span class="n">LazySingleton</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-<span class="n">Binders</span><span class="p">.</span><span class="na">dataSegmentPusherBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="s">"hdfs"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">HdfsDataSegmentPusher</span><span class="p">.</span><span class="na">class</span><span class="p">).</span><span class="na">in</span><span class="p">(</span><span class="n">LazySingleton</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<span class="n">Binders</span><span class="o">.</span><span class="na">dataSegmentPusherBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="s">"hdfs"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">HdfsDataSegmentPusher</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">in</span><span class="o">(</span><span class="n">LazySingleton</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<p><code>Binders.dataSegment*Binder()</code> is a call provided by the druid-core jar which sets up a Guice multibind "MapBinder". If that doesn't make sense, don't worry about it, just think of it as a magical incantation.</p>
@@ -284,12 +284,12 @@
<p>Adding a Firehose is done almost entirely through the Jackson Modules instead of Guice. Specifically, note the implementation</p>
<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="nd">@Override</span>
-<span class="kd">public</span> <span class="n">List</span><span class="o"><?</span> <span class="kd">extends</span> <span class="n">Module</span><span class="o">></span> <span class="nf">getJacksonModules</span><span class="p">()</span>
-<span class="p">{</span>
- <span class="k">return</span> <span class="n">ImmutableList</span><span class="p">.</span><span class="na">of</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">SimpleModule</span><span class="p">().</span><span class="na">registerSubtypes</span><span class="p">(</span><span class="k">new</span> <span class="n">NamedType</span><span class="p">(</span><span class="n">StaticS3FirehoseFactory</span><span class="p">.</span><span class="na">class</span><span class="p">,</span> <span class="s">"static-s3"</span><span class="p">))</span>
- <span class="p">);</span>
-<span class="p">}</span>
+<span class="kd">public</span> <span class="n">List</span><span class="o"><?</span> <span class="kd">extends</span> <span class="n">Module</span><span class="o">></span> <span class="nf">getJacksonModules</span><span class="o">()</span>
+<span class="o">{</span>
+ <span class="k">return</span> <span class="n">ImmutableList</span><span class="o">.</span><span class="na">of</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">SimpleModule</span><span class="o">().</span><span class="na">registerSubtypes</span><span class="o">(</span><span class="k">new</span> <span class="n">NamedType</span><span class="o">(</span><span class="n">StaticS3FirehoseFactory</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="s">"static-s3"</span><span class="o">))</span>
+ <span class="o">);</span>
+<span class="o">}</span>
</code></pre></div>
<p>This is registering the FirehoseFactory with Jackson's polymorphic serde layer. More concretely, having this will mean that if you specify a <code>"firehose": { "type": "static-s3", ... }</code> in your realtime config, then the system will load this FirehoseFactory for your firehose.</p>
@@ -314,32 +314,32 @@
</ol>
<p>Registering these uses the same general strategy as a deep storage mechanism does. You do something like</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">DruidBinders</span><span class="p">.</span><span class="na">queryToolChestBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="n">SegmentMetadataQuery</span><span class="p">.</span><span class="na">class</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">SegmentMetadataQueryQueryToolChest</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">DruidBinders</span><span class="o">.</span><span class="na">queryToolChestBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="n">SegmentMetadataQuery</span><span class="o">.</span><span class="na">class</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">SegmentMetadataQueryQueryToolChest</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-<span class="n">DruidBinders</span><span class="p">.</span><span class="na">queryRunnerFactoryBinder</span><span class="p">(</span><span class="n">binder</span><span class="p">)</span>
- <span class="p">.</span><span class="na">addBinding</span><span class="p">(</span><span class="n">SegmentMetadataQuery</span><span class="p">.</span><span class="na">class</span><span class="p">)</span>
- <span class="p">.</span><span class="na">to</span><span class="p">(</span><span class="n">SegmentMetadataQueryRunnerFactory</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<span class="n">DruidBinders</span><span class="o">.</span><span class="na">queryRunnerFactoryBinder</span><span class="o">(</span><span class="n">binder</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">addBinding</span><span class="o">(</span><span class="n">SegmentMetadataQuery</span><span class="o">.</span><span class="na">class</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">to</span><span class="o">(</span><span class="n">SegmentMetadataQueryRunnerFactory</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<p>The first one binds the SegmentMetadataQueryQueryToolChest for usage when a SegmentMetadataQuery is used. The second one does the same thing but for the QueryRunnerFactory instead.</p>
<h3 id="adding-new-jersey-resources">Adding new Jersey resources</h3>
<p>Adding new Jersey resources to a module requires calling the following code to bind the resource in the module:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Jerseys</span><span class="p">.</span><span class="na">addResource</span><span class="p">(</span><span class="n">binder</span><span class="p">,</span> <span class="n">NewResource</span><span class="p">.</span><span class="na">class</span><span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="n">Jerseys</span><span class="o">.</span><span class="na">addResource</span><span class="o">(</span><span class="n">binder</span><span class="o">,</span> <span class="n">NewResource</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
</code></pre></div>
<h3 id="adding-a-new-password-provider-implementation">Adding a new Password Provider implementation</h3>
<p>You will need to implement <code>org.apache.druid.metadata.PasswordProvider</code> interface. For every place where Druid uses PasswordProvider, a new instance of the implementation will be created,
thus make sure all the necessary information required for fetching each password is supplied during object instantiation.
In your implementation of <code>org.apache.druid.initialization.DruidModule</code>, <code>getJacksonModules</code> should look something like this -</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="k">return</span> <span class="n">ImmutableList</span><span class="p">.</span><span class="na">of</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">SimpleModule</span><span class="p">(</span><span class="s">"SomePasswordProviderModule"</span><span class="p">)</span>
- <span class="p">.</span><span class="na">registerSubtypes</span><span class="p">(</span>
- <span class="k">new</span> <span class="n">NamedType</span><span class="p">(</span><span class="n">SomePasswordProvider</span><span class="p">.</span><span class="na">class</span><span class="p">,</span> <span class="s">"some"</span><span class="p">)</span>
- <span class="p">)</span>
- <span class="p">);</span>
+<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span> <span class="k">return</span> <span class="n">ImmutableList</span><span class="o">.</span><span class="na">of</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">SimpleModule</span><span class="o">(</span><span class="s">"SomePasswordProviderModule"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">registerSubtypes</span><span class="o">(</span>
+ <span class="k">new</span> <span class="n">NamedType</span><span class="o">(</span><span class="n">SomePasswordProvider</span><span class="o">.</span><span class="na">class</span><span class="o">,</span> <span class="s">"some"</span><span class="o">)</span>
+ <span class="o">)</span>
+ <span class="o">);</span>
</code></pre></div>
<p>where <code>SomePasswordProvider</code> is the implementation of <code>PasswordProvider</code> interface, you can have a look at <code>org.apache.druid.metadata.EnvironmentVariablePasswordProvider</code> for example.</p>
diff --git a/docs/0.15.1-incubating/ingestion/compaction.html b/docs/0.15.1-incubating/ingestion/compaction.html
index c6713ec..ba5e142 100644
--- a/docs/0.15.1-incubating/ingestion/compaction.html
+++ b/docs/0.15.1-incubating/ingestion/compaction.html
@@ -153,15 +153,15 @@
<p>Compaction tasks merge all segments of the given interval. The syntax is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"compact"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><i</span><span class="kc">nter</span><span class="err">val</span> <span class="kc">t</span><span class="err">o</span> <span class="err">speci</span><span class="kc">f</span><span class="err">y</span> <span class="err">segme</span><span class="kc">nts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
- <span class="s2">"dimensions"</span> <span class="err"><cus</span><span class="kc">t</span><span class="err">om</span> <span class="err">dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">Spec></span><span class="p">,</span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><interval</span> <span class="err">to</span> <span class="err">specify</span> <span class="err">segments</span> <span class="err">to</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
+ <span class="nt">"dimensions"</span> <span class="err"><custom</span> <span class="err">dimensionsSpec></span><span class="p">,</span>
<span class="nt">"keepSegmentGranularity"</span><span class="p">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"segmentGranularity"</span><span class="p">:</span> <span class="err"><segme</span><span class="kc">nt</span> <span class="err">gra</span><span class="kc">nular</span><span class="err">i</span><span class="kc">t</span><span class="err">y</span> <span class="err">a</span><span class="kc">fter</span> <span class="err">compac</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"targetCompactionSizeBytes"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tar</span><span class="err">ge</span><span class="kc">t</span> <span class="err">size</span> <span class="err">o</span><span class="kc">f</span> <span class="err">compac</span><span class="kc">te</span><span class="err">d</span> <span class="err">segme</span><span class="kc">nts</span><span class="err">></span>
- <span class="s2">"tuningConfig"</span> <span class="err"><i</span><span class="kc">n</span><span class="err">dex</span> <span class="kc">tas</span><span class="err">k</span> <span class="kc">tun</span><span class="err">i</span><span class="kc">n</span><span class="err">gCo</span><span class="kc">nf</span><span class="err">ig></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"segmentGranularity"</span><span class="p">:</span> <span class="err"><segment</span> <span class="err">granularity</span> <span class="err">after</span> <span class="err">compaction></span><span class="p">,</span>
+ <span class="nt">"targetCompactionSizeBytes"</span><span class="p">:</span> <span class="err"><target</span> <span class="err">size</span> <span class="err">of</span> <span class="err">compacted</span> <span class="err">segments></span>
+ <span class="s2">"tuningConfig"</span> <span class="err"><index</span> <span class="err">task</span> <span class="err">tuningConfig></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.15.1-incubating/ingestion/data-formats.html b/docs/0.15.1-incubating/ingestion/data-formats.html
index b5485c3..17ba888 100644
--- a/docs/0.15.1-incubating/ingestion/data-formats.html
+++ b/docs/0.15.1-incubating/ingestion/data-formats.html
@@ -192,7 +192,7 @@
<p>All forms of Druid ingestion require some form of schema object. The format of the data to be ingested is specified using the<code>parseSpec</code> entry in your <code>dataSchema</code>.</p>
<h3 id="json">JSON</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"json"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -205,7 +205,7 @@
<p>If you have nested JSON, <a href="flatten-json.html">Druid can automatically flatten it for you</a>.</p>
<h3 id="csv">CSV</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"csv"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -234,7 +234,7 @@
<p>The <code>columns</code> field must be included and and ensure that the order of the fields matches the columns of your input data in the same order.</p>
<h3 id="tsv-delimited">TSV (Delimited)</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"tsv"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
@@ -266,23 +266,23 @@
<p>The <code>columns</code> field must be included and and ensure that the order of the fields matches the columns of your input data in the same order.</p>
<h3 id="regex">Regex</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
<span class="p">},</span>
<span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"dimensions"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_lis</span><span class="kc">t</span><span class="err">_o</span><span class="kc">f</span><span class="err">_dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">ns</span><span class="err">></span><span class="p">]</span>
+ <span class="nt">"dimensions"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_list_of_dimensions></span><span class="p">]</span>
<span class="p">},</span>
- <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_colum</span><span class="kc">ns</span><span class="err">_here></span><span class="p">],</span>
- <span class="nt">"pattern"</span> <span class="p">:</span> <span class="err"><regex</span> <span class="err">pa</span><span class="kc">ttern</span> <span class="kc">f</span><span class="err">or</span> <span class="err">par</span><span class="kc">t</span><span class="err">i</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">da</span><span class="kc">ta</span><span class="err">></span>
+ <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><your_columns_here></span><span class="p">],</span>
+ <span class="nt">"pattern"</span> <span class="p">:</span> <span class="err"><regex</span> <span class="err">pattern</span> <span class="err">for</span> <span class="err">partitioning</span> <span class="err">data></span>
<span class="p">}</span>
</code></pre></div>
<p>The <code>columns</code> field must match the columns of your regex matching groups in the same order. If columns are not provided, default
columns names ("column_1", "column2", ... "column_n") will be assigned. Ensure that your column names include all your dimensions. </p>
<h3 id="javascript">JavaScript</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"parseSpec"</span><span class="p">:{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"parseSpec"</span><span class="err">:</span><span class="p">{</span>
<span class="nt">"format"</span> <span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
<span class="nt">"timestampSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"column"</span> <span class="p">:</span> <span class="s2">"timestamp"</span>
diff --git a/docs/0.15.1-incubating/ingestion/delete-data.html b/docs/0.15.1-incubating/ingestion/delete-data.html
index f5fc801..c51da77 100644
--- a/docs/0.15.1-incubating/ingestion/delete-data.html
+++ b/docs/0.15.1-incubating/ingestion/delete-data.html
@@ -168,10 +168,10 @@
<p>Kill tasks delete all information about a segment and removes it from deep storage. Killable segments must be disabled (used==0) in the Druid segment table. The available grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"kill"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><all_segme</span><span class="kc">nts</span><span class="err">_i</span><span class="kc">n</span><span class="err">_</span><span class="kc">t</span><span class="err">his_i</span><span class="kc">nter</span><span class="err">val_will_die!></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><all_segments_in_this_interval_will_die!></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.15.1-incubating/ingestion/firehose.html b/docs/0.15.1-incubating/ingestion/firehose.html
index ffc35d8..ac8ff2f 100644
--- a/docs/0.15.1-incubating/ingestion/firehose.html
+++ b/docs/0.15.1-incubating/ingestion/firehose.html
@@ -465,7 +465,7 @@
This can be used to merge data from more than one firehose.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"combining"</span><span class="p">,</span>
- <span class="nt">"delegates"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span> <span class="kc">f</span><span class="err">irehose</span><span class="mi">1</span> <span class="p">},</span> <span class="p">{</span> <span class="kc">f</span><span class="err">irehose</span><span class="mi">2</span> <span class="p">},</span> <span class="err">.....</span> <span class="p">]</span>
+ <span class="nt">"delegates"</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span> <span class="err">firehose1</span> <span class="p">},</span> <span class="p">{</span> <span class="err">firehose2</span> <span class="p">},</span> <span class="err">.....</span> <span class="p">]</span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.15.1-incubating/ingestion/flatten-json.html b/docs/0.15.1-incubating/ingestion/flatten-json.html
index cf76d04..f9c2d71 100644
--- a/docs/0.15.1-incubating/ingestion/flatten-json.html
+++ b/docs/0.15.1-incubating/ingestion/flatten-json.html
@@ -226,7 +226,7 @@
<p>The column "metrica" is a Long metric column, "hello" is an array of Double metrics, and "nestmet.val" is a nested Long metric. All other columns are dimensions.</p>
<p>To flatten this JSON, the parseSpec could be defined as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"parseSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"parseSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"format"</span><span class="p">:</span> <span class="s2">"json"</span><span class="p">,</span>
<span class="nt">"flattenSpec"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"useFieldDiscovery"</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
@@ -307,7 +307,7 @@
<p>"ignore_me" will be automatically discovered but excluded as specified by dimensionsExclusions.</p>
<p>Aggregators should use the metric column names as defined in the flattenSpec. Using the example above:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metricsSpec"</span> <span class="p">:</span> <span class="p">[</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metricsSpec"</span> <span class="err">:</span> <span class="p">[</span>
<span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span>
<span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"path-metric-sum"</span><span class="p">,</span>
diff --git a/docs/0.15.1-incubating/ingestion/hadoop.html b/docs/0.15.1-incubating/ingestion/hadoop.html
index bb952e0..474fa43 100644
--- a/docs/0.15.1-incubating/ingestion/hadoop.html
+++ b/docs/0.15.1-incubating/ingestion/hadoop.html
@@ -222,7 +222,7 @@
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hadoop"</span>
<span class="p">}</span>
<span class="p">},</span>
- <span class="nt">"hadoopDependencyCoordinates"</span><span class="p">:</span> <span class="err"><my_hadoop_versio</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"hadoopDependencyCoordinates"</span><span class="p">:</span> <span class="err"><my_hadoop_version></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
@@ -512,7 +512,7 @@
</tbody></table>
<h3 id="jobproperties-field-of-tuningconfig">jobProperties field of TuningConfig</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"tuningConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"tuningConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"jobProperties"</span><span class="p">:</span> <span class="p">{</span>
<span class="nt">"<hadoop-property-a>"</span><span class="p">:</span> <span class="s2">"<value-a>"</span><span class="p">,</span>
@@ -616,7 +616,7 @@
sized data segments relative to single-dimension partitioning.</p>
<h3 id="hash-based-partitioning">Hash-based partitioning</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"partitionsSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"partitionsSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"hashed"</span><span class="p">,</span>
<span class="nt">"targetPartitionSize"</span><span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
@@ -657,7 +657,7 @@
</tbody></table>
<h3 id="single-dimension-partitioning">Single-dimension partitioning</h3>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"partitionsSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"partitionsSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimension"</span><span class="p">,</span>
<span class="nt">"targetPartitionSize"</span><span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
diff --git a/docs/0.15.1-incubating/ingestion/ingestion-spec.html b/docs/0.15.1-incubating/ingestion/ingestion-spec.html
index b942c8b..84844c9 100644
--- a/docs/0.15.1-incubating/ingestion/ingestion-spec.html
+++ b/docs/0.15.1-incubating/ingestion/ingestion-spec.html
@@ -188,7 +188,7 @@
<h1 id="dataschema">DataSchema</h1>
<p>An example dataSchema is shown below:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"wikipedia"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -602,7 +602,7 @@
<p>For example, the following <code>dimensionsSpec</code> section from a <code>dataSchema</code> ingests one column as Long (<code>countryNum</code>), two
columns as Float (<code>userLatitude</code>, <code>userLongitude</code>), and the other columns as Strings, with bitmap indexes disabled
for the <code>comment</code> column.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dimensionsSpec"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span>
<span class="s2">"page"</span><span class="p">,</span>
<span class="s2">"language"</span><span class="p">,</span>
diff --git a/docs/0.15.1-incubating/ingestion/locking-and-priority.html b/docs/0.15.1-incubating/ingestion/locking-and-priority.html
index 94cd3d8..4ff0bc5 100644
--- a/docs/0.15.1-incubating/ingestion/locking-and-priority.html
+++ b/docs/0.15.1-incubating/ingestion/locking-and-priority.html
@@ -202,7 +202,7 @@
</tbody></table>
<p>You can override the task priority by setting your priority in the task context like below.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"context"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"context"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"priority"</span> <span class="p">:</span> <span class="mi">100</span>
<span class="p">}</span>
</code></pre></div>
diff --git a/docs/0.15.1-incubating/ingestion/misc-tasks.html b/docs/0.15.1-incubating/ingestion/misc-tasks.html
index deb9063..3cd88ac 100644
--- a/docs/0.15.1-incubating/ingestion/misc-tasks.html
+++ b/docs/0.15.1-incubating/ingestion/misc-tasks.html
@@ -155,10 +155,10 @@
<p>These tasks start, sleep for a time and are used only for testing. The available grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"noop"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_segme</span><span class="kc">nt</span><span class="err">_i</span><span class="kc">nter</span><span class="err">val></span><span class="p">,</span>
- <span class="nt">"runTime"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_millis_</span><span class="kc">t</span><span class="err">o_sleep></span><span class="p">,</span>
- <span class="nt">"firehose"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">_</span><span class="kc">f</span><span class="err">irehose_</span><span class="kc">t</span><span class="err">o_</span><span class="kc">test</span><span class="err">_co</span><span class="kc">nne</span><span class="err">c</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><optional_task_id></span><span class="p">,</span>
+ <span class="nt">"interval"</span> <span class="p">:</span> <span class="err"><optional_segment_interval></span><span class="p">,</span>
+ <span class="nt">"runTime"</span> <span class="p">:</span> <span class="err"><optional_millis_to_sleep></span><span class="p">,</span>
+ <span class="nt">"firehose"</span><span class="p">:</span> <span class="err"><optional_firehose_to_test_connect></span>
<span class="p">}</span>
</code></pre></div>
<h2 id="segment-merging-tasks-deprecated">Segment Merging Tasks (Deprecated)</h2>
@@ -168,11 +168,11 @@
<p>Append tasks append a list of segments together into a single segment (one after the other). The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"append"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">appe</span><span class="kc">n</span><span class="err">d></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">list</span> <span class="err">of</span> <span class="err">DataSegment</span> <span class="err">objects</span> <span class="err">to</span> <span class="err">append></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><optional</span> <span class="err">list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="merge-task">Merge Task</h3>
@@ -183,12 +183,12 @@
<p>The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"merge"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whe</span><span class="kc">t</span><span class="err">her</span> <span class="err">or</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="kc">t</span><span class="err">o</span> <span class="err">rollup</span> <span class="err">da</span><span class="kc">ta</span> <span class="err">duri</span><span class="kc">n</span><span class="err">g</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="kc">t</span><span class="err">o</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whether</span> <span class="err">or</span> <span class="err">not</span> <span class="err">to</span> <span class="err">rollup</span> <span class="err">data</span> <span class="err">during</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"segments"</span><span class="p">:</span> <span class="err"><JSON</span> <span class="err">list</span> <span class="err">of</span> <span class="err">DataSegment</span> <span class="err">objects</span> <span class="err">to</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="same-interval-merge-task">Same Interval Merge Task</h3>
@@ -198,12 +198,12 @@
<p>The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"same_interval_merge"</span><span class="p">,</span>
- <span class="nt">"id"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_id></span><span class="p">,</span>
- <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k_da</span><span class="kc">tas</span><span class="err">ource></span><span class="p">,</span>
- <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">ors></span><span class="p">,</span>
- <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whe</span><span class="kc">t</span><span class="err">her</span> <span class="err">or</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="kc">t</span><span class="err">o</span> <span class="err">rollup</span> <span class="err">da</span><span class="kc">ta</span> <span class="err">duri</span><span class="kc">n</span><span class="err">g</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
- <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><Da</span><span class="kc">ta</span><span class="err">Segme</span><span class="kc">nt</span> <span class="err">objec</span><span class="kc">ts</span> <span class="err">i</span><span class="kc">n</span> <span class="kc">t</span><span class="err">his</span> <span class="err">i</span><span class="kc">nter</span><span class="err">val</span> <span class="err">are</span> <span class="err">goi</span><span class="kc">n</span><span class="err">g</span> <span class="kc">t</span><span class="err">o</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
- <span class="nt">"context"</span><span class="p">:</span> <span class="err"><</span><span class="kc">tas</span><span class="err">k</span> <span class="err">co</span><span class="kc">nte</span><span class="err">x</span><span class="kc">t</span><span class="err">></span>
+ <span class="nt">"id"</span><span class="p">:</span> <span class="err"><task_id></span><span class="p">,</span>
+ <span class="nt">"dataSource"</span><span class="p">:</span> <span class="err"><task_datasource></span><span class="p">,</span>
+ <span class="nt">"aggregations"</span><span class="p">:</span> <span class="err"><list</span> <span class="err">of</span> <span class="err">aggregators></span><span class="p">,</span>
+ <span class="nt">"rollup"</span><span class="p">:</span> <span class="err"><whether</span> <span class="err">or</span> <span class="err">not</span> <span class="err">to</span> <span class="err">rollup</span> <span class="err">data</span> <span class="err">during</span> <span class="err">a</span> <span class="err">merge></span><span class="p">,</span>
+ <span class="nt">"interval"</span><span class="p">:</span> <span class="err"><DataSegment</span> <span class="err">objects</span> <span class="err">in</span> <span class="err">this</span> <span class="err">interval</span> <span class="err">are</span> <span class="err">going</span> <span class="err">to</span> <span class="err">be</span> <span class="err">merged></span><span class="p">,</span>
+ <span class="nt">"context"</span><span class="p">:</span> <span class="err"><task</span> <span class="err">context></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.15.1-incubating/ingestion/stream-pull.html b/docs/0.15.1-incubating/ingestion/stream-pull.html
index 2bf7b72..fa0777f 100644
--- a/docs/0.15.1-incubating/ingestion/stream-pull.html
+++ b/docs/0.15.1-incubating/ingestion/stream-pull.html
@@ -547,7 +547,7 @@
<p>Segments are identified by datasource, time interval, and version. With sharding, a segment is also identified by a partition number. Typically, each shard will have the same version but a different partition number to uniquely identify it.</p>
<p>In small-data scenarios, sharding is unnecessary and can be set to none (the default):</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span><span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span><span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
</code></pre></div>
<p>However, in scenarios with multiple realtime processes, <code>none</code> is less useful as it cannot help with scaling data volume (see below). Note that for the batch indexing service, no explicit configuration is required; sharding is provided automatically.</p>
@@ -565,7 +565,7 @@
</ul>
<p>Configure <code>linear</code> under <code>schema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
@@ -575,7 +575,7 @@
<p>This strategy is similar to <code>linear</code> except that it does not tolerate non-sequential partition numbering (it will <em>not</em> allow querying of partitions 0 and 2 if partition 1 is missing). It also requires explicitly setting the total number of partitions.</p>
<p>Configure <code>numbered</code> under <code>schema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"numbered"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span><span class="p">,</span>
<span class="nt">"partitions"</span><span class="p">:</span> <span class="mi">2</span>
@@ -586,13 +586,13 @@
<p>The <code>shardSpec</code> configuration can be used to create redundancy by having the same <code>partitionNum</code> values on different processes.</p>
<p>For example, if RealTimeProcess1 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
</code></pre></div>
<p>and RealTimeProcess2 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">0</span>
<span class="p">}</span>
@@ -600,7 +600,7 @@
<p>then two realtime processes can store segments with the same datasource, version, time interval, and partition number. Brokers that query for data in such segments will assume that they hold the same data, and the query will target only one of the segments.</p>
<p><code>shardSpec</code> can also help achieve scale. For this, add processes with a different <code>partionNum</code>. Continuing with the example, if RealTimeProcess3 has:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"shardSpec"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"shardSpec"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"linear"</span><span class="p">,</span>
<span class="nt">"partitionNum"</span><span class="p">:</span> <span class="mi">1</span>
<span class="p">}</span>
diff --git a/docs/0.15.1-incubating/ingestion/update-existing-data.html b/docs/0.15.1-incubating/ingestion/update-existing-data.html
index 0dacf0f..187c63b 100644
--- a/docs/0.15.1-incubating/ingestion/update-existing-data.html
+++ b/docs/0.15.1-incubating/ingestion/update-existing-data.html
@@ -275,7 +275,7 @@
</tbody></table>
<p>For example</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"inputSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"dataSource"</span><span class="p">,</span>
@@ -309,7 +309,7 @@
</tbody></table>
<p>For example:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hadoop"</span><span class="p">,</span>
<span class="nt">"inputSpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"multi"</span><span class="p">,</span>
diff --git a/docs/0.15.1-incubating/operations/use_sbt_to_build_fat_jar.html b/docs/0.15.1-incubating/operations/use_sbt_to_build_fat_jar.html
index 2090cfb..7165581 100644
--- a/docs/0.15.1-incubating/operations/use_sbt_to_build_fat_jar.html
+++ b/docs/0.15.1-incubating/operations/use_sbt_to_build_fat_jar.html
@@ -149,106 +149,106 @@
-->
<h1 id="content-for-build-sbt">Content for build.sbt</h1>
-<div class="highlight"><pre><code class="language-scala" data-lang="scala"><span></span><span class="n">libraryDependencies</span> <span class="o">++=</span> <span class="nc">Seq</span><span class="p">(</span>
- <span class="s">"com.amazonaws"</span> <span class="o">%</span> <span class="s">"aws-java-sdk"</span> <span class="o">%</span> <span class="s">"1.9.23"</span> <span class="n">exclude</span><span class="p">(</span><span class="s">"common-logging"</span><span class="p">,</span> <span class="s">"common-logging"</span><span class="p">),</span>
- <span class="s">"org.joda"</span> <span class="o">%</span> <span class="s">"joda-convert"</span> <span class="o">%</span> <span class="s">"1.7"</span><span class="p">,</span>
- <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"2.7"</span><span class="p">,</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-services"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-service"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-hadoop"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"mysql-metadata-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-s3-extensions"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-histogram"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-hdfs-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="p">(</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"org.ow2.asm"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="p">),</span>
- <span class="nc">ExclusionRule</span><span class="p">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="p">)</span>
- <span class="p">),</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-core"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-databind"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-guava"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-joda"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-base"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-json-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-smile-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.fasterxml.jackson.module"</span> <span class="o">%</span> <span class="s">"jackson-module-jaxb-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="p">,</span>
- <span class="s">"com.sun.jersey"</span> <span class="o">%</span> <span class="s">"jersey-servlet"</span> <span class="o">%</span> <span class="s">"1.17.1"</span><span class="p">,</span>
- <span class="s">"mysql"</span> <span class="o">%</span> <span class="s">"mysql-connector-java"</span> <span class="o">%</span> <span class="s">"5.1.34"</span><span class="p">,</span>
- <span class="s">"org.scalatest"</span> <span class="o">%%</span> <span class="s">"scalatest"</span> <span class="o">%</span> <span class="s">"2.2.3"</span> <span class="o">%</span> <span class="s">"test"</span><span class="p">,</span>
+<div class="highlight"><pre><code class="language-scala" data-lang="scala"><span></span><span class="n">libraryDependencies</span> <span class="o">++=</span> <span class="nc">Seq</span><span class="o">(</span>
+ <span class="s">"com.amazonaws"</span> <span class="o">%</span> <span class="s">"aws-java-sdk"</span> <span class="o">%</span> <span class="s">"1.9.23"</span> <span class="n">exclude</span><span class="o">(</span><span class="s">"common-logging"</span><span class="o">,</span> <span class="s">"common-logging"</span><span class="o">),</span>
+ <span class="s">"org.joda"</span> <span class="o">%</span> <span class="s">"joda-convert"</span> <span class="o">%</span> <span class="s">"1.7"</span><span class="o">,</span>
+ <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"joda-time"</span> <span class="o">%</span> <span class="s">"2.7"</span><span class="o">,</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-services"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-service"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid"</span> <span class="o">%</span> <span class="s">"druid-indexing-hadoop"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"mysql-metadata-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-s3-extensions"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-histogram"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"org.apache.druid.extensions"</span> <span class="o">%</span> <span class="s">"druid-hdfs-storage"</span> <span class="o">%</span> <span class="s">"0.8.1"</span> <span class="n">excludeAll</span> <span class="o">(</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"org.ow2.asm"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.core"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.datatype"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.dataformat"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.jaxrs"</span><span class="o">),</span>
+ <span class="nc">ExclusionRule</span><span class="o">(</span><span class="s">"com.fasterxml.jackson.module"</span><span class="o">)</span>
+ <span class="o">),</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-core"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.core"</span> <span class="o">%</span> <span class="s">"jackson-databind"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-guava"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.datatype"</span> <span class="o">%</span> <span class="s">"jackson-datatype-joda"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-base"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-json-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.jaxrs"</span> <span class="o">%</span> <span class="s">"jackson-jaxrs-smile-provider"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.fasterxml.jackson.module"</span> <span class="o">%</span> <span class="s">"jackson-module-jaxb-annotations"</span> <span class="o">%</span> <span class="s">"2.3.0"</span><span class="o">,</span>
+ <span class="s">"com.sun.jersey"</span> <span class="o">%</span> <span class="s">"jersey-servlet"</span> <span class="o">%</span> <span class="s">"1.17.1"</span><span class="o">,</span>
+ <span class="s">"mysql"</span> <span class="o">%</span> <span class="s">"mysql-connector-java"</span> <span class="o">%</span> <span class="s">"5.1.34"</span><span class="o">,</span>
+ <span class="s">"org.scalatest"</span> <span class="o">%%</span> <span class="s">"scalatest"</span> <span class="o">%</span> <span class="s">"2.2.3"</span> <span class="o">%</span> <span class="s">"test"</span><span class="o">,</span>
<span class="s">"org.mockito"</span> <span class="o">%</span> <span class="s">"mockito-core"</span> <span class="o">%</span> <span class="s">"1.10.19"</span> <span class="o">%</span> <span class="s">"test"</span>
-<span class="p">)</span>
+<span class="o">)</span>
-<span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span> <span class="o">:=</span> <span class="p">{</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"pom."</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"javax.inject.Named"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"mime.types"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog$1.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/NoOpLog.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogFactory.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogConfigurationException.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/Log.class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"META-INF/jersey-module-version"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".properties"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".class"</span> <span class="o">=></span> <span class="nc">MergeStrategy</span><span class="p">.</span><span class="n">first</span>
- <span class="k">case</span> <span class="n">x</span> <span class="o">=></span>
- <span class="kd">val</span> <span class="n">oldStrategy</span> <span class="o">=</span> <span class="p">(</span><span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span><span class="p">).</span><span class="n">value</span>
- <span class="n">oldStrategy</span><span class="p">(</span><span class="n">x</span><span class="p">)</span>
-<span class="p">}</span>
+<span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span> <span class="o">:=</span> <span class="o">{</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"pom."</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"javax.inject.Named"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"mime.types"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/SimpleLog$1.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/impl/NoOpLog.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogFactory.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/LogConfigurationException.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"org/apache/commons/logging/Log.class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">"META-INF/jersey-module-version"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".properties"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">path</span> <span class="k">if</span> <span class="n">path</span> <span class="n">contains</span> <span class="s">".class"</span> <span class="k">=></span> <span class="nc">MergeStrategy</span><span class="o">.</span><span class="n">first</span>
+ <span class="k">case</span> <span class="n">x</span> <span class="k">=></span>
+ <span class="k">val</span> <span class="n">oldStrategy</span> <span class="k">=</span> <span class="o">(</span><span class="n">assemblyMergeStrategy</span> <span class="n">in</span> <span class="n">assembly</span><span class="o">).</span><span class="n">value</span>
+ <span class="n">oldStrategy</span><span class="o">(</span><span class="n">x</span><span class="o">)</span>
+<span class="o">}</span>
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/docs/0.15.1-incubating/querying/aggregations.html b/docs/0.15.1-incubating/querying/aggregations.html
index 96e7f50..1dd8fd4 100644
--- a/docs/0.15.1-incubating/querying/aggregations.html
+++ b/docs/0.15.1-incubating/querying/aggregations.html
@@ -158,7 +158,7 @@
<h3 id="count-aggregator">Count aggregator</h3>
<p><code>count</code> computes the count of Druid rows that match the filters.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span> <span class="p">}</span>
</code></pre></div>
<p>Please note the count aggregator counts the number of Druid rows, which does not always reflect the number of raw events ingested.
This is because Druid can be configured to roll up data at ingestion time. To
@@ -170,7 +170,7 @@
<h4 id="longsum-aggregator"><code>longSum</code> aggregator</h4>
<p>computes the sum of values as a 64-bit, signed integer</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<p><code>name</code> – output name for the summed value
<code>fieldName</code> – name of the metric column to sum over</p>
@@ -178,44 +178,44 @@
<h4 id="doublesum-aggregator"><code>doubleSum</code> aggregator</h4>
<p>Computes and stores the sum of values as 64-bit floating point value. Similar to <code>longSum</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatsum-aggregator"><code>floatSum</code> aggregator</h4>
<p>Computes and stores the sum of values as 32-bit floating point value. Similar to <code>longSum</code> and <code>doubleSum</code></p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatSum"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="min-max-aggregators">Min / Max aggregators</h3>
<h4 id="doublemin-aggregator"><code>doubleMin</code> aggregator</h4>
<p><code>doubleMin</code> computes the minimum of all metric values and Double.POSITIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="doublemax-aggregator"><code>doubleMax</code> aggregator</h4>
<p><code>doubleMax</code> computes the maximum of all metric values and Double.NEGATIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatmin-aggregator"><code>floatMin</code> aggregator</h4>
<p><code>floatMin</code> computes the minimum of all metric values and Float.POSITIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="floatmax-aggregator"><code>floatMax</code> aggregator</h4>
<p><code>floatMax</code> computes the maximum of all metric values and Float.NEGATIVE_INFINITY</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="longmin-aggregator"><code>longMin</code> aggregator</h4>
<p><code>longMin</code> computes the minimum of all metric values and Long.MAX_VALUE</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMin"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h4 id="longmax-aggregator"><code>longMax</code> aggregator</h4>
<p><code>longMax</code> computes the maximum of all metric values and Long.MIN_VALUE</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longMax"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="first-last-aggregator">First / Last aggregator</h3>
@@ -228,8 +228,8 @@
<p><code>doubleFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="doublelast-aggregator"><code>doubleLast</code> aggregator</h4>
@@ -237,8 +237,8 @@
<p><code>doubleLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="floatfirst-aggregator"><code>floatFirst</code> aggregator</h4>
@@ -246,8 +246,8 @@
<p><code>floatFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="floatlast-aggregator"><code>floatLast</code> aggregator</h4>
@@ -255,8 +255,8 @@
<p><code>floatLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"floatLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="longfirst-aggregator"><code>longFirst</code> aggregator</h4>
@@ -264,8 +264,8 @@
<p><code>longFirst</code> computes the metric value with the minimum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span>
<span class="p">}</span>
</code></pre></div>
<h4 id="longlast-aggregator"><code>longLast</code> aggregator</h4>
@@ -273,8 +273,8 @@
<p><code>longLast</code> computes the metric value with the maximum timestamp or 0 if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"longLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="stringfirst-aggregator"><code>stringFirst</code> aggregator</h4>
@@ -282,10 +282,10 @@
<p><code>stringFirst</code> computes the metric value with the minimum timestamp or <code>null</code> if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFirst"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1024</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolea</span><span class="kc">n</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><integer></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">1024),</span>
+ <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolean></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="stringlast-aggregator"><code>stringLast</code> aggregator</h4>
@@ -293,10 +293,10 @@
<p><code>stringLast</code> computes the metric value with the maximum timestamp or <code>null</code> if no row exist</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringLast"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="mi">1024</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolea</span><span class="kc">n</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
+ <span class="nt">"maxStringBytes"</span> <span class="p">:</span> <span class="err"><integer></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">1024),</span>
+ <span class="nt">"filterNullValues"</span> <span class="p">:</span> <span class="err"><boolean></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<h3 id="javascript-aggregator">JavaScript aggregator</h3>
@@ -305,7 +305,7 @@
JavaScript functions are expected to return floating-point values.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><colum</span><span class="kc">n</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><colum</span><span class="kc">n</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
+ <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span> <span class="err"><column</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><column</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
<span class="nt">"fnAggregate"</span> <span class="p">:</span> <span class="s2">"function(current, column1, column2, ...) {</span>
<span class="s2"> <updates partial aggregate (current) based on the current row values></span>
<span class="s2"> return <updated partial aggregate></span>
@@ -425,10 +425,10 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"filtered"</span><span class="p">,</span>
<span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span> <span class="err">value></span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><dimension</span> <span class="err">value></span>
<span class="p">}</span>
- <span class="nt">"aggregator"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="s2">"aggregator"</span> <span class="p">:</span> <span class="err"><aggregation></span>
<span class="p">}</span>
</code></pre></div>
</div>
diff --git a/docs/0.15.1-incubating/querying/dimensionspecs.html b/docs/0.15.1-incubating/querying/dimensionspecs.html
index 417513d..d93933e 100644
--- a/docs/0.15.1-incubating/querying/dimensionspecs.html
+++ b/docs/0.15.1-incubating/querying/dimensionspecs.html
@@ -161,8 +161,8 @@
<p>Returns dimension values as is and optionally renames the dimension.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"default"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"outputName"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"outputName"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
<span class="nt">"outputType"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"STRING"</span><span class="err">|</span><span class="s2">"LONG"</span><span class="err">|</span><span class="s2">"FLOAT"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
@@ -175,10 +175,10 @@
<p>Returns dimension values transformed using the given <a href="#extraction-functions">extraction function</a>.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"extraction"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"outputName"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension></span><span class="p">,</span>
+ <span class="nt">"outputName"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
<span class="nt">"outputType"</span><span class="p">:</span> <span class="err"><</span><span class="s2">"STRING"</span><span class="err">|</span><span class="s2">"LONG"</span><span class="err">|</span><span class="s2">"FLOAT"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err"><extraction_function></span>
<span class="p">}</span>
</code></pre></div>
<p><code>outputType</code> may also be specified in an ExtractionDimensionSpec to apply type conversion to results before merging. If left unspecified, the <code>outputType</code> defaults to STRING.</p>
@@ -195,13 +195,13 @@
<p>In addition to "query filter" which efficiently selects the rows to be processed, you can use the filtered dimension spec to filter for specific values within the values of a multi-value dimension. These dimensionSpecs take a delegate DimensionSpec and a filtering criteria. From the "exploded" rows, only rows matching the given filtering criteria are returned in the query result.</p>
<p>The following filtered dimension spec acts as a whitelist or blacklist for values as per the "isWhitelist" attribute value.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"listFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"values"</span><span class="p">:</span> <span class="err"><array</span> <span class="err">o</span><span class="kc">f</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">gs></span><span class="p">,</span> <span class="nt">"isWhitelist"</span><span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">a</span><span class="kc">ttr</span><span class="err">ibu</span><span class="kc">te</span> <span class="kc">f</span><span class="err">or</span> <span class="kc">true</span><span class="err">/</span><span class="kc">false</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">is</span> <span class="kc">true</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"listFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"values"</span><span class="p">:</span> <span class="err"><array</span> <span class="err">of</span> <span class="err">strings></span><span class="p">,</span> <span class="nt">"isWhitelist"</span><span class="p">:</span> <span class="err"><optional</span> <span class="err">attribute</span> <span class="err">for</span> <span class="kc">true</span><span class="err">/</span><span class="kc">false</span><span class="p">,</span> <span class="err">default</span> <span class="err">is</span> <span class="err">true></span> <span class="p">}</span>
</code></pre></div>
<p>Following filtered dimension spec retains only the values matching regex. Note that <code>listFiltered</code> is faster than this and one should use that for whitelist or blacklist usecase.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regexFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><java</span> <span class="err">regex</span> <span class="err">pa</span><span class="kc">ttern</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regexFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><java</span> <span class="err">regex</span> <span class="err">pattern></span> <span class="p">}</span>
</code></pre></div>
<p>Following filtered dimension spec retains only the values starting with the same prefix.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"prefixFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">Spec></span><span class="p">,</span> <span class="nt">"prefix"</span><span class="p">:</span> <span class="err"><pre</span><span class="kc">f</span><span class="err">ix</span> <span class="err">s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"prefixFiltered"</span><span class="p">,</span> <span class="nt">"delegate"</span> <span class="p">:</span> <span class="err"><dimensionSpec></span><span class="p">,</span> <span class="nt">"prefix"</span><span class="p">:</span> <span class="err"><prefix</span> <span class="err">string></span> <span class="p">}</span>
</code></pre></div>
<p>For more details and examples, see <a href="multi-value-dimensions.html">multi-value dimensions</a>.</p>
@@ -295,8 +295,8 @@
If there is no match, it returns the dimension value as is.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span>
- <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expressio</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"index"</span> <span class="p">:</span> <span class="err"><group</span> <span class="kc">t</span><span class="err">o</span> <span class="err">ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="mi">1</span><span class="err">></span>
+ <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expression></span><span class="p">,</span>
+ <span class="nt">"index"</span> <span class="p">:</span> <span class="err"><group</span> <span class="err">to</span> <span class="err">extract</span><span class="p">,</span> <span class="err">default</span> <span class="err">1></span>
<span class="nt">"replaceMissingValue"</span> <span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
<span class="nt">"replaceMissingValueWith"</span> <span class="p">:</span> <span class="s2">"foobar"</span>
<span class="p">}</span>
@@ -316,7 +316,7 @@
<h3 id="partial-extraction-function">Partial Extraction Function</h3>
<p>Returns the dimension value unchanged if the regular expression matches, otherwise returns null.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"partial"</span><span class="p">,</span> <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expressio</span><span class="kc">n</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"partial"</span><span class="p">,</span> <span class="nt">"expr"</span> <span class="p">:</span> <span class="err"><regular_expression></span> <span class="p">}</span>
</code></pre></div>
<h3 id="search-query-extraction-function">Search Query Extraction Function</h3>
@@ -366,11 +366,11 @@
<li><code>asMillis</code> : boolean value, set to true to treat input strings as millis rather than ISO8601 strings. Additionally, if <code>format</code> is null or not specified, output will be in millis rather than ISO8601.</li>
</ul>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"timeFormat"</span><span class="p">,</span>
- <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"timeZone"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">t</span><span class="err">ime_zo</span><span class="kc">ne</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">UTC)</span><span class="p">,</span>
- <span class="nt">"locale"</span> <span class="p">:</span> <span class="err"><locale></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="err">curre</span><span class="kc">nt</span> <span class="err">locale)</span><span class="p">,</span>
- <span class="nt">"granularity"</span> <span class="p">:</span> <span class="err"><gra</span><span class="kc">nular</span><span class="err">i</span><span class="kc">t</span><span class="err">y></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">fault</span> <span class="kc">n</span><span class="err">o</span><span class="kc">ne</span><span class="err">)</span> <span class="p">},</span>
- <span class="nt">"asMillis"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="err">)</span> <span class="p">}</span>
+ <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><output_format></span> <span class="err">(optional)</span><span class="p">,</span>
+ <span class="nt">"timeZone"</span> <span class="p">:</span> <span class="err"><time_zone></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">UTC),</span>
+ <span class="nt">"locale"</span> <span class="p">:</span> <span class="err"><locale></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">current</span> <span class="err">locale),</span>
+ <span class="nt">"granularity"</span> <span class="p">:</span> <span class="err"><granularity></span> <span class="err">(optional</span><span class="p">,</span> <span class="err">default</span> <span class="err">none)</span> <span class="p">}</span><span class="err">,</span>
+ <span class="s2">"asMillis"</span> <span class="err">:</span> <span class="err"><</span><span class="kc">true</span> <span class="err">or</span> <span class="kc">false</span><span class="err">></span> <span class="err">(optional)</span> <span class="err">}</span>
</code></pre></div>
<p>For example, the following dimension spec returns the day of the week for Montréal in French:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
@@ -401,9 +401,9 @@
<p>If a value cannot be parsed using the provided timeFormat, it will be returned as-is.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"time"</span><span class="p">,</span>
- <span class="nt">"timeFormat"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">n</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"resultFormat"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">f</span><span class="err">orma</span><span class="kc">t</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"joda"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span><span class="p">,</span> <span class="kc">false</span><span class="err">></span> <span class="p">}</span>
+ <span class="nt">"timeFormat"</span> <span class="p">:</span> <span class="err"><input_format></span><span class="p">,</span>
+ <span class="nt">"resultFormat"</span> <span class="p">:</span> <span class="err"><output_format></span><span class="p">,</span>
+ <span class="nt">"joda"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">true</span><span class="p">,</span> <span class="err">false></span> <span class="p">}</span>
</code></pre></div>
<h3 id="javascript-extraction-function">Javascript Extraction Function</h3>
@@ -574,7 +574,7 @@
<h3 id="string-format-extraction-function">String Format Extraction Function</h3>
<p>Returns the dimension value formatted according to the given format string.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFormat"</span><span class="p">,</span> <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><spri</span><span class="kc">ntf</span><span class="err">_expressio</span><span class="kc">n</span><span class="err">></span><span class="p">,</span> <span class="nt">"nullHandling"</span> <span class="p">:</span> <span class="err"><op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span> <span class="err">a</span><span class="kc">ttr</span><span class="err">ibu</span><span class="kc">te</span> <span class="kc">f</span><span class="err">or</span> <span class="err">ha</span><span class="kc">n</span><span class="err">dli</span><span class="kc">n</span><span class="err">g</span> <span class="kc">null</span> <span class="err">value></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"stringFormat"</span><span class="p">,</span> <span class="nt">"format"</span> <span class="p">:</span> <span class="err"><sprintf_expression></span><span class="p">,</span> <span class="nt">"nullHandling"</span> <span class="p">:</span> <span class="err"><optional</span> <span class="err">attribute</span> <span class="err">for</span> <span class="err">handling</span> <span class="kc">null</span> <span class="err">value></span> <span class="p">}</span>
</code></pre></div>
<p>For example if you want to concat "[" and "]" before and after the actual dimension value, you need to specify "[%s]" as format string. "nullHandling" can be one of <code>nullString</code>, <code>emptyString</code> or <code>returnNull</code>. With "[%s]" format, each configuration will result <code>[null]</code>, <code>[]</code>, <code>null</code>. Default is <code>nullString</code>.</p>
diff --git a/docs/0.15.1-incubating/querying/filters.html b/docs/0.15.1-incubating/querying/filters.html
index 29f62f1..c90dffc 100644
--- a/docs/0.15.1-incubating/querying/filters.html
+++ b/docs/0.15.1-incubating/querying/filters.html
@@ -157,7 +157,7 @@
<p>The simplest filter is a selector filter. The selector filter will match a specific dimension with a specific value. Selector filters can be used as the base filters for more complex Boolean expressions of filters.</p>
<p>The grammar for a SELECTOR filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_value_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span> <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dimension_value_string></span> <span class="p">}</span>
</code></pre></div>
<p>This is the equivalent of <code>WHERE <dimension_string> = '<dimension_value_string>'</code>.</p>
@@ -166,7 +166,7 @@
<h3 id="column-comparison-filter">Column Comparison filter</h3>
<p>The column comparison filter is similar to the selector filter, but instead compares dimensions to each other. For example:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"columnComparison"</span><span class="p">,</span> <span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span><span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_a></span><span class="p">,</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_b></span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"columnComparison"</span><span class="p">,</span> <span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span><span class="err"><dimension_a></span><span class="p">,</span> <span class="err"><dimension_b></span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>This is the equivalent of <code>WHERE <dimension_a> = <dimension_b></code>.</p>
@@ -175,7 +175,7 @@
<h3 id="regular-expression-filter">Regular expression filter</h3>
<p>The regular expression filter is similar to the selector filter, but using regular expressions. It matches the specified dimension with the given pattern. The pattern can be any standard <a href="http://docs.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html">Java regular expression</a>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><pa</span><span class="kc">ttern</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"regex"</span><span class="p">,</span> <span class="nt">"dimension"</span><span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span> <span class="nt">"pattern"</span><span class="p">:</span> <span class="err"><pattern_string></span> <span class="p">}</span>
</code></pre></div>
<p>The regex filter supports the use of extraction functions, see <a href="#filtering-with-extraction-functions">Filtering with Extraction Functions</a> for details.</p>
@@ -184,21 +184,21 @@
<h4 id="and">AND</h4>
<p>The grammar for an AND filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>The filters in fields can be any other filter defined on this page.</p>
<h4 id="or">OR</h4>
<p>The grammar for an OR filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"or"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"or"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span>
</code></pre></div>
<p>The filters in fields can be any other filter defined on this page.</p>
<h4 id="not">NOT</h4>
<p>The grammar for a NOT filter is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"not"</span><span class="p">,</span> <span class="nt">"field"</span><span class="p">:</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"not"</span><span class="p">,</span> <span class="nt">"field"</span><span class="p">:</span> <span class="err"><filter></span> <span class="p">}</span>
</code></pre></div>
<p>The filter specified at field can be any other filter defined on this page.</p>
@@ -209,7 +209,7 @@
<p>The function takes a single argument, the dimension value, and returns either true or false.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
- <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g></span><span class="p">,</span>
+ <span class="nt">"dimension"</span> <span class="p">:</span> <span class="err"><dimension_string></span><span class="p">,</span>
<span class="nt">"function"</span> <span class="p">:</span> <span class="s2">"function(value) { <...> }"</span>
<span class="p">}</span>
</code></pre></div>
@@ -687,14 +687,14 @@
the "regex" filter) the numeric column values will be converted to strings during the scan.</p>
<p>For example, filtering on a specific value, <code>myFloatColumn = 10.1</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"myFloatColumn"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"10.1"</span>
<span class="p">}</span>
</code></pre></div>
<p>Filtering on a range of values, <code>10 <= myFloatColumn < 20</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"bound"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"myFloatColumn"</span><span class="p">,</span>
<span class="nt">"ordering"</span><span class="p">:</span> <span class="s2">"numeric"</span><span class="p">,</span>
@@ -713,14 +713,14 @@
<p>If the user wishes to interpret the timestamp with a specific format, timezone, or locale, the <a href="./dimensionspecs.html#time-format-extraction-function">Time Format Extraction Function</a> is useful.</p>
<p>For example, filtering on a long timestamp value:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"__time"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"124457387532"</span>
<span class="p">}</span>
</code></pre></div>
<p>Filtering on day of week:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"filter"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"filter"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"selector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"__time"</span><span class="p">,</span>
<span class="nt">"value"</span><span class="p">:</span> <span class="s2">"Friday"</span><span class="p">,</span>
diff --git a/docs/0.15.1-incubating/querying/granularities.html b/docs/0.15.1-incubating/querying/granularities.html
index f8d36ea..8cf4dc7 100644
--- a/docs/0.15.1-incubating/querying/granularities.html
+++ b/docs/0.15.1-incubating/querying/granularities.html
@@ -308,10 +308,10 @@
<p>Duration granularities are specified as an exact duration in milliseconds and timestamps are returned as UTC. Duration granularity values are in millis.</p>
<p>They also support specifying an optional origin, which defines where to start counting time buckets from (defaults to 1970-01-01T00:00:00Z).</p>
-<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mf">7200000</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mi">7200000</span><span class="p">}</span>
</code></pre></div>
<p>This chunks up every 2 hours.</p>
-<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mf">3600000</span><span class="p">,</span> <span class="s2">"origin"</span><span class="o">:</span> <span class="s2">"2012-01-01T00:30:00Z"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-javascript" data-lang="javascript"><span></span><span class="p">{</span><span class="s2">"type"</span><span class="o">:</span> <span class="s2">"duration"</span><span class="p">,</span> <span class="s2">"duration"</span><span class="o">:</span> <span class="mi">3600000</span><span class="p">,</span> <span class="s2">"origin"</span><span class="o">:</span> <span class="s2">"2012-01-01T00:30:00Z"</span><span class="p">}</span>
</code></pre></div>
<p>This chunks up every hour on the half-hour.</p>
diff --git a/docs/0.15.1-incubating/querying/groupbyquery.html b/docs/0.15.1-incubating/querying/groupbyquery.html
index bfcfb80..0488a07 100644
--- a/docs/0.15.1-incubating/querying/groupbyquery.html
+++ b/docs/0.15.1-incubating/querying/groupbyquery.html
@@ -277,10 +277,10 @@
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"2012-01-01T00:00:00.000Z"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"country"</span> <span class="p">:</span> <span class="err"><some_dim_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"device"</span> <span class="p">:</span> <span class="err"><some_dim_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"total_usage"</span> <span class="p">:</span> <span class="err"><some_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"data_transfer"</span> <span class="p">:</span><span class="err"><some_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
+ <span class="nt">"country"</span> <span class="p">:</span> <span class="err"><some_dim_value_one></span><span class="p">,</span>
+ <span class="nt">"device"</span> <span class="p">:</span> <span class="err"><some_dim_value_two></span><span class="p">,</span>
+ <span class="nt">"total_usage"</span> <span class="p">:</span> <span class="err"><some_value_one></span><span class="p">,</span>
+ <span class="nt">"data_transfer"</span> <span class="p">:</span><span class="err"><some_value_two></span><span class="p">,</span>
<span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_avg_usage_value></span>
<span class="p">}</span>
<span class="p">},</span>
@@ -288,11 +288,11 @@
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"2012-01-01T00:00:12.000Z"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span>
- <span class="nt">"dim1"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_dim_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"dim2"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_dim_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"sample_name1"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_value_o</span><span class="kc">ne</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"sample_name2"</span> <span class="p">:</span><span class="err"><some_o</span><span class="kc">t</span><span class="err">her_value_</span><span class="kc">t</span><span class="err">wo></span><span class="p">,</span>
- <span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_o</span><span class="kc">t</span><span class="err">her_avg_usage_value></span>
+ <span class="nt">"dim1"</span> <span class="p">:</span> <span class="err"><some_other_dim_value_one></span><span class="p">,</span>
+ <span class="nt">"dim2"</span> <span class="p">:</span> <span class="err"><some_other_dim_value_two></span><span class="p">,</span>
+ <span class="nt">"sample_name1"</span> <span class="p">:</span> <span class="err"><some_other_value_one></span><span class="p">,</span>
+ <span class="nt">"sample_name2"</span> <span class="p">:</span><span class="err"><some_other_value_two></span><span class="p">,</span>
+ <span class="nt">"avg_usage"</span> <span class="p">:</span> <span class="err"><some_other_avg_usage_value></span>
<span class="p">}</span>
<span class="p">},</span>
<span class="err">...</span>
@@ -326,7 +326,7 @@
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"extraction"</span><span class="p">,</span>
<span class="nt">"dimension"</span> <span class="p">:</span> <span class="s2">"d2col"</span><span class="p">,</span>
<span class="nt">"outputName"</span> <span class="p">:</span> <span class="s2">"D2"</span><span class="p">,</span>
- <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err">ex</span><span class="kc">tra</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">_</span><span class="kc">fun</span><span class="err">c</span>
+ <span class="nt">"extractionFn"</span> <span class="p">:</span> <span class="err">extraction_func</span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span><span class="s2">"lookup"</span><span class="p">,</span>
@@ -337,10 +337,10 @@
<span class="p">],</span>
<span class="err">...</span>
<span class="err">...</span>
-<span class="nt">"subtotalsSpec"</span><span class="p">:[</span> <span class="p">[</span><span class="s2">"D1"</span><span class="p">,</span> <span class="s2">"D2"</span><span class="p">,</span> <span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">1</span><span class="s2">", "</span><span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">3</span><span class="err">"]],</span>
+<span class="nt">"subtotalsSpec"</span><span class="p">:[</span> <span class="p">[</span><span class="s2">"D1"</span><span class="p">,</span> <span class="s2">"D2"</span><span class="p">,</span> <span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">1</span><span class="s2">", "</span><span class="err">D</span><span class="mi">3</span><span class="s2">"], ["</span><span class="err">D</span><span class="mi">3</span><span class="err">"</span><span class="p">]],</span>
<span class="err">..</span>
-<span class="err">}</span>
+<span class="p">}</span>
</code></pre></div>
<p>Response returned would be equivalent to concatenating result of 3 groupBy queries with "dimensions" field being ["D1", "D2", D3"], ["D1", "D3"] and ["D3"] with appropriate <code>DimensionSpec</code> json blob as used in above query.
Response for above query would look something like below...</p>
@@ -350,13 +350,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D2"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D2"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="err">...</span>
@@ -365,13 +365,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D1"</span><span class="p">:</span> <span class="s2">".."</span><span class="p">,</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="err">...</span>
@@ -380,13 +380,13 @@
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t1"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="p">{</span>
<span class="nt">"version"</span> <span class="p">:</span> <span class="s2">"v1"</span><span class="p">,</span>
<span class="nt">"timestamp"</span> <span class="p">:</span> <span class="s2">"t2"</span><span class="p">,</span>
<span class="nt">"event"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"D3"</span><span class="p">:</span> <span class="s2">".."</span> <span class="p">}</span>
<span class="p">}</span>
- <span class="p">},</span>
+ <span class="err">}</span><span class="p">,</span>
<span class="err">...</span>
<span class="p">]</span>
</code></pre></div>
diff --git a/docs/0.15.1-incubating/querying/having.html b/docs/0.15.1-incubating/querying/having.html
index 4aba948..07166f3 100644
--- a/docs/0.15.1-incubating/querying/having.html
+++ b/docs/0.15.1-incubating/querying/having.html
@@ -168,7 +168,7 @@
<span class="nt">"having"</span><span class="p">:</span>
<span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"filter"</span><span class="p">,</span>
- <span class="nt">"filter"</span> <span class="p">:</span> <span class="err"><a</span><span class="kc">n</span><span class="err">y</span> <span class="err">Druid</span> <span class="err">query</span> <span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span>
+ <span class="nt">"filter"</span> <span class="p">:</span> <span class="err"><any</span> <span class="err">Druid</span> <span class="err">query</span> <span class="err">filter></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -205,7 +205,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -221,7 +221,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -239,7 +239,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -257,7 +257,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"lessThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -277,7 +277,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimSelector"</span><span class="p">,</span>
<span class="nt">"dimension"</span><span class="p">:</span> <span class="s2">"<dimension>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="err">_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><dimension_value></span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -297,12 +297,12 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"lessThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">]</span>
<span class="p">}</span>
@@ -322,12 +322,12 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"greaterThan"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">},</span>
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">]</span>
<span class="p">}</span>
@@ -347,7 +347,7 @@
<span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"equalTo"</span><span class="p">,</span>
<span class="nt">"aggregation"</span><span class="p">:</span> <span class="s2">"<aggregate_metric>"</span><span class="p">,</span>
- <span class="nt">"value"</span><span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">meric_value></span>
+ <span class="nt">"value"</span><span class="p">:</span> <span class="err"><numeric_value></span>
<span class="p">}</span>
<span class="p">}</span>
<span class="p">}</span>
diff --git a/docs/0.15.1-incubating/querying/hll-old.html b/docs/0.15.1-incubating/querying/hll-old.html
index c41a1f9..2bb54ef 100644
--- a/docs/0.15.1-incubating/querying/hll-old.html
+++ b/docs/0.15.1-incubating/querying/hll-old.html
@@ -159,9 +159,9 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"cardinality"</span><span class="p">,</span>
<span class="nt">"name"</span><span class="p">:</span> <span class="s2">"<output_name>"</span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><dime</span><span class="kc">ns</span><span class="err">io</span><span class="kc">n</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
- <span class="nt">"byRow"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span><span class="p">,</span>
- <span class="nt">"round"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="kc">false</span><span class="err">)</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span> <span class="err"><dimension</span><span class="mi">1</span><span class="err">></span><span class="p">,</span> <span class="err"><dimension</span><span class="mi">2</span><span class="err">></span><span class="p">,</span> <span class="err">...</span> <span class="p">],</span>
+ <span class="nt">"byRow"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false),</span>
+ <span class="nt">"round"</span><span class="p">:</span> <span class="err"><</span><span class="kc">false</span> <span class="err">|</span> <span class="kc">true</span><span class="err">></span> <span class="err">#</span> <span class="err">(optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">false)</span>
<span class="p">}</span>
</code></pre></div>
<p>Each individual element of the "fields" list can be a String or <a href="../querying/dimensionspecs.html">DimensionSpec</a>. A String dimension in the fields list is equivalent to a DefaultDimensionSpec (no transformations).</p>
@@ -233,8 +233,8 @@
<p>Uses <a href="http://algo.inria.fr/flajolet/Publications/FlFuGaMe07.pdf">HyperLogLog</a> to compute the estimated cardinality of a dimension that has been aggregated as a "hyperUnique" metric at indexing time.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUnique"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><me</span><span class="kc">tr</span><span class="err">ic_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><metric_name></span><span class="p">,</span>
<span class="nt">"isInputHyperUnique"</span> <span class="p">:</span> <span class="kc">false</span><span class="p">,</span>
<span class="nt">"round"</span> <span class="p">:</span> <span class="kc">false</span>
<span class="p">}</span>
diff --git a/docs/0.15.1-incubating/querying/limitspec.html b/docs/0.15.1-incubating/querying/limitspec.html
index 84870d7..82f61c6 100644
--- a/docs/0.15.1-incubating/querying/limitspec.html
+++ b/docs/0.15.1-incubating/querying/limitspec.html
@@ -157,8 +157,8 @@
<p>The default limit spec takes a limit and the list of columns to do an orderBy operation over. The grammar is:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"default"</span><span class="p">,</span>
- <span class="nt">"limit"</span> <span class="p">:</span> <span class="err"><i</span><span class="kc">nte</span><span class="err">ger_value></span><span class="p">,</span>
- <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">OrderByColum</span><span class="kc">n</span><span class="err">Spec</span><span class="p">],</span>
+ <span class="nt">"limit"</span> <span class="p">:</span> <span class="err"><integer_value></span><span class="p">,</span>
+ <span class="nt">"columns"</span> <span class="p">:</span> <span class="p">[</span><span class="err">list</span> <span class="err">of</span> <span class="err">OrderByColumnSpec</span><span class="p">],</span>
<span class="p">}</span>
</code></pre></div>
<h4 id="orderbycolumnspec">OrderByColumnSpec</h4>
@@ -167,7 +167,7 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"dimension"</span> <span class="p">:</span> <span class="s2">"<Any dimension or metric name>"</span><span class="p">,</span>
<span class="nt">"direction"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"ascending"</span><span class="err">|</span><span class="s2">"descending"</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"dimensionOrder"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"lexicographic"</span><span class="err">(de</span><span class="kc">fault</span><span class="err">)|</span><span class="s2">"alphanumeric"</span><span class="err">|</span><span class="s2">"strlen"</span><span class="err">|</span><span class="s2">"numeric"</span><span class="err">></span>
+ <span class="nt">"dimensionOrder"</span> <span class="p">:</span> <span class="err"><</span><span class="s2">"lexicographic"</span><span class="err">(default)|</span><span class="s2">"alphanumeric"</span><span class="err">|</span><span class="s2">"strlen"</span><span class="err">|</span><span class="s2">"numeric"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
<p>If only the dimension is provided (as a JSON string), the default order-by is ascending with lexicographic sorting.</p>
diff --git a/docs/0.15.1-incubating/querying/post-aggregations.html b/docs/0.15.1-incubating/querying/post-aggregations.html
index 1e19174..559b697 100644
--- a/docs/0.15.1-incubating/querying/post-aggregations.html
+++ b/docs/0.15.1-incubating/querying/post-aggregations.html
@@ -177,12 +177,12 @@
</ul>
<p>The grammar for an arithmetic post aggregation is:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">pos</span><span class="kc">t</span><span class="err">Aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">postAggregation</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arithmetic"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fn"</span> <span class="p">:</span> <span class="err"><ari</span><span class="kc">t</span><span class="err">hme</span><span class="kc">t</span><span class="err">ic_</span><span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
- <span class="nt">"ordering"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">null</span> <span class="err">(de</span><span class="kc">fault</span><span class="err">)</span><span class="p">,</span> <span class="err">or</span> <span class="s2">"numericFirst"</span><span class="err">></span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fn"</span> <span class="p">:</span> <span class="err"><arithmetic_function></span><span class="p">,</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><post_aggregator></span><span class="p">,</span> <span class="err"><post_aggregator></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
+ <span class="nt">"ordering"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">null</span> <span class="err">(default)</span><span class="p">,</span> <span class="err">or</span> <span class="nt">"numericFirst"</span><span class="err">></span>
<span class="p">}</span>
</code></pre></div>
<h3 id="field-accessor-post-aggregators">Field accessor post-aggregators</h3>
@@ -193,15 +193,15 @@
For complex aggregators, like "cardinality" and "hyperUnique", the <code>type</code> of the post-aggregator determines what
the post-aggregator will return. Use type "fieldAccess" to return the raw aggregation object, or use type
"finalizingFieldAccess" to return a finalized value, such as an estimated cardinality.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"fieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<p>or</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"finalizingFieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"finalizingFieldAccess"</span><span class="p">,</span> <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><aggregator_name></span> <span class="p">}</span>
</code></pre></div>
<h3 id="constant-post-aggregator">Constant post-aggregator</h3>
<p>The constant post-aggregator always returns the specified value.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"constant"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">nu</span><span class="err">merical_value></span> <span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"constant"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span> <span class="nt">"value"</span> <span class="p">:</span> <span class="err"><numerical_value></span> <span class="p">}</span>
</code></pre></div>
<h3 id="greatest-least-post-aggregators">Greatest / Least post-aggregators</h3>
@@ -216,18 +216,18 @@
<p>Example:</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"doubleGreatest"</span><span class="p">,</span>
- <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err"><pos</span><span class="kc">t</span><span class="err">_aggrega</span><span class="kc">t</span><span class="err">or></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span>
+ <span class="nt">"name"</span> <span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><post_aggregator></span><span class="p">,</span> <span class="err"><post_aggregator></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span>
<span class="p">}</span>
</code></pre></div>
<h3 id="javascript-post-aggregator">JavaScript post-aggregator</h3>
<p>Applies the provided JavaScript function to the given fields. Fields are passed as arguments to the JavaScript function in the given order.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">pos</span><span class="kc">t</span><span class="err">Aggrega</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="err">postAggregation</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"javascript"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span><span class="err">_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="err"><aggrega</span><span class="kc">t</span><span class="err">or_</span><span class="kc">na</span><span class="err">me></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
- <span class="nt">"function"</span><span class="p">:</span> <span class="err"><javascrip</span><span class="kc">t</span> <span class="kc">fun</span><span class="err">c</span><span class="kc">t</span><span class="err">io</span><span class="kc">n</span><span class="err">></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output_name></span><span class="p">,</span>
+ <span class="nt">"fieldNames"</span> <span class="p">:</span> <span class="p">[</span><span class="err"><aggregator_name></span><span class="p">,</span> <span class="err"><aggregator_name></span><span class="p">,</span> <span class="err">...</span><span class="p">],</span>
+ <span class="nt">"function"</span><span class="p">:</span> <span class="err"><javascript</span> <span class="err">function></span>
<span class="p">}</span>
</code></pre></div>
<p>Example JavaScript aggregator:</p>
@@ -247,16 +247,16 @@
<p>The hyperUniqueCardinality post aggregator is used to wrap a hyperUnique object such that it can be used in post aggregations.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUniqueCardinality"</span><span class="p">,</span>
- <span class="nt">"name"</span><span class="p">:</span> <span class="err"><ou</span><span class="kc">t</span><span class="err">pu</span><span class="kc">t</span> <span class="kc">na</span><span class="err">me></span><span class="p">,</span>
- <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><</span><span class="kc">t</span><span class="err">he</span> <span class="kc">na</span><span class="err">me</span> <span class="kc">f</span><span class="err">ield</span> <span class="err">value</span> <span class="err">o</span><span class="kc">f</span> <span class="kc">t</span><span class="err">he</span> <span class="err">hyperU</span><span class="kc">n</span><span class="err">ique</span> <span class="err">aggrega</span><span class="kc">t</span><span class="err">or></span>
+ <span class="nt">"name"</span><span class="p">:</span> <span class="err"><output</span> <span class="err">name></span><span class="p">,</span>
+ <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="err"><the</span> <span class="err">name</span> <span class="err">field</span> <span class="err">value</span> <span class="err">of</span> <span class="err">the</span> <span class="err">hyperUnique</span> <span class="err">aggregator></span>
<span class="p">}</span>
</code></pre></div>
<p>It can be used in a sample calculation as so:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"aggregations"</span> <span class="p">:</span> <span class="p">[{</span>
- <span class="p">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"rows"</span><span class="p">},</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"aggregations"</span> <span class="err">:</span> <span class="p">[{</span>
+ <span class="err">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"count"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"rows"</span><span class="p">},</span>
<span class="p">{</span><span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"hyperUnique"</span><span class="p">,</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"unique_users"</span><span class="p">,</span> <span class="nt">"fieldName"</span> <span class="p">:</span> <span class="s2">"uniques"</span><span class="p">}</span>
- <span class="p">}],</span>
- <span class="nt">"postAggregations"</span> <span class="p">:</span> <span class="p">[{</span>
+ <span class="err">}</span><span class="p">]</span><span class="err">,</span>
+ <span class="s2">"postAggregations"</span> <span class="err">:</span> <span class="p">[{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"arithmetic"</span><span class="p">,</span>
<span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"average_users_per_row"</span><span class="p">,</span>
<span class="nt">"fn"</span> <span class="p">:</span> <span class="s2">"/"</span><span class="p">,</span>
diff --git a/docs/0.15.1-incubating/querying/segmentmetadataquery.html b/docs/0.15.1-incubating/querying/segmentmetadataquery.html
index 703e178..e0e6406 100644
--- a/docs/0.15.1-incubating/querying/segmentmetadataquery.html
+++ b/docs/0.15.1-incubating/querying/segmentmetadataquery.html
@@ -263,17 +263,17 @@
<h4 id="all">All</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"all"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"all"</span><span class="p">}</span>
</code></pre></div>
<h4 id="none">None</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"none"</span><span class="p">}</span>
</code></pre></div>
<h4 id="list">List</h4>
<p>The grammar is as follows:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"toInclude"</span><span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"list"</span><span class="p">,</span> <span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="err"><s</span><span class="kc">tr</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">lis</span><span class="kc">t</span> <span class="err">o</span><span class="kc">f</span> <span class="err">colum</span><span class="kc">n</span> <span class="kc">na</span><span class="err">mes></span><span class="p">]}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"toInclude"</span><span class="err">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"list"</span><span class="p">,</span> <span class="nt">"columns"</span><span class="p">:</span> <span class="p">[</span><span class="err"><string</span> <span class="err">list</span> <span class="err">of</span> <span class="err">column</span> <span class="err">names></span><span class="p">]}</span>
</code></pre></div>
<h3 id="analysistypes">analysisTypes</h3>
diff --git a/docs/0.15.1-incubating/querying/select-query.html b/docs/0.15.1-incubating/querying/select-query.html
index 4ac4e4e..68f9077 100644
--- a/docs/0.15.1-incubating/querying/select-query.html
+++ b/docs/0.15.1-incubating/querying/select-query.html
@@ -342,9 +342,9 @@
<p>The <code>threshold</code> determines how many hits are returned, with each hit indexed by an offset. When <code>descending</code> is true, the offset will be negative value.</p>
<p>The results above include:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"pagingIdentifiers"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"pagingIdentifiers"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"wikipedia_2012-12-29T00:00:00.000Z_2013-01-10T08:00:00.000Z_2013-01-10T08:13:47.830Z_v9"</span> <span class="p">:</span> <span class="mi">4</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<h3 id="result-pagination">Result Pagination</h3>
@@ -353,7 +353,7 @@
<p>The <code>threshold</code> option controls how many rows are returned in each block of paginated results.</p>
<p>To initiate a paginated query, the user should specify a PagingSpec with a <code>threshold</code> set and a blank <code>pagingIdentifiers</code> field, e.g.:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"pagingSpec"</span><span class="p">:{</span><span class="nt">"pagingIdentifiers"</span><span class="p">:</span> <span class="p">{},</span> <span class="nt">"threshold"</span><span class="p">:</span><span class="mi">5</span><span class="p">}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"pagingSpec"</span><span class="err">:</span><span class="p">{</span><span class="nt">"pagingIdentifiers"</span><span class="p">:</span> <span class="p">{},</span> <span class="nt">"threshold"</span><span class="p">:</span><span class="mi">5</span><span class="p">}</span>
</code></pre></div>
<p>When the query returns, the results will contain a <code>pagingIndentifers</code> field indicating the current pagination point in the result set (an identifier and an offset).</p>
@@ -382,9 +382,9 @@
<span class="p">}</span>
</code></pre></div>
<p>The paginated query with <code>fromNext</code> set to false returns a result set with the following <code>pagingIdentifiers</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"pagingIdentifiers"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"pagingIdentifiers"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"wikipedia_2012-12-29T00:00:00.000Z_2013-01-10T08:00:00.000Z_2013-01-10T08:13:47.830Z_v9"</span> <span class="p">:</span> <span class="mi">4</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<p>To retrieve the next result set, the next query must be sent with the paging offset (4) incremented by 1.</p>
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="p">{</span>
diff --git a/docs/0.15.1-incubating/querying/sql.html b/docs/0.15.1-incubating/querying/sql.html
index 0ba27c7..dcdaf73 100644
--- a/docs/0.15.1-incubating/querying/sql.html
+++ b/docs/0.15.1-incubating/querying/sql.html
@@ -1058,22 +1058,22 @@
<p>Example code:</p>
<div class="highlight"><pre><code class="language-java" data-lang="java"><span></span><span class="c1">// Connect to /druid/v2/sql/avatica/ on your Broker.</span>
-<span class="n">String</span> <span class="n">url</span> <span class="o">=</span> <span class="s">"jdbc:avatica:remote:url=http://localhost:8082/druid/v2/sql/avatica/"</span><span class="p">;</span>
+<span class="n">String</span> <span class="n">url</span> <span class="o">=</span> <span class="s">"jdbc:avatica:remote:url=http://localhost:8082/druid/v2/sql/avatica/"</span><span class="o">;</span>
<span class="c1">// Set any connection context parameters you need here (see "Connection context" below).</span>
<span class="c1">// Or leave empty for default behavior.</span>
-<span class="n">Properties</span> <span class="n">connectionProperties</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="p">();</span>
+<span class="n">Properties</span> <span class="n">connectionProperties</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">();</span>
-<span class="k">try</span> <span class="p">(</span><span class="n">Connection</span> <span class="n">connection</span> <span class="o">=</span> <span class="n">DriverManager</span><span class="p">.</span><span class="na">getConnection</span><span class="p">(</span><span class="n">url</span><span class="p">,</span> <span class="n">connectionProperties</span><span class="p">))</span> <span class="p">{</span>
- <span class="k">try</span> <span class="p">(</span>
- <span class="kd">final</span> <span class="n">Statement</span> <span class="n">statement</span> <span class="o">=</span> <span class="n">connection</span><span class="p">.</span><span class="na">createStatement</span><span class="p">();</span>
- <span class="kd">final</span> <span class="n">ResultSet</span> <span class="n">resultSet</span> <span class="o">=</span> <span class="n">statement</span><span class="p">.</span><span class="na">executeQuery</span><span class="p">(</span><span class="n">query</span><span class="p">)</span>
- <span class="p">)</span> <span class="p">{</span>
- <span class="k">while</span> <span class="p">(</span><span class="n">resultSet</span><span class="p">.</span><span class="na">next</span><span class="p">())</span> <span class="p">{</span>
+<span class="k">try</span> <span class="o">(</span><span class="n">Connection</span> <span class="n">connection</span> <span class="o">=</span> <span class="n">DriverManager</span><span class="o">.</span><span class="na">getConnection</span><span class="o">(</span><span class="n">url</span><span class="o">,</span> <span class="n">connectionProperties</span><span class="o">))</span> <span class="o">{</span>
+ <span class="k">try</span> <span class="o">(</span>
+ <span class="kd">final</span> <span class="n">Statement</span> <span class="n">statement</span> <span class="o">=</span> <span class="n">connection</span><span class="o">.</span><span class="na">createStatement</span><span class="o">();</span>
+ <span class="kd">final</span> <span class="n">ResultSet</span> <span class="n">resultSet</span> <span class="o">=</span> <span class="n">statement</span><span class="o">.</span><span class="na">executeQuery</span><span class="o">(</span><span class="n">query</span><span class="o">)</span>
+ <span class="o">)</span> <span class="o">{</span>
+ <span class="k">while</span> <span class="o">(</span><span class="n">resultSet</span><span class="o">.</span><span class="na">next</span><span class="o">())</span> <span class="o">{</span>
<span class="c1">// Do something</span>
- <span class="p">}</span>
- <span class="p">}</span>
-<span class="p">}</span>
+ <span class="o">}</span>
+ <span class="o">}</span>
+<span class="o">}</span>
</code></pre></div>
<p>Table metadata is available over JDBC using <code>connection.getMetaData()</code> or by querying the
<a href="#retrieving-metadata">"INFORMATION_SCHEMA" tables</a>. Parameterized queries (using <code>?</code> or other placeholders) don't work properly,
diff --git a/docs/0.15.1-incubating/querying/timeboundaryquery.html b/docs/0.15.1-incubating/querying/timeboundaryquery.html
index 28421a5..cc95333 100644
--- a/docs/0.15.1-incubating/querying/timeboundaryquery.html
+++ b/docs/0.15.1-incubating/querying/timeboundaryquery.html
@@ -154,8 +154,8 @@
<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="p">{</span>
<span class="nt">"queryType"</span> <span class="p">:</span> <span class="s2">"timeBoundary"</span><span class="p">,</span>
<span class="nt">"dataSource"</span><span class="p">:</span> <span class="s2">"sample_datasource"</span><span class="p">,</span>
- <span class="nt">"bound"</span> <span class="p">:</span> <span class="err"><</span> <span class="s2">"maxTime"</span> <span class="err">|</span> <span class="s2">"minTime"</span> <span class="err">></span> <span class="err">#</span> <span class="err">op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span><span class="p">,</span> <span class="err">de</span><span class="kc">faults</span> <span class="kc">t</span><span class="err">o</span> <span class="err">re</span><span class="kc">turn</span><span class="err">i</span><span class="kc">n</span><span class="err">g</span> <span class="err">bo</span><span class="kc">t</span><span class="err">h</span> <span class="kc">t</span><span class="err">imes</span><span class="kc">ta</span><span class="err">mps</span> <span class="err">i</span><span class="kc">f</span> <span class="kc">n</span><span class="err">o</span><span class="kc">t</span> <span class="err">se</span><span class="kc">t</span>
- <span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err"><</span><span class="kc">f</span><span class="err">il</span><span class="kc">ter</span><span class="err">></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span> <span class="err">#</span> <span class="err">op</span><span class="kc">t</span><span class="err">io</span><span class="kc">nal</span>
+ <span class="nt">"bound"</span> <span class="p">:</span> <span class="err"><</span> <span class="s2">"maxTime"</span> <span class="err">|</span> <span class="s2">"minTime"</span> <span class="err">></span> <span class="err">#</span> <span class="err">optional</span><span class="p">,</span> <span class="err">defaults</span> <span class="err">to</span> <span class="err">returning</span> <span class="err">both</span> <span class="err">timestamps</span> <span class="err">if</span> <span class="err">not</span> <span class="err">set</span>
+ <span class="nt">"filter"</span> <span class="p">:</span> <span class="p">{</span> <span class="nt">"type"</span><span class="p">:</span> <span class="s2">"and"</span><span class="p">,</span> <span class="nt">"fields"</span><span class="p">:</span> <span class="p">[</span><span class="err"><filter></span><span class="p">,</span> <span class="err"><filter></span><span class="p">,</span> <span class="err">...</span><span class="p">]</span> <span class="p">}</span> <span class="err">#</span> <span class="err">optional</span>
<span class="p">}</span>
</code></pre></div>
<p>There are 3 main parts to a time boundary query:</p>
diff --git a/docs/0.15.1-incubating/querying/topnmetricspec.html b/docs/0.15.1-incubating/querying/topnmetricspec.html
index 1c09c05..102cf3b 100644
--- a/docs/0.15.1-incubating/querying/topnmetricspec.html
+++ b/docs/0.15.1-incubating/querying/topnmetricspec.html
@@ -155,10 +155,10 @@
<h2 id="numeric-topnmetricspec">Numeric TopNMetricSpec</h2>
<p>The simplest metric specification is a String value indicating the metric to sort topN results by. They are included in a topN query with:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="s2">"<metric_name>"</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="s2">"<metric_name>"</span>
</code></pre></div>
<p>The metric field can also be given as a JSON object. The grammar for dimension values sorted by numeric value is shown below:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"numeric"</span><span class="p">,</span>
<span class="nt">"metric"</span><span class="p">:</span> <span class="s2">"<metric_name>"</span>
<span class="p">}</span>
@@ -215,7 +215,7 @@
</tbody></table>
<p>The following metricSpec uses lexicographic sorting.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"dimension"</span><span class="p">,</span>
<span class="nt">"ordering"</span><span class="p">:</span> <span class="s2">"lexicographic"</span><span class="p">,</span>
<span class="nt">"previousStop"</span><span class="p">:</span> <span class="s2">"<previousStop_value>"</span>
@@ -226,9 +226,9 @@
<h2 id="inverted-topnmetricspec">Inverted TopNMetricSpec</h2>
<p>Sort dimension values in inverted order, i.e inverts the order of the delegate metric spec. It can be used to sort the values in ascending order.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"metric"</span><span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"metric"</span><span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span><span class="p">:</span> <span class="s2">"inverted"</span><span class="p">,</span>
- <span class="nt">"metric"</span><span class="p">:</span> <span class="err"><delega</span><span class="kc">te</span><span class="err">_</span><span class="kc">t</span><span class="err">op_</span><span class="kc">n</span><span class="err">_me</span><span class="kc">tr</span><span class="err">ic_spec></span>
+ <span class="nt">"metric"</span><span class="p">:</span> <span class="err"><delegate_top_n_metric_spec></span>
<span class="p">}</span>
</code></pre></div>
<table><thead>
diff --git a/docs/0.15.1-incubating/tutorials/tutorial-compaction.html b/docs/0.15.1-incubating/tutorials/tutorial-compaction.html
index 32481cb..d96c7b8 100644
--- a/docs/0.15.1-incubating/tutorials/tutorial-compaction.html
+++ b/docs/0.15.1-incubating/tutorials/tutorial-compaction.html
@@ -189,7 +189,7 @@
├────────┤
│ <span class="m">39244</span> │
└────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">1</span>.38s.
+Retrieved <span class="m">1</span> row in <span class="m">1</span>.38s.
</code></pre></div>
<h2 id="compact-the-data">Compact the data</h2>
@@ -235,7 +235,7 @@
├────────┤
│ <span class="m">39244</span> │
└────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">1</span>.30s.
+Retrieved <span class="m">1</span> row in <span class="m">1</span>.30s.
</code></pre></div>
<p>After the Coordinator has been running for at least 15 minutes, the <a href="http://localhost:8888/unified-console.html#segments">segments view</a> should show there are 24 segments, one per hour:</p>
diff --git a/docs/0.15.1-incubating/tutorials/tutorial-ingestion-spec.html b/docs/0.15.1-incubating/tutorials/tutorial-ingestion-spec.html
index c4d36be..d821056 100644
--- a/docs/0.15.1-incubating/tutorials/tutorial-ingestion-spec.html
+++ b/docs/0.15.1-incubating/tutorials/tutorial-ingestion-spec.html
@@ -194,14 +194,14 @@
<p>Let's start with an empty <code>dataSchema</code> and add fields to it as we progress through the tutorial.</p>
<p>Create a new file called <code>ingestion-tutorial-index.json</code> in <code>quickstart/</code> with the following contents:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{}</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{}</span>
</code></pre></div>
<p>We will be making successive edits to this ingestion spec as we progress through the tutorial.</p>
<h3 id="datasource-name">Datasource name</h3>
<p>The datasource name is specified by the <code>dataSource</code> parameter in the <code>dataSchema</code>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="p">}</span>
</code></pre></div>
@@ -212,7 +212,7 @@
<p>A <code>dataSchema</code> has a <code>parser</code> field, which defines the parser that Druid will use to interpret the input data.</p>
<p>Since our input data is represented as JSON strings, we'll use a <code>string</code> parser with <code>json</code> format:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -227,7 +227,7 @@
<p>The <code>parser</code> needs to know how to extract the main timestamp field from the input data. When using a <code>json</code> type <code>parseSpec</code>, the timestamp is defined in a <code>timestampSpec</code>. </p>
<p>The timestamp column in our input data is named "ts", containing ISO 8601 timestamps, so let's add a <code>timestampSpec</code> with that information to the <code>parseSpec</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -261,7 +261,7 @@
<p>For this tutorial, let's enable rollup. This is specified with a <code>granularitySpec</code> on the <code>dataSchema</code>. </p>
<p>Note that the <code>granularitySpec</code> lies outside of the <code>parser</code>. We will revist the <code>parser</code> soon when we define our dimensions and metrics.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -294,7 +294,7 @@
<h4 id="dimensions">Dimensions</h4>
<p>Dimensions are specified with a <code>dimensionsSpec</code> inside the <code>parseSpec</code>.</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -337,7 +337,7 @@
<h4 id="metrics">Metrics</h4>
<p>Metrics are specified with a <code>metricsSpec</code> inside the <code>dataSchema</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -380,7 +380,7 @@
<h3 id="no-rollup">No rollup</h3>
<p>If we were not using rollup, all columns would be specified in the <code>dimensionsSpec</code>, e.g.:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"dimensionsSpec"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"dimensionsSpec"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dimensions"</span><span class="p">:</span> <span class="p">[</span>
<span class="s2">"srcIP"</span><span class="p">,</span>
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"srcPort"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"long"</span> <span class="p">},</span>
@@ -391,7 +391,7 @@
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"bytes"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"long"</span> <span class="p">},</span>
<span class="p">{</span> <span class="nt">"name"</span> <span class="p">:</span> <span class="s2">"srcPort"</span><span class="p">,</span> <span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"double"</span> <span class="p">}</span>
<span class="p">]</span>
- <span class="p">},</span>
+ <span class="p">}</span><span class="err">,</span>
</code></pre></div>
<h3 id="define-granularities">Define granularities</h3>
@@ -405,7 +405,7 @@
<h4 id="segment-granularity">Segment granularity</h4>
<p>Segment granularity is configured by the <code>segmentGranularity</code> property in the <code>granularitySpec</code>. For this tutorial, we'll create hourly segments:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -444,7 +444,7 @@
<h4 id="query-granularity">Query granularity</h4>
<p>The query granularity is configured by the <code>queryGranularity</code> property in the <code>granularitySpec</code>. For this tutorial, let's use minute granularity:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -474,8 +474,8 @@
<span class="nt">"granularitySpec"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"uniform"</span><span class="p">,</span>
<span class="nt">"segmentGranularity"</span> <span class="p">:</span> <span class="s2">"HOUR"</span><span class="p">,</span>
- <span class="nt">"queryGranularity"</span> <span class="p">:</span> <span class="nt">"MINUTE"</span>
- <span class="nt">"rollup"</span> <span class="p">:</span> <span class="kc">true</span>
+ <span class="nt">"queryGranularity"</span> <span class="p">:</span> <span class="s2">"MINUTE"</span>
+ <span class="s2">"rollup"</span> <span class="p">:</span> <span class="kc">true</span>
<span class="p">}</span>
<span class="p">}</span>
</code></pre></div>
@@ -490,7 +490,7 @@
<p>For batch tasks, it is necessary to define a time interval. Input rows with timestamps outside of the time interval will not be ingested.</p>
<p>The interval is also specified in the <code>granularitySpec</code>:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="nt">"dataSchema"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span><span class="s2">"dataSchema"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"dataSource"</span> <span class="p">:</span> <span class="s2">"ingestion-tutorial"</span><span class="p">,</span>
<span class="nt">"parser"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"string"</span><span class="p">,</span>
@@ -575,7 +575,7 @@
<h2 id="define-the-input-source">Define the input source</h2>
<p>Now let's define our input source, which is specified in an <code>ioConfig</code> object. Each task type has its own type of <code>ioConfig</code>. The native batch task uses "firehoses" to read input data, so let's configure a "local" firehose to read the example netflow data we saved earlier:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"ioConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"ioConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"index"</span><span class="p">,</span>
<span class="nt">"firehose"</span> <span class="p">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"local"</span><span class="p">,</span>
@@ -637,7 +637,7 @@
<p>Each ingestion task has a <code>tuningConfig</code> section that allows users to tune various ingestion parameters.</p>
<p>As an example, let's add a <code>tuningConfig</code> that sets a target segment size for the native batch ingestion task:</p>
-<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="nt">"tuningConfig"</span> <span class="p">:</span> <span class="p">{</span>
+<div class="highlight"><pre><code class="language-json" data-lang="json"><span></span> <span class="s2">"tuningConfig"</span> <span class="err">:</span> <span class="p">{</span>
<span class="nt">"type"</span> <span class="p">:</span> <span class="s2">"index"</span><span class="p">,</span>
<span class="nt">"maxRowsPerSegment"</span> <span class="p">:</span> <span class="mi">5000000</span>
<span class="p">}</span>
@@ -722,7 +722,7 @@
│ <span class="m">2018</span>-01-01T02:33:00.000Z │ <span class="m">30000</span> │ <span class="m">56</span>.9 │ <span class="m">2</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">5000</span> │ <span class="m">300</span> │ <span class="m">17</span> │ <span class="m">7</span>.7.7.7 │ <span class="m">4000</span> │
│ <span class="m">2018</span>-01-01T02:35:00.000Z │ <span class="m">30000</span> │ <span class="m">46</span>.3 │ <span class="m">1</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">5000</span> │ <span class="m">300</span> │ <span class="m">17</span> │ <span class="m">7</span>.7.7.7 │ <span class="m">4000</span> │
└──────────────────────────┴───────┴──────┴───────┴─────────┴─────────┴─────────┴──────────┴─────────┴─────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">0</span>.12s.
+Retrieved <span class="m">5</span> rows in <span class="m">0</span>.12s.
dsql>
</code></pre></div>
diff --git a/docs/0.15.1-incubating/tutorials/tutorial-query.html b/docs/0.15.1-incubating/tutorials/tutorial-query.html
index 2887c53..a6612a8 100644
--- a/docs/0.15.1-incubating/tutorials/tutorial-query.html
+++ b/docs/0.15.1-incubating/tutorials/tutorial-query.html
@@ -215,7 +215,7 @@
│ Wikipedia:In the news/Candidates │ <span class="m">17</span> │
│ Wikipedia:Requests <span class="k">for</span> page protection │ <span class="m">17</span> │
└──────────────────────────────────────────────────────────┴───────┘
-Retrieved <span class="m">10</span> rows <span class="k">in</span> <span class="m">0</span>.06s.
+Retrieved <span class="m">10</span> rows in <span class="m">0</span>.06s.
</code></pre></div>
<h3 id="query-sql-over-http">Query SQL over HTTP</h3>
@@ -312,7 +312,7 @@
├─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ DruidQueryRel<span class="o">(</span><span class="nv">query</span><span class="o">=[{</span><span class="s2">"queryType"</span>:<span class="s2">"topN"</span>,<span class="s2">"dataSource"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"table"</span>,<span class="s2">"name"</span>:<span class="s2">"wikipedia"</span><span class="o">}</span>,<span class="s2">"virtualColumns"</span>:<span class="o">[]</span>,<span class="s2">"dimension"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"default"</span>,<span class="s2">"dimension"</span>:<span class="s2">"page"</span>,<span class="s2">"outputName"</span>:<span class="s2">"d0"</span>,<span class="s2">"outputType"</span>:<span class="s2">"STRING"</span><span class="o">}</span>,<span class="s2">"metric"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"numeric"</span>,<span class="s2">"metric"</span>:<span class="s2">"a0"</span><span class="o">}</span>,<span class="s2">"threshold"</span>:10,<span class="s2">"intervals"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"intervals"</span>,<span class="s2">"intervals"</span>:<span class="o">[</span><span class="s2">"2015-09-12T00:00:00.000Z/2015-09-13T00:00:00.001Z"</span><span class="o">]}</span>,<span class="s2">"filter"</span>:null,<span class="s2">"granularity"</span>:<span class="o">{</span><span class="s2">"type"</span>:<span class="s2">"all"</span><span class="o">}</span>,<span class="s2">"aggregations"</span>:<span class="o">[{</span><span class="s2">"type"</span>:<span class="s2">"count"</span>,<span class="s2">"name"</span>:<span class="s2">"a0"</span><span class="o">}]</span>,<span class="s2">"postAggregations"</span>:<span class="o">[]</span>,<span class="s2">"context"</span>:<span class="o">{}</span>,<span class="s2">"descending"</span>:false<span class="o">}]</span>, <span class="nv">signature</span><span class="o">=[{</span>d0:STRING, a0:LONG<span class="o">}])</span> │
└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-Retrieved <span class="m">1</span> row <span class="k">in</span> <span class="m">0</span>.03s.
+Retrieved <span class="m">1</span> row in <span class="m">0</span>.03s.
</code></pre></div>
<h2 id="native-json-queries">Native JSON queries</h2>
diff --git a/docs/0.15.1-incubating/tutorials/tutorial-rollup.html b/docs/0.15.1-incubating/tutorials/tutorial-rollup.html
index 889c1af..8c445b1 100644
--- a/docs/0.15.1-incubating/tutorials/tutorial-rollup.html
+++ b/docs/0.15.1-incubating/tutorials/tutorial-rollup.html
@@ -255,7 +255,7 @@
│ <span class="m">2018</span>-01-02T21:33:00.000Z │ <span class="m">100288</span> │ <span class="m">2</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">161</span> │ <span class="m">7</span>.7.7.7 │
│ <span class="m">2018</span>-01-02T21:35:00.000Z │ <span class="m">2818</span> │ <span class="m">1</span> │ <span class="m">8</span>.8.8.8 │ <span class="m">12</span> │ <span class="m">7</span>.7.7.7 │
└──────────────────────────┴────────┴───────┴─────────┴─────────┴─────────┘
-Retrieved <span class="m">5</span> rows <span class="k">in</span> <span class="m">1</span>.18s.
+Retrieved <span class="m">5</span> rows in <span class="m">1</span>.18s.
dsql>
</code></pre></div>
diff --git a/docs/0.15.1-incubating/tutorials/tutorial-transform-spec.html b/docs/0.15.1-incubating/tutorials/tutorial-transform-spec.html
index 8329ac6..20409c8 100644
--- a/docs/0.15.1-incubating/tutorials/tutorial-transform-spec.html
+++ b/docs/0.15.1-incubating/tutorials/tutorial-transform-spec.html
@@ -266,7 +266,7 @@
│ <span class="m">2018</span>-01-01T06:01:00.000Z │ super-snake │ <span class="m">1</span> │ <span class="m">3</span> │ <span class="m">300</span> │ <span class="m">900</span> │
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ super-octopus │ <span class="m">1</span> │ <span class="m">1</span> │ <span class="m">100</span> │ <span class="m">300</span> │
└──────────────────────────┴────────────────┴───────┴──────────┴────────┴───────────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">0</span>.03s.
+Retrieved <span class="m">3</span> rows in <span class="m">0</span>.03s.
</code></pre></div>
<p>The "lion" row has been discarded, the <code>animal</code> column has been transformed, and we have both the original and transformed <code>number</code> column.</p>
diff --git a/docs/0.15.1-incubating/tutorials/tutorial-update-data.html b/docs/0.15.1-incubating/tutorials/tutorial-update-data.html
index 0baf67b..480021d 100644
--- a/docs/0.15.1-incubating/tutorials/tutorial-update-data.html
+++ b/docs/0.15.1-incubating/tutorials/tutorial-update-data.html
@@ -179,7 +179,7 @@
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ aardvark │ <span class="m">1</span> │ <span class="m">42</span> │
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ giraffe │ <span class="m">1</span> │ <span class="m">14124</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">1</span>.42s.
+Retrieved <span class="m">3</span> rows in <span class="m">1</span>.42s.
</code></pre></div>
<h3 id="overwrite-the-initial-data">Overwrite the initial data</h3>
@@ -201,7 +201,7 @@
│ <span class="m">2018</span>-01-01T03:01:00.000Z │ aardvark │ <span class="m">1</span> │ <span class="m">9999</span> │
│ <span class="m">2018</span>-01-01T04:01:00.000Z │ bear │ <span class="m">1</span> │ <span class="m">111</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">3</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">3</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<h2 id="combine-old-data-with-new-data-and-overwrite">Combine old data with new data and overwrite</h2>
@@ -224,7 +224,7 @@
│ <span class="m">2018</span>-01-01T06:01:00.000Z │ snake │ <span class="m">1</span> │ <span class="m">1234</span> │
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ octopus │ <span class="m">1</span> │ <span class="m">115</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">6</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">6</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<h2 id="append-to-the-data">Append to the data</h2>
@@ -249,7 +249,7 @@
│ <span class="m">2018</span>-01-01T04:01:00.000Z │ bear │ <span class="m">1</span> │ <span class="m">222</span> │
│ <span class="m">2018</span>-01-01T09:01:00.000Z │ falcon │ <span class="m">1</span> │ <span class="m">1241</span> │
└──────────────────────────┴──────────┴───────┴────────┘
-Retrieved <span class="m">8</span> rows <span class="k">in</span> <span class="m">0</span>.02s.
+Retrieved <span class="m">8</span> rows in <span class="m">0</span>.02s.
</code></pre></div>
<p>If we run a GroupBy query instead of a <code>select *</code>, we can see that the "bear" rows will group together at query time:</p>
<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span></span>dsql> <span class="k">select</span> __time, animal, SUM<span class="o">(</span><span class="s2">"count"</span><span class="o">)</span>, SUM<span class="o">(</span><span class="s2">"number"</span><span class="o">)</span> from <span class="s2">"updates-tutorial"</span> group by __time, animal<span class="p">;</span>
@@ -264,7 +264,7 @@
│ <span class="m">2018</span>-01-01T07:01:00.000Z │ octopus │ <span class="m">1</span> │ <span class="m">115</span> │
│ <span class="m">2018</span>-01-01T09:01:00.000Z │ falcon │ <span class="m">1</span> │ <span class="m">1241</span> │
└──────────────────────────┴──────────┴────────┴────────┘
-Retrieved <span class="m">7</span> rows <span class="k">in</span> <span class="m">0</span>.23s.
+Retrieved <span class="m">7</span> rows in <span class="m">0</span>.23s.
</code></pre></div>
</div>
<div class="col-md-3">
diff --git a/index.html b/index.html
index e5cc18f..82052cf 100644
--- a/index.html
+++ b/index.html
@@ -269,6 +269,74 @@
</p>
</div>
+ <div class="event">
+ <div class="mini-cal">
+ <div class="date-month">
+ Jul
+ </div>
+ <div class="date-day">
+ 21
+ </div>
+ </div>
+ <p>
+ <a href="https://druidsummit.org/events/druid-summit-seattle-2022/">
+ <span class ="title">Druid Summit – Seattle</span><br>
+ <span class="text-muted">Organized by Imply</span>
+ </a>
+ </p>
+ </div>
+
+ <div class="event">
+ <div class="mini-cal">
+ <div class="date-month">
+ Jul
+ </div>
+ <div class="date-day">
+ 26
+ </div>
+ </div>
+ <p>
+ <a href="https://druidsummit.org/events/druid-summit-chicago-2022/">
+ <span class ="title">Druid Summit – Chicago</span><br>
+ <span class="text-muted">Organized by Imply</span>
+ </a>
+ </p>
+ </div>
+
+ <div class="event">
+ <div class="mini-cal">
+ <div class="date-month">
+ Aug
+ </div>
+ <div class="date-day">
+ 4
+ </div>
+ </div>
+ <p>
+ <a href="https://druidsummit.org/events/druid-summit-new-york-city-2022/">
+ <span class ="title">Druid Summit – New York City</span><br>
+ <span class="text-muted">Organized by Imply</span>
+ </a>
+ </p>
+ </div>
+
+ <div class="event">
+ <div class="mini-cal">
+ <div class="date-month">
+ Aug
+ </div>
+ <div class="date-day">
+ 10
+ </div>
+ </div>
+ <p>
+ <a href="https://druidsummit.org/events/druid-summit-los-angeles-2022/">
+ <span class ="title">Druid Summit – Los Angeles</span><br>
+ <span class="text-muted">Organized by Imply</span>
+ </a>
+ </p>
+ </div>
+
<a class="btn btn-default btn-xs" href="https://www.meetup.com/topics/apache-druid/">Join a Druid Meetup!</a>
</div>
