You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2016/06/12 08:33:23 UTC

svn commit: r1747967 [2/4] - in /calcite/site: community/ css/ docs/

Modified: calcite/site/docs/adapter.html
URL: http://svn.apache.org/viewvc/calcite/site/docs/adapter.html?rev=1747967&r1=1747966&r2=1747967&view=diff
==============================================================================
--- calcite/site/docs/adapter.html (original)
+++ calcite/site/docs/adapter.html Sun Jun 12 08:33:22 2016
@@ -128,6 +128,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -170,6 +174,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -212,6 +220,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -261,6 +273,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -303,6 +319,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -345,6 +365,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -394,6 +418,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -436,6 +464,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -478,6 +510,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -520,6 +556,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -569,6 +609,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -611,6 +655,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -653,6 +701,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -702,6 +754,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -744,6 +800,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -786,6 +846,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -828,6 +892,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -852,6 +920,7 @@ presenting the data as tables within a s
   <li><a href="cassandra_adapter.html">Cassandra adapter</a> (<a href="/apidocs/org/apache/calcite/adapter/cassandra/package-summary.html">calcite-cassandra</a>)</li>
   <li>CSV adapter (<a href="/apidocs/org/apache/calcite/adapter/csv/package-summary.html">example/csv</a>)</li>
   <li><a href="druid_adapter.html">Druid adapter</a> (<a href="/apidocs/org/apache/calcite/adapter/druid/package-summary.html">calcite-druid</a>)</li>
+  <li><a href="elasticsearch_adapter.html">Elasticsearch adapter</a> (<a href="/apidocs/org/apache/calcite/adapter/elasticsearch/package-summary.html">calcite-elasticsearch</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>Spark adapter (<a href="/apidocs/org/apache/calcite/adapter/spark/package-summary.html">calcite-spark</a>)</li>
@@ -888,7 +957,7 @@ Connections can be local or remote (JSON
 as implemented by Avatica’s
 <a href="/apidocs/org/apache/calcite/avatica/ConnectStringParser.html">ConnectStringParser</a>.)</p>
 
-<p>JDBC connect string parameters</p>
+<h2 id="jdbc-connect-string-parameters">JDBC connect string parameters</h2>
 
 <table>
   <thead>
@@ -903,6 +972,10 @@ as implemented by Avatica’s
       <td style="text-align: left">Whether identifiers are matched case-sensitively. If not specified, value from <code class="highlighter-rouge">lex</code> is used.</td>
     </tr>
     <tr>
+      <td style="text-align: left"><a href="/apidocs/org/apache/calcite/config/CalciteConnectionProperty.html#CONFORMANCE">conformance</a></td>
+      <td style="text-align: left">SQL conformance level. Values: “default” (the default, similar to “pragmatic_2003”), “oracle_10”, “pragmatic_99”, “pragmatic_2003”, “strict_92”, “strict_99”, “strict_2003”.</td>
+    </tr>
+    <tr>
       <td style="text-align: left"><a href="/apidocs/org/apache/calcite/config/CalciteConnectionProperty.html#CREATE_MATERIALIZATIONS">createMaterializations</a></td>
       <td style="text-align: left">Whether Calcite should create materializations. Default false.</td>
     </tr>
@@ -939,6 +1012,14 @@ as implemented by Avatica’s
       <td style="text-align: left">Name of initial schema.</td>
     </tr>
     <tr>
+      <td style="text-align: left"><a href="/apidocs/org/apache/calcite/config/CalciteConnectionProperty.html#SCHEMA_FACTORY">schemaFactory</a></td>
+      <td style="text-align: left">Schema factory. The name of a class that implements <a href="/apidocs/org/apache/calcite/schema/SchemaFactory.html">SchemaFactory</a> and has a public default constructor or an <code class="highlighter-rouge">INSTANCE</code> constant. Ignored if <code class="highlighter-rouge">model</code> is specified.</td>
+    </tr>
+    <tr>
+      <td style="text-align: left"><a href="/apidocs/org/apache/calcite/config/CalciteConnectionProperty.html#SCHEMA_TYPE">schemaType</a></td>
+      <td style="text-align: left">Schema type. Value must be “MAP” (the default), “JDBC”, or “CUSTOM” (implicit if <code class="highlighter-rouge">schemaFactory</code> is specified). Ignored if <code class="highlighter-rouge">model</code> is specified.</td>
+    </tr>
+    <tr>
       <td style="text-align: left"><a href="/apidocs/org/apache/calcite/config/CalciteConnectionProperty.html#SPARK">spark</a></td>
       <td style="text-align: left">Specifies whether Spark should be used as the engine for processing that cannot be pushed to the source system. If false (the default), Calcite generates code that implements the Enumerable interface.</td>
     </tr>
@@ -957,6 +1038,40 @@ as implemented by Avatica’s
   </tbody>
 </table>
 
+<p>To make a connection to a single schema based on a built-in schema type, you don’t need to specify
+a model. For example,</p>
+
+<p>jdbc:calcite:schemaType=JDBC; schema.jdbcUser=SCOTT; schema.jdbcPassword=TIGER; schema.jdbcUrl=jdbc:hsqldb:res:foodmart</p>
+
+<p>creates a connection with a schema mapped via the JDBC schema adapter to the foodmart database.</p>
+
+<p>Similarly, you can connect to a single schema based on a user-defined schema adapter.
+For example,</p>
+
+<p>jdbc:calcite:schemaFactory=org.apache.calcite.adapter.cassandra.CassandraSchemaFactory; schema.host=localhost; schema.keyspace=twissandra</p>
+
+<p>makes a connection to the Cassandra adapter, equivalent to writing the following model file:</p>
+
+<p>```json
+{
+  “version”: “1.0”,
+  “defaultSchema”: “foodmart”,
+  “schemas”: [
+    {
+      type: ‘custom’,
+      name: ‘twissandra’,
+      factory: ‘org.apache.calcite.adapter.cassandra.CassandraSchemaFactory’,
+      operand: {
+        host: ‘localhost’,
+        keyspace: ‘twissandra’
+      }
+    }
+  ]
+}</p>
+
+<p>```</p>
+
+<p>Note how each key in the <code class="highlighter-rouge">operand</code> section appears with a <code class="highlighter-rouge">schema.</code> prefix in the connect string.</p>
 
           
 
@@ -1008,6 +1123,7 @@ as implemented by Avatica’s
   
   
   
+  
 
   
 
@@ -1059,6 +1175,14 @@ as implemented by Avatica’s
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/index.html">Background</a></li>
       
 
@@ -1066,6 +1190,7 @@ as implemented by Avatica’s
   
   
   
+  
 
   
 
@@ -1145,6 +1270,14 @@ as implemented by Avatica’s
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/tutorial.html">Tutorial</a></li>
       
 
@@ -1152,6 +1285,7 @@ as implemented by Avatica’s
   
   
   
+  
 
   
 
@@ -1178,6 +1312,7 @@ as implemented by Avatica’s
   
   
   
+  
 
   
 
@@ -1192,6 +1327,7 @@ as implemented by Avatica’s
   
   
   
+  
 
   
 
@@ -1263,6 +1399,14 @@ as implemented by Avatica’s
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/stream.html">Streaming</a></li>
       
 
@@ -1270,6 +1414,7 @@ as implemented by Avatica’s
   
   
   
+  
 
   
 
@@ -1325,6 +1470,14 @@ as implemented by Avatica’s
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/lattice.html">Lattices</a></li>
       
 
@@ -1340,6 +1493,7 @@ as implemented by Avatica’s
   
   
   
+  
 
   
 
@@ -1363,6 +1517,10 @@ as implemented by Avatica’s
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_overview.html">Overview</a></li>
       
 
@@ -1370,6 +1528,7 @@ as implemented by Avatica’s
   
   
   
+  
 
   
 
@@ -1401,6 +1560,10 @@ as implemented by Avatica’s
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_roadmap.html">Roadmap</a></li>
       
 
@@ -1408,6 +1571,7 @@ as implemented by Avatica’s
   
   
   
+  
 
   
 
@@ -1427,6 +1591,10 @@ as implemented by Avatica’s
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_json_reference.html">JSON Reference</a></li>
       
 
@@ -1434,6 +1602,7 @@ as implemented by Avatica’s
   
   
   
+  
 
   
 
@@ -1461,6 +1630,10 @@ as implemented by Avatica’s
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_protobuf_reference.html">Protobuf Reference</a></li>
       
 
@@ -1476,6 +1649,7 @@ as implemented by Avatica’s
   
   
   
+  
 
   
 
@@ -1543,6 +1717,14 @@ as implemented by Avatica’s
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/reference.html">SQL language</a></li>
       
 
@@ -1550,6 +1732,7 @@ as implemented by Avatica’s
   
   
   
+  
 
   
 
@@ -1609,6 +1792,14 @@ as implemented by Avatica’s
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/model.html">JSON models</a></li>
       
 
@@ -1616,6 +1807,7 @@ as implemented by Avatica’s
   
   
   
+  
 
   
 
@@ -1663,6 +1855,14 @@ as implemented by Avatica’s
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/howto.html">HOWTO</a></li>
       
 
@@ -1678,13 +1878,10 @@ as implemented by Avatica’s
   
   
   
-
   
 
   
-    
-    
-    
+
   
     
     
@@ -1721,16 +1918,6 @@ as implemented by Avatica’s
     
     
     
-      <li class=""><a href="/docs/history.html">History</a></li>
-      
-
-
-  
-  
-  
-
-  
-
   
     
     
@@ -1743,30 +1930,17 @@ as implemented by Avatica’s
     
     
     
+      <li class=""><a href="/docs/history.html">History</a></li>
+      
+
+
   
-    
-    
-    
-  
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
+
   
-    
-    
-    
+
   
     
     
@@ -1791,16 +1965,6 @@ as implemented by Avatica’s
     
     
     
-      <li class=""><a href="/docs/powered_by.html">Powered By Calcite</a></li>
-      
-
-
-  
-  
-  
-
-  
-
   
     
     
@@ -1845,26 +2009,17 @@ as implemented by Avatica’s
     
     
     
+      <li class=""><a href="/docs/powered_by.html">Powered By Calcite</a></li>
+      
+
+
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
+
   
-    
-    
-    
+
   
     
     
@@ -1877,12 +2032,14 @@ as implemented by Avatica’s
     
     
     
-  
+      <li class=""><a href="/docs/api/">API</a></li>
+      
 
 
   
   
   
+  
 
   
 
@@ -1963,6 +2120,11 @@ as implemented by Avatica’s
     
     
   
+    
+    
+    
+      <li class=""><a href="/docs/testapi/">Test API</a></li>
+      
 
 
 </ul>

Modified: calcite/site/docs/algebra.html
URL: http://svn.apache.org/viewvc/calcite/site/docs/algebra.html?rev=1747967&r1=1747966&r2=1747967&view=diff
==============================================================================
--- calcite/site/docs/algebra.html (original)
+++ calcite/site/docs/algebra.html Sun Jun 12 08:33:22 2016
@@ -128,6 +128,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -170,6 +174,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -212,6 +220,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -261,6 +273,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -303,6 +319,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -345,6 +365,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -394,6 +418,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -436,6 +464,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -478,6 +510,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -520,6 +556,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -569,6 +609,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -611,6 +655,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -653,6 +701,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -702,6 +754,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -744,6 +800,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -786,6 +846,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -828,6 +892,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -1404,6 +1472,7 @@ added to the stack.</p>
   
   
   
+  
 
   
 
@@ -1455,6 +1524,14 @@ added to the stack.</p>
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/index.html">Background</a></li>
       
 
@@ -1462,6 +1539,7 @@ added to the stack.</p>
   
   
   
+  
 
   
 
@@ -1541,6 +1619,14 @@ added to the stack.</p>
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/tutorial.html">Tutorial</a></li>
       
 
@@ -1548,6 +1634,7 @@ added to the stack.</p>
   
   
   
+  
 
   
 
@@ -1574,6 +1661,7 @@ added to the stack.</p>
   
   
   
+  
 
   
 
@@ -1588,6 +1676,7 @@ added to the stack.</p>
   
   
   
+  
 
   
 
@@ -1659,6 +1748,14 @@ added to the stack.</p>
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/stream.html">Streaming</a></li>
       
 
@@ -1666,6 +1763,7 @@ added to the stack.</p>
   
   
   
+  
 
   
 
@@ -1721,6 +1819,14 @@ added to the stack.</p>
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/lattice.html">Lattices</a></li>
       
 
@@ -1736,6 +1842,7 @@ added to the stack.</p>
   
   
   
+  
 
   
 
@@ -1759,6 +1866,10 @@ added to the stack.</p>
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_overview.html">Overview</a></li>
       
 
@@ -1766,6 +1877,7 @@ added to the stack.</p>
   
   
   
+  
 
   
 
@@ -1797,6 +1909,10 @@ added to the stack.</p>
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_roadmap.html">Roadmap</a></li>
       
 
@@ -1804,6 +1920,7 @@ added to the stack.</p>
   
   
   
+  
 
   
 
@@ -1823,6 +1940,10 @@ added to the stack.</p>
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_json_reference.html">JSON Reference</a></li>
       
 
@@ -1830,6 +1951,7 @@ added to the stack.</p>
   
   
   
+  
 
   
 
@@ -1857,6 +1979,10 @@ added to the stack.</p>
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_protobuf_reference.html">Protobuf Reference</a></li>
       
 
@@ -1872,6 +1998,7 @@ added to the stack.</p>
   
   
   
+  
 
   
 
@@ -1939,6 +2066,14 @@ added to the stack.</p>
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/reference.html">SQL language</a></li>
       
 
@@ -1946,6 +2081,7 @@ added to the stack.</p>
   
   
   
+  
 
   
 
@@ -2005,6 +2141,14 @@ added to the stack.</p>
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/model.html">JSON models</a></li>
       
 
@@ -2012,6 +2156,7 @@ added to the stack.</p>
   
   
   
+  
 
   
 
@@ -2059,6 +2204,14 @@ added to the stack.</p>
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/howto.html">HOWTO</a></li>
       
 
@@ -2074,17 +2227,10 @@ added to the stack.</p>
   
   
   
-
   
 
   
-    
-    
-    
-  
-    
-    
-    
+
   
     
     
@@ -2117,16 +2263,6 @@ added to the stack.</p>
     
     
     
-      <li class=""><a href="/docs/history.html">History</a></li>
-      
-
-
-  
-  
-  
-
-  
-
   
     
     
@@ -2143,26 +2279,17 @@ added to the stack.</p>
     
     
     
+      <li class=""><a href="/docs/history.html">History</a></li>
+      
+
+
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
+
   
-    
-    
-    
+
   
     
     
@@ -2187,16 +2314,6 @@ added to the stack.</p>
     
     
     
-      <li class=""><a href="/docs/powered_by.html">Powered By Calcite</a></li>
-      
-
-
-  
-  
-  
-
-  
-
   
     
     
@@ -2241,26 +2358,17 @@ added to the stack.</p>
     
     
     
+      <li class=""><a href="/docs/powered_by.html">Powered By Calcite</a></li>
+      
+
+
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
+
   
-    
-    
-    
+
   
     
     
@@ -2273,12 +2381,14 @@ added to the stack.</p>
     
     
     
-  
+      <li class=""><a href="/docs/api/">API</a></li>
+      
 
 
   
   
   
+  
 
   
 
@@ -2359,6 +2469,11 @@ added to the stack.</p>
     
     
   
+    
+    
+    
+      <li class=""><a href="/docs/testapi/">Test API</a></li>
+      
 
 
 </ul>

Modified: calcite/site/docs/avatica_json_reference.html
URL: http://svn.apache.org/viewvc/calcite/site/docs/avatica_json_reference.html?rev=1747967&r1=1747966&r2=1747967&view=diff
==============================================================================
--- calcite/site/docs/avatica_json_reference.html (original)
+++ calcite/site/docs/avatica_json_reference.html Sun Jun 12 08:33:22 2016
@@ -128,6 +128,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -170,6 +174,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -212,6 +220,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -261,6 +273,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -303,6 +319,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -345,6 +365,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -394,6 +418,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -436,6 +464,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -478,6 +510,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -520,6 +556,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -569,6 +609,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -611,6 +655,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -653,6 +701,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -702,6 +754,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -744,6 +800,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -786,6 +846,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -828,6 +892,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -1843,6 +1911,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -1894,6 +1963,14 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/index.html">Background</a></li>
       
 
@@ -1901,6 +1978,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -1980,6 +2058,14 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/tutorial.html">Tutorial</a></li>
       
 
@@ -1987,6 +2073,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2013,6 +2100,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2027,6 +2115,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2098,6 +2187,14 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/stream.html">Streaming</a></li>
       
 
@@ -2105,6 +2202,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2160,6 +2258,14 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/lattice.html">Lattices</a></li>
       
 
@@ -2175,6 +2281,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2198,6 +2305,10 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_overview.html">Overview</a></li>
       
 
@@ -2205,6 +2316,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2236,6 +2348,10 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_roadmap.html">Roadmap</a></li>
       
 
@@ -2243,6 +2359,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2262,6 +2379,10 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
       <li class="current"><a href="/docs/avatica_json_reference.html">JSON Reference</a></li>
       
 
@@ -2269,6 +2390,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2296,6 +2418,10 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_protobuf_reference.html">Protobuf Reference</a></li>
       
 
@@ -2311,6 +2437,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2378,6 +2505,14 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/reference.html">SQL language</a></li>
       
 
@@ -2385,6 +2520,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2444,6 +2580,14 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/model.html">JSON models</a></li>
       
 
@@ -2451,6 +2595,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2498,6 +2643,14 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/howto.html">HOWTO</a></li>
       
 
@@ -2513,17 +2666,10 @@ SQL or by a DatabaseMetaData operation w
   
   
   
-
   
 
   
-    
-    
-    
-  
-    
-    
-    
+
   
     
     
@@ -2556,16 +2702,6 @@ SQL or by a DatabaseMetaData operation w
     
     
     
-      <li class=""><a href="/docs/history.html">History</a></li>
-      
-
-
-  
-  
-  
-
-  
-
   
     
     
@@ -2582,26 +2718,17 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+      <li class=""><a href="/docs/history.html">History</a></li>
+      
+
+
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
+
   
-    
-    
-    
+
   
     
     
@@ -2626,16 +2753,6 @@ SQL or by a DatabaseMetaData operation w
     
     
     
-      <li class=""><a href="/docs/powered_by.html">Powered By Calcite</a></li>
-      
-
-
-  
-  
-  
-
-  
-
   
     
     
@@ -2680,26 +2797,17 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+      <li class=""><a href="/docs/powered_by.html">Powered By Calcite</a></li>
+      
+
+
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
+
   
-    
-    
-    
+
   
     
     
@@ -2712,12 +2820,14 @@ SQL or by a DatabaseMetaData operation w
     
     
     
-  
+      <li class=""><a href="/docs/api/">API</a></li>
+      
 
 
   
   
   
+  
 
   
 
@@ -2798,6 +2908,11 @@ SQL or by a DatabaseMetaData operation w
     
     
   
+    
+    
+    
+      <li class=""><a href="/docs/testapi/">Test API</a></li>
+      
 
 
 </ul>

Modified: calcite/site/docs/avatica_overview.html
URL: http://svn.apache.org/viewvc/calcite/site/docs/avatica_overview.html?rev=1747967&r1=1747966&r2=1747967&view=diff
==============================================================================
--- calcite/site/docs/avatica_overview.html (original)
+++ calcite/site/docs/avatica_overview.html Sun Jun 12 08:33:22 2016
@@ -128,6 +128,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -170,6 +174,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -212,6 +220,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -261,6 +273,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -303,6 +319,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -345,6 +365,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -394,6 +418,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -436,6 +464,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -478,6 +510,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -520,6 +556,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -569,6 +609,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -611,6 +655,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -653,6 +701,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -702,6 +754,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -744,6 +800,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -786,6 +846,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -828,6 +892,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -1022,6 +1090,7 @@ At some point Avatica could become a sep
   
   
   
+  
 
   
 
@@ -1073,6 +1142,14 @@ At some point Avatica could become a sep
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/index.html">Background</a></li>
       
 
@@ -1080,6 +1157,7 @@ At some point Avatica could become a sep
   
   
   
+  
 
   
 
@@ -1159,6 +1237,14 @@ At some point Avatica could become a sep
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/tutorial.html">Tutorial</a></li>
       
 
@@ -1166,6 +1252,7 @@ At some point Avatica could become a sep
   
   
   
+  
 
   
 
@@ -1192,6 +1279,7 @@ At some point Avatica could become a sep
   
   
   
+  
 
   
 
@@ -1206,6 +1294,7 @@ At some point Avatica could become a sep
   
   
   
+  
 
   
 
@@ -1277,6 +1366,14 @@ At some point Avatica could become a sep
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/stream.html">Streaming</a></li>
       
 
@@ -1284,6 +1381,7 @@ At some point Avatica could become a sep
   
   
   
+  
 
   
 
@@ -1339,6 +1437,14 @@ At some point Avatica could become a sep
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/lattice.html">Lattices</a></li>
       
 
@@ -1354,6 +1460,7 @@ At some point Avatica could become a sep
   
   
   
+  
 
   
 
@@ -1377,6 +1484,10 @@ At some point Avatica could become a sep
     
     
     
+  
+    
+    
+    
       <li class="current"><a href="/docs/avatica_overview.html">Overview</a></li>
       
 
@@ -1384,6 +1495,7 @@ At some point Avatica could become a sep
   
   
   
+  
 
   
 
@@ -1415,6 +1527,10 @@ At some point Avatica could become a sep
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_roadmap.html">Roadmap</a></li>
       
 
@@ -1422,6 +1538,7 @@ At some point Avatica could become a sep
   
   
   
+  
 
   
 
@@ -1441,6 +1558,10 @@ At some point Avatica could become a sep
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_json_reference.html">JSON Reference</a></li>
       
 
@@ -1448,6 +1569,7 @@ At some point Avatica could become a sep
   
   
   
+  
 
   
 
@@ -1475,6 +1597,10 @@ At some point Avatica could become a sep
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_protobuf_reference.html">Protobuf Reference</a></li>
       
 
@@ -1490,6 +1616,7 @@ At some point Avatica could become a sep
   
   
   
+  
 
   
 
@@ -1557,6 +1684,14 @@ At some point Avatica could become a sep
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/reference.html">SQL language</a></li>
       
 
@@ -1564,6 +1699,7 @@ At some point Avatica could become a sep
   
   
   
+  
 
   
 
@@ -1623,6 +1759,14 @@ At some point Avatica could become a sep
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/model.html">JSON models</a></li>
       
 
@@ -1630,6 +1774,7 @@ At some point Avatica could become a sep
   
   
   
+  
 
   
 
@@ -1677,6 +1822,14 @@ At some point Avatica could become a sep
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/howto.html">HOWTO</a></li>
       
 
@@ -1692,17 +1845,10 @@ At some point Avatica could become a sep
   
   
   
-
   
 
   
-    
-    
-    
-  
-    
-    
-    
+
   
     
     
@@ -1735,16 +1881,6 @@ At some point Avatica could become a sep
     
     
     
-      <li class=""><a href="/docs/history.html">History</a></li>
-      
-
-
-  
-  
-  
-
-  
-
   
     
     
@@ -1761,26 +1897,17 @@ At some point Avatica could become a sep
     
     
     
+      <li class=""><a href="/docs/history.html">History</a></li>
+      
+
+
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
+
   
-    
-    
-    
+
   
     
     
@@ -1805,16 +1932,6 @@ At some point Avatica could become a sep
     
     
     
-      <li class=""><a href="/docs/powered_by.html">Powered By Calcite</a></li>
-      
-
-
-  
-  
-  
-
-  
-
   
     
     
@@ -1859,26 +1976,17 @@ At some point Avatica could become a sep
     
     
     
+      <li class=""><a href="/docs/powered_by.html">Powered By Calcite</a></li>
+      
+
+
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
+
   
-    
-    
-    
+
   
     
     
@@ -1891,12 +1999,14 @@ At some point Avatica could become a sep
     
     
     
-  
+      <li class=""><a href="/docs/api/">API</a></li>
+      
 
 
   
   
   
+  
 
   
 
@@ -1977,6 +2087,11 @@ At some point Avatica could become a sep
     
     
   
+    
+    
+    
+      <li class=""><a href="/docs/testapi/">Test API</a></li>
+      
 
 
 </ul>

Modified: calcite/site/docs/avatica_protobuf_reference.html
URL: http://svn.apache.org/viewvc/calcite/site/docs/avatica_protobuf_reference.html?rev=1747967&r1=1747966&r2=1747967&view=diff
==============================================================================
--- calcite/site/docs/avatica_protobuf_reference.html (original)
+++ calcite/site/docs/avatica_protobuf_reference.html Sun Jun 12 08:33:22 2016
@@ -128,6 +128,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -170,6 +174,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -212,6 +220,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -261,6 +273,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -303,6 +319,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -345,6 +365,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -394,6 +418,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -436,6 +464,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -478,6 +510,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -520,6 +556,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -569,6 +609,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -611,6 +655,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -653,6 +701,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -702,6 +754,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -744,6 +800,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -786,6 +846,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -828,6 +892,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -1907,6 +1975,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -1958,6 +2027,14 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/index.html">Background</a></li>
       
 
@@ -1965,6 +2042,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2044,6 +2122,14 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/tutorial.html">Tutorial</a></li>
       
 
@@ -2051,6 +2137,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2077,6 +2164,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2091,6 +2179,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2162,6 +2251,14 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/stream.html">Streaming</a></li>
       
 
@@ -2169,6 +2266,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2224,6 +2322,14 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/lattice.html">Lattices</a></li>
       
 
@@ -2239,6 +2345,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2262,6 +2369,10 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_overview.html">Overview</a></li>
       
 
@@ -2269,6 +2380,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2300,6 +2412,10 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_roadmap.html">Roadmap</a></li>
       
 
@@ -2307,6 +2423,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2326,6 +2443,10 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_json_reference.html">JSON Reference</a></li>
       
 
@@ -2333,6 +2454,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2360,6 +2482,10 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
       <li class="current"><a href="/docs/avatica_protobuf_reference.html">Protobuf Reference</a></li>
       
 
@@ -2375,6 +2501,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2442,6 +2569,14 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/reference.html">SQL language</a></li>
       
 
@@ -2449,6 +2584,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2508,6 +2644,14 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/model.html">JSON models</a></li>
       
 
@@ -2515,6 +2659,7 @@ SQL or by a DatabaseMetaData operation w
   
   
   
+  
 
   
 
@@ -2562,6 +2707,14 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/howto.html">HOWTO</a></li>
       
 
@@ -2577,17 +2730,10 @@ SQL or by a DatabaseMetaData operation w
   
   
   
-
   
 
   
-    
-    
-    
-  
-    
-    
-    
+
   
     
     
@@ -2620,16 +2766,6 @@ SQL or by a DatabaseMetaData operation w
     
     
     
-      <li class=""><a href="/docs/history.html">History</a></li>
-      
-
-
-  
-  
-  
-
-  
-
   
     
     
@@ -2646,26 +2782,17 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+      <li class=""><a href="/docs/history.html">History</a></li>
+      
+
+
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
+
   
-    
-    
-    
+
   
     
     
@@ -2690,16 +2817,6 @@ SQL or by a DatabaseMetaData operation w
     
     
     
-      <li class=""><a href="/docs/powered_by.html">Powered By Calcite</a></li>
-      
-
-
-  
-  
-  
-
-  
-
   
     
     
@@ -2744,26 +2861,17 @@ SQL or by a DatabaseMetaData operation w
     
     
     
+      <li class=""><a href="/docs/powered_by.html">Powered By Calcite</a></li>
+      
+
+
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
+
   
-    
-    
-    
+
   
     
     
@@ -2776,12 +2884,14 @@ SQL or by a DatabaseMetaData operation w
     
     
     
-  
+      <li class=""><a href="/docs/api/">API</a></li>
+      
 
 
   
   
   
+  
 
   
 
@@ -2862,6 +2972,11 @@ SQL or by a DatabaseMetaData operation w
     
     
   
+    
+    
+    
+      <li class=""><a href="/docs/testapi/">Test API</a></li>
+      
 
 
 </ul>

Modified: calcite/site/docs/avatica_roadmap.html
URL: http://svn.apache.org/viewvc/calcite/site/docs/avatica_roadmap.html?rev=1747967&r1=1747966&r2=1747967&view=diff
==============================================================================
--- calcite/site/docs/avatica_roadmap.html (original)
+++ calcite/site/docs/avatica_roadmap.html Sun Jun 12 08:33:22 2016
@@ -128,6 +128,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -170,6 +174,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -212,6 +220,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -261,6 +273,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -303,6 +319,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -345,6 +365,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -394,6 +418,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -436,6 +464,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -478,6 +510,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -520,6 +556,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -569,6 +609,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -611,6 +655,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -653,6 +701,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -702,6 +754,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -744,6 +800,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -786,6 +846,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -828,6 +892,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -944,6 +1012,7 @@
   
   
   
+  
 
   
 
@@ -995,6 +1064,14 @@
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/index.html">Background</a></li>
       
 
@@ -1002,6 +1079,7 @@
   
   
   
+  
 
   
 
@@ -1081,6 +1159,14 @@
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/tutorial.html">Tutorial</a></li>
       
 
@@ -1088,6 +1174,7 @@
   
   
   
+  
 
   
 
@@ -1114,6 +1201,7 @@
   
   
   
+  
 
   
 
@@ -1128,6 +1216,7 @@
   
   
   
+  
 
   
 
@@ -1199,6 +1288,14 @@
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/stream.html">Streaming</a></li>
       
 
@@ -1206,6 +1303,7 @@
   
   
   
+  
 
   
 
@@ -1261,6 +1359,14 @@
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/lattice.html">Lattices</a></li>
       
 
@@ -1276,6 +1382,7 @@
   
   
   
+  
 
   
 
@@ -1299,6 +1406,10 @@
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_overview.html">Overview</a></li>
       
 
@@ -1306,6 +1417,7 @@
   
   
   
+  
 
   
 
@@ -1337,6 +1449,10 @@
     
     
     
+  
+    
+    
+    
       <li class="current"><a href="/docs/avatica_roadmap.html">Roadmap</a></li>
       
 
@@ -1344,6 +1460,7 @@
   
   
   
+  
 
   
 
@@ -1363,6 +1480,10 @@
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_json_reference.html">JSON Reference</a></li>
       
 
@@ -1370,6 +1491,7 @@
   
   
   
+  
 
   
 
@@ -1397,6 +1519,10 @@
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_protobuf_reference.html">Protobuf Reference</a></li>
       
 
@@ -1412,6 +1538,7 @@
   
   
   
+  
 
   
 
@@ -1479,6 +1606,14 @@
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/reference.html">SQL language</a></li>
       
 
@@ -1486,6 +1621,7 @@
   
   
   
+  
 
   
 
@@ -1545,6 +1681,14 @@
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/model.html">JSON models</a></li>
       
 
@@ -1552,6 +1696,7 @@
   
   
   
+  
 
   
 
@@ -1599,6 +1744,14 @@
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/howto.html">HOWTO</a></li>
       
 
@@ -1614,17 +1767,10 @@
   
   
   
-
   
 
   
-    
-    
-    
-  
-    
-    
-    
+
   
     
     
@@ -1657,16 +1803,6 @@
     
     
     
-      <li class=""><a href="/docs/history.html">History</a></li>
-      
-
-
-  
-  
-  
-
-  
-
   
     
     
@@ -1683,26 +1819,17 @@
     
     
     
+      <li class=""><a href="/docs/history.html">History</a></li>
+      
+
+
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
+
   
-    
-    
-    
+
   
     
     
@@ -1727,16 +1854,6 @@
     
     
     
-      <li class=""><a href="/docs/powered_by.html">Powered By Calcite</a></li>
-      
-
-
-  
-  
-  
-
-  
-
   
     
     
@@ -1781,26 +1898,17 @@
     
     
     
+      <li class=""><a href="/docs/powered_by.html">Powered By Calcite</a></li>
+      
+
+
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
+
   
-    
-    
-    
+
   
     
     
@@ -1813,12 +1921,14 @@
     
     
     
-  
+      <li class=""><a href="/docs/api/">API</a></li>
+      
 
 
   
   
   
+  
 
   
 
@@ -1899,6 +2009,11 @@
     
     
   
+    
+    
+    
+      <li class=""><a href="/docs/testapi/">Test API</a></li>
+      
 
 
 </ul>

Modified: calcite/site/docs/cassandra_adapter.html
URL: http://svn.apache.org/viewvc/calcite/site/docs/cassandra_adapter.html?rev=1747967&r1=1747966&r2=1747967&view=diff
==============================================================================
--- calcite/site/docs/cassandra_adapter.html (original)
+++ calcite/site/docs/cassandra_adapter.html Sun Jun 12 08:33:22 2016
@@ -128,6 +128,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -170,6 +174,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -212,6 +220,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -261,6 +273,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -303,6 +319,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -345,6 +365,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -394,6 +418,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -436,6 +464,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -478,6 +510,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -520,6 +556,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -569,6 +609,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -611,6 +655,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -653,6 +701,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -702,6 +754,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -744,6 +800,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -786,6 +846,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -828,6 +892,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -994,6 +1062,7 @@ prove useful.</p>
   
   
   
+  
 
   
 
@@ -1045,6 +1114,14 @@ prove useful.</p>
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/index.html">Background</a></li>
       
 
@@ -1052,6 +1129,7 @@ prove useful.</p>
   
   
   
+  
 
   
 
@@ -1131,6 +1209,14 @@ prove useful.</p>
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/tutorial.html">Tutorial</a></li>
       
 
@@ -1138,6 +1224,7 @@ prove useful.</p>
   
   
   
+  
 
   
 
@@ -1164,6 +1251,7 @@ prove useful.</p>
   
   
   
+  
 
   
 
@@ -1178,6 +1266,7 @@ prove useful.</p>
   
   
   
+  
 
   
 
@@ -1249,6 +1338,14 @@ prove useful.</p>
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/stream.html">Streaming</a></li>
       
 
@@ -1256,6 +1353,7 @@ prove useful.</p>
   
   
   
+  
 
   
 
@@ -1311,6 +1409,14 @@ prove useful.</p>
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/lattice.html">Lattices</a></li>
       
 
@@ -1326,6 +1432,7 @@ prove useful.</p>
   
   
   
+  
 
   
 
@@ -1349,6 +1456,10 @@ prove useful.</p>
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_overview.html">Overview</a></li>
       
 
@@ -1356,6 +1467,7 @@ prove useful.</p>
   
   
   
+  
 
   
 
@@ -1387,6 +1499,10 @@ prove useful.</p>
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_roadmap.html">Roadmap</a></li>
       
 
@@ -1394,6 +1510,7 @@ prove useful.</p>
   
   
   
+  
 
   
 
@@ -1413,6 +1530,10 @@ prove useful.</p>
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_json_reference.html">JSON Reference</a></li>
       
 
@@ -1420,6 +1541,7 @@ prove useful.</p>
   
   
   
+  
 
   
 
@@ -1447,6 +1569,10 @@ prove useful.</p>
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_protobuf_reference.html">Protobuf Reference</a></li>
       
 
@@ -1462,6 +1588,7 @@ prove useful.</p>
   
   
   
+  
 
   
 
@@ -1529,6 +1656,14 @@ prove useful.</p>
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/reference.html">SQL language</a></li>
       
 
@@ -1536,6 +1671,7 @@ prove useful.</p>
   
   
   
+  
 
   
 
@@ -1595,6 +1731,14 @@ prove useful.</p>
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/model.html">JSON models</a></li>
       
 
@@ -1602,6 +1746,7 @@ prove useful.</p>
   
   
   
+  
 
   
 
@@ -1649,6 +1794,14 @@ prove useful.</p>
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/howto.html">HOWTO</a></li>
       
 
@@ -1664,17 +1817,10 @@ prove useful.</p>
   
   
   
-
   
 
   
-    
-    
-    
-  
-    
-    
-    
+
   
     
     
@@ -1707,16 +1853,6 @@ prove useful.</p>
     
     
     
-      <li class=""><a href="/docs/history.html">History</a></li>
-      
-
-
-  
-  
-  
-
-  
-
   
     
     
@@ -1733,26 +1869,17 @@ prove useful.</p>
     
     
     
+      <li class=""><a href="/docs/history.html">History</a></li>
+      
+
+
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
+
   
-    
-    
-    
+
   
     
     
@@ -1777,16 +1904,6 @@ prove useful.</p>
     
     
     
-      <li class=""><a href="/docs/powered_by.html">Powered By Calcite</a></li>
-      
-
-
-  
-  
-  
-
-  
-
   
     
     
@@ -1831,26 +1948,17 @@ prove useful.</p>
     
     
     
+      <li class=""><a href="/docs/powered_by.html">Powered By Calcite</a></li>
+      
+
+
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
+
   
-    
-    
-    
+
   
     
     
@@ -1863,12 +1971,14 @@ prove useful.</p>
     
     
     
-  
+      <li class=""><a href="/docs/api/">API</a></li>
+      
 
 
   
   
   
+  
 
   
 
@@ -1949,6 +2059,11 @@ prove useful.</p>
     
     
   
+    
+    
+    
+      <li class=""><a href="/docs/testapi/">Test API</a></li>
+      
 
 
 </ul>

Modified: calcite/site/docs/druid_adapter.html
URL: http://svn.apache.org/viewvc/calcite/site/docs/druid_adapter.html?rev=1747967&r1=1747966&r2=1747967&view=diff
==============================================================================
--- calcite/site/docs/druid_adapter.html (original)
+++ calcite/site/docs/druid_adapter.html Sun Jun 12 08:33:22 2016
@@ -128,6 +128,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -170,6 +174,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -212,6 +220,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -261,6 +273,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -303,6 +319,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -345,6 +365,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -394,6 +418,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -436,6 +464,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -478,6 +510,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -520,6 +556,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -569,6 +609,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -611,6 +655,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -653,6 +701,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -702,6 +754,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -744,6 +800,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -786,6 +846,10 @@
   
     
   
+    
+  
+    
+  
 
   
 
@@ -828,6 +892,10 @@
   
     
   
+    
+  
+    
+  
 
 
     </optgroup>
@@ -871,7 +939,8 @@ of the Druid adapter.</p>
       </span><span class="nt">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"wiki"</span><span class="p">,</span><span class="w">
       </span><span class="nt">"factory"</span><span class="p">:</span><span class="w"> </span><span class="s2">"org.apache.calcite.adapter.druid.DruidSchemaFactory"</span><span class="p">,</span><span class="w">
       </span><span class="nt">"operand"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nt">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:8082/druid/v2/?pretty"</span><span class="w">
+        </span><span class="nt">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:8082"</span><span class="p">,</span><span class="w">
+        </span><span class="nt">"coordinatorUrl"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:8081"</span><span class="w">
       </span><span class="p">},</span><span class="w">
       </span><span class="nt">"tables"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
         </span><span class="p">{</span><span class="w">
@@ -956,7 +1025,7 @@ as follows:</p>
 sqlline&gt;</code></pre></figure>
 
 <p>That query shows the top 5 countries of origin of wiki page edits
-on 2015-09-12 (the date covered by the wikiticker data set).</p>
+on 2015-09-12 (the date covered by the <code class="highlighter-rouge">wikiticker</code> data set).</p>
 
 <p>Now let’s see how the query was evaluated:</p>
 
@@ -988,6 +1057,96 @@ into a single Druid data set called �
 <p>You can access it via the
 <code class="highlighter-rouge">druid/src/test/resources/druid-foodmart-model.json</code> model.</p>
 
+<h1 id="simplifying-the-model">Simplifying the model</h1>
+
+<p>If less metadata is provided in the model, the Druid adapter can discover
+it automatically from Druid. Here is a schema equivalent to the previous one
+but with <code class="highlighter-rouge">dimensions</code>, <code class="highlighter-rouge">metrics</code> and <code class="highlighter-rouge">timestampColumn</code> removed:</p>
+
+<figure class="highlight"><pre><code class="language-json" data-lang="json"><span class="p">{</span><span class="w">
+  </span><span class="nt">"version"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1.0"</span><span class="p">,</span><span class="w">
+  </span><span class="nt">"defaultSchema"</span><span class="p">:</span><span class="w"> </span><span class="s2">"wiki"</span><span class="p">,</span><span class="w">
+  </span><span class="nt">"schemas"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+    </span><span class="p">{</span><span class="w">
+      </span><span class="nt">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"custom"</span><span class="p">,</span><span class="w">
+      </span><span class="nt">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"wiki"</span><span class="p">,</span><span class="w">
+      </span><span class="nt">"factory"</span><span class="p">:</span><span class="w"> </span><span class="s2">"org.apache.calcite.adapter.druid.DruidSchemaFactory"</span><span class="p">,</span><span class="w">
+      </span><span class="nt">"operand"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nt">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:8082"</span><span class="p">,</span><span class="w">
+        </span><span class="nt">"coordinatorUrl"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:8081"</span><span class="w">
+      </span><span class="p">},</span><span class="w">
+      </span><span class="nt">"tables"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+          </span><span class="nt">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"wiki"</span><span class="p">,</span><span class="w">
+          </span><span class="nt">"factory"</span><span class="p">:</span><span class="w"> </span><span class="s2">"org.apache.calcite.adapter.druid.DruidTableFactory"</span><span class="p">,</span><span class="w">
+          </span><span class="nt">"operand"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="nt">"dataSource"</span><span class="p">:</span><span class="w"> </span><span class="s2">"wikiticker"</span><span class="p">,</span><span class="w">
+            </span><span class="nt">"interval"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1900-01-09T00:00:00.000Z/2992-01-10T00:00:00.000Z"</span><span class="w">
+          </span><span class="p">}</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+      </span><span class="p">]</span><span class="w">
+    </span><span class="p">}</span><span class="w">
+  </span><span class="p">]</span><span class="w">
+</span><span class="p">}</span></code></pre></figure>
+
+<p>Calcite dispatches a
+<a href="http://druid.io/docs/latest/querying/segmentmetadataquery.html">segmentMetadataQuery</a>
+to Druid to discover the columns of the table.
+Now, let’s take out the <code class="highlighter-rouge">tables</code> element:</p>
+
+<figure class="highlight"><pre><code class="language-json" data-lang="json"><span class="p">{</span><span class="w">
+  </span><span class="nt">"version"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1.0"</span><span class="p">,</span><span class="w">
+  </span><span class="nt">"defaultSchema"</span><span class="p">:</span><span class="w"> </span><span class="s2">"wiki"</span><span class="p">,</span><span class="w">
+  </span><span class="nt">"schemas"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+    </span><span class="p">{</span><span class="w">
+      </span><span class="nt">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"custom"</span><span class="p">,</span><span class="w">
+      </span><span class="nt">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"wiki"</span><span class="p">,</span><span class="w">
+      </span><span class="nt">"factory"</span><span class="p">:</span><span class="w"> </span><span class="s2">"org.apache.calcite.adapter.druid.DruidSchemaFactory"</span><span class="p">,</span><span class="w">
+      </span><span class="nt">"operand"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="nt">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:8082"</span><span class="p">,</span><span class="w">
+        </span><span class="nt">"coordinatorUrl"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://localhost:8081"</span><span class="w">
+      </span><span class="p">}</span><span class="w">
+    </span><span class="p">}</span><span class="w">
+  </span><span class="p">]</span><span class="w">
+</span><span class="p">}</span></code></pre></figure>
+
+<p>Calcite discovers the “wikiticker” data source via the
+<a href="http://druid.io/docs/latest/design/coordinator.html#metadata-store-information">/druid/coordinator/v1/metadata/datasources</a>
+REST call. Now that the “wiki” table element is removed, the table is called
+“wikiticker”. Any other data sources present in Druid will also appear as
+tables.</p>
+
+<p>Our model is now a single schema based on a custom schema factory with only two
+operands, so we can
+<a href="https://issues.apache.org/jira/browse/CALCITE-1206">dispense with the model</a>
+and supply the operands as part of the connect string:</p>
+
+<figure class="highlight"><pre><code class="language-bash" data-lang="bash">  jdbc:calcite:schemaFactory<span class="o">=</span>org.apache.calcite.adapter.druid.DruidSchemaFactory; schema.url<span class="o">=</span>http://localhost:8082; schema.coordinatorUrl<span class="o">=</span>http://localhost:8081</code></pre></figure>
+
+<p>In fact, those are the
+<a href="/apidocs/org/apache/calcite/adapter/druid/DruidSchemaFactory.html">default values of the operands</a>,
+so we can omit them:</p>
+
+<figure class="highlight"><pre><code class="language-bash" data-lang="bash">  jdbc:calcite:schemaFactory<span class="o">=</span>org.apache.calcite.adapter.druid.DruidSchemaFactory</code></pre></figure>
+
+<p>Now, we can connect to <code class="highlighter-rouge">sqlline</code> using a very simple connect string, and list
+the available tables:</p>
+
+<figure class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="gp">$ </span>./sqlline
+<span class="gp">sqlline&gt; </span>!connect jdbc:calcite:schemaFactory<span class="o">=</span>org.apache.calcite.adapter.druid.DruidSchemaFactory admin admin
+<span class="gp">sqlline&gt; </span>!tables
++-----------+-------------+------------+--------------+
+| TABLE_CAT | TABLE_SCHEM | TABLE_NAME | TABLE_TYPE   |
++-----------+-------------+------------+--------------+
+|           | adhoc       | foodmart   | TABLE        |
+|           | adhoc       | wikiticker | TABLE        |
+|           | metadata    | COLUMNS    | SYSTEM_TABLE |
+|           | metadata    | TABLES     | SYSTEM_TABLE |
++-----------+-------------+------------+--------------+</code></pre></figure>
+
+<p>We see the two system tables (<code class="highlighter-rouge">TABLES</code> and <code class="highlighter-rouge">COLUMNS</code>),
+and the two tables in Druid (<code class="highlighter-rouge">foodmart</code> and <code class="highlighter-rouge">wikiticker</code>).</p>
+
           
 
 
@@ -1060,6 +1219,7 @@ into a single Druid data set called �
   
   
   
+  
 
   
 
@@ -1111,6 +1271,14 @@ into a single Druid data set called �
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/index.html">Background</a></li>
       
 
@@ -1118,6 +1286,7 @@ into a single Druid data set called �
   
   
   
+  
 
   
 
@@ -1197,6 +1366,14 @@ into a single Druid data set called �
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/tutorial.html">Tutorial</a></li>
       
 
@@ -1204,6 +1381,7 @@ into a single Druid data set called �
   
   
   
+  
 
   
 
@@ -1230,6 +1408,7 @@ into a single Druid data set called �
   
   
   
+  
 
   
 
@@ -1244,6 +1423,7 @@ into a single Druid data set called �
   
   
   
+  
 
   
 
@@ -1315,6 +1495,14 @@ into a single Druid data set called �
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/stream.html">Streaming</a></li>
       
 
@@ -1322,6 +1510,7 @@ into a single Druid data set called �
   
   
   
+  
 
   
 
@@ -1377,6 +1566,14 @@ into a single Druid data set called �
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/lattice.html">Lattices</a></li>
       
 
@@ -1392,6 +1589,7 @@ into a single Druid data set called �
   
   
   
+  
 
   
 
@@ -1415,6 +1613,10 @@ into a single Druid data set called �
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_overview.html">Overview</a></li>
       
 
@@ -1422,6 +1624,7 @@ into a single Druid data set called �
   
   
   
+  
 
   
 
@@ -1453,6 +1656,10 @@ into a single Druid data set called �
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_roadmap.html">Roadmap</a></li>
       
 
@@ -1460,6 +1667,7 @@ into a single Druid data set called �
   
   
   
+  
 
   
 
@@ -1479,6 +1687,10 @@ into a single Druid data set called �
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_json_reference.html">JSON Reference</a></li>
       
 
@@ -1486,6 +1698,7 @@ into a single Druid data set called �
   
   
   
+  
 
   
 
@@ -1513,6 +1726,10 @@ into a single Druid data set called �
     
     
     
+  
+    
+    
+    
       <li class=""><a href="/docs/avatica_protobuf_reference.html">Protobuf Reference</a></li>
       
 
@@ -1528,6 +1745,7 @@ into a single Druid data set called �
   
   
   
+  
 
   
 
@@ -1595,6 +1813,14 @@ into a single Druid data set called �
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/reference.html">SQL language</a></li>
       
 
@@ -1602,6 +1828,7 @@ into a single Druid data set called �
   
   
   
+  
 
   
 
@@ -1661,6 +1888,14 @@ into a single Druid data set called �
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/model.html">JSON models</a></li>
       
 
@@ -1668,6 +1903,7 @@ into a single Druid data set called �
   
   
   
+  
 
   
 
@@ -1715,6 +1951,14 @@ into a single Druid data set called �
     
     
     
+  
+    
+    
+    
+  
+    
+    
+    
       <li class=""><a href="/docs/howto.html">HOWTO</a></li>
       
 
@@ -1730,17 +1974,10 @@ into a single Druid data set called �
   
   
   
-
   
 
   
-    
-    
-    
-  
-    
-    
-    
+
   
     
     
@@ -1773,16 +2010,6 @@ into a single Druid data set called �
     
     
     
-      <li class=""><a href="/docs/history.html">History</a></li>
-      
-
-
-  
-  
-  
-
-  
-
   
     
     
@@ -1799,26 +2026,17 @@ into a single Druid data set called �
     
     
     
+      <li class=""><a href="/docs/history.html">History</a></li>
+      
+
+
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
+
   
-    
-    
-    
+
   
     
     
@@ -1843,16 +2061,6 @@ into a single Druid data set called �
     
     
     
-      <li class=""><a href="/docs/powered_by.html">Powered By Calcite</a></li>
-      
-
-
-  
-  
-  
-
-  
-
   
     
     
@@ -1897,26 +2105,17 @@ into a single Druid data set called �
     
     
     
+      <li class=""><a href="/docs/powered_by.html">Powered By Calcite</a></li>
+      
+
+
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
   
-    
-    
-    
+
   
-    
-    
-    
+
   
     
     
@@ -1929,12 +2128,14 @@ into a single Druid data set called �
     
     
     
-  
+      <li class=""><a href="/docs/api/">API</a></li>
+      
 
 
   
   
   
+  
 
   
 
@@ -2015,6 +2216,11 @@ into a single Druid data set called �
     
     
   
+    
+    
+    
+      <li class=""><a href="/docs/testapi/">Test API</a></li>
+      
 
 
 </ul>