From: Toine Siebelink <toine.siebelink@est.tech>
Date: Mon, 13 Mar 2023 14:18:02 +0000 (+0000)
Subject: Merge "Reduce dataspace/anchor lookups in CpsDataPersistenceService"
X-Git-Tag: 3.2.6~17
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9a552aaf3dcd944a629aa30a3cb8122eb8ce7585;p=cps.git

Merge "Reduce dataspace/anchor lookups in CpsDataPersistenceService"
---

9a552aaf3dcd944a629aa30a3cb8122eb8ce7585
diff --cc cps-ri/src/main/java/org/onap/cps/spi/impl/CpsDataPersistenceServiceImpl.java
index 593ed13344,e3be0137d3..3ea388242e
--- a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsDataPersistenceServiceImpl.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsDataPersistenceServiceImpl.java
@@@ -334,13 -302,9 +307,11 @@@ public class CpsDataPersistenceServiceI
      }
  
      @Override
 +    @Timed(value = "cps.data.persistence.service.datanode.query",
 +            description = "Time taken to query data nodes")
      public List<DataNode> queryDataNodes(final String dataspaceName, final String anchorName, final String cpsPath,
                                           final FetchDescendantsOption fetchDescendantsOption) {
-         final DataspaceEntity dataspaceEntity = dataspaceRepository.getByName(dataspaceName);
-         final AnchorEntity anchorEntity = anchorRepository.getByDataspaceAndName(dataspaceEntity, anchorName);
+         final AnchorEntity anchorEntity = getAnchorEntity(dataspaceName, anchorName);
          final CpsPathQuery cpsPathQuery;
          try {
              cpsPathQuery = CpsPathUtil.getCpsPathQuery(cpsPath);