update

opendistro-for-elasticsearch · Dec 15, 2020 · 752a7d1 · 752a7d1
1 parent b41d8f7
commit 752a7d1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/ppl/ExplainIT.java b/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/ppl/ExplainIT.java
@@ -60,7 +60,8 @@ public void testFilterPushDownExplain() throws Exception {
             "source=elasticsearch-sql_test_index_account"
                 + "| where age > 30 "
                 + "| where age < 40 "
-                + "| where balance > 10000 ")
+                + "| where balance > 10000 "
+                + "| fields age")
     );
   }
 
@@ -80,12 +81,14 @@ public void testFilterAndAggPushDownExplain() throws Exception {
   @Test
   public void testSortPushDownExplain() throws Exception {
     String expected = loadFromFile("expectedOutput/ppl/explain_sort_push.json");
+
     assertJsonEquals(
         expected,
         explainQueryToString(
             "source=elasticsearch-sql_test_index_account"
                 + "| sort age "
-                + "| where age > 30")
+                + "| where age > 30"
+                + "| fields age")
     );
   }
 

diff --git a/integ-test/src/test/resources/expectedOutput/ppl/explain_filter_push.json b/integ-test/src/test/resources/expectedOutput/ppl/explain_filter_push.json
@@ -2,13 +2,13 @@
   "root": {
     "name": "ProjectOperator",
     "description": {
-      "fields": "[account_number, firstname, address, gender, city, lastname, balance, employer, state, age, email]"
+      "fields": "[age]"
     },
     "children": [
       {
         "name": "ElasticsearchIndexScan",
         "description": {
-          "request": "ElasticsearchQueryRequest(indexName\u003delasticsearch-sql_test_index_account, sourceBuilder\u003d{\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"query\":{\"bool\":{\"filter\":[{\"bool\":{\"filter\":[{\"range\":{\"balance\":{\"from\":10000,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}},{\"range\":{\"age\":{\"from\":null,\"to\":40,\"include_lower\":true,\"include_upper\":false,\"boost\":1.0}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},{\"range\":{\"age\":{\"from\":30,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},\"sort\":[{\"_doc\":{\"order\":\"asc\"}}]}, searchDone\u003dfalse)"
+          "request": "ElasticsearchQueryRequest(indexName\u003delasticsearch-sql_test_index_account, sourceBuilder\u003d{\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"query\":{\"bool\":{\"filter\":[{\"bool\":{\"filter\":[{\"range\":{\"balance\":{\"from\":10000,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}},{\"range\":{\"age\":{\"from\":null,\"to\":40,\"include_lower\":true,\"include_upper\":false,\"boost\":1.0}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},{\"range\":{\"age\":{\"from\":30,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},\"_source\":{\"includes\":[\"age\"],\"excludes\":[]},\"sort\":[{\"_doc\":{\"order\":\"asc\"}}]}, searchDone\u003dfalse)"
         },
         "children": []
       }

diff --git a/integ-test/src/test/resources/expectedOutput/ppl/explain_sort_push.json b/integ-test/src/test/resources/expectedOutput/ppl/explain_sort_push.json
@@ -2,13 +2,13 @@
   "root": {
     "name": "ProjectOperator",
     "description": {
-      "fields": "[account_number, firstname, address, gender, city, lastname, balance, employer, state, age, email]"
+      "fields": "[age]"
     },
     "children": [
       {
         "name": "ElasticsearchIndexScan",
         "description": {
-          "request": "ElasticsearchQueryRequest(indexName\u003delasticsearch-sql_test_index_account, sourceBuilder\u003d{\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"query\":{\"range\":{\"age\":{\"from\":30,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}},\"sort\":[{\"age\":{\"order\":\"asc\",\"missing\":\"_first\"}}]}, searchDone\u003dfalse)"
+          "request": "ElasticsearchQueryRequest(indexName\u003delasticsearch-sql_test_index_account, sourceBuilder\u003d{\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"query\":{\"range\":{\"age\":{\"from\":30,\"to\":null,\"include_lower\":false,\"include_upper\":true,\"boost\":1.0}}},\"_source\":{\"includes\":[\"age\"],\"excludes\":[]},\"sort\":[{\"age\":{\"order\":\"asc\",\"missing\":\"_first\"}}]}, searchDone\u003dfalse)"
         },
         "children": []
       }