Merge commit '60d0b3a31da52cf510c83a37a106941adc1be1de' into elastic2.1

Author: eliranmoyal

.travis.yml

@@ -2,7 +2,7 @@ language: java
 
 jdk:
   - oraclejdk8
-  - openjdk7
+  - oraclejdk7
 
 
 script:

README.md

@@ -1,7 +1,8 @@
 Elasticsearch-SQL
 =================
 **1.X** [![1.X Build Status](https://travis-ci.org/NLPchina/elasticsearch-sql.svg?branch=master)](https://travis-ci.org/NLPchina/elasticsearch-sql) <br>
-**2.X** [![2.0.0 Build Status](https://travis-ci.org/NLPchina/elasticsearch-sql.svg?branch=elastic2.0)](https://travis-ci.org/NLPchina/elasticsearch-sql)
+**2.0.0** [![2.0.0 Build Status](https://travis-ci.org/NLPchina/elasticsearch-sql.svg?branch=elastic2.0)](https://travis-ci.org/NLPchina/elasticsearch-sql)<br>
+**2.1.0** [![2.1.0 Build Status](https://travis-ci.org/NLPchina/elasticsearch-sql.svg?branch=elastic2.0)](https://travis-ci.org/NLPchina/elasticsearch-sql)<br>
 
 Query elasticsearch using familiar SQL syntax.
 You can also use ES functions in SQL.
@@ -20,18 +21,23 @@ Install as plugin:
 Versions
 ------------
 
-| elasticsearch version | latest version | remarks                        |
-| --------------------- | -------------  | -----------------------------  |
-| 1.X	                | 1.4.6          | tested against elastic 1.4-1.6 |
-| 2.0.0                 | 2.0.1          | delete commands not supported  |
+| elasticsearch version | latest version | remarks                        | branch     |
+| --------------------- | -------------  | -----------------------------  | ---------- |
+| 1.X	                | 1.4.7          | tested against elastic 1.4-1.6 | master     |
+| 2.0.0                 | 2.0.2          | delete commands not supported  | elastic2.0 |
+| 2.1.0                 | 2.1.0          | delete commands not supported  | elastic2.1 |
 
 ### Elasticsearch 1.X
 ````
-./bin/plugin -u https://github.com/NLPchina/elasticsearch-sql/releases/download/1.4.6/elasticsearch-sql-1.4.6.zip --install sql
+./bin/plugin -u https://github.com/NLPchina/elasticsearch-sql/releases/download/1.4.7/elasticsearch-sql-1.4.7.zip --install sql
 ````
 ### Elasticsearch 2.0.0
 ````
-./bin/plugin install https://github.com/NLPchina/elasticsearch-sql/releases/download/2.0.1/elasticsearch-sql-2.0.1.zip 
+./bin/plugin install https://github.com/NLPchina/elasticsearch-sql/releases/download/2.0.2/elasticsearch-sql-2.0.2.zip 
+````
+### Elasticsearch 2.1.0
+````
+./bin/plugin install https://github.com/NLPchina/elasticsearch-sql/releases/download/2.1.0/elasticsearch-sql-2.1.0.zip 
 ````
 After doing this, you need to restart the Elasticsearch server. Otherwise you may get errors like `Invalid index name [sql], must not start with '']; ","status":400}`.
 

src/_site/query.js

@@ -161,7 +161,7 @@ function addFieldsToRow (row,hit) {
 function removeNestedAndFilters (aggs) {
     for(field in aggs)
     {
-        if (field.endsWith("@NESTED") || field.endsWith("@FILTER")){
+        if (field.endsWith("@NESTED") || field.endsWith("@FILTER") || field.endsWith("@NESTED_REVERSED")){
             delete aggs[field]["doc_count"];
             delete aggs[field]["key"];
             leftField = Object.keys(aggs[field])[0];

src/main/java/org/elasticsearch/plugin/nlpcn/RestSqlAction.java

@@ -1,13 +1,17 @@
 package org.elasticsearch.plugin.nlpcn;
 
-import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.plugin.nlpcn.executors.ActionRequestRestExecuterFactory;
+import org.elasticsearch.plugin.nlpcn.executors.RestExecutor;
 import org.elasticsearch.rest.*;
 import org.nlpcn.es4sql.SearchDao;
+import org.nlpcn.es4sql.query.QueryAction;
 import org.nlpcn.es4sql.query.SqlElasticRequestBuilder;
 
+import java.util.Map;
+
 
 public class RestSqlAction extends BaseRestHandler {
 
@@ -27,18 +31,18 @@ protected void handleRequest(RestRequest request, RestChannel channel, final Cli
 		if (sql == null) {
 			sql = request.content().toUtf8();
 		}
-
 		SearchDao searchDao = new SearchDao(client);
-        SqlElasticRequestBuilder actionRequestBuilder = searchDao.explain(sql);
-        ActionRequest actionRequest = actionRequestBuilder.request();
+        QueryAction queryAction= searchDao.explain(sql);
 
 		// TODO add unittests to explain. (rest level?)
 		if (request.path().endsWith("/_explain")) {
-			String jsonExplanation = actionRequestBuilder.explain();
+			String jsonExplanation = queryAction.explain().explain();
 			BytesRestResponse bytesRestResponse = new BytesRestResponse(RestStatus.OK, jsonExplanation);
 			channel.sendResponse(bytesRestResponse);
 		} else {
-			new ActionRequestRestExecuter(actionRequestBuilder, channel, client).execute();
+            Map<String, String> params = request.params();
+            RestExecutor restExecutor = ActionRequestRestExecuterFactory.createExecutor(params.get("format"));
+			restExecutor.execute(client,params,queryAction,channel);
 		}
 	}
 }

src/main/java/org/elasticsearch/plugin/nlpcn/executors/ActionRequestRestExecuterFactory.java

@@ -0,0 +1,16 @@
+package org.elasticsearch.plugin.nlpcn.executors;
+
+/**
+ * Created by Eliran on 26/12/2015.
+ */
+public class ActionRequestRestExecuterFactory {
+    public static RestExecutor createExecutor(String format) {
+        if(format == null || format.equals("")){
+            return new ElasticDefaultRestExecutor();
+        }
+        if(format.equalsIgnoreCase("csv")){
+            return new CSVResultRestExecutor();
+        }
+        return null;
+    }
+}

src/main/java/org/elasticsearch/plugin/nlpcn/executors/CSVResult.java

@@ -0,0 +1,24 @@
+package org.elasticsearch.plugin.nlpcn.executors;
+
+import java.util.List;
+
+/**
+ * Created by Eliran on 27/12/2015.
+ */
+public class CSVResult {
+    private final List<String> headers;
+    private final List<String> lines;
+
+    public CSVResult(List<String> headers, List<String> lines) {
+        this.headers = headers;
+        this.lines = lines;
+    }
+
+    public List<String> getHeaders() {
+        return headers;
+    }
+
+    public List<String> getLines() {
+        return lines;
+    }
+}

src/main/java/org/elasticsearch/plugin/nlpcn/executors/CSVResultRestExecutor.java

@@ -0,0 +1,47 @@
+package org.elasticsearch.plugin.nlpcn.executors;
+
+import com.google.common.base.Joiner;
+import org.elasticsearch.client.Client;
+import org.elasticsearch.plugin.nlpcn.QueryActionElasticExecutor;
+import org.elasticsearch.rest.BytesRestResponse;
+import org.elasticsearch.rest.RestChannel;
+import org.elasticsearch.rest.RestStatus;
+import org.nlpcn.es4sql.query.QueryAction;
+
+import java.util.*;
+
+/**
+ * Created by Eliran on 26/12/2015.
+ */
+public class CSVResultRestExecutor implements RestExecutor {
+
+    @Override
+    public void execute(Client client, Map<String, String> params, QueryAction queryAction, RestChannel channel) throws Exception {
+        Object queryResult = QueryActionElasticExecutor.executeAnyAction(client, queryAction);
+        boolean flat = false;
+        if(params.containsKey("flat")){
+            flat = Boolean.parseBoolean(params.get("flat"));
+        }
+        String separator = ",";
+        if(params.containsKey("separator")){
+         separator = params.get("separator");
+        }
+        CSVResult result  = new CSVResultsExtractor().extractResults(queryResult,flat,separator);
+        String newLine = "\n";
+        if(params.containsKey("newLine")){
+         newLine = params.get("newLine");
+        }
+        String csvString = buildString(separator, result, newLine);
+        BytesRestResponse bytesRestResponse = new BytesRestResponse(RestStatus.OK, csvString);
+        channel.sendResponse(bytesRestResponse);
+    }
+
+    private String buildString(String separator, CSVResult result, String newLine) {
+        StringBuilder csv = new StringBuilder();
+        csv.append(Joiner.on(separator).join(result.getHeaders()));
+        csv.append(newLine);
+        csv.append(Joiner.on(newLine).join(result.getLines()));
+        return csv.toString();
+    }
+
+}