es 6.8.0 support

Author: shi-yuan

.travis.yml

@@ -7,7 +7,7 @@ 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-6.7.2.deb && sudo dpkg -i --force-confnew elasticsearch-6.7.2.deb
+  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.0.deb && sudo dpkg -i --force-confnew elasticsearch-6.8.0.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>6.7.2.0</version>
+	<version>6.8.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>6.7.2</elasticsearch.version>
+		<elasticsearch.version>6.8.0</elasticsearch.version>
 		<elasticsearch.plugin.classname>org.elasticsearch.plugin.nlpcn.SqlPlug</elasticsearch.plugin.classname>
         <druid.version>1.1.16</druid.version>
         <guava.version>15.0</guava.version>

src/main/java/org/nlpcn/es4sql/domain/JoinSelect.java

@@ -19,7 +19,7 @@ public class JoinSelect {
     private List<Condition> connectedConditions;
     private int totalLimit;
 
-    private final int DEAFULT_NUM_OF_RESULTS = 200;
+    public static int DEAFULT_NUM_OF_RESULTS = 200;
 
     private SQLJoinTableSource.JoinType joinType;
 

src/main/java/org/nlpcn/es4sql/domain/Select.java

@@ -14,7 +14,7 @@
  */
 public class Select extends Query {
 
-    public static final int DEFAULT_ROWCOUNT = 1000;
+    public static int DEFAULT_ROWCOUNT = 1000;
 
 	// Using this functions, will cause query to execute as aggregation.
 	private final List<String> aggsFunctions = Arrays.asList("SUM", "MAX", "MIN", "AVG", "TOPHITS", "COUNT", "STATS","EXTENDED_STATS","PERCENTILES","SCRIPTED_METRIC");

src/main/java/org/nlpcn/es4sql/domain/hints/HintFactory.java

@@ -159,6 +159,10 @@ public static Hint getHintFromString(String hintAsString) throws SqlParseExcepti
             String conflictsParam = getParamFromHint(hintAsString, "! CONFLICTS");
             return new Hint(HintType.CONFLICTS, new String[] { conflictsParam });
         }
+        if (hintAsString.startsWith("! PREFERENCE")) {
+            String preferenceParam = getParamFromHint(hintAsString, "! PREFERENCE");
+            return new Hint(HintType.PREFERENCE, new String[]{preferenceParam});
+        }
 
         return null;
     }

src/main/java/org/nlpcn/es4sql/domain/hints/HintType.java

@@ -20,5 +20,6 @@ public enum HintType
     COLLAPSE,
     POST_FILTER,
     STATS,
-    CONFLICTS
+    CONFLICTS,
+    PREFERENCE
 }

src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java

@@ -218,6 +218,7 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {
         updateRequestWithCollapse(select, request);
         updateRequestWithPostFilter(select, request);
         updateRequestWithStats(select, request);
+        updateRequestWithPreference(select, request);
         SqlElasticSearchRequestBuilder sqlElasticRequestBuilder = new SqlElasticSearchRequestBuilder(request);
         return sqlElasticRequestBuilder;
     }

src/main/java/org/nlpcn/es4sql/query/DefaultQueryAction.java

@@ -91,6 +91,7 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {
 		updateRequestWithCollapse(select, request);
 		updateRequestWithPostFilter(select, request);
 		updateRequestWithStats(select, request);
+		updateRequestWithPreference(select, request);
 		SqlElasticSearchRequestBuilder sqlElasticRequestBuilder = new SqlElasticSearchRequestBuilder(request);
 
 		return sqlElasticRequestBuilder;

src/main/java/org/nlpcn/es4sql/query/QueryAction.java

@@ -81,6 +81,14 @@ protected void updateRequestWithIndexAndRoutingOptions(Select select, SearchRequ
         }
     }
 
+    protected void updateRequestWithPreference(Select select, SearchRequestBuilder request) {
+        for (Hint hint : select.getHints()) {
+            if (hint.getType() == HintType.PREFERENCE && hint.getParams() != null && 0 < hint.getParams().length) {
+                request.setPreference(hint.getParams()[0].toString());
+            }
+        }
+    }
+
     protected void updateRequestWithHighlight(Select select, SearchRequestBuilder request) {
         boolean foundAnyHighlights = false;
         HighlightBuilder highlightBuilder = new HighlightBuilder();

src/test/java/org/nlpcn/es4sql/ExplainTest.java

@@ -114,6 +114,11 @@ public void testCastInWhereExplain() throws SqlParseException, SQLFeatureNotSupp
         System.out.println(explain("select * from file1 where cast(offset as int) > 20"));
     }
 
+    @Test
+    public void testPreferenceExplain() throws SqlParseException, SQLFeatureNotSupportedException {
+        System.out.println(explain("select /*! PREFERENCE(_shards:2,3|_local) */ * from myindex"));
+    }
+
     private String explain(String sql) throws SQLFeatureNotSupportedException, SqlParseException {
         SearchDao searchDao = MainTestSuite.getSearchDao();
         SqlElasticRequestBuilder requestBuilder = searchDao.explain(sql).explain();