NLPchina#120 ignore_unavailable hint

eliranmoyal · eliranmoyal · commit 2c9b06355322 · 2015-12-02T00:26:39.000+02:00
diff --git a/src/main/java/org/nlpcn/es4sql/domain/hints/HintFactory.java b/src/main/java/org/nlpcn/es4sql/domain/hints/HintFactory.java
@@ -45,6 +45,10 @@ public static Hint getHintFromString(String hintAsString){
             }
             return new Hint(HintType.USE_SCROLL, new Object[]{docsPerShardFetch,timeout});
         }
+        if(hintAsString.startsWith("! IGNORE_UNAVAILABLE")){
+            return new Hint(HintType.IGNORE_UNAVAILABLE,null);
+        }
+
         return null;
     }
 
diff --git a/src/main/java/org/nlpcn/es4sql/domain/hints/HintType.java b/src/main/java/org/nlpcn/es4sql/domain/hints/HintType.java
@@ -12,6 +12,6 @@ public enum HintType
     JOIN_LIMIT,
     USE_NESTED_LOOPS,
     NL_MULTISEARCH_SIZE,
-    USE_SCROLL;
-
+    USE_SCROLL,
+    IGNORE_UNAVAILABLE;
 }
diff --git a/src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java b/src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java
@@ -139,6 +139,7 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {
 		setLimit(select.getOffset(), select.getRowCount());
 
 		request.setSearchType(SearchType.DEFAULT);
+        updateWithIndicesOptionsIfNeeded(select,request);
         SqlElasticSearchRequestBuilder sqlElasticRequestBuilder = new SqlElasticSearchRequestBuilder(request);
         return sqlElasticRequestBuilder;
 	}
diff --git a/src/main/java/org/nlpcn/es4sql/query/DefaultQueryAction.java b/src/main/java/org/nlpcn/es4sql/query/DefaultQueryAction.java
@@ -47,6 +47,7 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {
         if(!usedScroll){
             request.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
         }
+        updateWithIndicesOptionsIfNeeded(select,request);
 
         SqlElasticSearchRequestBuilder sqlElasticRequestBuilder = new SqlElasticSearchRequestBuilder(request);
 		return sqlElasticRequestBuilder;
diff --git a/src/main/java/org/nlpcn/es4sql/query/QueryAction.java b/src/main/java/org/nlpcn/es4sql/query/QueryAction.java
@@ -2,9 +2,12 @@
 
 import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
+import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.client.Client;
 import org.nlpcn.es4sql.domain.Query;
 import org.nlpcn.es4sql.domain.Select;
+import org.nlpcn.es4sql.domain.hints.Hint;
+import org.nlpcn.es4sql.domain.hints.HintType;
 import org.nlpcn.es4sql.exception.SqlParseException;
 
 /**
@@ -23,6 +26,20 @@ public QueryAction(Client client, Query query) {
 		this.query = query;
 	}
 
+    protected void updateWithIndicesOptionsIfNeeded(Select select,SearchRequestBuilder request) {
+        boolean ignore = false;
+        for(Hint hint : select.getHints()){
+            if(hint.getType() == HintType.IGNORE_UNAVAILABLE){
+                ignore = true;
+                break;
+            }
+        }
+        if(ignore)
+            //saving the defaults from TransportClient search
+            request.setIndicesOptions(IndicesOptions.fromOptions(true, false, true, false, IndicesOptions.strictExpandOpenAndForbidClosed()));
+    }
+
+
 
 	/**
 	 * Prepare the request, and return ES request.
diff --git a/src/test/java/org/nlpcn/es4sql/QueryTest.java b/src/test/java/org/nlpcn/es4sql/QueryTest.java
@@ -8,6 +8,7 @@
 import org.elasticsearch.common.joda.time.DateTime;
 import org.elasticsearch.common.joda.time.format.DateTimeFormat;
 import org.elasticsearch.common.joda.time.format.DateTimeFormatter;
+import org.elasticsearch.indices.IndexMissingException;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.junit.Assert;
@@ -801,6 +802,18 @@ public void nestedOnInTermsQuery() throws IOException, SqlParseException, SQLFea
         Assert.assertEquals(3, response.getTotalHits());
     }
 
+    @Test
+    public void multipleIndicesOneNotExistWithHint() throws IOException, SqlParseException, SQLFeatureNotSupportedException{
+        SearchHits response = query(String.format("SELECT /*! IGNORE_UNAVAILABLE */ * FROM %s,%s ", TEST_INDEX,"badindex"));
+        Assert.assertTrue(response.getTotalHits() > 0);
+    }
+
+    @Test(expected=IndexMissingException.class)
+    public void multipleIndicesOneNotExistWithoutHint() throws IOException, SqlParseException, SQLFeatureNotSupportedException{
+        SearchHits response = query(String.format("SELECT  * FROM %s,%s ", TEST_INDEX,"badindex"));
+        Assert.assertTrue(response.getTotalHits() > 0);
+    }
+
     private SearchHits query(String query) throws SqlParseException, SQLFeatureNotSupportedException, SQLFeatureNotSupportedException {
         SearchDao searchDao = MainTestSuite.getSearchDao();
         SqlElasticSearchRequestBuilder select = (SqlElasticSearchRequestBuilder) searchDao.explain(query);

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,10 @@ public static Hint getHintFromString(String hintAsString){`
`45`	`45`	`}`
`46`	`46`	`return new Hint(HintType.USE_SCROLL, new Object[]{docsPerShardFetch,timeout});`
`47`	`47`	`}`
	`48`	`+ if(hintAsString.startsWith("! IGNORE_UNAVAILABLE")){`
	`49`	`+ return new Hint(HintType.IGNORE_UNAVAILABLE,null);`
	`50`	`+ }`
	`51`	`+`
`48`	`52`	`return null;`
`49`	`53`	`}`
`50`	`54`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ public enum HintType`
`12`	`12`	`JOIN_LIMIT,`
`13`	`13`	`USE_NESTED_LOOPS,`
`14`	`14`	`NL_MULTISEARCH_SIZE,`
`15`		`- USE_SCROLL;`
`16`		`-`
	`15`	`+ USE_SCROLL,`
	`16`	`+ IGNORE_UNAVAILABLE;`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,7 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {`
`139`	`139`	`setLimit(select.getOffset(), select.getRowCount());`
`140`	`140`
`141`	`141`	`request.setSearchType(SearchType.DEFAULT);`
	`142`	`+ updateWithIndicesOptionsIfNeeded(select,request);`
`142`	`143`	`SqlElasticSearchRequestBuilder sqlElasticRequestBuilder = new SqlElasticSearchRequestBuilder(request);`
`143`	`144`	`return sqlElasticRequestBuilder;`
`144`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {`
`47`	`47`	`if(!usedScroll){`
`48`	`48`	`request.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);`
`49`	`49`	`}`
	`50`	`+ updateWithIndicesOptionsIfNeeded(select,request);`
`50`	`51`
`51`	`52`	`SqlElasticSearchRequestBuilder sqlElasticRequestBuilder = new SqlElasticSearchRequestBuilder(request);`
`52`	`53`	`return sqlElasticRequestBuilder;`