Elastic5.0.1

.gitignore

@@ -18,4 +18,5 @@ elasticsearch-sql.iml
 .idea
 src/_site/vendor/codemirror/mode/jinja2/.goutputstream-*
 src/_site/node_modules
+src/site-server/node_modules
 *~

.travis.yml

@@ -2,18 +2,31 @@ language: java
 
 jdk:
   - oraclejdk8
-  - oraclejdk7
-
-install:
-  - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true
 
+addons:
+  apt:
+    packages:
+      - oracle-java8-installer
 
-script:
-  - wget https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.4.1/elasticsearch-2.4.1.deb && sudo dpkg -i --force-confnew elasticsearch-2.4.1.deb
+addons:
+  apt:
+    packages:
+      - oracle-java8-installer
+
+before_install:
+  # update to java 8
+  - sudo update-java-alternatives -s java-8-oracle
+  - export JAVA_HOME=/usr/lib/jvm/java-8-oracle
+  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.0.1.deb && sudo dpkg -i --force-confnew elasticsearch-5.0.1.deb
   - sudo cp ./src/test/resources/elasticsearch.yml /etc/elasticsearch/elasticsearch.yml
   - sudo cat /etc/elasticsearch/elasticsearch.yml
-  - sudo /usr/share/elasticsearch/bin/plugin install delete-by-query
+  - sudo java -version
   - sudo service elasticsearch start
-  - sleep 10
+  - sleep 30
+
+install:
+  - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true
+
+script:
   - ulimit -a
   - mvn test

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>2.4.1.0</version>
+	<version>5.0.1.0</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>
@@ -47,7 +47,7 @@
 		<elasticsearch.plugin.name>sql</elasticsearch.plugin.name>
 		<elasticsearch.plugin.site>true</elasticsearch.plugin.site>
 		<elasticsearch.plugin.jvm>true</elasticsearch.plugin.jvm>
-		<elasticsearch.version>2.4.1</elasticsearch.version>
+		<elasticsearch.version>5.0.1</elasticsearch.version>
 		<elasticsearch.plugin.classname>org.elasticsearch.plugin.nlpcn.SqlPlug</elasticsearch.plugin.classname>
 	</properties>
 
@@ -80,6 +80,12 @@
 			<version>1.0.15</version>
 		</dependency>
 
+        <dependency>
+            <groupId>org.locationtech.spatial4j</groupId>
+            <artifactId>spatial4j</artifactId>
+            <version>0.6</version>
+        </dependency>
+
 		<dependency>
 			<groupId>com.vividsolutions</groupId>
 			<artifactId>jts</artifactId>
@@ -92,27 +98,48 @@
 			<version>${elasticsearch.version}</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.elasticsearch.plugin</groupId>
-			<artifactId>delete-by-query</artifactId>
-			<version>${elasticsearch.version}</version>
-			<scope>provided</scope>
-		</dependency>
+
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>transport</artifactId>
+            <version>${elasticsearch.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-			<version>1.2.16</version>
+			<version>1.2.17</version>
 			<scope>provided</scope>
 		</dependency>
 
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.7</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.7</version>
+            <scope>provided</scope>
+        </dependency>
+
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
 			<version>2.5</version>
 			<scope>provided</scope>
 		</dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>15.0</version>
+        </dependency>
+
 
-	</dependencies>
+    </dependencies>
 
 
 	<build>
@@ -132,8 +159,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.3.2</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
@@ -192,13 +219,13 @@
 									<outputDirectory>${project.build.directory}</outputDirectory>
 									<destFileName>druid.jar</destFileName>
 								</artifactItem>
-								<artifactItem>
-									<groupId>org.elasticsearch.plugin</groupId>
-									<artifactId>delete-by-query</artifactId>
-									<overWrite>true</overWrite>
-									<outputDirectory>${project.build.directory}</outputDirectory>
-									<destFileName>deleteByQuery.jar</destFileName>
-								</artifactItem>
+                                <artifactItem>
+                                    <groupId>com.google.guava</groupId>
+                                    <artifactId>guava</artifactId>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <destFileName>guava.jar</destFileName>
+                                </artifactItem>
 							</artifactItems>
 							<outputDirectory>${project.build.directory}</outputDirectory>
 							<overWriteReleases>false</overWriteReleases>
@@ -251,6 +278,7 @@
 				<version>2.4</version>
 				<configuration>
 					<descriptor>src/assembly/zip.xml</descriptor>
+                    <finalName>elasticsearch</finalName>
 				</configuration>
 			</plugin>
 

src/main/java/com/alibaba/druid/pool/ElasticSearchConnection.java

@@ -4,6 +4,7 @@
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
+import org.elasticsearch.transport.client.PreBuiltTransportClient;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -28,7 +29,7 @@ public ElasticSearchConnection(String jdbcUrl) {
 
         Settings settings = Settings.builder().put("client.transport.ignore_cluster_name", true).build();
         try {
-            TransportClient transportClient = TransportClient.builder().settings(settings).build();
+            TransportClient transportClient = new PreBuiltTransportClient(settings);
 
             String hostAndPortArrayStr = jdbcUrl.split("/")[2];
             String[] hostAndPortArray = hostAndPortArrayStr.split(",");

src/main/java/com/alibaba/druid/pool/ElasticSearchDruidPooledPreparedStatement.java

@@ -2,7 +2,6 @@
 
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.transport.TransportClient;
-import org.elasticsearch.plugin.deletebyquery.DeleteByQueryPlugin;
 import org.elasticsearch.plugin.nlpcn.QueryActionElasticExecutor;
 import org.elasticsearch.plugin.nlpcn.executors.CSVResult;
 import org.elasticsearch.plugin.nlpcn.executors.CSVResultsExtractor;

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

@@ -4,15 +4,13 @@
 import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
-import org.elasticsearch.action.deletebyquery.DeleteByQueryAction;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.rest.BytesRestResponse;
 import org.elasticsearch.rest.RestChannel;
 import org.elasticsearch.rest.RestStatus;
-import org.elasticsearch.rest.action.support.RestStatusToXContentListener;
-import org.elasticsearch.rest.action.support.RestToXContentListener;
+import org.elasticsearch.rest.action.RestStatusToXContentListener;
 import org.nlpcn.es4sql.exception.SqlParseException;
 import org.nlpcn.es4sql.query.SqlElasticDeleteByQueryRequestBuilder;
 import org.nlpcn.es4sql.query.SqlElasticRequestBuilder;

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

@@ -18,6 +18,8 @@
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.internal.InternalSearchHit;
 import org.elasticsearch.search.internal.InternalSearchHits;
+import org.elasticsearch.search.sort.FieldSortBuilder;
+import org.elasticsearch.search.sort.SortOrder;
 import org.nlpcn.es4sql.domain.Field;
 import org.nlpcn.es4sql.exception.SqlParseException;
 import org.nlpcn.es4sql.query.SqlElasticRequestBuilder;
@@ -202,11 +204,12 @@ protected SearchResponse scrollOneTimeWithMax(Client client,TableInJoinRequestBu
                 .setScroll(new TimeValue(60000))
                 .setSize(MAX_RESULTS_ON_ONE_FETCH);
         boolean ordered = tableRequest.getOriginalSelect().isOrderdSelect();
-        if(!ordered) scrollRequest.setSearchType(SearchType.SCAN);
+        if(!ordered) scrollRequest.addSort(FieldSortBuilder.DOC_FIELD_NAME, SortOrder.ASC);
         responseWithHits = scrollRequest.get();
         //on ordered select - not using SCAN , elastic returns hits on first scroll
-        if(!ordered)
-            responseWithHits = client.prepareSearchScroll(responseWithHits.getScrollId()).setScroll(new TimeValue(600000)).get();
+        //es5.0 elastic always return docs on scan
+//        if(!ordered)
+//            responseWithHits = client.prepareSearchScroll(responseWithHits.getScrollId()).setScroll(new TimeValue(600000)).get();
         return responseWithHits;
     }
 

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

@@ -11,6 +11,8 @@
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
+import org.elasticsearch.search.sort.FieldSortBuilder;
+import org.elasticsearch.search.sort.SortOrder;
 import org.nlpcn.es4sql.domain.Select;
 
 import java.io.IOException;
@@ -26,12 +28,13 @@ public static SearchResponse scrollOneTimeWithHits(Client client, SearchRequestB
                 .setScroll(new TimeValue(60000))
                 .setSize(resultSize);
         boolean ordered = originalSelect.isOrderdSelect();
-        if(!ordered) scrollRequest.setSearchType(SearchType.SCAN);
+        if(!ordered) scrollRequest.addSort(FieldSortBuilder.DOC_FIELD_NAME, SortOrder.ASC);
         responseWithHits = scrollRequest.get();
         //on ordered select - not using SCAN , elastic returns hits on first scroll
-        if(!ordered) {
-            responseWithHits = client.prepareSearchScroll(responseWithHits.getScrollId()).setScroll(new TimeValue(600000)).get();
-        }
+        //es5.0 elastic always return docs on scan
+//        if(!ordered) {
+//            responseWithHits = client.prepareSearchScroll(responseWithHits.getScrollId()).setScroll(new TimeValue(600000)).get();
+//        }
         return responseWithHits;
     }