es 7.14.0 support

Author: shi-yuan

.travis.yml

@@ -4,7 +4,7 @@ jdk:
   - openjdk8
 
 before_install:
-  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.13.4-amd64.deb && sudo dpkg -i --force-confnew elasticsearch-7.13.4-amd64.deb
+  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.14.0-amd64.deb && sudo dpkg -i --force-confnew elasticsearch-7.14.0-amd64.deb
   - sudo cp ./src/test/resources/elasticsearch.yml /etc/elasticsearch/elasticsearch.yml
   - sudo cat /etc/elasticsearch/elasticsearch.yml
   - sudo java -version

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>7.13.4.0</version>
+	<version>7.14.0.0</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>
@@ -44,7 +44,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<runSuite>**/MainTestSuite.class</runSuite>
 		<elasticsearch.plugin.name>sql</elasticsearch.plugin.name>
-		<elasticsearch.version>7.13.4</elasticsearch.version>
+		<elasticsearch.version>7.14.0</elasticsearch.version>
 		<elasticsearch.plugin.classname>org.elasticsearch.plugin.nlpcn.SqlPlug</elasticsearch.plugin.classname>
         <druid.version>1.1.16</druid.version>
         <guava.version>30.1.1-jre</guava.version>

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

@@ -1,13 +1,6 @@
 package org.elasticsearch.plugin.nlpcn;
 
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.search.SearchType;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.rest.RestChannel;
 import org.elasticsearch.search.SearchHits;
-import org.nlpcn.es4sql.domain.Select;
 import org.nlpcn.es4sql.exception.SqlParseException;
 
 import java.io.IOException;
@@ -16,6 +9,6 @@
  * Created by Eliran on 21/8/2016.
  */
 public interface ElasticHitsExecutor {
-    public void run() throws IOException, SqlParseException ;
-    public SearchHits getHits();
+    void run() throws IOException, SqlParseException ;
+    SearchHits getHits();
 }

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

@@ -5,8 +5,8 @@
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.text.Text;
-import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.rest.BytesRestResponse;
 import org.elasticsearch.rest.RestChannel;
 import org.elasticsearch.rest.RestStatus;
@@ -59,6 +59,7 @@ public void  sendResponse(RestChannel channel){
         }
     }
 
+    @Override
     public void run() throws IOException, SqlParseException {
         long timeBefore = System.currentTimeMillis();
         List<SearchHit> combinedSearchHits =  innerRun();
@@ -72,6 +73,7 @@ public void run() throws IOException, SqlParseException {
 
     protected abstract List<SearchHit> innerRun() throws IOException, SqlParseException ;
 
+    @Override
     public SearchHits getHits(){
         return results;
     }

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

@@ -5,10 +5,10 @@
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.Client;
-import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.sort.FieldSortBuilder;

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

@@ -5,7 +5,7 @@
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.text.Text;
-import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
@@ -50,6 +50,7 @@ public HashJoinElasticExecutor(Client client, HashJoinElasticRequestBuilder requ
         this.alreadyMatched = new HashSet<>();
     }
 
+    @Override
     public List<SearchHit> innerRun() throws IOException, SqlParseException {
 
         Map<String, Map<String, List<Object>>> optimizationTermsFilterStructure =

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

@@ -5,7 +5,7 @@
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.document.DocumentField;
 import org.elasticsearch.common.text.Text;
-import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.nlpcn.es4sql.Util;

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

@@ -7,7 +7,7 @@
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.text.Text;
-import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.nlpcn.es4sql.domain.Condition;

src/main/java/org/nlpcn/es4sql/SQLFunctions.java

@@ -12,7 +12,7 @@
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import org.elasticsearch.common.collect.Tuple;
+import org.elasticsearch.core.Tuple;
 import org.nlpcn.es4sql.domain.KVValue;
 
 import java.util.ArrayList;

src/main/java/org/nlpcn/es4sql/parse/FieldMaker.java

@@ -15,7 +15,7 @@
 import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
 import com.alibaba.druid.util.StringUtils;
 import com.google.common.collect.Lists;
-import org.elasticsearch.common.collect.Tuple;
+import org.elasticsearch.core.Tuple;
 import org.nlpcn.es4sql.SQLFunctions;
 import org.nlpcn.es4sql.Util;
 import org.nlpcn.es4sql.domain.Field;