Author: jhyde
Date: Tue Oct 18 16:48:19 2016
New Revision: 1765480

URL: http://svn.apache.org/viewvc?rev=1765480&view=rev
Log:
[CALCITE-1443] and [CALCITE-1419]

Modified:
    calcite/site/docs/cassandra_adapter.html
    calcite/site/docs/reference.html

Modified: calcite/site/docs/cassandra_adapter.html
URL: 
http://svn.apache.org/viewvc/calcite/site/docs/cassandra_adapter.html?rev=1765480&r1=1765479&r2=1765480&view=diff
==============================================================================
--- calcite/site/docs/cassandra_adapter.html (original)
+++ calcite/site/docs/cassandra_adapter.html Tue Oct 18 16:48:19 2016
@@ -908,7 +908,9 @@ the adapter will attempt to automaticall
   </span><span class="err">]</span><span class="w">
 </span><span class="err">}</span></code></pre></figure>
 
-<p>Assuming this file is stored as <code 
class="highlighter-rouge">model.json</code>, you can connect to
+<p>Note that you can also specify <code 
class="highlighter-rouge">username</code> and <code 
class="highlighter-rouge">password</code> keys along with
+the <code class="highlighter-rouge">host</code> and <code 
class="highlighter-rouge">keyspace</code> if your server requires 
authentication.
+Assuming this file is stored as <code 
class="highlighter-rouge">model.json</code>, you can connect to
 Cassandra via <a href="https://github.com/julianhyde/sqlline";><code 
class="highlighter-rouge">sqlline</code></a> as
 follows:</p>
 

Modified: calcite/site/docs/reference.html
URL: 
http://svn.apache.org/viewvc/calcite/site/docs/reference.html?rev=1765480&r1=1765479&r2=1765480&view=diff
==============================================================================
--- calcite/site/docs/reference.html (original)
+++ calcite/site/docs/reference.html Tue Oct 18 16:48:19 2016
@@ -906,6 +906,7 @@ form.</p>
       <span class="k">EXPLAIN</span> <span class="n">PLAN</span>
       <span class="p">[</span> <span class="k">WITH</span> <span 
class="k">TYPE</span> <span class="o">|</span> <span class="k">WITH</span> 
<span class="k">IMPLEMENTATION</span> <span class="o">|</span> <span 
class="k">WITHOUT</span> <span class="k">IMPLEMENTATION</span> <span 
class="p">]</span>
       <span class="p">[</span> <span class="k">EXCLUDING</span> <span 
class="n">ATTRIBUTES</span> <span class="o">|</span> <span 
class="k">INCLUDING</span> <span class="p">[</span> <span class="k">ALL</span> 
<span class="p">]</span> <span class="n">ATTRIBUTES</span> <span 
class="p">]</span>
+      <span class="p">[</span> <span class="k">AS</span> <span 
class="n">JSON</span> <span class="o">|</span> <span class="k">AS</span> <span 
class="n">XML</span> <span class="p">]</span>
       <span class="k">FOR</span> <span class="p">(</span> <span 
class="n">query</span> <span class="o">|</span> <span class="k">insert</span> 
<span class="o">|</span> <span class="k">update</span> <span class="o">|</span> 
<span class="n">merge</span> <span class="o">|</span> <span 
class="k">delete</span> <span class="p">)</span>
 
 <span class="k">describe</span><span class="p">:</span>
@@ -1302,6 +1303,7 @@ INVOKER,
 ISOLATION,
 JAVA,
 <strong>JOIN</strong>,
+JSON,
 K,
 KEY,
 KEY_MEMBER,
@@ -2087,7 +2089,7 @@ the user or application to supply a time
   <tbody>
     <tr>
       <td style="text-align: left">string || string</td>
-      <td style="text-align: left">Concatenates two character strings.</td>
+      <td style="text-align: left">Concatenates two character strings</td>
     </tr>
     <tr>
       <td style="text-align: left">CHAR_LENGTH(string)</td>
@@ -2110,6 +2112,10 @@ the user or application to supply a time
       <td style="text-align: left">Returns the position of the first 
occurrence of <em>string1</em> in <em>string2</em></td>
     </tr>
     <tr>
+      <td style="text-align: left">POSITION(string1 IN string2 FROM 
integer)</td>
+      <td style="text-align: left">Returns the position of the first 
occurrence of <em>string1</em> in <em>string2</em> starting at a given point 
(not standard SQL)</td>
+    </tr>
+    <tr>
       <td style="text-align: left">TRIM( { BOTH | LEADING | TRAILING } string1 
FROM string2)</td>
       <td style="text-align: left">Removes the longest string containing only 
the characters in <em>string1</em> from the start/end/both ends of 
<em>string1</em></td>
     </tr>
@@ -2119,11 +2125,11 @@ the user or application to supply a time
     </tr>
     <tr>
       <td style="text-align: left">SUBSTRING(string FROM integer)</td>
-      <td style="text-align: left">Returns a substring of a character string 
starting at a given point.</td>
+      <td style="text-align: left">Returns a substring of a character string 
starting at a given point</td>
     </tr>
     <tr>
       <td style="text-align: left">SUBSTRING(string FROM integer FOR 
integer)</td>
-      <td style="text-align: left">Returns a substring of a character string 
starting at a given point with a given length.</td>
+      <td style="text-align: left">Returns a substring of a character string 
starting at a given point with a given length</td>
     </tr>
     <tr>
       <td style="text-align: left">INITCAP(string)</td>
@@ -2150,13 +2156,17 @@ the user or application to supply a time
   <tbody>
     <tr>
       <td style="text-align: left">binary || binary</td>
-      <td style="text-align: left">Concatenates two binary strings.</td>
+      <td style="text-align: left">Concatenates two binary strings</td>
     </tr>
     <tr>
       <td style="text-align: left">POSITION(binary1 IN binary2)</td>
       <td style="text-align: left">Returns the position of the first 
occurrence of <em>binary1</em> in <em>binary2</em></td>
     </tr>
     <tr>
+      <td style="text-align: left">POSITION(binary1 IN binary2 FROM 
integer)</td>
+      <td style="text-align: left">Returns the position of the first 
occurrence of <em>binary1</em> in <em>binary2</em> starting at a given point 
(not standard SQL)</td>
+    </tr>
+    <tr>
       <td style="text-align: left">OVERLAY(binary1 PLACING binary2 FROM 
integer [ FOR integer2 ])</td>
       <td style="text-align: left">Replaces a substring of <em>binary1</em> 
with <em>binary2</em></td>
     </tr>
@@ -2461,10 +2471,6 @@ the user or application to supply a time
       <td style="text-align: left">Returns the concatenation of character 
strings</td>
     </tr>
     <tr>
-      <td style="text-align: left">{fn LOCATE(string1, string2)}</td>
-      <td style="text-align: left">Returns the position in <em>string2</em> of 
the first occurrence of <em>string1</em>. Searches from the beginning of the 
second CharacterExpression, unless the startIndex parameter is specified.</td>
-    </tr>
-    <tr>
       <td style="text-align: left">{fn INSERT(string1, start, length, 
string2)}</td>
       <td style="text-align: left">Inserts <em>string2</em> into a slot in 
<em>string1</em></td>
     </tr>


Reply via email to