Author: jhyde
Date: Sat Jul 29 04:02:26 2017
New Revision: 1803353
URL: http://svn.apache.org/viewvc?rev=1803353&view=rev
Log:
Revert adapters page, until OS adapter is released
Modified:
calcite/site/docs/adapter.html
calcite/site/docs/reference.html
Modified: calcite/site/docs/adapter.html
URL:
http://svn.apache.org/viewvc/calcite/site/docs/adapter.html?rev=1803353&r1=1803352&r2=1803353&view=diff
==============================================================================
--- calcite/site/docs/adapter.html (original)
+++ calcite/site/docs/adapter.html Sat Jul 29 04:02:26 2017
@@ -117,7 +117,6 @@ presenting the data as tables within a s
<li><a href="file_adapter.html">File adapter</a> (<a
href="/apidocs/org/apache/calcite/adapter/file/package-summary.html">calcite-file</a>)</li>
<li>JDBC adapter (part of <a
href="/apidocs/org/apache/calcite/adapter/jdbc/package-summary.html">calcite-core</a>)</li>
<li>MongoDB adapter (<a
href="/apidocs/org/apache/calcite/adapter/mongodb/package-summary.html">calcite-mongodb</a>)</li>
- <li><a href="os_adapter.html">OS adapter</a> (<a
href="/apidocs/org/apache/calcite/adapter/os/package-summary.html">calcite-os</a>)</li>
<li><a href="pig_adapter.html">Pig adapter</a> (<a
href="/apidocs/org/apache/calcite/adapter/pig/package-summary.html">calcite-pig</a>)</li>
<li>Solr cloud adapter (<a
href="https://github.com/bluejoe2008/solr-sql";>solr-sql</a>)</li>
<li>Spark adapter (<a
href="/apidocs/org/apache/calcite/adapter/spark/package-summary.html">calcite-spark</a>)</li>
Modified: calcite/site/docs/reference.html
URL:
http://svn.apache.org/viewvc/calcite/site/docs/reference.html?rev=1803353&r1=1803352&r2=1803353&view=diff
==============================================================================
--- calcite/site/docs/reference.html (original)
+++ calcite/site/docs/reference.html Sat Jul 29 04:02:26 2017
@@ -234,7 +234,7 @@ form.</p>
<span class="o">|</span> <span class="n">query</span> <span
class="k">INTERSECT</span> <span class="p">[</span> <span class="k">ALL</span>
<span class="o">|</span> <span class="k">DISTINCT</span> <span
class="p">]</span> <span class="n">query</span>
<span class="err">}</span>
<span class="p">[</span> <span class="k">ORDER</span> <span
class="k">BY</span> <span class="n">orderItem</span> <span class="p">[,</span>
<span class="n">orderItem</span> <span class="p">]</span><span
class="o">*</span> <span class="p">]</span>
- <span class="p">[</span> <span class="k">LIMIT</span> <span
class="p">[</span> <span class="k">start</span><span class="p">,</span> <span
class="p">]</span> <span class="err">{</span> <span class="k">count</span>
<span class="o">|</span> <span class="k">ALL</span> <span class="err">}</span>
<span class="p">]</span>
+ <span class="p">[</span> <span class="k">LIMIT</span> <span
class="err">{</span> <span class="k">count</span> <span class="o">|</span>
<span class="k">ALL</span> <span class="err">}</span> <span class="p">]</span>
<span class="p">[</span> <span class="k">OFFSET</span> <span
class="k">start</span> <span class="err">{</span> <span class="k">ROW</span>
<span class="o">|</span> <span class="k">ROWS</span> <span class="err">}</span>
<span class="p">]</span>
<span class="p">[</span> <span class="k">FETCH</span> <span
class="err">{</span> <span class="k">FIRST</span> <span class="o">|</span>
<span class="k">NEXT</span> <span class="err">}</span> <span class="p">[</span>
<span class="k">count</span> <span class="p">]</span> <span
class="err">{</span> <span class="k">ROW</span> <span class="o">|</span> <span
class="k">ROWS</span> <span class="err">}</span> <span class="p">]</span>
@@ -281,14 +281,10 @@ form.</p>
<span class="n">tablePrimary</span><span class="p">:</span>
<span class="p">[</span> <span class="p">[</span> <span
class="n">catalogName</span> <span class="p">.</span> <span class="p">]</span>
<span class="n">schemaName</span> <span class="p">.</span> <span
class="p">]</span> <span class="n">tableName</span>
<span class="s1">'('</span> <span class="k">TABLE</span> <span
class="p">[</span> <span class="p">[</span> <span class="n">catalogName</span>
<span class="p">.</span> <span class="p">]</span> <span
class="n">schemaName</span> <span class="p">.</span> <span class="p">]</span>
<span class="n">tableName</span> <span class="s1">')'</span>
- <span class="o">|</span> <span class="n">tablePrimary</span> <span
class="p">[</span> <span class="n">EXTEND</span> <span class="p">]</span> <span
class="s1">'('</span> <span class="n">columnDecl</span> <span
class="p">[,</span> <span class="n">columnDecl</span> <span
class="p">]</span><span class="o">*</span> <span class="s1">')'</span>
<span class="o">|</span> <span class="p">[</span> <span
class="k">LATERAL</span> <span class="p">]</span> <span class="s1">'('</span>
<span class="n">query</span> <span class="s1">')'</span>
<span class="o">|</span> <span class="k">UNNEST</span> <span
class="s1">'('</span> <span class="n">expression</span> <span
class="s1">')'</span> <span class="p">[</span> <span class="k">WITH</span>
<span class="k">ORDINALITY</span> <span class="p">]</span>
<span class="o">|</span> <span class="p">[</span> <span
class="k">LATERAL</span> <span class="p">]</span> <span class="k">TABLE</span>
<span class="s1">'('</span> <span class="p">[</span> <span
class="k">SPECIFIC</span> <span class="p">]</span> <span
class="n">functionName</span> <span class="s1">'('</span> <span
class="n">expression</span> <span class="p">[,</span> <span
class="n">expression</span> <span class="p">]</span><span class="o">*</span>
<span class="s1">')'</span> <span class="s1">')'</span>
-<span class="n">columnDecl</span><span class="p">:</span>
- <span class="k">column</span> <span class="k">type</span> <span
class="p">[</span> <span class="k">NOT</span> <span class="k">NULL</span> <span
class="p">]</span>
-
<span class="k">values</span><span class="p">:</span>
<span class="k">VALUES</span> <span class="n">expression</span> <span
class="p">[,</span> <span class="n">expression</span> <span
class="p">]</span><span class="o">*</span>
@@ -323,11 +319,6 @@ columns as the target table, except in c
<p>In <em>merge</em>, at least one of the WHEN MATCHED and WHEN NOT MATCHED
clauses must
be present.</p>
-<p><em>tablePrimary</em> may only contain an EXTEND clause in certain
-<a
href="/apidocs/org/apache/calcite/sql/validate/SqlConformance.html#allowExtend--">conformance
levels</a>;
-in those same conformance levels, any <em>column</em> in <em>insert</em> may
be replaced by
-<em>columnDecl</em>, which has a similar effect to including it in an EXTEND
clause.</p>
-
<p>In <em>orderItem</em>, if <em>expression</em> is a positive integer
<em>n</em>, it denotes
the <em>n</em>th item in the SELECT clause.</p>
@@ -363,10 +354,6 @@ but is not standard SQL and is only allo
<p>CROSS APPLY and OUTER APPLY are only allowed in certain
<a
href="/apidocs/org/apache/calcite/sql/validate/SqlConformance.html#isApplyAllowed--">conformance
levels</a>.</p>
-<p>âLIMIT start, countâ is equivalent to âLIMIT count OFFSET startâ
-but is only allowed in certain
-<a
href="/apidocs/org/apache/calcite/sql/validate/SqlConformance.html#isLimitStartCountAllowed--">conformance
levels</a>.</p>
-
<h2 id="keywords">Keywords</h2>
<p>The following is a list of SQL keywords.
@@ -1345,32 +1332,12 @@ the user or application to supply a time
<td style="text-align: left">Whether <em>value</em> is not equal to
every row returned by <em>sub-query</em></td>
</tr>
<tr>
- <td style="text-align: left">value comparison SOME (sub-query)</td>
- <td style="text-align: left">Whether <em>value</em> <em>comparison</em>
at least one row returned by <em>sub-query</em></td>
- </tr>
- <tr>
- <td style="text-align: left">value comparison ANY (sub-query)</td>
- <td style="text-align: left">Synonym for SOME</td>
- </tr>
- <tr>
- <td style="text-align: left">value comparison ALL (sub-query)</td>
- <td style="text-align: left">Whether <em>value</em> <em>comparison</em>
every row returned by <em>sub-query</em></td>
- </tr>
- <tr>
<td style="text-align: left">EXISTS (sub-query)</td>
<td style="text-align: left">Whether <em>sub-query</em> returns at least
one row</td>
</tr>
</tbody>
</table>
-<figure class="highlight"><pre><code class="language-sql"
data-lang="sql"><span class="n">comp</span><span class="p">:</span>
- <span class="o">=</span>
- <span class="o">|</span> <span class="o"><></span>
- <span class="o">|</span> <span class="o">></span>
- <span class="o">|</span> <span class="o">>=</span>
- <span class="o">|</span> <span class="o"><</span>
- <span class="o">|</span> <span class="o"><=</span></code></pre></figure>
-
<h3 id="logical-operators">Logical operators</h3>
<table>
