Code Review / cps.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Fix for recursive SQL returning extra level of descendants
[cps.git] / cps-ri / src / main / java / org / onap / cps / spi / repository / FragmentRepository.java
diff --git a/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepository.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepository.java
index 8114f10..82c422f 100755 (executable)
--- a/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepository.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepository.java
@@ -27,6 +27,7 @@ import java.util.Collection;
 import java.util.List;\r
 import java.util.Optional;\r
 import org.onap.cps.spi.entities.AnchorEntity;\r
+import org.onap.cps.spi.entities.DataspaceEntity;\r
 import org.onap.cps.spi.entities.FragmentEntity;\r
 import org.onap.cps.spi.entities.FragmentExtract;\r
 import org.onap.cps.spi.exceptions.DataNodeNotFoundException;\r
@@ -46,61 +47,58 @@ public interface FragmentRepository extends JpaRepository<FragmentEntity, Long>,
             new DataNodeNotFoundException(anchorEntity.getDataspace().getName(), anchorEntity.getName(), xpath));\r
     }\r
 \r
-    boolean existsByAnchorId(int anchorId);\r
+    List<FragmentEntity> findByAnchorIdAndXpathIn(long anchorId, String[] xpaths);\r
 \r
-    @Query("SELECT f FROM FragmentEntity f WHERE anchor = :anchor")\r
-    List<FragmentExtract> findAllExtractsByAnchor(@Param("anchor") AnchorEntity anchorEntity);\r
+    default List<FragmentEntity> findByAnchorAndXpathIn(final AnchorEntity anchorEntity,\r
+                                                        final Collection<String> xpaths) {\r
+        return findByAnchorIdAndXpathIn(anchorEntity.getId(), xpaths.toArray(new String[0]));\r
+    }\r
 \r
-    @Query(value = "SELECT * FROM fragment WHERE xpath = ANY (:xpaths)", nativeQuery = true)\r
-    List<FragmentEntity> findAllByXpathIn(@Param("xpaths") String[] xpath);\r
+    @Query(value = "SELECT fragment.* FROM fragment JOIN anchor ON anchor.id = fragment.anchor_id "\r
+        + "WHERE dataspace_id = :dataspaceId AND xpath = ANY (:xpaths)", nativeQuery = true)\r
+    List<FragmentEntity> findByDataspaceIdAndXpathIn(@Param("dataspaceId") int dataspaceId,\r
+                                                     @Param("xpaths") String[] xpaths);\r
 \r
-    default List<FragmentEntity> findAllByXpathIn(final Collection<String> xpaths) {\r
-        return findAllByXpathIn(xpaths.toArray(new String[0]));\r
+    default List<FragmentEntity> findByDataspaceAndXpathIn(final DataspaceEntity dataspaceEntity,\r
+                                                           final Collection<String> xpaths) {\r
+        return findByDataspaceIdAndXpathIn(dataspaceEntity.getId(), xpaths.toArray(new String[0]));\r
     }\r
 \r
+    boolean existsByAnchorId(long anchorId);\r
+\r
+    @Query("SELECT f FROM FragmentEntity f WHERE anchor = :anchor")\r
+    List<FragmentExtract> findAllExtractsByAnchor(@Param("anchor") AnchorEntity anchorEntity);\r
+\r
     @Modifying\r
     @Query(value = "DELETE FROM fragment WHERE anchor_id = ANY (:anchorIds)", nativeQuery = true)\r
-    void deleteByAnchorIdIn(@Param("anchorIds") int[] anchorIds);\r
+    void deleteByAnchorIdIn(@Param("anchorIds") long[] anchorIds);\r
 \r
     default void deleteByAnchorIn(final Collection<AnchorEntity> anchorEntities) {\r
-        deleteByAnchorIdIn(anchorEntities.stream().map(AnchorEntity::getId).mapToInt(id -> id).toArray());\r
+        deleteByAnchorIdIn(anchorEntities.stream().map(AnchorEntity::getId).mapToLong(id -> id).toArray());\r
     }\r
 \r
     @Modifying\r
     @Query(value = "DELETE FROM fragment WHERE anchor_id = :anchorId AND xpath = ANY (:xpaths)", nativeQuery = true)\r
-    void deleteByAnchorIdAndXpaths(@Param("anchorId") int anchorId, @Param("xpaths") String[] xpaths);\r
+    void deleteByAnchorIdAndXpaths(@Param("anchorId") long anchorId, @Param("xpaths") String[] xpaths);\r
 \r
-    default void deleteByAnchorIdAndXpaths(final int anchorId, final Collection<String> xpaths) {\r
+    default void deleteByAnchorIdAndXpaths(final long anchorId, final Collection<String> xpaths) {\r
         deleteByAnchorIdAndXpaths(anchorId, xpaths.toArray(new String[0]));\r
     }\r
 \r
     @Modifying\r
     @Query(value = "DELETE FROM fragment f WHERE anchor_id = :anchorId AND xpath LIKE ANY (:xpathPatterns)",\r
         nativeQuery = true)\r
-    void deleteByAnchorIdAndXpathLikeAny(@Param("anchorId") int anchorId,\r
+    void deleteByAnchorIdAndXpathLikeAny(@Param("anchorId") long anchorId,\r
                                          @Param("xpathPatterns") String[] xpathPatterns);\r
 \r
-    default void deleteListsByAnchorIdAndXpaths(int anchorId, Collection<String> xpaths) {\r
+    default void deleteListsByAnchorIdAndXpaths(long anchorId, Collection<String> xpaths) {\r
         final String[] listXpathPatterns = xpaths.stream().map(xpath -> xpath + "[%").toArray(String[]::new);\r
         deleteByAnchorIdAndXpathLikeAny(anchorId, listXpathPatterns);\r
     }\r
 \r
-    @Query("SELECT f FROM FragmentEntity f WHERE anchor = :anchor"\r
-        + " AND (xpath = :parentXpath OR xpath LIKE CONCAT(:parentXpath,'/%'))")\r
-    List<FragmentExtract> findByAnchorAndParentXpath(@Param("anchor") AnchorEntity anchorEntity,\r
-                                                     @Param("parentXpath") String parentXpath);\r
-\r
-    @Query(value = "SELECT id, anchor_id AS anchorId, xpath, parent_id AS parentId,"\r
-        + " CAST(attributes AS TEXT) AS attributes"\r
-        + " FROM FRAGMENT WHERE anchor_id = :anchorId"\r
-        + " AND xpath ~ :xpathRegex",\r
-        nativeQuery = true)\r
-    List<FragmentExtract> quickFindWithDescendants(@Param("anchorId") int anchorId,\r
-                                                   @Param("xpathRegex") String xpathRegex);\r
-\r
     @Query(value = "SELECT xpath FROM fragment WHERE anchor_id = :anchorId AND xpath = ANY (:xpaths)",\r
         nativeQuery = true)\r
-    List<String> findAllXpathByAnchorIdAndXpathIn(@Param("anchorId") int anchorId,\r
+    List<String> findAllXpathByAnchorIdAndXpathIn(@Param("anchorId") long anchorId,\r
                                                   @Param("xpaths") String[] xpaths);\r
 \r
     default List<String> findAllXpathByAnchorAndXpathIn(final AnchorEntity anchorEntity,\r
@@ -121,24 +119,40 @@ public interface FragmentRepository extends JpaRepository<FragmentEntity, Long>,
         + "   UNION "\r
         + "  SELECT c.id, depth + 1 "\r
         + "    FROM fragment c INNER JOIN parent_search p ON c.parent_id = p.id"\r
-        + "   WHERE depth <= (SELECT CASE WHEN :maxDepth = -1 THEN " + Integer.MAX_VALUE + " ELSE :maxDepth END) "\r
+        + "   WHERE depth < (SELECT CASE WHEN :maxDepth = -1 THEN " + Integer.MAX_VALUE + " ELSE :maxDepth END) "\r
         + ") "\r
         + "SELECT f.id, anchor_id AS anchorId, xpath, f.parent_id AS parentId, CAST(attributes AS TEXT) AS attributes "\r
         + "FROM fragment f INNER JOIN parent_search p ON f.id = p.id",\r
         nativeQuery = true\r
     )\r
-    List<FragmentExtract> findExtractsWithDescendants(@Param("anchorId") int anchorId,\r
+    List<FragmentExtract> findExtractsWithDescendants(@Param("anchorId") long anchorId,\r
                                                       @Param("xpaths") String[] xpaths,\r
                                                       @Param("maxDepth") int maxDepth);\r
 \r
-    default List<FragmentExtract> findExtractsWithDescendants(final int anchorId, final Collection<String> xpaths,\r
+    default List<FragmentExtract> findExtractsWithDescendants(final long anchorId, final Collection<String> xpaths,\r
                                                               final int maxDepth) {\r
         return findExtractsWithDescendants(anchorId, xpaths.toArray(new String[0]), maxDepth);\r
     }\r
 \r
-    @Query(value = "SELECT id, anchor_id AS anchorId, xpath, parent_id AS parentId,"\r
-            + " CAST(attributes AS TEXT) AS attributes"\r
-            + " FROM FRAGMENT WHERE xpath ~ :xpathRegex",\r
-            nativeQuery = true)\r
-    List<FragmentExtract> quickFindWithDescendantsAcrossAnchor(@Param("xpathRegex") String xpathRegex);\r
+    @Query(value\r
+        = "WITH RECURSIVE parent_search AS ("\r
+        + "  SELECT id, 0 AS depth "\r
+        + "    FROM fragment "\r
+        + "   WHERE id = ANY (:ids) "\r
+        + "   UNION "\r
+        + "  SELECT c.id, depth + 1 "\r
+        + "    FROM fragment c INNER JOIN parent_search p ON c.parent_id = p.id"\r
+        + "   WHERE depth < (SELECT CASE WHEN :maxDepth = -1 THEN " + Integer.MAX_VALUE + " ELSE :maxDepth END) "\r
+        + ") "\r
+        + "SELECT f.id, anchor_id AS anchorId, xpath, f.parent_id AS parentId, CAST(attributes AS TEXT) AS attributes "\r
+        + "FROM fragment f INNER JOIN parent_search p ON f.id = p.id",\r
+        nativeQuery = true\r
+    )\r
+    List<FragmentExtract> findExtractsWithDescendantsByIds(@Param("ids") long[] ids,\r
+                                                           @Param("maxDepth") int maxDepth);\r
+\r
+    default List<FragmentExtract> findExtractsWithDescendantsByIds(final Collection<Long> ids, final int maxDepth) {\r
+        return findExtractsWithDescendantsByIds(ids.stream().mapToLong(id -> id).toArray(), maxDepth);\r
+    }\r
+\r
 }\r
"cps"