Merge pull request #750 from bserdar/749

Fix #749: do not set query limits if there are queries for non-root n…

Author: bvulaj

crud/src/main/java/com/redhat/lightblue/assoc/ep/ExecutionPlan.java

@@ -114,6 +114,17 @@ public ExecutionPlan(QueryExpression requestQuery,
         // This is set to true when we identify the step that sets matchcount
         boolean matchCountSet=false;
 
+
+        // This is set if there are queries associated with the nodes
+        // that are not the root node of the retrieval plan
+        boolean queries_in_non_root_nodes=false;
+        for(QueryPlanNode node:retrievalQueryPlan.getAllNodes()) {
+            if(node.getSources().length!=0&& // non-root
+               !node.getData().getConjuncts().isEmpty()) {
+                queries_in_non_root_nodes=true;
+                break;
+            }
+        }
         // First, create execution blocks for every node in the search and
         // retrieval plans. We keep a map of query plan nodes to execution
         // blocks to keep query plan immutable.
@@ -197,7 +208,7 @@ public ExecutionPlan(QueryExpression requestQuery,
                 if (block == rootEntityInQueryPlan) {
                     // This is the block for the root entity
                     if (rootIsTheOnlySource) {
-                        if (unassigned.isEmpty()) {
+                        if (unassigned.isEmpty()&&!queries_in_non_root_nodes) {
                             // Root is the only source, and there are no unassigned clauses
                             // We can sort/limit here
                             search.setLimit(from, to);
@@ -230,7 +241,7 @@ public ExecutionPlan(QueryExpression requestQuery,
                         		last = new Source<>(new Skip(block, from.intValue(), last));
                         	}
                         	if (to != null) {
-                        		last = new Source<>(new Limit(block, to.intValue() - from.intValue() + 1, last));
+                        		last = new Source<>(new Limit(block, to.intValue() - (from==null?0:from.intValue()) + 1, last));
                         	}
                         }
                         block.setResultStep(last);
@@ -258,17 +269,6 @@ public ExecutionPlan(QueryExpression requestQuery,
         // Done with the search plan. Now we build the execution plan for retrieval
         LOGGER.debug("Building execution plan from retrieval query plan:{}", retrievalQueryPlan);
         List<Conjunct> unassigned = retrievalQueryPlan.getUnassignedClauses();
-
-        // This is set if there are queries associated with the nodes
-        // that are not the root node of the retrieval plan
-        boolean queries_in_non_root_nodes=false;
-        for(QueryPlanNode node:retrievalQueryPlan.getAllNodes()) {
-            if(node.getSources().length!=0&& // non-root
-               !node.getData().getConjuncts().isEmpty()) {
-                queries_in_non_root_nodes=true;
-                break;
-            }
-        }
         if(qfi==null) {
             qfi = getAllQueryFieldInfo(retrievalQueryPlan);
         } else {
@@ -329,7 +329,7 @@ public ExecutionPlan(QueryExpression requestQuery,
                         resultStep = new Skip(block, from.intValue(), new Source<>(resultStep));
                     }
                     if (to != null) {
-                        resultStep = new Limit(block, to.intValue() - from.intValue() + 1, new Source<>(resultStep));
+                        resultStep = new Limit(block, to.intValue() - (from==null?0:from.intValue()) + 1, new Source<>(resultStep));
                     }
                 }
                 resultStep = new Project(block, new Source<>(resultStep), requestProjection);

crud/src/test/java/com/redhat/lightblue/mediator/CompositeFinderTest.java

@@ -1088,4 +1088,17 @@ public void test_self_ref_with_parents() throws Exception {
         Assert.assertEquals(1,response.getEntityData().size());
         Assert.assertTrue(response.getEntityData().get(0).get("vulnerabilities").get(0).get("packages").get(0).get("fixed_by_images").size()==1);
     }
+
+    @Test
+    public void limited_retrieval_with_queries_on_sub() throws Exception {
+        FindRequest fr=new FindRequest();
+        fr.setQuery(query("{'$and':[{'array':'repositories','elemMatch':{'field':'repositories.*._id','op':'>','rvalue':'1'}},"+
+                          "{'array':'repositories','elemMatch':{'field':'published','op':'=','rvalue':true}}]}"));        
+        fr.setProjection(projection("[{'field':'*','recursive':true},{'field':'repositories.*.repositories.*.vendors','recursive':true}]"));
+        fr.setEntityVersion(new EntityVersion("containerImage","1.0.0"));
+        fr.setTo(2l);
+        Response response=mediator.find(fr);
+        System.out.println(response.getEntityData());
+        Assert.assertEquals(3,response.getEntityData().size());
+    }
 }

crud/src/test/resources/composite/containerImage.json

@@ -5,7 +5,14 @@
         "backend":"mongo",
         "datasource": "mongodata",
         "collection": "containerImage"
-    }
+    },
+      "indexes":[
+          {
+              "fields":[
+                  {"field":"repositories.*.published","dir":"$asc"}
+                  ]
+          }
+          ]
   },
   "schema" : {
     "name" : "containerImage",

crud/src/test/resources/composite/containerRepository.json

@@ -28,6 +28,16 @@
           "repository": { "type": "string" },
           "registry": { "type": "string" },
           "vendorLabel": { "type":"string" },
+          "vendors":{
+              "type":"reference",
+              "entity":"vendors",
+              "versionValue":"1.0.0",
+              "query":{
+                  "field":"label",
+                  "op":"=",
+                  "rfield":"$parent.vendorLabel"
+              }
+          },
           "images": {
               "type":"reference",
               "entity":"containerImage",

crud/src/test/resources/composite/vendors.json

@@ -0,0 +1,31 @@
+{
+  "entityInfo" : {
+    "name": "vendors",
+    "datastore": {
+        "backend":"mongo",
+        "datasource": "mongodata",
+        "collection": "vendors"
+    }
+  },
+  "schema" : {
+    "name" : "vendors",
+      "version": {
+          "value": "1.0.0",
+          "changelog": "Test"
+      },
+    "status": {
+        "value": "active"
+    },
+      "access" : {
+          "insert": ["anyone"],
+          "find":["anyone"],
+          "update":["anyone"],
+          "delete":["anyone"]
+      },
+      "fields": {
+          "_id": {"type": "string", "constraints":{ "identity":1 } },
+          "objectType": {"type": "string"},
+          "label": { "type": "string" }
+      }
+  }
+}

crud/src/test/resources/composite/vendors_data.json

@@ -0,0 +1,3 @@
+[
+    {"_id":"1","objectType":"vendors","label":"Red Hat" }
+]