[calcite] branch master updated: [CALCITE-3434] ElasticSearch schema with pathPrefix (Jeffery Zhang)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danny0405 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/master by this push:
     new cae7afb  [CALCITE-3434] ElasticSearch schema with pathPrefix (Jeffery Zhang)
cae7afb is described below

commit cae7afbf8e18f839de295ff492cf2cbc4abe1e93
Author: 张俭 <zj...@ly.com>
AuthorDate: Fri Oct 18 11:10:34 2019 +0800

    [CALCITE-3434] ElasticSearch schema with pathPrefix (Jeffery Zhang)
    
    We can use "pathPrefix" in "operand" to set up ElasticSearch rest
    client.
    i.e.
    "operand": {
    "coordinates": "{'localhost': 80}",
    "pathPrefix":"test",
    "index":"xxx"
    }
    
    close apache/calcite#1518
---
 .../adapter/elasticsearch/ElasticsearchSchemaFactory.java   | 13 +++++++++----
 site/_docs/elasticsearch_adapter.md                         |  6 ++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchSchemaFactory.java b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchSchemaFactory.java
index 9b6997e..eb0241e 100644
--- a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchSchemaFactory.java
+++ b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchSchemaFactory.java
@@ -28,6 +28,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Preconditions;
 
 import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -85,9 +86,9 @@ public class ElasticsearchSchemaFactory implements SchemaFactory {
         throw new IllegalArgumentException
         ("Both 'coordinates' and 'hosts' is missing in configuration. Provide one of them.");
       }
-
+      final String pathPrefix = (String) map.get("pathPrefix");
       // create client
-      final RestClient client = connect(hosts);
+      final RestClient client = connect(hosts, pathPrefix);
       final String index = (String) map.get("index");
 
       return new ElasticsearchSchema(client, new ObjectMapper(), index);
@@ -101,12 +102,16 @@ public class ElasticsearchSchemaFactory implements SchemaFactory {
    * @param hosts list of ES HTTP Hosts to connect to
    * @return newly initialized low-level rest http client for ES
    */
-  private static RestClient connect(List<HttpHost> hosts) {
+  private static RestClient connect(List<HttpHost> hosts, String pathPrefix) {
 
     Objects.requireNonNull(hosts, "hosts or coordinates");
     Preconditions.checkArgument(!hosts.isEmpty(), "no ES hosts specified");
 
-    return RestClient.builder(hosts.toArray(new HttpHost[hosts.size()])).build();
+    RestClientBuilder builder = RestClient.builder(hosts.toArray(new HttpHost[hosts.size()]));
+    if (pathPrefix != null && !pathPrefix.isEmpty()) {
+      builder.setPathPrefix(pathPrefix);
+    }
+    return builder.build();
   }
 
 }
diff --git a/site/_docs/elasticsearch_adapter.md b/site/_docs/elasticsearch_adapter.md
index 1c3a634..ab68c25 100644
--- a/site/_docs/elasticsearch_adapter.md
+++ b/site/_docs/elasticsearch_adapter.md
@@ -63,19 +63,21 @@ $ ./sqlline
 sqlline> !connect jdbc:calcite:model=model.json admin admin
 {% endhighlight %}
 
-You can also specify the index name that is represented by the `index` parameter in the model definition:
+You can also specify the index name and path prefix that is represented by the `index` and `pathPrefix` parameter in the model definition:
 
 {% highlight json %}
 ...
 
       "operand": {
         "coordinates": "{'127.0.0.1': 9200}",
-        "index": "usa"
+        "index": "usa",
+        "pathPrefix": "path"
       }
 
 ...
 {% endhighlight %}
 
+
 `sqlline` will now accept SQL queries which access your Elasticsearch.
 The purpose of this adapter is to compile the query into the most efficient
 Elasticsearch SEARCH JSON possible by exploiting filtering and sorting directly