Delete by query to not wrap the inner query into an additional query element

plugins/delete-by-query/src/main/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryAction.java

@@ -107,8 +107,8 @@ void executeScan() {
                     scanRequest.routing(request.routing());
                 }
 
+                scanRequest.source(request.source());
                 SearchSourceBuilder source = new SearchSourceBuilder()
-                        .query(request.source())
                         .fields("_routing", "_parent")
                         .sort("_doc") // important for performance
                         .fetchSource(false)
@@ -119,7 +119,7 @@ void executeScan() {
                 if (request.timeout() != null) {
                     source.timeout(request.timeout());
                 }
-                scanRequest.source(source);
+                scanRequest.extraSource(source);
 
                 logger.trace("executing scan request");
                 searchAction.execute(scanRequest, new ActionListener<SearchResponse>() {
@@ -302,10 +302,6 @@ boolean hasTimedOut() {
             return request.timeout() != null && (threadPool.estimatedTimeInMillis() >= (startTime + request.timeout().millis()));
         }
 
-        void addShardFailure(ShardOperationFailedException failure) {
-            addShardFailures(new ShardOperationFailedException[]{failure});
-        }
-
         void addShardFailures(ShardOperationFailedException[] failures) {
             if (!CollectionUtils.isEmpty(failures)) {
                 ShardOperationFailedException[] duplicates = new ShardOperationFailedException[shardFailures.length + failures.length];

plugins/delete-by-query/src/test/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryActionTests.java

@@ -30,6 +30,7 @@
 import org.elasticsearch.action.search.ClearScrollResponse;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchType;
+import org.elasticsearch.action.support.QuerySourceBuilder;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.text.StringText;
 import org.elasticsearch.common.unit.TimeValue;
@@ -85,7 +86,7 @@ public void testExecuteScan() {
         assertHitCount(client().prepareCount("test").get(), numDocs);
 
         final long limit = randomIntBetween(0, numDocs);
-        DeleteByQueryRequest delete = new DeleteByQueryRequest().indices("test").source(boolQuery().must(rangeQuery("num").lte(limit)).buildAsBytes());
+        DeleteByQueryRequest delete = new DeleteByQueryRequest().indices("test").source(new QuerySourceBuilder().setQuery(boolQuery().must(rangeQuery("num").lte(limit))));
         TestActionListener listener = new TestActionListener();
 
         newAsyncAction(delete, listener).executeScan();

plugins/delete-by-query/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yaml

@@ -1,5 +1,4 @@
----
-"Basic delete_by_query":
+setup:
   - do:
       index:
           index:  test_1
@@ -24,6 +23,8 @@
   - do:
       indices.refresh: {}
 
+---
+"Basic delete_by_query":
   - do:
       delete_by_query:
         index:  test_1
@@ -40,3 +41,14 @@
         index: test_1
 
   - match:  { count:     2  }
+
+---
+"No query element delete_by_query":
+  - do:
+      catch: request
+      delete_by_query:
+        index:  test_1
+        body:
+          match:
+            foo: bar
+