Author: jhyde
Date: Thu Dec 27 20:52:43 2018
New Revision: 1849815

URL: http://svn.apache.org/viewvc?rev=1849815&view=rev
Log:
Site: Rename MapD to OmniSci, and update logos (re-apply); ElasticAdapter

Modified:
    calcite/site/docs/adapter.html
    calcite/site/docs/elasticsearch_adapter.html
    calcite/site/docs/powered_by.html
    calcite/site/img/powered-by.png

Modified: calcite/site/docs/adapter.html
URL: 
http://svn.apache.org/viewvc/calcite/site/docs/adapter.html?rev=1849815&r1=1849814&r2=1849815&view=diff
==============================================================================
--- calcite/site/docs/adapter.html (original)
+++ calcite/site/docs/adapter.html Thu Dec 27 20:52:43 2018
@@ -114,9 +114,7 @@ presenting the data as tables within a s
   <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/elasticsearch2/package-summary.html">calcite-elasticsearch2</a>
-and
-<a 
href="/apidocs/org/apache/calcite/adapter/elasticsearch5/package-summary.html">calcite-elasticsearch5</a>)</li>
+(<a 
href="/apidocs/org/apache/calcite/adapter/elasticsearch/package-summary.html">calcite-elasticsearch</a>)</li>
   <li><a href="file_adapter.html">File adapter</a> (<a 
href="/apidocs/org/apache/calcite/adapter/file/package-summary.html">calcite-file</a>)</li>
   <li><a href="geode_adapter.html">Geode adapter</a> (<a 
href="/apidocs/org/apache/calcite/adapter/geode/package-summary.html">calcite-geode</a>)</li>
   <li>JDBC adapter (part of <a 
href="/apidocs/org/apache/calcite/adapter/jdbc/package-summary.html">calcite-core</a>)</li>

Modified: calcite/site/docs/elasticsearch_adapter.html
URL: 
http://svn.apache.org/viewvc/calcite/site/docs/elasticsearch_adapter.html?rev=1849815&r1=1849814&r2=1849815&view=diff
==============================================================================
--- calcite/site/docs/elasticsearch_adapter.html (original)
+++ calcite/site/docs/elasticsearch_adapter.html Thu Dec 27 20:52:43 2018
@@ -128,19 +128,15 @@ in the model definition.</p>
     </span><span class="p">{</span><span class="w">
       </span><span class="s2">"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="s2">"name"</span><span class="p">:</span><span 
class="w"> </span><span class="s2">"elasticsearch"</span><span 
class="p">,</span><span class="w">
-      </span><span class="s2">"factory"</span><span class="p">:</span><span 
class="w"> </span><span 
class="s2">"org.apache.calcite.adapter.elasticsearch2.Elasticsearch2SchemaFactory"</span><span
 class="p">,</span><span class="w">
+      </span><span class="s2">"factory"</span><span class="p">:</span><span 
class="w"> </span><span 
class="s2">"org.apache.calcite.adapter.elasticsearch.ElasticsearchSchemaFactory"</span><span
 class="p">,</span><span class="w">
       </span><span class="s2">"operand"</span><span class="p">:</span><span 
class="w"> </span><span class="p">{</span><span class="w">
         </span><span class="s2">"coordinates"</span><span 
class="p">:</span><span class="w"> </span><span class="s2">"{'127.0.0.1': 
9300}"</span><span class="p">,</span><span class="w">
-        </span><span class="s2">"userConfig"</span><span 
class="p">:</span><span class="w"> </span><span 
class="s2">"{'bulk.flush.max.actions': 10, 'bulk.flush.max.size.mb': 
1}"</span><span class="p">,</span><span class="w">
         </span><span class="s2">"index"</span><span class="p">:</span><span 
class="w"> </span><span class="s2">"usa"</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>This adapter is targeted for Elasticsearch 2.x. To use Calcite with 
Elasticsearch 5.x+ you can use the factory
-of the adapter targeted for Elasticsearch 5.x: <code 
class="highlighter-rouge">org.apache.calcite.adapter.elasticsearch5.Elasticsearch5SchemaFactory</code></p>
-
 <p>Assuming this file is stored as <code 
class="highlighter-rouge">model.json</code>, you can connect to
 Elasticsearch via <a href="https://github.com/julianhyde/sqlline";><code 
class="highlighter-rouge">sqlline</code></a> as
 follows:</p>
@@ -206,9 +202,16 @@ Elasticsearch in ascending order.</p>
   </span><span class="p">]</span><span class="w">
 </span><span class="p">}</span></code></pre></figure>
 
-<p>This is the initial version of the Calcite Elasticsearch adapter.
-Work is in progress to introduce new features like aggregations into
-it.</p>
+<h3 id="use-of-scrolling-api">Use of Scrolling API</h3>
+<p>For queries without aggregate functions (like <code 
class="highlighter-rouge">COUNT</code>, <code 
class="highlighter-rouge">MAX</code> etc.) elastic adapter 
+uses <a 
href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-scroll.html";>scroll
 API</a>, by default. 
+This ensures that consistent and full data-set is returned to end user (lazily 
and in batches). Please note that
+scroll is automatically cleared (removed) when all query resuts are 
consumed.</p>
+
+<h3 id="supported-versions">Supported versions</h3>
+<p>Currently this adapter supports ElasticSearch versions 2.x (or newer). 
Generally
+we try to follow official <a href="https://www.elastic.co/support/eol";>support 
schedule</a>.</p>
+
 
           
 

Modified: calcite/site/docs/powered_by.html
URL: 
http://svn.apache.org/viewvc/calcite/site/docs/powered_by.html?rev=1849815&r1=1849814&r2=1849815&view=diff
==============================================================================
--- calcite/site/docs/powered_by.html (original)
+++ calcite/site/docs/powered_by.html Thu Dec 27 20:52:43 2018
@@ -122,7 +122,7 @@
   <li><a href="#cascading" id="markdown-toc-cascading">Cascading</a></li>
   <li><a href="#dremio" id="markdown-toc-dremio">Dremio</a></li>
   <li><a href="#herddb" id="markdown-toc-herddb">HerdDB</a></li>
-  <li><a href="#mapd" id="markdown-toc-mapd">MapD</a></li>
+  <li><a href="#omnisci" id="markdown-toc-omnisci">OmniSci</a></li>
   <li><a href="#qubole-quark" id="markdown-toc-qubole-quark">Qubole 
Quark</a></li>
   <li><a href="#sql-gremlin" id="markdown-toc-sql-gremlin">SQL-Gremlin</a></li>
 </ul>
@@ -209,9 +209,9 @@ is a distributed JVM-Embeddable Database
 <a href="https://bookkeeper.apache.org/";>Apache BookKeeper</a>.
 It uses Calcite as its SQL Planner.</p>
 
-<h3 id="mapd">MapD</h3>
+<h3 id="omnisci">OmniSci</h3>
 
-<p><a href="https://www.mapd.com";>MapD</a>
+<p><a href="https://www.omnisci.com";>OmniSci</a>
 is a GPU-powered database and visual analytics platform for
 interactive exploration of large datasets.</p>
 

Modified: calcite/site/img/powered-by.png
URL: 
http://svn.apache.org/viewvc/calcite/site/img/powered-by.png?rev=1849815&r1=1849814&r2=1849815&view=diff
==============================================================================
Binary files - no diff available.


Reply via email to