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/03/17 20:37:50 UTC
svn commit: r1735482 [5/5] - in /calcite/site: avatica/ avatica/community/
avatica/develop/ avatica/docs/ avatica/downloads/ avatica/news/
avatica/news/2016/03/03/separate-project/ avatica/news/releases/ docs/
Modified: calcite/site/avatica/docs/roadmap.html
URL: http://svn.apache.org/viewvc/calcite/site/avatica/docs/roadmap.html?rev=1735482&r1=1735481&r2=1735482&view=diff
==============================================================================
--- calcite/site/avatica/docs/roadmap.html (original)
+++ calcite/site/avatica/docs/roadmap.html Thu Mar 17 19:37:49 2016
@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title>Roadmap</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
- <meta name="generator" content="Jekyll v3.0.3">
+ <meta name="generator" content="Jekyll v2.4.0">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:300,300italic,400,400italic,700,700italic,900">
<link rel="stylesheet" href="/avatica/css/screen.css">
<link rel="icon" type="image/x-icon" href="/avatica/favicon.ico">
@@ -360,22 +360,32 @@
+
+
+
+
+
+
+
+
+
+
<li class=""><a href="/avatica/docs/index.html">Background</a></li>
@@ -386,34 +396,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<li class="current"><a href="/avatica/docs/roadmap.html">Roadmap</a></li>
@@ -432,26 +458,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
<li class=""><a href="/avatica/docs/json_reference.html">JSON Reference</a></li>
@@ -462,30 +500,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<li class=""><a href="/avatica/docs/protobuf_reference.html">Protobuf Reference</a></li>
@@ -496,18 +548,26 @@
+
+
+
+
+
+
+
+
<li class=""><a href="/avatica/docs/howto.html">HOWTO</a></li>
@@ -526,14 +586,20 @@
+
+
+
+
+
+
<li class=""><a href="/avatica/docs/history.html">History</a></li>
@@ -544,40 +610,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
-
+ <li class=""><a href="/avatica/docs/api.html">API</a></li>
+
@@ -585,40 +628,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ <li class=""><a href="/avatica/docs/testapi.html">Test API</a></li>
+
</ul>
Modified: calcite/site/avatica/downloads/index.html
URL: http://svn.apache.org/viewvc/calcite/site/avatica/downloads/index.html?rev=1735482&r1=1735481&r2=1735482&view=diff
==============================================================================
--- calcite/site/avatica/downloads/index.html (original)
+++ calcite/site/avatica/downloads/index.html Thu Mar 17 19:37:49 2016
@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title>Downloads</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
- <meta name="generator" content="Jekyll v3.0.3">
+ <meta name="generator" content="Jekyll v2.4.0">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:300,300italic,400,400italic,700,700italic,900">
<link rel="stylesheet" href="/avatica/css/screen.css">
<link rel="icon" type="image/x-icon" href="/avatica/favicon.ico">
@@ -101,10 +101,10 @@
</thead>
<tbody>
<tr>
- <td style="text-align: left"><a href="/avatica/docs/history.html#v9-9-9">9.9.9</a></td>
- <td style="text-align: left">03 Mar 2016</td>
- <td style="text-align: left"><a href="https://github.com/apache/calcite/commit/abcdef">abcdef</a></td>
- <td style="text-align: left"><a href="http://www.apache.org/dyn/closer.lua?filename=calcite/apache-calcite-9.9.9/apache-calcite-9.9.9-src.tar.gz&action=download">tar</a> (<a href="https://www.apache.org/dist/calcite/apache-calcite-9.9.9/apache-calcite-9.9.9-src.tar.gz.md5">md5</a> <a href="https://www.apache.org/dist/calcite/apache-calcite-9.9.9/apache-calcite-9.9.9-src.tar.gz.asc">pgp</a>) <br /> <a href="http://www.apache.org/dyn/closer.lua?filename=calcite/apache-calcite-9.9.9/apache-calcite-9.9.9-src.zip&action=download">zip</a> (<a href="https://www.apache.org/dist/calcite/apache-calcite-9.9.9/apache-calcite-9.9.9-src.zip.md5">md5</a> <a href="https://www.apache.org/dist/calcite/apache-calcite-9.9.9/apache-calcite-9.9.9-src.zip.asc">pgp</a>)</td>
+ <td style="text-align: left"><a href="/avatica/docs/history.html#v1-7-1">1.7.1</a></td>
+ <td style="text-align: left">18 Mar 2016</td>
+ <td style="text-align: left"><a href="https://github.com/apache/calcite/commit/11cb0a8">11cb0a8</a></td>
+ <td style="text-align: left"><a href="http://www.apache.org/dyn/closer.lua?filename=calcite/apache-calcite-avatica-1.7.1/apache-calcite-avatica-1.7.1-src.tar.gz&action=download">tar</a> (<a href="https://www.apache.org/dist/calcite/apache-calcite-avatica-1.7.1/apache-calcite-avatica-1.7.1-src.tar.gz.md5">md5</a> <a href="https://www.apache.org/dist/calcite/apache-calcite-avatica-1.7.1/apache-calcite-avatica-1.7.1-src.tar.gz.asc">pgp</a>) <br /> <a href="http://www.apache.org/dyn/closer.lua?filename=calcite/apache-calcite-avatica-1.7.1/apache-calcite-avatica-1.7.1-src.zip&action=download">zip</a> (<a href="https://www.apache.org/dist/calcite/apache-calcite-avatica-1.7.1/apache-calcite-avatica-1.7.1-src.zip.md5">md5</a> <a href="https://www.apache.org/dist/calcite/apache-calcite-avatica-1.7.1/apache-calcite-avatica-1.7.1-src.zip.asc">pgp</a>)</td>
</tr>
</tbody>
</table>
@@ -118,8 +118,7 @@ download has completed OK.</p>
<p>For fast downloads, current source distributions are hosted on mirror servers;
older source distributions are in the
-<a href="http://archive.apache.org/dist/calcite/">archive</a>
-or <a href="http://archive.apache.org/dist/incubator/calcite/">incubator archive</a>.
+<a href="http://archive.apache.org/dist/calcite/">archive</a>.
If a download from a mirror fails, retry, and the second download will likely
succeed.</p>
@@ -128,15 +127,20 @@ succeed.</p>
<h1 id="maven-artifacts">Maven artifacts</h1>
-<p>Add the following to the dependencies section of your <code class="highlighter-rouge">pom.xml</code> file:</p>
+<p>Add the following to the dependencies section of your <code>pom.xml</code> file:</p>
-<figure class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt"><dependencies></span>
+<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt"><dependencies></span>
<span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.calcite.avatica<span class="nt"></groupId></span>
- <span class="nt"><artifactId></span>calcite-avatica<span class="nt"></artifactId></span>
- <span class="nt"><version></span>9.9.9<span class="nt"></version></span>
+ <span class="nt"><artifactId></span>avatica<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>1.7.1<span class="nt"></version></span>
<span class="nt"></dependency></span>
-<span class="nt"></dependencies></span></code></pre></figure>
+ <span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.apache.calcite.avatica<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>avatica-server<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>1.7.1<span class="nt"></version></span>
+ <span class="nt"></dependency></span>
+<span class="nt"></dependencies></span></code></pre></div>
</article>
Modified: calcite/site/avatica/index.html
URL: http://svn.apache.org/viewvc/calcite/site/avatica/index.html?rev=1735482&r1=1735481&r2=1735482&view=diff
==============================================================================
--- calcite/site/avatica/index.html (original)
+++ calcite/site/avatica/index.html Thu Mar 17 19:37:49 2016
@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title>Apache Calcite • Dynamic data management framework</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
- <meta name="generator" content="Jekyll v3.0.3">
+ <meta name="generator" content="Jekyll v2.4.0">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:300,300italic,400,400italic,700,700italic,900">
<link rel="stylesheet" href="/avatica/css/screen.css">
<link rel="icon" type="image/x-icon" href="/avatica/favicon.ico">
Modified: calcite/site/avatica/news/2016/03/03/separate-project/index.html
URL: http://svn.apache.org/viewvc/calcite/site/avatica/news/2016/03/03/separate-project/index.html?rev=1735482&r1=1735481&r2=1735482&view=diff
==============================================================================
--- calcite/site/avatica/news/2016/03/03/separate-project/index.html (original)
+++ calcite/site/avatica/news/2016/03/03/separate-project/index.html Thu Mar 17 19:37:49 2016
@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title>Splitting Avatica from Calcite</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
- <meta name="generator" content="Jekyll v3.0.3">
+ <meta name="generator" content="Jekyll v2.4.0">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:300,300italic,400,400italic,700,700italic,900">
<link rel="stylesheet" href="/avatica/css/screen.css">
<link rel="icon" type="image/x-icon" href="/avatica/favicon.ico">
@@ -85,7 +85,7 @@
<option value="/avatica/news/">Home</option>
<optgroup label="v1.x">
- <option value="/news/2016/03/03/tbd-release/">Avatica x.y.z</option>
+ <option value="/news/2016/03/18/release-1.7.1/">Release 1.7.1</option>
<option value="/news/2016/03/03/separate-project/">Splitting Avatica from Calcite</option>
@@ -124,8 +124,10 @@
-->
-<p>This marks the separation of Avatica from itâs previous location as a sub-module
-of Apache Calciteâs Maven build. This separation is not to remove Avatica from
+<p>This marks the separation of Avatica from its previous location as a sub-module
+of Apache Calciteâs Maven build.</p>
+
+<p>This separation is not to remove Avatica from
the governance of the Apache Calcite project, but to allow for even more rapid
releases from both the Avatica and Calcite projects. We can confidently make new
releases of each without having to worry about the current state of development
@@ -151,7 +153,7 @@ features in the other.</p>
<ul>
<li class="">
- <a href="/avatica/news/2016/03/03/tbd-release/">9.9.9</a>
+ <a href="/avatica/news/2016/03/18/release-1.7.1/">1.7.1</a>
</li>
</ul>
Modified: calcite/site/avatica/news/index.html
URL: http://svn.apache.org/viewvc/calcite/site/avatica/news/index.html?rev=1735482&r1=1735481&r2=1735482&view=diff
==============================================================================
--- calcite/site/avatica/news/index.html (original)
+++ calcite/site/avatica/news/index.html Thu Mar 17 19:37:49 2016
@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title>News</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
- <meta name="generator" content="Jekyll v3.0.3">
+ <meta name="generator" content="Jekyll v2.4.0">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:300,300italic,400,400italic,700,700italic,900">
<link rel="stylesheet" href="/avatica/css/screen.css">
<link rel="icon" type="image/x-icon" href="/avatica/favicon.ico">
@@ -85,7 +85,7 @@
<option value="/avatica/news/">Home</option>
<optgroup label="v1.x">
- <option value="/news/2016/03/03/tbd-release/">Avatica x.y.z</option>
+ <option value="/news/2016/03/18/release-1.7.1/">Release 1.7.1</option>
<option value="/news/2016/03/03/separate-project/">Splitting Avatica from Calcite</option>
@@ -101,8 +101,8 @@
<article>
<h2>
- <a href="/avatica/news/2016/03/03/tbd-release/">
- Avatica x.y.z
+ <a href="/avatica/news/2016/03/18/release-1.7.1/">
+ Release 1.7.1
</a>
</h2>
<span class="post-category">
@@ -112,7 +112,7 @@
</span>
<div class="post-meta">
<span class="post-date">
- 03 Mar 2016
+ 18 Mar 2016
</span>
@@ -129,10 +129,70 @@
-->
-<p>Apache Calcite is happy to release Avatica x.y.z.</p>
+<p>Apache Calciteâs PMC has just released Avatica 1.7.1, the first
+release of <a href="http://calcite.apache.org/avatica/">Avatica</a> as an
+independent project. Weâre excited because it makes Avatica easier to
+use, and allows us to be more agile in our release schedule.</p>
+
+<p>(Avatica was previously released as part of Calcite. Avatica is still
+governed by Apache Calciteâs PMC, and stored in the same git
+repository as Calcite, but releases are no longer synchronized, and
+Avatica does not depend on any Calcite modules.)</p>
+
+<p>A significant portion of the work of this release was âMaven workâ to
+separate the build and release processes, but there were several
+important bug fixes, including a security fix for Jetty (see below).</p>
+
+<p>Performance, specifically on the write path, was a big focus in this
+release.
+[<a href="https://issues.apache.org/jira/browse/CALCITE-1091">CALCITE-1091</a>]
+contained a number of important changes. Some of these changes (e.g.
+[<a href="https://issues.apache.org/jira/browse/CALCITE-1092">CALCITE-1092</a>]
+and
+[<a href="https://issues.apache.org/jira/browse/CALCITE-1093">CALCITE-1093</a>])
+were related to heap usage in the Avatica server, while
+[<a href="https://issues.apache.org/jira/browse/CALCITE-1094">CALCITE-1094</a>]
+and
+[<a href="https://issues.apache.org/jira/browse/CALCITE-1117">CALCITE-1117</a>]
+were strictly performance-related.</p>
+
+<p>The latter improved performance the most. Switching to the
+<a href="http://hc.apache.org/">Apache Commons HttpComponents Client</a>
+library instead of using the Java platformâs built-in
+<a href="https://docs.oracle.com/javase/7/docs/api/java/net/HttpURLConnection.html">HttpURLConnection</a>,
+we noticed a 15% improvement in pure write workloads.</p>
+
+<p>Three dependent library upgrades:</p>
+
+<ul>
+ <li>We completely removed
+<a href="https://commons.apache.org/proper/commons-logging/">Commons Logging</a>
+in favor of <a href="http://slf4j.org/">SLF4J</a> in
+[<a href="https://issues.apache.org/jira/browse/CALCITE-669">CALCITE-669</a>].
+This logging framework update will allow downstream integrators to
+use the logging implementation of their choice instead of being
+forced to inherit Commons Logging.</li>
+ <li>We upgraded Jackson from 2.1.1 to 2.6.3 in
+[<a href="https://issues.apache.org/jira/browse/CALCITE-1021">CALCITE-1021</a>].</li>
+ <li>We upgraded Jetty from 9.2.7.v20150116 to 9.2.15.v20160210 in
+[<a href="https://issues.apache.org/jira/browse/CALCITE-1156">CALCITE-1156</a>]
+to fix a
+<a href="https://blog.gdssecurity.com/labs/2015/2/25/jetleak-vulnerability-remote-leakage-of-shared-buffers-in-je.html">security issue</a>.</li>
+</ul>
+
+<p>Note that Avaticaâs Maven coordinates have changed. The <code>groupId</code> is
+now âorg.apache.calcite.avaticaâ (previously âorg.apache.calciteâ),
+and <code>artifactId</code>s are
+âavaticaâ,
+âavatica-metricsâ,
+âavatica-metrics-dropwizardmetrics3â,
+âavatica-noop-driverâ,
+âavatica-serverâ
+(previously âcalcite-avaticaâ, etc.). Make sure to update these when
+upgrading to this version.</p>
- <p>See the <a href="/avatica/docs/history.html#v9-9-9">release notes</a>;
+ <p>See the <a href="/avatica/docs/history.html#v1-7-1">release notes</a>;
<a href="/avatica/downloads#source-releases">download</a> the release.</p>
</div>
@@ -170,8 +230,10 @@
-->
-<p>This marks the separation of Avatica from itâs previous location as a sub-module
-of Apache Calciteâs Maven build. This separation is not to remove Avatica from
+<p>This marks the separation of Avatica from its previous location as a sub-module
+of Apache Calciteâs Maven build.</p>
+
+<p>This separation is not to remove Avatica from
the governance of the Apache Calcite project, but to allow for even more rapid
releases from both the Avatica and Calcite projects. We can confidently make new
releases of each without having to worry about the current state of development
@@ -208,7 +270,7 @@ of the website.</p>
<ul>
<li class="">
- <a href="/avatica/news/2016/03/03/tbd-release/">9.9.9</a>
+ <a href="/avatica/news/2016/03/18/release-1.7.1/">1.7.1</a>
</li>
</ul>
Modified: calcite/site/avatica/news/releases/index.html
URL: http://svn.apache.org/viewvc/calcite/site/avatica/news/releases/index.html?rev=1735482&r1=1735481&r2=1735482&view=diff
==============================================================================
--- calcite/site/avatica/news/releases/index.html (original)
+++ calcite/site/avatica/news/releases/index.html Thu Mar 17 19:37:49 2016
@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title>Releases</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
- <meta name="generator" content="Jekyll v3.0.3">
+ <meta name="generator" content="Jekyll v2.4.0">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:300,300italic,400,400italic,700,700italic,900">
<link rel="stylesheet" href="/avatica/css/screen.css">
<link rel="icon" type="image/x-icon" href="/avatica/favicon.ico">
@@ -85,7 +85,7 @@
<option value="/avatica/news/">Home</option>
<optgroup label="v1.x">
- <option value="/news/2016/03/03/tbd-release/">Avatica x.y.z</option>
+ <option value="/news/2016/03/18/release-1.7.1/">Release 1.7.1</option>
<option value="/news/2016/03/03/separate-project/">Splitting Avatica from Calcite</option>
@@ -101,8 +101,8 @@
<article>
<h2>
- <a href="/avatica/news/2016/03/03/tbd-release/">
- Avatica x.y.z
+ <a href="/avatica/news/2016/03/18/release-1.7.1/">
+ Release 1.7.1
</a>
</h2>
<span class="post-category">
@@ -112,7 +112,7 @@
</span>
<div class="post-meta">
<span class="post-date">
- 03 Mar 2016
+ 18 Mar 2016
</span>
@@ -129,10 +129,70 @@
-->
-<p>Apache Calcite is happy to release Avatica x.y.z.</p>
+<p>Apache Calciteâs PMC has just released Avatica 1.7.1, the first
+release of <a href="http://calcite.apache.org/avatica/">Avatica</a> as an
+independent project. Weâre excited because it makes Avatica easier to
+use, and allows us to be more agile in our release schedule.</p>
+
+<p>(Avatica was previously released as part of Calcite. Avatica is still
+governed by Apache Calciteâs PMC, and stored in the same git
+repository as Calcite, but releases are no longer synchronized, and
+Avatica does not depend on any Calcite modules.)</p>
+
+<p>A significant portion of the work of this release was âMaven workâ to
+separate the build and release processes, but there were several
+important bug fixes, including a security fix for Jetty (see below).</p>
+
+<p>Performance, specifically on the write path, was a big focus in this
+release.
+[<a href="https://issues.apache.org/jira/browse/CALCITE-1091">CALCITE-1091</a>]
+contained a number of important changes. Some of these changes (e.g.
+[<a href="https://issues.apache.org/jira/browse/CALCITE-1092">CALCITE-1092</a>]
+and
+[<a href="https://issues.apache.org/jira/browse/CALCITE-1093">CALCITE-1093</a>])
+were related to heap usage in the Avatica server, while
+[<a href="https://issues.apache.org/jira/browse/CALCITE-1094">CALCITE-1094</a>]
+and
+[<a href="https://issues.apache.org/jira/browse/CALCITE-1117">CALCITE-1117</a>]
+were strictly performance-related.</p>
+
+<p>The latter improved performance the most. Switching to the
+<a href="http://hc.apache.org/">Apache Commons HttpComponents Client</a>
+library instead of using the Java platformâs built-in
+<a href="https://docs.oracle.com/javase/7/docs/api/java/net/HttpURLConnection.html">HttpURLConnection</a>,
+we noticed a 15% improvement in pure write workloads.</p>
+
+<p>Three dependent library upgrades:</p>
+
+<ul>
+ <li>We completely removed
+<a href="https://commons.apache.org/proper/commons-logging/">Commons Logging</a>
+in favor of <a href="http://slf4j.org/">SLF4J</a> in
+[<a href="https://issues.apache.org/jira/browse/CALCITE-669">CALCITE-669</a>].
+This logging framework update will allow downstream integrators to
+use the logging implementation of their choice instead of being
+forced to inherit Commons Logging.</li>
+ <li>We upgraded Jackson from 2.1.1 to 2.6.3 in
+[<a href="https://issues.apache.org/jira/browse/CALCITE-1021">CALCITE-1021</a>].</li>
+ <li>We upgraded Jetty from 9.2.7.v20150116 to 9.2.15.v20160210 in
+[<a href="https://issues.apache.org/jira/browse/CALCITE-1156">CALCITE-1156</a>]
+to fix a
+<a href="https://blog.gdssecurity.com/labs/2015/2/25/jetleak-vulnerability-remote-leakage-of-shared-buffers-in-je.html">security issue</a>.</li>
+</ul>
+
+<p>Note that Avaticaâs Maven coordinates have changed. The <code>groupId</code> is
+now âorg.apache.calcite.avaticaâ (previously âorg.apache.calciteâ),
+and <code>artifactId</code>s are
+âavaticaâ,
+âavatica-metricsâ,
+âavatica-metrics-dropwizardmetrics3â,
+âavatica-noop-driverâ,
+âavatica-serverâ
+(previously âcalcite-avaticaâ, etc.). Make sure to update these when
+upgrading to this version.</p>
- <p>See the <a href="/avatica/docs/history.html#v9-9-9">release notes</a>;
+ <p>See the <a href="/avatica/docs/history.html#v1-7-1">release notes</a>;
<a href="/avatica/downloads#source-releases">download</a> the release.</p>
</div>
@@ -156,7 +216,7 @@
<ul>
<li class="">
- <a href="/avatica/news/2016/03/03/tbd-release/">9.9.9</a>
+ <a href="/avatica/news/2016/03/18/release-1.7.1/">1.7.1</a>
</li>
</ul>
Modified: calcite/site/docs/reference.html
URL: http://svn.apache.org/viewvc/calcite/site/docs/reference.html?rev=1735482&r1=1735481&r2=1735482&view=diff
==============================================================================
--- calcite/site/docs/reference.html (original)
+++ calcite/site/docs/reference.html Thu Mar 17 19:37:49 2016
@@ -2351,12 +2351,12 @@ the user or application to supply a time
<td style="text-align: left">Equivalent to <code>EXTRACT(QUARTER FROM date)</code>. Returns an integer between 1 and 4.</td>
</tr>
<tr>
- <td style="text-align: left">{fn TIMESTAMPADD(interval, count, timestamp)}</td>
- <td style="text-align: left">Adds an interval to a timestamp</td>
+ <td style="text-align: left">{fn TIMESTAMPADD(timeUnit, count, timestamp)}</td>
+ <td style="text-align: left">Adds an interval of <em>count</em> <em>timeUnit</em>s to a timestamp</td>
</tr>
<tr>
- <td style="text-align: left">{fn TIMESTAMPDIFF(interval, timestamp, timestamp)}</td>
- <td style="text-align: left">Subtracts two timestamps</td>
+ <td style="text-align: left">{fn TIMESTAMPDIFF(timeUnit, timestamp1, timestamp2)}</td>
+ <td style="text-align: left">Subtracts <em>timestamp1</em> from <em>timestamp2</em> and returns the result in <em>timeUnit</em>s</td>
</tr>
</tbody>
</table>