scroll with order for non-join queries.

eliranmoyal · eliranmoyal · commit a23a5c63d6ab · 2015-11-12T21:20:46.000+02:00
diff --git a/src/_site/controllers.js b/src/_site/controllers.js
@@ -170,6 +170,12 @@ function updateWithScrollIfNeeded (query) {
           	}
           	else {
           		$scope.gotNext=true;
+                scrollBudy = handler.getBody();
+                //not using scan type
+                if(scrollBudy.length >0 ){
+                    $scope.resultsColumns = handler.getHead();
+                    $scope.resultsRows = scrollBudy;
+                }
           	}
           }
           
diff --git a/src/main/java/org/nlpcn/es4sql/domain/Select.java b/src/main/java/org/nlpcn/es4sql/domain/Select.java
@@ -133,5 +133,9 @@ public boolean containsSubQueries() {
     public List<SubQueryExpression> getSubQueries() {
         return subQueries;
     }
+
+    public boolean isOrderdSelect(){
+        return this.getOrderBys()!=null && this.getOrderBys().size() >0 ;
+    }
 }
 
diff --git a/src/main/java/org/nlpcn/es4sql/query/DefaultQueryAction.java b/src/main/java/org/nlpcn/es4sql/query/DefaultQueryAction.java
@@ -43,8 +43,7 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {
 		setSorts(select.getOrderBys());
 		setLimit(select.getOffset(), select.getRowCount());
 
-		// set SearchType.
-        boolean usedScroll = useScrollIfNeeded();
+        boolean usedScroll = useScrollIfNeeded(select.isOrderdSelect());
         if(!usedScroll){
             request.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
         }
@@ -53,7 +52,7 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {
 		return sqlElasticRequestBuilder;
 	}
 
-    private boolean useScrollIfNeeded() {
+    private boolean useScrollIfNeeded(boolean existsOrderBy) {
         Hint scrollHint = null;
         for(Hint hint: select.getHints()){
             if(hint.getType() == HintType.USE_SCROLL){
@@ -64,8 +63,8 @@ private boolean useScrollIfNeeded() {
         if(scrollHint!=null) {
             int scrollSize = (Integer) scrollHint.getParams()[0];
             int timeoutInMilli = (Integer) scrollHint.getParams()[1];
-            request.setSearchType(SearchType.SCAN)
-                    .setScroll(new TimeValue(timeoutInMilli))
+            if(!existsOrderBy) request.setSearchType(SearchType.SCAN);
+            request.setScroll(new TimeValue(timeoutInMilli))
                     .setSize(scrollSize);
         }
         return scrollHint !=null ;
diff --git a/src/test/java/org/nlpcn/es4sql/QueryTest.java b/src/test/java/org/nlpcn/es4sql/QueryTest.java
@@ -671,6 +671,19 @@ public void useScrollWithParams() throws IOException, SqlParseException, SQLFeat
         Assert.assertEquals(1000,hits.getTotalHits());
     }
 
+
+    @Test
+    public void useScrollWithOrderByAndParams() throws IOException, SqlParseException, SQLFeatureNotSupportedException{
+        SearchResponse response = getSearchResponse(String.format("SELECT /*! USE_SCROLL(5,50000)*/ age,gender,firstname,balance FROM  %s/account order by age", TEST_INDEX, TEST_INDEX));
+        Assert.assertNotNull(response.getScrollId());
+        SearchHits hits = response.getHits();
+        Assert.assertEquals(5,hits.getHits().length);
+        Assert.assertEquals(1000,hits.getTotalHits());
+        for(SearchHit hit : hits){
+            Assert.assertEquals(20,hit.sourceAsMap().get("age"));
+        }
+    }
+
     @Test
     public void innerQueryTest() throws SqlParseException, SQLFeatureNotSupportedException {
         String query = String.format("select * from %s/dog where holdersName IN (select firstname from %s/account where firstname = 'Hattie')",TEST_INDEX,TEST_INDEX);

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,12 @@ function updateWithScrollIfNeeded (query) {`
`170`	`170`	`}`
`171`	`171`	`else {`
`172`	`172`	`$scope.gotNext=true;`
	`173`	`+ scrollBudy = handler.getBody();`
	`174`	`+ //not using scan type`
	`175`	`+ if(scrollBudy.length >0 ){`
	`176`	`+ $scope.resultsColumns = handler.getHead();`
	`177`	`+ $scope.resultsRows = scrollBudy;`
	`178`	`+ }`
`173`	`179`	`}`
`174`	`180`	`}`
`175`	`181`
Original file line number	Diff line number	Diff line change
`@@ -133,5 +133,9 @@ public boolean containsSubQueries() {`
`133`	`133`	`public List<SubQueryExpression> getSubQueries() {`
`134`	`134`	`return subQueries;`
`135`	`135`	`}`
	`136`	`+`
	`137`	`+ public boolean isOrderdSelect(){`
	`138`	`+ return this.getOrderBys()!=null && this.getOrderBys().size() >0 ;`
	`139`	`+ }`
`136`	`140`	`}`
`137`	`141`