Merge pull request #687 from bserdar/686

686

Author: paterczm

crud/src/main/java/com/redhat/lightblue/assoc/QueryPlanChooser.java

@@ -143,25 +143,29 @@ private void iterateReferences(CompositeMetadata root, List<Conjunct> unassigned
         Error.push("iterateReferences");
         try {
             Set<Path> childPaths = root.getChildPaths();
+            LOGGER.debug("childPaths={}",childPaths);
             QueryPlanNode sourceNode = qplan.getNode(root);
             for (Path childPath : childPaths) {
+                LOGGER.debug("Processing child path={}",childPath);
                 ResolvedReferenceField rrf = root.getDescendantReference(childPath);
                 if(rrf!=null) {
                     QueryPlanNode destNode = qplan.getNode(rrf.getReferencedMetadata());
-                    QueryPlanData qd = qplan.getEdgeData(sourceNode, destNode);
-                    if (qd == null) {
-                        qplan.setEdgeData(sourceNode, destNode, qd = qplan.newData());
-                    }
-                    qd.setReference(rrf);
-                    ReferenceField ref = rrf.getReferenceField();
-                    if (ref.getQuery() != null) {
-                        LOGGER.debug("Association query:{}", ref.getQuery());
-                        List<Conjunct> refQueryClauses = new ArrayList<>();
-                        rewriteQuery(ref.getQuery(), refQueryClauses, qplan, rrf);
-                        LOGGER.debug("Association query clauses:{}", refQueryClauses);
-                        assignQueriesToPlanNodesAndEdges(refQueryClauses, unassignedClauses);
-                    }
-                    iterateReferences(rrf.getReferencedMetadata(), unassignedClauses);
+                    if(destNode!=null) {
+                        QueryPlanData qd = qplan.getEdgeData(sourceNode, destNode);
+                        if (qd == null) {
+                            qplan.setEdgeData(sourceNode, destNode, qd = qplan.newData());
+                        }
+                        qd.setReference(rrf);
+                        ReferenceField ref = rrf.getReferenceField();
+                        if (ref.getQuery() != null) {
+                            LOGGER.debug("Association query:{}", ref.getQuery());
+                            List<Conjunct> refQueryClauses = new ArrayList<>();
+                            rewriteQuery(ref.getQuery(), refQueryClauses, qplan, rrf);
+                            LOGGER.debug("Association query clauses:{}", refQueryClauses);
+                            assignQueriesToPlanNodesAndEdges(refQueryClauses, unassignedClauses);
+                        }
+                        iterateReferences(rrf.getReferencedMetadata(), unassignedClauses);
+                    } // else, this destination entity is excluded in query plan
                 } else
                     throw new RuntimeException("Cannot retrieve descendant reference for "+childPath);
             }

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

@@ -245,6 +245,17 @@ public void retrieveAandBonly() throws Exception {
     }
 
     @Test
+    public void retrieveAandB_noproject() throws Exception {
+        FindRequest fr = new FindRequest();
+        fr.setQuery(query("{'field':'obj1.c.*._id','op':'=','rvalue':'CDEEP2'}"));
+        fr.setProjection(projection("[{'field':'*','recursive':1},{'field':'level1.arr1.*.ref'}]"));
+        fr.setEntityVersion(new EntityVersion("A", "1.0.0"));
+        Response response = mediator.find(fr);
+        Assert.assertEquals(1, response.getEntityData().size());
+        Assert.assertEquals("ADEEP2", response.getEntityData().get(0).get("_id").asText());
+    }
+
+    
     public void retrieveAandBonly_defaultVersion() throws Exception {
         FindRequest fr = new FindRequest();
         fr.setQuery(query("{'field':'_id','op':'=','rvalue':'A01'}"));

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

@@ -903,6 +903,23 @@
     ]
   }
   },{
+  "_id":"ADEEP2",
+   "objectType":"A",
+   "b_ref":"BNONP",
+      "obj1":{
+       "c_ref":"CDEEP2"
+   },
+   "level1": {
+    "arr1": [
+       { 
+         "b_ref":"B01"
+       },
+       { 
+         "b_ref":"B02"
+       }
+    ]
+   }
+  },{
   "_id":"MANYB1",
   "objectType":"A",
   "nonid_b_ref":"MANYB1"

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

@@ -517,5 +517,9 @@
   "_id":"BMANY4",
   "objectType":"B",
   "field1":"MANYB2"
+  },{
+  "_id":"BNONP",
+  "objectType":"B",
+  "field1":"BNONP"
   }
 ]

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

@@ -448,4 +448,13 @@
     "d_ref":"D50"
     },
   "b_ref":"B50"
+  },{
+  "_id":"CDEEP2",
+  "objectType":"C",
+  "field1":"-zcfIobvXmCmii5u8GdKaVAv3o7ax",
+  "obj1":{
+    "field1":"7w.ldg",
+    "d_ref":"D50"
+    },
+  "b_ref":"B50"
   }]

metadata/src/main/java/com/redhat/lightblue/metadata/CompositeMetadata.java

@@ -185,6 +185,11 @@ public String toTreeString() {
         return bld.toString();
     }
 
+    @Override
+    public String toString() {
+        return toTreeString();
+    }
+
     /**
      * Returns the composite metadata containing the field pointed by the given
      * path

metadata/src/test/java/com/redhat/lightblue/metadata/AbstractGetMetadataTest.java

@@ -120,6 +120,19 @@ public void query_b_in_A() throws Exception {
         Assert.assertNull(a.getChildMetadata(new Path("obj1.c")));
     }
 
+    @Test
+    public void query_b_project_c() throws Exception {
+        EntityMetadata md = getMd("composite/A.json");
+        GMD gmd = new GMD();
+        gmd.add(query("{'field':'b.*.field1','op':'=','rvalue':'x'}"));
+        gmd.add(projection("[{'field':'*'},{'field':'obj1.c'}]"));
+        CompositeMetadata a = CompositeMetadata.buildCompositeMetadata(md, gmd);
+
+        System.out.println(a.toTreeString());
+        Assert.assertNotNull(a.getChildMetadata(new Path("b")));
+        Assert.assertNotNull(a.getChildMetadata(new Path("obj1.c")));
+    }
+
     @Test
     public void query_b_and_c_in_A() throws Exception {
         EntityMetadata md = getMd("composite/A.json");